mr_mongo 0.0.1 → 0.1.0

data/ChangeLog.md

@@ -1,6 +1,12 @@
 ChangeLog of Mr. Mongo
 ======================
 
+0.1.0 released 2013-04-08
+-------------------------
+
+- [Add] Dynamic Parameters feature
+- [Add] Default Parameter feature
+
 0.0.1 released 2013-04-08
 -------------------------
 

data/README.md

@@ -64,6 +64,37 @@ function (key, values) {
 }
 ```
 
+### Dynamic Parameters
+
+sub-commands `exec` and `exec_on_memory` accepts *Dynamic Parameters* by `--params` option.
+
+`--params` can be specified as JSON hash.
+
+```
+$ bundle exec mr_mongo exec some_map_reduce.rb --params '{"date":"2013-02-01"}'
+```
+
+In DSL, Dynamic Parameters can be get with `#params` method.
+
+```ruby
+set :collection, 'accesses'
+set :query, {date: params['date']} if params['date']
+
+__END__
+
+...
+```
+
+### Default Parameter
+
+Default Parameter can be set with `#default_param` method
+
+```ruby
+default_param 'date', '2013-02-01'
+
+# => params will be {"date" => "2013-02-01"} by default.
+```
+
 ## Contributing
 
 1. Fork it

data/lib/mr_mongo/application.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'mongo'
+require 'multi_json'
 require 'pp'
 
 module MrMongo
@@ -8,6 +9,7 @@ module MrMongo
 
     desc 'exec', 'executes MapReduce'
     method_option :db, default: DEFAULT_URI
+    method_option :params
     def exec(*files)
       files.each do |file|
         puts "Executing #{file}..."
@@ -20,6 +22,7 @@ module MrMongo
 
     desc 'exec_on_memory', 'executes MapReduce on memory'
     method_option :db, default: DEFAULT_URI
+    method_option :params
     def exec_on_memory(*files)
       files.each do |file|
         puts "Executing #{file} on memory..."
@@ -36,7 +39,10 @@ module MrMongo
     end
 
     def context
-      Context.new(db: database)
+      context_params = {db: database}
+      context_params[:params] = ::MultiJson.load(options[:params]) if options[:params]
+
+      Context.new(context_params)
     end
 
     def database

data/lib/mr_mongo/context.rb

@@ -1,9 +1,14 @@
 module MrMongo
   class Context
-    attr_reader :db
+    attr_reader :db, :params
 
     def initialize(params = {})
-      @db = params[:db] if params[:db]
+      @db     = params[:db]     if params[:db]
+      @params = params[:params] if params[:params]
+    end
+
+    def params?
+      not @params.nil?
     end
   end
 end

data/lib/mr_mongo/dsl.rb

@@ -3,7 +3,9 @@ module MrMongo
     attr_reader :map_reduce
 
     def initialize(context)
-      @map_reduce = MapReduce.new(context)
+      @context        = context
+      @map_reduce     = MapReduce.new(context)
+      @default_params = {}
     end
 
     def parse(&block)
@@ -15,5 +17,17 @@ module MrMongo
     def set(key, value = true)
       @map_reduce.send("#{key}=", value)
     end
+
+    def params
+      if @context.params?
+        @default_params.merge(@context.params)
+      else
+        @default_params
+      end
+    end
+
+    def default_param(key, value)
+      @default_params[key] = value
+    end
   end
 end

data/lib/mr_mongo/version.rb

@@ -1,3 +1,3 @@
 module MrMongo
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/mr_mongo.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mongo", "~> 1.8.4"
   spec.add_dependency "bson_ext", "~> 1.8.4"
   spec.add_dependency "thor", "~> 0.18.1"
+  spec.add_dependency "multi_json", "~> 1.7.2"
   spec.add_dependency "inline_template_loader", "~> 0.3.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/unit/lib/mr_mongo/dsl_spec.rb

@@ -20,5 +20,44 @@ module MrMongo
         it { should be_true }
       end
     end
+
+    describe '#params' do
+      subject { dsl.params }
+
+      context 'when context has no params' do
+        context 'without default params' do
+          it { should == {} }
+        end
+
+        context 'with default params' do
+          before { dsl.default_param 'foo', 'bar' }
+
+          it { should eq({'foo' => 'bar'}) }
+        end
+      end
+
+      context 'when context has params' do
+        let(:context) { Context.new(params: input_params) }
+        let(:input_params) { {'hoge' => 'fuga'} }
+
+        context 'without default params' do
+          it { should == input_params }
+        end
+
+        context 'with default params' do
+          context 'no override' do
+            before { dsl.default_param 'foo', 'bar' }
+
+            it { should eq({'foo' => 'bar', 'hoge' => 'fuga'}) }
+          end
+
+          context 'override' do
+            before { dsl.default_param 'hoge', 'piyo' }
+
+            it { should eq({'hoge' => 'fuga'}) }
+          end
+        end
+      end
+    end
   end
 end

data/spec/unit/lib/mr_mongo/map_reduce_spec.rb

@@ -1,6 +1,6 @@
 module MrMongo
   describe MapReduce do
-    let(:context) { Context.new(db: testing_database) }
+    let(:context) { Context.new }
     let(:map_reduce) { MapReduce.new(context) }
 
     describe '#to_options' do
@@ -26,6 +26,8 @@ module MrMongo
     end
 
     describe 'MapReduce excution', mongo: true do
+      let(:context) { Context.new(db: testing_database) }
+
       let(:expected) do
         [
           {'_id' => 'be', 'value' => 2.0},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr_mongo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: inline_template_loader
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1664865836217424745
+      hash: 1026442737
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1664865836217424745
+      hash: 1026442737
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23