humongous 0.1.9.beta → 0.2.0

data/lib/humongous.rb

@@ -3,6 +3,7 @@ require "sinatra/base"
 require "mongo"
 require "json"
 require 'humongous/monkey_patch'
+require 'humongous/helpers'
 require 'humongous/application'
 require 'humongous/version'
 

data/lib/humongous/application.rb

@@ -1,4 +1,3 @@
-# require './monkey_patch'
 module Humongous
 
   MonkeyPatch.activate!
@@ -39,81 +38,7 @@ module Humongous
     end
 
     helpers do
-
-      def connection(params)
-        opts = opts_to_connect(params)
-        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?
-        @connection.add_auth(params[:auth][:db], params[:auth][:username], params[:auth][:password])
-        @connection.apply_saved_authentication
-      end
-
-      def opts_to_connect(params = {})
-        return @options if @options && @options[:freeze]
-        @options = DEFAULT_OPTIONS
-        return @options if params.blank?
-        @options[:url] = params[:url]
-        @options[:port] = params[:port]
-        @options[:freeze] = true
-        @options
-      end
-
-      def get_uri(params = {})
-        @options = DEFAULT_OPTIONS
-        @options = @options.merge(params)
-        unless @options[:username].empty? && @options[:password].empty?
-          "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|
-          begin
-            options[id] = BSON::ObjectId.from_string(options[id])
-          rescue BSON::InvalidObjectId
-            puts "found illegal ObjectId, skipping..."
-            next
-          rescue e
-            puts e.message
-          end
-        end
-        options
-      end
-      
-      def doc_to_bson( doc, converter )
-        doc = send(converter, doc)
-        doc.each do |k,v|
-          case v
-          when Hash
-            send(converter, v )
-          end
-        end
-        doc
-      end
-      
-      def from_bson( options )
-        ids = options.select{ |k,v| v.is_a? BSON::ObjectId }
-        ids.each do | k, v |
-          options[k] = v.to_s
-        end
-        options
-      end
-      
-      def json_converter( params_json )
-        params_json.gsub(/(\w+):/, '"\1":')
-      end
-
+      include Humongous::Helpers::SinatraHelpers
     end
 
     reciever = lambda do
@@ -228,6 +153,19 @@ module Humongous
       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?
+      opts[:out] = params[:out] unless params[:out].blank?
+      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])
+      @collection = @database.collection(params[:collection_name])
+      content_type :json
+      @collection.map_reduce( params[:map], params[:reduce], opts ).to_json
+    end
 
   end
 

data/lib/humongous/helpers.rb

@@ -0,0 +1,93 @@
+module Humongous
+  module Helpers
+    
+    module SinatraHelpers
+      
+      def connection(params)
+        opts = opts_to_connect(params)
+        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?
+        @connection.add_auth(params[:auth][:db], params[:auth][:username], params[:auth][:password])
+        @connection.apply_saved_authentication
+      end
+
+      def opts_to_connect(params = {})
+        return @options if @options && @options[:freeze]
+        @options = {
+          :url => "localhost",
+          :port => "27017",
+          :username => "",
+          :password => ""
+        }
+        return @options if params.blank?
+        @options[:url] = params[:url]
+        @options[:port] = params[:port]
+        @options[:freeze] = true
+        @options
+      end
+
+      def get_uri(params = {})
+        @options = {
+          :url => "localhost",
+          :port => "27017",
+          :username => "",
+          :password => ""
+        }
+        @options = @options.merge(params)
+        unless @options[:username].empty? && @options[:password].empty?
+          "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|
+          begin
+            options[id] = BSON::ObjectId.from_string(options[id])
+          rescue BSON::InvalidObjectId
+            puts "found illegal ObjectId, skipping..."
+            next
+          rescue e
+            puts e.message
+          end
+        end
+        options
+      end
+      
+      def doc_to_bson( doc, converter )
+        doc = send(converter, doc)
+        doc.each do |k,v|
+          case v
+          when Hash
+            send(converter, v )
+          end
+        end
+        doc
+      end
+      
+      def from_bson( options )
+        ids = options.select{ |k,v| v.is_a? BSON::ObjectId }
+        ids.each do | k, v |
+          options[k] = v.to_s
+        end
+        options
+      end
+      
+      def json_converter( params_json )
+        params_json.gsub(/(\w+):/, '"\1":')
+      end
+      
+    end
+    
+  end
+end

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

@@ -7,6 +7,7 @@ app.helpers = {};
 app.isObject = function (value) {
 	return Object.prototype.toString.call(value) == "[object Object]";
 };
+app.isArray = $.isArray;
 //adding storage event
 $( document ).bind( 'storage', function( e, action, on, values ){
 	console.log(arguments);

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

@@ -51,7 +51,7 @@ app.html.query_browser = {
         { 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 }
+        { tag: "LI", child: { tag: "A", href: "#", text: "MapReduce", show: "mapreduce_form" }, onClick: this._pills_click_handler }
       ]}
     )
   },
@@ -277,8 +277,68 @@ app.query_forms = {
         }
       });
     }
-  }//,
-  // mapreduce_form: {
-  //   tag: "DIV", cls: "mapreduce_form", text: "mapreduce_form"
-  // },
+  },
+  mapreduce_form: { tag: "FORM", cls: "mapreduce_form", children: 
+    [
+      { tag: "FIELDSET", children: [
+        // this._get_legend(),
+        { tag: "DIV", cls: "input_row", children: [
+          { tag: "DIV", cls: "map_form", children: [
+            { tag: "LABEL", "for": "map", text: "Map" },
+            { tag: "TEXTAREA", style: "height: 100px; width: 150px", type: "text", placeholder: "Map function", id: "map", size: "41", name: "map" }
+          ] },
+          { tag: "DIV", cls: "reduce_form", children: [
+            { tag: "LABEL", "for": "reduce", text: "Reduce" },
+            { tag: "TEXTAREA", type: "text", style: "height: 100px; width: 150px", placeholder: "Reduce function", id: "reduce", name: "reduce" }
+          ] },
+          { tag: "DIV", cls: "finalize_form", children: [
+            { tag: "LABEL", "for": "finalize", text: "Finalize" },
+            { tag: "TEXTAREA", type: "text", style: "height: 100px; width: 150px", placeholder: "Finalize function", id: "finalize", name: "finalize" }
+          ] },
+          { tag: "DIV", cls: "clear" }
+        ] },
+        // { tag: "DIV", cls: "clear" },
+        { 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: "20", name: "query" }
+          ] },
+          { tag: "DIV", cls: "sort_form", children: [
+            { tag: "LABEL", "for": "sort", text: "Sort" },
+            { tag: "INPUT", type: "text", placeholder: "[\"name\", \"asc\"]", id: "sort", size: "15", name: "sort" }
+          ] },
+          { 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: "DIV", cls: "out_form", children: [
+            { tag: "LABEL", "for": "out", text: "Out" },
+            { tag: "INPUT", type: "text", placeholder: "{inline: 1}", id: "out", size: "5", name: "out", cls: 'number' }
+          ] },
+          { tag: "INPUT", type: 'submit', cls: "submit_btn btn", value: "Search" },
+          { tag: "DIV", cls: "clear" }
+        ] }
+      ] }
+    ], onSubmit: function(e){
+        e.preventDefault();
+        app.ax({
+          url: "/database/" + app.storage.get("database")  + "/collection/" + app.storage.get("collection")  + "/mapreduce",
+          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' );
+            }else{
+              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. Output is saved in " + data.result + "document." }
+                ] };
+              $( alert ).appendTo( '.query_result' );
+            }
+          }
+        });
+      }
+  }
 }

data/lib/humongous/public/styles/application.css

@@ -55,10 +55,10 @@ body {
 label{
   width: auto;
 }
-.query_form, .sort_form, .skip_form, .fields_form, .limit_form, .submit_btn{
+.query_form, .sort_form, .skip_form, .fields_form, .limit_form, .submit_btn, .map_form, .reduce_form, .finalize_form, .out_form{
   float: left;
 }
-input{
+input, textarea{
   margin: 0px 10px 0px 5px;
   width: auto;
 }

data/lib/humongous/version.rb

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

metadata

@@ -1,118 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: humongous
-version: !ruby/object:Gem::Version 
-  hash: 1605700641
-  prerelease: 6
-  segments: 
-  - 0
-  - 1
-  - 9
-  - beta
-  version: 0.1.9.beta
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - bagwanpankaj
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-20 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: vegas
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152825240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 1
-        - 8
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.1.8
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152825240
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &2152824760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152824760
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: &2152824280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mongo
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2152824280
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: &2152823800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2152823800
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2152823320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 6
-        - 5
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.6.5
   type: :runtime
-  version_requirements: *id005
-description: "Humongous: A Ruby way to browse and maintain mongo instance. Using HTML5."
+  prerelease: false
+  version_requirements: *2152823320
+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
 - lib/humongous/version.rb
 - lib/humongous/monkey_patch.rb
+- lib/humongous/helpers.rb
 - lib/humongous/application.rb
 - lib/humongous/public/images/favicon.ico
 - lib/humongous/public/images/ajax-loader.gif
@@ -128,42 +97,29 @@ 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 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       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 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       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: