From 9e1f48f7e76058483df12f96b6e7caa878d94633 Mon Sep 17 00:00:00 2001 From: bagwanpankaj Date: Thu, 6 Feb 2014 22:18:17 +0530 Subject: [PATCH] [ADD] changed to connect to remote --- LICENSE.txt | 2 +- README.markdown | 2 +- humongous.gemspec | 2 +- lib/humongous/application.rb | 8 ++++++++ lib/humongous/helpers.rb | 6 +++--- lib/humongous/public/javascripts/application.js | 4 ++-- lib/humongous/version.rb | 2 +- lib/humongous/views/index.erb | 10 ++++++---- 8 files changed, 23 insertions(+), 13 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index c4d90b8..3a6d34e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2012 Bagwan Pankaj +Copyright (c) 2012-2014 Bagwan Pankaj Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/README.markdown b/README.markdown index 53359da..3abefca 100644 --- a/README.markdown +++ b/README.markdown @@ -67,5 +67,5 @@ There are lot of things and area to improve and develop. Since it in pre release ## Copyright -Copyright (c) 2012 [Bagwan Pankaj]. See LICENSE.txt for further details. +Copyright (c) 2012-2014 [Bagwan Pankaj]. See LICENSE.txt for further details. diff --git a/humongous.gemspec b/humongous.gemspec index 47c6983..6695a83 100644 --- a/humongous.gemspec +++ b/humongous.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version= s.required_ruby_version = '>= 1.8.7' s.authors = ["bagwanpankaj"] - s.date = "2012-02-20" + s.date = "2014-02-06" s.description = "Humongous: A Ruby way to browse and maintain mongo instance. Using HTML5." s.email = "bagwanpankaj@gmail.com" s.executables = ["humongous"] diff --git a/lib/humongous/application.rb b/lib/humongous/application.rb index e217fe8..fe4f5ce 100644 --- a/lib/humongous/application.rb +++ b/lib/humongous/application.rb @@ -37,6 +37,14 @@ class Application < Sinatra::Base halt 401, {'Content-Type' => 'text/javascript'}, { :errmsg => "Need to login", :ok => false }.to_json end + error Mongo::InvalidNSName do + halt 502, headers, "Humongous is unable to find MongoDB instance. Make sure that MongoDB is running." + end + + error Mongo::AuthenticationError do + halt 502, headers, "Humongous is unable to find MongoDB instance. Make sure that MongoDB is running." + end + helpers { include Humongous::Helpers::SinatraHelpers } reciever = lambda do diff --git a/lib/humongous/helpers.rb b/lib/humongous/helpers.rb index 1d11a45..2556ef1 100644 --- a/lib/humongous/helpers.rb +++ b/lib/humongous/helpers.rb @@ -5,12 +5,12 @@ module SinatraHelpers def connection(params) opts = opts_to_connect(params) - session[:connection] ||= Mongo::Connection.new(opts[:url], opts[:port]) + session[:connection] = Mongo::Connection.new(opts[:url], opts[:port]) end def autanticate! @connection.apply_saved_authentication and return unless @connection.auths.blank? - return if params[:auth].blank? + return if params[:auth].blank? || params[:auth][:db].blank? @connection.add_auth(params[:auth][:db], params[:auth][:username], params[:auth][:password]) @connection.apply_saved_authentication end @@ -24,7 +24,7 @@ def opts_to_connect(params = {}) :password => "" } return @options if params.blank? - @options.merge({ :url => params[:url], :port => params[:port], :freeze => true }) + @options.merge!({ :url => params[:url], :port => params[:port], :freeze => true }) end def get_uri(params = {}) diff --git a/lib/humongous/public/javascripts/application.js b/lib/humongous/public/javascripts/application.js index dc95f28..6e97929 100644 --- a/lib/humongous/public/javascripts/application.js +++ b/lib/humongous/public/javascripts/application.js @@ -4,9 +4,9 @@ $(document).ready(function(){ backdrop: "static" }); $("#login_dialog a").click( function(e){ - if(validate("#login_dialog .modal-body form")){ + // if(validate("#login_dialog .modal-body form")){ $("#login_dialog .modal-body form").submit(); - } + // } e.preventDefault(); }); $("#loader").bind("ajaxSend", function(){ diff --git a/lib/humongous/version.rb b/lib/humongous/version.rb index 3ffe0f8..0d44493 100644 --- a/lib/humongous/version.rb +++ b/lib/humongous/version.rb @@ -1,3 +1,3 @@ module Humongous - VERSION = "0.2.0" + VERSION = "1.0.0" end \ No newline at end of file diff --git a/lib/humongous/views/index.erb b/lib/humongous/views/index.erb index 999623b..e4a7c17 100644 --- a/lib/humongous/views/index.erb +++ b/lib/humongous/views/index.erb @@ -39,6 +39,7 @@ Humongous @@ -133,7 +134,7 @@ -
© Bagwan Pankaj 2012
+
© Bagwan Pankaj 2012-2014
-

Copyright (c) 2012 Bagwan Pankaj

+

Copyright (c) 2012-2014 Bagwan Pankaj

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -166,7 +167,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-
© Bagwan Pankaj 2012
+
© Bagwan Pankaj 2012-2014