humongous 0.1.8.beta → 0.1.9.beta

data/README.markdown

@@ -15,7 +15,7 @@ and run on terminal/console
     humongous
 
 And you are good to go it will open this in a browser or you can navigate it on port [9000](http://0.0.0.0:9000)
-to stope the server run the command again with -K option
+to stop the server run the command again with -K option
 
     humongous -K
 
@@ -48,7 +48,7 @@ For more info write me at me[at]bagwanpankaj.com
 
 ## Support
 
-Currently it only supports Ruby version >= 1.9.2
+Currently it only supports Ruby version >= 1.8.7. Humongous has been tested on MRI 18, MRI 19 and JRuby.
 
 ## TODO's
 
@@ -56,7 +56,8 @@ There are lot of things and area to improve and develop. Since it in pre release
 
 * Error Handling [DONE]
 * Authentication module [DONE]
-* Better UI (need a real contribution here)
+* Sophisticated Querying support [In Progress]
+* Better UI (need a real contribution here) [In Progress]
 * Better documentation
 * Example series
 

data/lib/humongous.rb

@@ -1,11 +1,7 @@
 require 'rubygems'
-# require 'bundler'
-# require "bundler/setup"
-
 require "sinatra/base"
 require "mongo"
 require "json"
-require "crack"
 require 'humongous/monkey_patch'
 require 'humongous/application'
 require 'humongous/version'

data/lib/humongous/application.rb

@@ -109,6 +109,10 @@ module Humongous
         end
         options
       end
+      
+      def json_converter( params_json )
+        params_json.gsub(/(\w+):/, '"\1":')
+      end
 
     end
 
@@ -154,12 +158,14 @@ module Humongous
     post "/database/:db_name/collection/:collection_name/page/:page" do
       selector = {}
       opts = {}
-      query = Crack::JSON.parse(params[:query])
-      query["_id"] = BSON::ObjectId.from_string(query["_id"]) if query && !!query["_id"]
-      selector = selector.merge(query) if !!query
-      opts[:fields] = params[:fields].split(",").collect(&:strip) unless params[:fields].empty?
+      if params[:query].present?
+        query = JSON.parse(json_converter(params[:query]))
+        query["_id"] = BSON::ObjectId.from_string(query["_id"]) if query["_id"].present?
+        selector = selector.merge(query)
+      end
+      opts[:fields] = params[:fields].split(",").collect(&:strip) unless params[:fields].blank?
       opts[:skip] = params[:skip].to_i
-      opts[:sort] = Crack::JSON.parse(params[:sort])
+      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])
@@ -188,14 +194,41 @@ module Humongous
 
     post "/database" do
       @connection.db(params["database_name"]).create_collection("test");
+      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]);
+      content_type :json
       { :status => "OK", :created => true, :name => params["collection_name"] }.to_json
     end
 
+    delete "/database/:database_name/collection/:collection_name/remove" do
+      selector = {}
+      opts = {}
+      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"])
+      @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])
+      @collection = @database.collection(params[:collection_name])
+      if params[:doc].present?
+        doc = JSON.parse(json_converter(params[:doc]))
+        @collection.insert(doc)
+        created = true
+      end
+      content_type :json
+      { :created => created, :id => true, :status => "OK" }.to_json
+    end
+
   end
 
 end

data/lib/humongous/monkey_patch.rb

@@ -7,6 +7,10 @@ module Humongous
         self.respond_to?(:empty?) ? empty? : nil?
       end
       
+      def present?
+        !blank?
+      end
+      
       def self.activate!
         Object.send(:include, self)
       end

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

@@ -39,7 +39,7 @@ $(document).ready(function(){
     app.helpers.yielder( app.html.query_browser, {} );
     e.preventDefault();
   } );
-  $( '.yielder form' ).live( 'submit', function( e ){
+  $( '.yielder form.find_form' ).live( 'submit', function( e ){
     var db = app.storage.get("database"), coll = app.storage.get("collection")
     if(db && !coll){
       alert("Please choose a collection first.")

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

@@ -7,41 +7,8 @@ app.html.query_browser = {
     this.clear();
     return(
       { tag: "DIV", cls: "query_browser", children: [
-        { tag: "FORM", children: 
-          [
-            { tag: "FIELDSET", children: [
-              // this._get_legend(),
-              { tag: "DIV", cls: "input_row", children: [
-                { tag: "DIV", cls: "query_form", children: [
-                  { tag: "LABEL", "for": "query", text: "Query" },
-                  { tag: "INPUT", type: "text", placeholder: "Find All", id: "query", size: "41", name: "query" }
-                ] },
-                { tag: "DIV", cls: "sort_form", children: [
-                  { tag: "LABEL", "for": "sort", text: "Sort" },
-                  { tag: "INPUT", type: "text", placeholder: "[\"name\", \"asc\"]", id: "sort", name: "sort" }
-                ] },
-                { tag: "DIV", cls: "clear" }
-              ] },
-              // { tag: "DIV", cls: "clear" },
-              { tag: "DIV", cls: "input_row", children: [
-                { tag: "DIV", cls: "fields_form", children: [
-                  { tag: "LABEL", "for": "fields", text: "Fields" },
-                  { tag: "INPUT", type: "text", placeholder: "field1, field2", id: "fields", size: "30", name: "fields" }
-                ] },
-                { tag: "DIV", cls: "skip_form", children: [
-                  { tag: "LABEL", "for": "skip", text: "Skip" },
-                  { tag: "INPUT", type: "text", placeholder: "0", id: "skip", size: "5", name: "skip", value: "0", cls: 'number' }
-                ] },
-                { tag: "DIV", cls: "limit_form", children: [
-                  { tag: "LABEL", "for": "limit", text: "Limit" },
-                  { tag: "INPUT", type: "text", placeholder: "10", id: "limit", size: "5", name: "limit", value: "10", cls: 'number' }
-                ] },
-                { tag: "INPUT", type: 'submit', cls: "submit_btn btn", value: "Search" },
-                { tag: "DIV", cls: "clear" }
-              ] }
-            ] }
-          ]
-        },
+        this._query_pills(),
+        { tag: "DIV", cls: "query_form_container", child: app.query_forms["find_form"] },
         { tag: "DIV", cls: "query_result" },
         { tag: "DIV", id: "object_modal", "style": "display: none; ", cls: "modal hide fade", children: [
           { tag: "DIV", cls: "modal-header", children: [
@@ -77,6 +44,23 @@ app.html.query_browser = {
         $('#object_modal').modal('toggle');
       }
     })
+  },
+  _query_pills: function(){
+    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: "MapReduce", show: "mapreduce_form" }, onClick: this._pills_click_handler }
+      ]}
+    )
+  },
+  _pills_click_handler: function(e){
+    var click_container = $(e.target);
+    $( 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.html.build_results = {
@@ -185,4 +169,116 @@ app.html.template.select_field = app.merge( app.html.template.abstract_field, {
     };
     return res;
   }
-} );
+} );
+app.query_forms = {
+  find_form: { tag: "FORM", cls: "find_form", children: 
+    [
+      { tag: "FIELDSET", children: [
+        // this._get_legend(),
+        { tag: "DIV", cls: "input_row", children: [
+          { tag: "DIV", cls: "query_form", children: [
+            { tag: "LABEL", "for": "query", text: "Query" },
+            { tag: "INPUT", type: "text", placeholder: "Find All", id: "query", size: "41", name: "query" }
+          ] },
+          { tag: "DIV", cls: "sort_form", children: [
+            { tag: "LABEL", "for": "sort", text: "Sort" },
+            { tag: "INPUT", type: "text", placeholder: "[\"name\", \"asc\"]", id: "sort", name: "sort" }
+          ] },
+          { tag: "DIV", cls: "clear" }
+        ] },
+        // { tag: "DIV", cls: "clear" },
+        { tag: "DIV", cls: "input_row", children: [
+          { tag: "DIV", cls: "fields_form", children: [
+            { tag: "LABEL", "for": "fields", text: "Fields" },
+            { tag: "INPUT", type: "text", placeholder: "field1, field2", id: "fields", size: "30", name: "fields" }
+          ] },
+          { tag: "DIV", cls: "skip_form", children: [
+            { tag: "LABEL", "for": "skip", text: "Skip" },
+            { tag: "INPUT", type: "text", placeholder: "0", id: "skip", size: "5", name: "skip", value: "0", cls: 'number' }
+          ] },
+          { tag: "DIV", cls: "limit_form", children: [
+            { tag: "LABEL", "for": "limit", text: "Limit" },
+            { tag: "INPUT", type: "text", placeholder: "10", id: "limit", size: "5", name: "limit", value: "10", cls: 'number' }
+          ] },
+          { tag: "INPUT", type: 'submit', cls: "submit_btn btn", value: "Search" },
+          { tag: "DIV", cls: "clear" }
+        ] }
+      ] }
+    ]
+  },
+  remove_form: { tag: "FORM", cls: "remove_form", method: "DELETE", child: {
+      tag: "FIELDSET", children: [
+        { 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: "INPUT", type: 'submit', cls: "submit_btn btn", value: "Remove" },
+          { tag: "DIV", cls: "clear" }
+        ] }
+      ]
+    }, onSubmit: function(e){
+      e.preventDefault();
+      app.ax({
+        url: "/database/" + app.storage.get("database")  + "/collection/" + app.storage.get("collection")  + "/remove",
+        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" },
+              { tag: "P", text: "Query ran successfully." }
+            ] };
+          }else{
+            var alert = { tag: "DIV", cls: "alert-message error fade in", "data-alert": "true", children: [
+              { tag: "A", cls: "close", href: "#", text: "x" },
+              { tag: "P", text: "Query has thrown error. Please check again." }
+            ] };
+          }
+          $( ".query_result" ).children().remove();
+          $( alert ).appendTo( '.query_result' );
+        }
+      })
+    }
+  },
+  insert_form: { tag: "FORM", cls: "insert_form", method: "POST", child: {
+      tag: "FIELDSET", children: [
+        { 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: "INPUT", type: 'submit', cls: "submit_btn btn", value: "Insert" },
+          { tag: "DIV", cls: "clear" }
+        ] }
+      ]
+    }, onSubmit: function(e){
+      e.preventDefault();
+      app.ax({
+        url: "/database/" + app.storage.get("database")  + "/collection/" + app.storage.get("collection")  + "/insert",
+        data: $(this).serialize(),
+        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" },
+              { tag: "P", text: "Query ran successfully." }
+            ] };
+          }else{
+            var alert = { tag: "DIV", cls: "alert-message error fade in", "data-alert": "true", children: [
+              { tag: "A", cls: "close", href: "#", text: "x" },
+              { tag: "P", text: "Query has thrown error. Please check again." }
+            ] };
+          }
+          $( ".query_result" ).children().remove();
+          $( alert ).appendTo( '.query_result' );
+        }
+      });
+    }
+  }//,
+  // mapreduce_form: {
+  //   tag: "DIV", cls: "mapreduce_form", text: "mapreduce_form"
+  // },
+}

data/lib/humongous/version.rb

@@ -1,3 +1,3 @@
 module Humongous
-  VERSION = "0.1.8.beta"
+  VERSION = "0.1.9.beta"
 end

data/lib/humongous/views/index.erb

@@ -24,6 +24,7 @@
     <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>

metadata

@@ -1,92 +1,113 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: humongous
-version: !ruby/object:Gem::Version
-  version: 0.1.8.beta
+version: !ruby/object:Gem::Version 
+  hash: 1605700641
   prerelease: 6
+  segments: 
+  - 0
+  - 1
+  - 9
+  - beta
+  version: 0.1.9.beta
 platform: ruby
-authors:
+authors: 
 - bagwanpankaj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-21 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-21 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: vegas
-  requirement: &2160924140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 1
+        - 8
         version: 0.1.8
   type: :runtime
-  prerelease: false
-  version_requirements: *2160924140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  requirement: &2160923660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
         version: 1.3.2
   type: :runtime
-  prerelease: false
-  version_requirements: *2160923660
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: bson_ext
-  requirement: &2160923120 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
   type: :runtime
-  prerelease: false
-  version_requirements: *2160923120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: mongo
-  requirement: &2160922380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
   type: :runtime
-  prerelease: false
-  version_requirements: *2160922380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &2160921520 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 1.6.5
-  type: :runtime
   prerelease: false
-  version_requirements: *2160921520
-- !ruby/object:Gem::Dependency
-  name: crack
-  requirement: &2160920480 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 0.3.1
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 6
+        - 5
+        version: 1.6.5
   type: :runtime
-  prerelease: false
-  version_requirements: *2160920480
-description: ! 'Humongous: A Ruby way to browse and maintain mongo instance. Using
-  HTML5.'
+  version_requirements: *id005
+description: "Humongous: A Ruby way to browse and maintain mongo instance. Using HTML5."
 email: bagwanpankaj@gmail.com
-executables:
+executables: 
 - humongous
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.markdown
-files:
+files: 
 - LICENSE.txt
 - bin/humongous
 - lib/humongous.rb
@@ -107,28 +128,42 @@ files:
 - lib/humongous/views/index.erb
 - README.markdown
 homepage: http://github.com/bagwanpankaj/humongous
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: ! 'Humongous: A Mongo Browser for Ruby'
+summary: "Humongous: A Mongo Browser for Ruby"
 test_files: []
+
+has_rdoc: