map_reduced 0.0.2 → 0.0.5

data/lib/map_reduced.rb

@@ -6,5 +6,5 @@ require 'erb'
 require 'pathname'
 
 module MapReduced
-  VERSION = "0.0.2"
-end
+  VERSION = "0.0.5"
+end

data/lib/map_reduced/config.rb

@@ -3,12 +3,16 @@ module MapReduced
     class << self
 
       attr_writer :template_path
-      attr_reader :db
       
-      def database(string)
+      def database=(string)
         @db = Mongo::Connection.new.db(string)
       end
       
+      def db
+        warn "Tell MapReduced which database to use, like this:\nMapReduced::Config.database = 'my_awesome_database'" unless defined? @db
+        @db
+      end
+      
       def template_path
         return @template_path if defined?(@template_path)
         defined?(Rails) ? Rails.root + "app/functions" : Pathname.new(File.expand_path("./functions"))

data/lib/map_reduced/document.rb

@@ -1,14 +1,13 @@
 module MapReduced
   module Document
     module ClassMethods
-      @@added_functions = []
       def map_reduce(*names)
         names.each do |name|
           self.class_eval %Q{            
-            def self.run_#{name}
+            def self.run_#{name}(opts = {})
               begin
                 setup_functions
-                collection.map_reduce(map("#{name}"), reduce("#{name}"))
+                collection.map_reduce(map("#{name}"), reduce("#{name}"), opts)
               ensure
                 teardown_functions
               end
@@ -25,18 +24,22 @@ module MapReduced
         db.collection(collection_name)
       end
 
+      def collection_name=(name)
+        @collection_name = name
+      end
+      
       def use_functions(*names)
-        @@added_functions = names
+        @added_functions = names
       end
 
       private
 
-      def collection_name
-        "#{self.to_s.downcase}s"
+      def added_functions
+        @added_functions ||= []
       end
-      
-      def collection_name=(name)
-        @@collection_name = name
+
+      def collection_name
+        @collection_name ||= "#{self.to_s.downcase}s"
       end
       
       def map(function)
@@ -48,13 +51,13 @@ module MapReduced
       end
 
       def setup_functions
-        @@added_functions.each do |function_name|
+        added_functions.each do |function_name|
           db.add_stored_function(function_name.to_s, function_string(function_name))
         end
       end
 
       def teardown_functions
-        @@added_functions.each {|name| db.remove_stored_function(name.to_s)}
+        added_functions.each {|name| db.remove_stored_function(name.to_s)}
       end
 
       def function_string(name)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: map_reduced
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Scott Burton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 -07:00
+date: 2010-09-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency