humongous 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 86cdb56ee13549a4165b264d87fc0bbd2b959b77
-  data.tar.gz: 784d7b5e5edb6885c60a507ef08fdb9cd2bc9d88
+SHA256:
+  metadata.gz: ad9369e3d213e9e01c3035211675e402dfe7c8bd1aee66c92e9ad9a59b5d2186
+  data.tar.gz: ab1c5141dfbb78f2a3c55c07726d95088937dbe0bf1826ab9590d8e11a818fe9
 SHA512:
-  metadata.gz: 991ec178f1baf6c751c9f2a75076c71ca026b0b19bf61f212a02e52b8d9b9d6842aa477fcb8b1dd3ee6a38e75d4b6e2eeaf390536ed0c6931b9cb6e82d21e036
-  data.tar.gz: c0bcf6c81e1d01ff92fad06671575e275a52a904b83d538553763820e51fdc48ed5280692d75dc4df72bdd1bc9c875c9203ec516e56034b5deeb0c2b25abd364
+  metadata.gz: c7320a9d915a2f69df8477817157280cb17ac92d4b2dc13fe5efea3e917eb5a9f4c006cf94ec28f81439e64b85eb2a1cba9d6a2ef77bcb0cd21c28a0e5fef379
+  data.tar.gz: aa9fdcf76e0312fb50f087ea92fcb2deeb0462de5f4ecdd8c5fe7b85269841ffc6d5b270cbfb52fa9dd0f8da9d67d4fb03ce21e7a45379cc86795c07b4fa0b5b

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014 Bagwan Pankaj
+Copyright (c) 2012-2016 Bagwan Pankaj
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -4,12 +4,12 @@
 
 [![Gem Version](https://badge.fury.io/rb/humongous.png)](http://badge.fury.io/rb/humongous)
 
-     _   _                                                   
-    | | | |_   _ _ __ ___   ___  _ __   __ _  ___  _   _ ___ 
+     _   _
+    | | | |_   _ _ __ ___   ___  _ __   __ _  ___  _   _ ___
     | |_| | | | | '_ ` _ \ / _ \| '_ \ / _` |/ _ \| | | / __|
     |  _  | |_| | | | | | | (_) | | | | (_| | (_) | |_| \__ \
     |_| |_|\__,_|_| |_| |_|\___/|_| |_|\__, |\___/ \__,_|___/
-                                       |___/                 
+                                       |___/
 
 
 
@@ -75,10 +75,10 @@ There are lot of things and area to improve and develop. Since it in pre release
 * Example series
 
 ## Contributing to Humongous
- 
+
 * Fork, branch, code, and then send me a pull request. :)
 
 ## Copyright
 
-Copyright (c) 2012-2014 [Bagwan Pankaj]. See LICENSE.txt for further details.
+Copyright (c) 2012-2016 [Bagwan Pankaj]. See LICENSE.txt for further details.
 

data/lib/humongous/application.rb

@@ -4,7 +4,7 @@ module Humongous
 
   class Application < Sinatra::Base
     DEFAULT_OPTIONS = {
-      :url => "localhost",
+      :url => "127.0.0.1",
       :port => "27017",
       :username => "",
       :password => ""
@@ -29,19 +29,19 @@ module Humongous
       autanticate!
     end
 
-    error Mongo::ConnectionFailure do
+    error Mongo::Error::ConnectionCheckOutTimeout do
       halt 502, headers, "Humongous is unable to find MongoDB instance. Make sure that MongoDB is running."
     end
 
-    error Mongo::OperationFailure do
+    error Mongo::Error::OperationFailure do
       halt 401, {'Content-Type' => 'text/javascript'}, { :errmsg => "Need to login", :ok => false }.to_json
     end
 
-    error Mongo::InvalidNSName do
+    error Mongo::Error::InvalidDatabaseName do
       halt 502, headers, "Humongous is unable to find MongoDB instance. Make sure that MongoDB is running."
     end
 
-    error Mongo::AuthenticationError do
+    error Mongo::Error::AuthError do
       halt 502, headers, "Humongous is unable to find MongoDB instance. Make sure that MongoDB is running."
     end
 
@@ -49,13 +49,13 @@ module Humongous
 
     reciever = lambda do
       begin
-        @databases = @connection.database_info
-        @server_info = @connection.server_info
-        @header_string = "Server #{@connection.host}:#{@connection.port} stats"
-      rescue Mongo::OperationFailure => e
+        @databases = @connection.list_databases
+        @server_info = @connection.cluster.servers.collect{|c| c.scan!.config } #@connection.server_info
+        @header_string = "Server #{opts_to_connect[:url]}:#{opts_to_connect[:port]} stats"
+      rescue Mongo::Error::OperationFailure => e
         @databases = []
         @server_info = { :errmsg => "Need to login", :ok => false }
-        @header_string = "Server #{@connection.host}:#{@connection.port} stats"
+        @header_string = "Server #{opts_to_connect[:url]}:#{opts_to_connect[:port]} stats"
         @force_login = true
       end
       erb :index
@@ -65,22 +65,25 @@ module Humongous
     post "/", &reciever
 
     get "/database/:db_name" do
-      @database = @connection.db(params[:db_name])
+      @connection = @connection.use(params[:db_name])
+      @database = @connection.database
       @header_string = "Database #{@database.name} (#{@database.collection_names.size}) stats"
       content_type :json
-      { :collections => @database.collection_names, :stats => @database.stats, :header => @header_string }.to_json
+      { :collections => @database.collection_names, :stats => [], :header => @header_string }.to_json
     end
 
     get "/database/:db_name/collection/:collection_name" do
-      @database = @connection.db(params[:db_name])
+      @connection = @connection.use(params[:db_name])
+      @database = @connection.database
       @collection = @database.collection(params[:collection_name])
       content_type :json
-      { :stats => @collection.stats, :header => "Collection #{@database.name}.#{@collection.name} (#{@collection.stats.count}) stats" }.to_json
+      { :stats => [], :header => "Collection #{@database.name}.#{@collection.name} (#{@collection.count}) stats" }.to_json
     end
 
     delete "/database/:db_name/collection/:collection_name" do
-      @database = @connection.db(params[:db_name])
-      if @database.drop_collection(params[:collection_name])
+      @connection = @connection.use(params[:db_name])
+      @database = @connection.database
+      if @database.collection(params[:collection_name]).drop
         content_type :json
         { :status => "OK", :dropped => true }.to_json
       end
@@ -99,7 +102,8 @@ module Humongous
       opts[:sort] = JSON.parse(json_converter(params[:sort])) if params[:sort].present?
       opts[:limit] = params[:limit].to_i
       opts = default_opts.merge(opts)
-      @database = @connection.db(params[:db_name])
+      @connection = @connection.use(params[:db_name])
+      @database = @connection.database
       @collection = @database.collection(params[:collection_name])
       @records = @collection.find(selector,opts).to_a
       @records = @records.collect{|record| doc_to_bson(record, :from_bson) }
@@ -108,29 +112,33 @@ module Humongous
     end
 
     post "/database/:db_name/collection/:collection_name/save" do
-      @database = @connection.db(params[:db_name])
+      @connection = @connection.use(params[:db_name])
+      @database = @connection.database
       @collection = @database.collection(params[:collection_name])
       doc = params[:doc]
       doc = doc_to_bson(doc, :to_bson)
-      # doc["_id"] = BSON::ObjectId.from_string(doc["_id"])
-      @collection.save(doc)
+      @collection.update_one(doc)
       content_type :json
       { :status => "OK", :saved => true }.to_json
     end
 
     delete "/database/:db_name" do
       content_type :json
-      @connection.drop_database(params[:db_name]).to_json
+      @connection = @connection.use(params[:db_name])
+      drop_doc = @connection.database.drop
+      { :status => "OK", :saved => true, message: drop_doc.documents[0] }.to_json
     end
 
     post "/database" do
-      @connection.db(params["database_name"]).create_collection("test");
+      @connection = @connection.use(params[:database_name])
+      @connection.database["test"].create
       content_type :json
       { :status => "OK", :created => true, :name => params["database_name"] }.to_json
     end
 
     post "/database/:database_name/collection" do
-      @connection.db(params["database_name"]).create_collection(params[:collection_name]);
+      @connection = @connection.use(params[:database_name])
+      @connection.database[params[:collection_name]].create
       content_type :json
       { :status => "OK", :created => true, :name => params["collection_name"] }.to_json
     end
@@ -141,25 +149,27 @@ module Humongous
       query = JSON.parse(json_converter(params[:remove_query])) if params[:remove_query].present?
       query["_id"] = BSON::ObjectId.from_string(query["_id"]) if query.present? && query["_id"].present?
       selector = selector.merge(query) if !!query
-      @database = @connection.db(params["database_name"])
+      @connection = @connection.use(params[:database_name])
+      @database = @connection.database
       @collection = @database.collection(params["collection_name"])
       content_type :json
       { :removed => @collection.remove( selector, opts ), :status => "OK" }.to_json
     end
-    
+
     post "/database/:database_name/collection/:collection_name/insert" do
       created = false
-      @database = @connection.db(params[:database_name])
+      @connection = @connection.use(params[:database_name])
+      @database = @connection.database
       @collection = @database.collection(params[:collection_name])
       if params[:doc].present?
-        doc = JSON.parse(json_converter(params[:doc]))
-        @collection.insert(doc)
+        doc = JSON.parse(params[:doc])
+        @collection.insert_one(doc)
         created = true
       end
       content_type :json
       { :created => created, :id => true, :status => "OK" }.to_json
     end
-    
+
     post "/database/:database_name/collection/:collection_name/mapreduce" do
       opts = { :out => { :inline => true }, :raw => true }
       opts[:finalize] = params[:finalize] unless params[:finalize].blank?
@@ -167,7 +177,8 @@ module Humongous
       opts[:query] = JSON.parse(json_converter(params[:query])) unless params[:query].blank?
       opts[:sort] = params[:sort] unless params[:sort].blank?
       opts[:limit] = params[:limit] unless params[:limit].blank?
-      @database = @connection.db(params[:database_name])
+      @connection = @connection.use(params[:database_name])
+      @database = @connection.database
       @collection = @database.collection(params[:collection_name])
       content_type :json
       @collection.map_reduce( params[:map], params[:reduce], opts ).to_json
@@ -175,4 +186,4 @@ module Humongous
 
   end
 
-end
+end

data/lib/humongous/helpers.rb

@@ -1,51 +1,49 @@
 module Humongous
   module Helpers
-    
+
     module SinatraHelpers
-      
+
       def connection(params)
         opts = opts_to_connect(params)
-        session[:connection] = Mongo::Connection.new(opts[:url], opts[:port])
+        session[:connection] = Mongo::Client.new(get_uri(opts))
       end
 
       def autanticate!
-        @connection.apply_saved_authentication and return unless @connection.auths.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
+        @connection.with( database: params[:auth][:db], user: params[:auth][:username], password: params[:auth][:password])
       end
 
       def opts_to_connect(params = {})
         return @options if @options && @options[:freeze]
         @options = {
-          :url => "localhost",
+          :url => "127.0.0.1",
           :port => "27017",
           :username => "",
           :password => ""
         }
         return @options if params.blank?
-        @options.merge!({ :url => params[:url], :port => params[:port], :freeze => true })
+        @options.merge!(params)
       end
 
       def get_uri(params = {})
         @options = {
-          :url => "localhost",
+          :url => "127.0.0.1",
           :port => "27017",
           :username => "",
           :password => ""
         }
         @options = @options.merge(params)
-        unless @options[:username].empty? && @options[:password].empty?
+        if @options[:username].present? && @options[:password].present?
           "mongodb://#{@options[:username]}:#{@options[:password]}@#{@options[:url]}:#{@options[:port]}"
         else
           "mongodb://#{@options[:url]}:#{@options[:port]}"
         end
       end
-      
+
       def default_opts
         { :skip => 0, :limit => 10 }
       end
-      
+
       def to_bson( options )
         ids = options.keys.grep /_id$/
         ids.each do |id|
@@ -60,7 +58,7 @@ module Humongous
         end
         options
       end
-      
+
       def doc_to_bson( doc, converter )
         doc = send(converter, doc)
         doc.each do |k,v|
@@ -71,7 +69,7 @@ module Humongous
         end
         doc
       end
-      
+
       def from_bson( options )
         ids = options.select{ |k,v| v.is_a? BSON::ObjectId }
         ids.each do | k, v |
@@ -79,12 +77,12 @@ module Humongous
         end
         options
       end
-      
+
       def json_converter( params_json )
         params_json.gsub(/(\w+):/, '"\1":')
       end
-      
+
     end
-    
+
   end
-end
+end

data/lib/humongous/public/javascripts/query_browser.js

@@ -40,7 +40,6 @@ app.html.query_browser = {
       url: "/database/" + db + "/collection/" + coll + "/save",
       data: { "doc": JSON.parse(data)  },
       success: function( data ){
-        console.log(data)
         $('#object_modal').modal('toggle');
       }
     })
@@ -49,8 +48,8 @@ app.html.query_browser = {
     return(
       { tag: "UL", cls: "pills", children: [
         { tag: "LI", cls: "active", child: { tag: "A", href: "#", text: "Find", show: "find_form" }, onClick: this._pills_click_handler },
-        { tag: "LI", child: { tag: "A", href: "#", text: "Remove", show: "remove_form" }, onClick: this._pills_click_handler },
-        { tag: "LI", child: { tag: "A", href: "#", text: "Insert", show: "insert_form" }, onClick: this._pills_click_handler },
+        { tag: "LI", child: { tag: "A", href: "#", text: "Remove", show: "remove_form", editor: 'remove_query' }, onClick: this._pills_click_handler },
+        { tag: "LI", child: { tag: "A", href: "#", text: "Insert", show: "insert_form", editor: 'insert_query' }, onClick: this._pills_click_handler },
         { tag: "LI", child: { tag: "A", href: "#", text: "MapReduce", show: "mapreduce_form" }, onClick: this._pills_click_handler }
       ]}
     )
@@ -60,7 +59,17 @@ app.html.query_browser = {
     $( click_container ).parent().siblings().removeClass( "active" );
     $( click_container ).parent().addClass( "active" );
     $(".query_form_container").children().remove();
-    $( app.query_forms[click_container.attr("show")] ).appendTo(".query_form_container")
+    $( app.query_forms[click_container.attr("show")] ).appendTo(".query_form_container");
+    if(click_container.attr("editor")){
+      if(ace){
+        ace.config.set('basePath', 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.11');
+        var editor = ace.edit(click_container.attr("editor"));
+        if(editor){
+          editor.setTheme("ace/theme/monokai");
+          editor.session.setMode("ace/mode/json");
+        }
+      }
+    }
   }
 };
 app.html.build_results = {
@@ -171,7 +180,7 @@ app.html.template.select_field = app.merge( app.html.template.abstract_field, {
   }
 } );
 app.query_forms = {
-  find_form: { tag: "FORM", cls: "find_form", children: 
+  find_form: { tag: "FORM", cls: "find_form", children:
     [
       { tag: "FIELDSET", children: [
         // this._get_legend(),
@@ -211,7 +220,7 @@ app.query_forms = {
         { tag: "DIV", cls: "input_row", children: [
           { tag: "DIV", cls: "query_form", children: [
             { tag: "LABEL", "for": "remove_query", text: "Query", style: "margin: 0 10px 0" },
-            { tag: "TEXTAREA", style: "height: 50px; width: 300px", placeholder: "{}", id: "remove_query", name: "remove_query" }
+            { tag: "DIV", style: "height: 50px; width: 400px", placeholder: "{}", id: "remove_query", name: "remove_query" }
           ] },
           { tag: "INPUT", type: 'submit', cls: "submit_btn btn", value: "Remove" },
           { tag: "DIV", cls: "clear" }
@@ -224,7 +233,6 @@ app.query_forms = {
         data: $(this).serialize(),
         type: $(this).attr("method"),
         success: function( data ){
-          console.log(data);
           if(data.removed){
             var alert = { tag: "DIV", cls: "alert-message success fade in", "data-alert": "true", children: [
               { tag: "A", cls: "close", href: "#", text: "x" },
@@ -247,7 +255,7 @@ app.query_forms = {
         { tag: "DIV", cls: "input_row", children: [
           { tag: "DIV", cls: "query_form", children: [
             { tag: "LABEL", "for": "insert_query", text: "Query", style: "margin: 0 10px 0" },
-            { tag: "TEXTAREA", style: "height: 100px; width: 400px", placeholder: "{}", id: "insert_query", name: "doc" }
+            { tag: "DIV", style: "height: 200px; width: 500px", placeholder: "{}", id: "insert_query", name: "doc" }
           ] },
           { tag: "INPUT", type: 'submit', cls: "submit_btn btn", value: "Insert" },
           { tag: "DIV", cls: "clear" }
@@ -255,12 +263,14 @@ app.query_forms = {
       ]
     }, onSubmit: function(e){
       e.preventDefault();
+      if(ace){
+        var editor = ace.edit("insert_query");
+      };
       app.ax({
         url: "/database/" + app.storage.get("database")  + "/collection/" + app.storage.get("collection")  + "/insert",
-        data: $(this).serialize(),
+        data: editor ? { doc: editor.getValue() } : {},
         type: $(this).attr("method"),
         success: function( data ){
-          console.log(data);
           if(data.created){
             var alert = { tag: "DIV", cls: "alert-message success fade in", "data-alert": "true", children: [
               { tag: "A", cls: "close", href: "#", text: "x" },
@@ -278,7 +288,7 @@ app.query_forms = {
       });
     }
   },
-  mapreduce_form: { tag: "FORM", cls: "mapreduce_form", children: 
+  mapreduce_form: { tag: "FORM", cls: "mapreduce_form", children:
     [
       { tag: "FIELDSET", children: [
         // this._get_legend(),
@@ -326,7 +336,6 @@ app.query_forms = {
           data: $(this).serialize(),
           type: $(this).attr("method"),
           success: function( data ){
-            console.log(data);
             $( ".query_result" ).children().remove();
             if(app.isArray( data.results )){
               $( app.html.build_results.create( data.results ) ).appendTo( '.query_result' );
@@ -341,4 +350,4 @@ app.query_forms = {
         });
       }
   }
-}
+}

data/lib/humongous/version.rb

@@ -1,3 +1,3 @@
 module Humongous
-  VERSION = "1.0.2"
+  VERSION = "2.0.0"
 end

data/lib/humongous/views/index.erb

@@ -20,12 +20,12 @@
     <link rel="apple-touch-icon" href="/images/apple-touch-icon.png">
     <link rel="apple-touch-icon" sizes="72x72" href="/images/apple-touch-icon-72x72.png">
     <link rel="apple-touch-icon" sizes="114x114" href="/images/apple-touch-icon-114x114.png">
-    
+
     <script type='text/javascript' src='/javascripts/jquery.min.js'></script>
     <script type='text/javascript' src='/javascripts/jquery.nohtml.js'></script>
     <script type='text/javascript' src='/javascripts/bootstrap-modal.js'></script>
     <script type='text/javascript' src='/javascripts/bootstrap-alerts.js'></script>
-    
+
     <script type='text/javascript' src='/javascripts/core.js'></script>
     <script type='text/javascript' src='/javascripts/storage.js'></script>
     <script type='text/javascript' src='/javascripts/query_browser.js'></script>
@@ -63,9 +63,9 @@
               <div class="database_list">
                 <table>
                   <tbody>
-                    <% @databases.each do | db_name, size | %>
+                    <% @databases.each do | db | %>
                       <tr>
-                        <td data-source=<%= "/database/#{db_name}" %>><%= db_name %></td>
+                        <td data-source=<%= "/database/#{db[:name]}" %>><%= db[:name] %></td>
                       </tr>
                     <% end %>
                   </tbody>
@@ -92,7 +92,7 @@
             <div class="yielder zebra-striped">
               <table>
                 <tbody>
-                  <% @server_info.each do | property, value | %>
+                  <% @server_info.first.each do | property, value | %>
                     <tr>
                       <th><%= property %></th>
                       <td><%= value %></td>
@@ -106,7 +106,7 @@
       </div>
 
       <%= erb :_credits %>
-      
+
       <%= erb :_license %>
 
       <%= erb :_login_dialog %>
@@ -122,5 +122,6 @@
         })
       </script>
     <% end %>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.11/ace.min.js" type="text/javascript" charset="utf-8" async defer></script>
   </body>
-</html>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humongous
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - bagwanpankaj
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.11
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 2.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 2.0.8
 - !ruby/object:Gem::Dependency
-  name: bson_ext
+  name: bson
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 4.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 4.8.2
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 2.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 2.3.0
 description: 'Humongous: A Ruby way to browse and maintain mongo instance. Using HTML5.'
 email: bagwanpankaj@gmail.com
 executables:
@@ -132,10 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 3
 summary: 'Humongous: A Mongo Browser for Ruby'
 test_files: []
-has_rdoc: