mongo_mapper 0.13.1 → 0.14.0.rc1

data/lib/mongo_mapper/plugins/scopes.rb

@@ -9,19 +9,90 @@ module MongoMapper
       end
 
       module ClassMethods
-        def scope(name, scope_options={})
+        def scope(name, scope={})
           # Assign to _scopes instead of using []= to avoid mixing subclass scopes
-          self._scopes = scopes.merge(name => lambda do |*args|
-            result = scope_options.is_a?(Proc) ? scope_options.call(*args) : scope_options
-            result = self.query(result) if result.is_a?(Hash)
-            self.query.merge(result)
-          end)
-          singleton_class.send :define_method, name, &scopes[name]
+          self._scopes = scopes.merge(name => scope)
+
+          singleton_class.send :define_method, name do |*args|
+            process_scope(self, scopes[name], *args)
+          end
         end
 
         def scopes
           self._scopes ||= {}
         end
+
+        def active_scopes
+          @active_scopes ||= []
+        end
+
+        def default_scopes
+          @default_scopes ||= begin
+            superclass.respond_to?(:default_scopes) ?
+              superclass.default_scopes.dup :
+              []
+          end
+        end
+
+        def query(options = {})
+          res = super(options)
+
+          all_anonymous_scopes.each do |scope|
+            unscoped do
+              res = process_scope(res, scope)
+            end
+          end
+
+          res
+        end
+
+        def default_scope(*args, &block)
+          if block_given?
+            default_scopes << instance_exec(&block)
+          end
+
+          if args.any?
+            default_scopes << args
+          end
+
+          default_scopes
+        end
+
+        def with_scope(query = {})
+          active_scopes.push(query)
+          yield
+        ensure
+          active_scopes.pop
+        end
+
+        def unscoped
+          old_default_scopes = default_scopes.dup
+          old_active_scopes = active_scopes.dup
+
+          @default_scopes = []
+          @active_scopes = []
+
+          yield
+        ensure
+          @default_scopes = old_default_scopes
+          @active_scopes = old_active_scopes
+        end
+
+      private
+
+        def process_scope(context, scope, *args)
+          if scope.is_a?(Proc)
+            scope = context.instance_exec(*args, &scope)
+          end
+
+          scope.is_a?(Hash) ?
+            context.where(scope) :
+            scope
+        end
+
+        def all_anonymous_scopes
+          [default_scopes + active_scopes].flatten
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/timestamps.rb

@@ -23,6 +23,7 @@ module MongoMapper
           self[:created_at] = now if !persisted? && !created_at?
           self[:updated_at] = now
         end
+        true
       end
     end
   end

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.13.1'
+  Version = '0.14.0.rc1'
 end

data/lib/rails/generators/mongo_mapper/config/config_generator.rb

@@ -15,23 +15,22 @@ module MongoMapper
         template 'mongo.yml', File.join('config', 'mongo.yml')
       end
 
-      protected
+    protected
 
-        def app_name
-          @app_name ||= defined_app_const_base? ? defined_app_name : File.basename(destination_root)
-        end
-
-        def defined_app_name
-          defined_app_const_base.underscore
-        end
+      def app_name
+        @app_name ||= defined_app_const_base? ? defined_app_name : File.basename(destination_root)
+      end
 
-        def defined_app_const_base
-          Rails.respond_to?(:application) && defined?(Rails::Application) &&
-            Rails.application.is_a?(Rails::Application) && Rails.application.class.name.sub(/::Application$/, '')
-        end
+      def defined_app_name
+        defined_app_const_base.underscore
+      end
 
-        alias :defined_app_const_base? :defined_app_const_base
+      def defined_app_const_base
+        Rails.respond_to?(:application) && defined?(Rails::Application) &&
+          Rails.application.is_a?(Rails::Application) && Rails.application.class.name.sub(/::Application$/, '')
+      end
 
+      alias :defined_app_const_base? :defined_app_const_base
     end
   end
 end

data/lib/rails/generators/mongo_mapper/model/model_generator.rb

@@ -23,18 +23,18 @@ module MongoMapper
 
       hook_for :test_framework
 
-      protected
+    protected
 
-        def parent_class_name
-          options[:parent]
-        end
+      def parent_class_name
+        options[:parent]
+      end
 
-        # Rails 3.0.X compatibility
-        unless methods.include?(:module_namespacing)
-          def module_namespacing(&block)
-            yield if block
-          end
+      # Rails 3.0.X compatibility
+      unless methods.include?(:module_namespacing)
+        def module_namespacing(&block)
+          yield if block
         end
+      end
     end
   end
 end

data/spec/functional/accessible_spec.rb

@@ -39,12 +39,12 @@ describe "Accessible" do
 
     it "should assign inaccessible attribute through accessor" do
       @doc.admin = true
-      @doc.admin.should be_true
+      @doc.admin.should be_truthy
     end
 
     it "should ignore inaccessible attribute on #initialize" do
       doc = @doc_class.new(:name => 'John', :admin => true)
-      doc.admin.should be_false
+      doc.admin.should be_falsey
       doc.name.should == 'John'
     end
 
@@ -54,7 +54,7 @@ describe "Accessible" do
       doc.save!
 
       doc = @doc_class.first(:name => 'John')
-      doc.admin.should be_true
+      doc.admin.should be_truthy
       doc.name.should == 'John'
     end
 
@@ -64,37 +64,37 @@ describe "Accessible" do
       doc.save!
 
       doc.reload
-      doc.admin.should be_true
+      doc.admin.should be_truthy
       doc.name.should == 'John'
     end
 
     it "should not ignore inaccessible attribute on #update_attribute" do
       @doc.update_attribute('admin', true)
-      @doc.admin.should be_true
+      @doc.admin.should be_truthy
     end
 
     it "should ignore inaccessible attribute on #update_attributes" do
       @doc.update_attributes(:name => 'Ren Hoek', :admin => true)
       @doc.name.should == 'Ren Hoek'
-      @doc.admin.should be_false
+      @doc.admin.should be_falsey
     end
 
     it "should ignore inaccessible attribute on #update_attributes!" do
       @doc.update_attributes!(:name => 'Stimpson J. Cat', :admin => true)
       @doc.name.should == 'Stimpson J. Cat'
-      @doc.admin.should be_false
+      @doc.admin.should be_falsey
     end
 
     it "should ignore inaccessible attribute on #attributes=" do
       @doc.attributes = {:name => 'Ren Hoek', :admin => true}
       @doc.name.should == 'Ren Hoek'
-      @doc.admin.should be_false
+      @doc.admin.should be_falsey
     end
 
     it "should be indifferent to whether the accessible keys are strings or symbols" do
       @doc.update_attributes!("name" => 'Stimpson J. Cat', "admin" => true)
       @doc.name.should == 'Stimpson J. Cat'
-      @doc.admin.should be_false
+      @doc.admin.should be_falsey
     end
 
     it "should accept nil as constructor's argument without raising exception" do
@@ -180,19 +180,19 @@ describe "Accessible" do
 
     it "should assign inaccessible attribute through accessor" do
       @edoc.admin = true
-      @edoc.admin.should be_true
+      @edoc.admin.should be_truthy
     end
 
     it "should ignore inaccessible attribute on #update_attributes" do
       @edoc.update_attributes(:name => 'Ren Hoek', :admin => true)
       @edoc.name.should == 'Ren Hoek'
-      @edoc.admin.should be_false
+      @edoc.admin.should be_falsey
     end
 
     it "should ignore inaccessible attribute on #update_attributes!" do
       @edoc.update_attributes!(:name => 'Stimpson J. Cat', :admin => true)
       @edoc.name.should == 'Stimpson J. Cat'
-      @edoc.admin.should be_false
+      @edoc.admin.should be_falsey
     end
   end
 end

data/spec/functional/associations/belongs_to_polymorphic_proxy_spec.rb

@@ -9,26 +9,26 @@ describe "BelongsToPolymorphicProxy" do
 
   it "should default to nil" do
     status = Status.new
-    status.target.nil?.should be_true
+    status.target.nil?.should be_truthy
     status.target.inspect.should == "nil"
   end
 
   it "should have boolean presence method" do
     status = Status.new
-    status.target?.should be_false
+    status.target?.should be_falsey
 
     status.target = Project.new(:name => 'mongomapper')
-    status.target?.should be_true
+    status.target?.should be_truthy
   end
 
   it "should be able to replace the association" do
     status = Status.new(:name => 'Foo!')
     project = Project.new(:name => "mongomapper")
     status.target = project
-    status.save.should be_true
+    status.save.should be_truthy
 
     status = status.reload
-    status.target.nil?.should be_false
+    status.target.nil?.should be_falsey
     status.target_id.should == project._id
     status.target_type.should == "Project"
     status.target.name.should == "mongomapper"
@@ -38,13 +38,13 @@ describe "BelongsToPolymorphicProxy" do
     status = Status.new(:name => 'Foo!')
     project = Project.new(:name => "mongomapper")
     status.target = project
-    status.save.should be_true
+    status.save.should be_truthy
 
     status = status.reload
     status.target = nil
-    status.target_type.nil?.should be_true
-    status.target_id.nil?.should be_true
-    status.target.nil?.should be_true
+    status.target_type.nil?.should be_truthy
+    status.target_id.nil?.should be_truthy
+    status.target.nil?.should be_truthy
   end
 
   context "association id set but document not found" do
@@ -52,13 +52,13 @@ describe "BelongsToPolymorphicProxy" do
       @status = Status.new(:name => 'Foo!')
       project = Project.new(:name => "mongomapper")
       @status.target = project
-      @status.save.should be_true
+      @status.save.should be_truthy
       project.destroy
       @status.reload
     end
 
     it "should return nil instead of raising error" do
-      @status.target.nil?.should be_true
+      @status.target.nil?.should be_truthy
     end
   end
 end

data/spec/functional/associations/belongs_to_proxy_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-
 describe "BelongsToProxy" do
   before do
     @post_class = Doc()
@@ -11,7 +10,7 @@ describe "BelongsToProxy" do
   end
 
   it "should default to nil" do
-    @comment_class.new.post.nil?.should be_true
+    @comment_class.new.post.nil?.should be_truthy
   end
 
   it "should return nil instead of a proxy" do
@@ -20,10 +19,10 @@ describe "BelongsToProxy" do
 
   it "should have boolean presence method" do
     comment = @comment_class.new(:name => 'Foo!')
-    comment.post?.should be_false
+    comment.post?.should be_falsey
 
     comment.post = @post_class.new(:name => 'mongomapper')
-    comment.post?.should be_true
+    comment.post?.should be_truthy
   end
 
   it "should allow overriding association methods" do
@@ -34,19 +33,19 @@ describe "BelongsToProxy" do
     end
 
     instance = @comment_class.new
-    instance.post?.should be_false
+    instance.post?.should be_falsey
     instance.post = @post_class.new
-    instance.post?.should be_true
+    instance.post?.should be_truthy
   end
 
   it "should be able to replace the association" do
     post = @post_class.new(:name => 'mongomapper')
     comment = @comment_class.new(:name => 'Foo!', :post => post)
-    comment.save.should be_true
+    comment.save.should be_truthy
 
     comment = comment.reload
     comment.post.should == post
-    comment.post.nil?.should be_false
+    comment.post.nil?.should be_falsey
   end
 
   it "should not reload the association when replacing" do
@@ -71,12 +70,12 @@ describe "BelongsToProxy" do
     post2 = @post_class.create(:name => 'post2')
 
     comment = @comment_class.new(:name => 'Foo!', :post => post1)
-    comment.save.should be_true
+    comment.save.should be_truthy
 
 
     comment = comment.reload
     comment.post.should == post1
-    comment.post.nil?.should be_false
+    comment.post.nil?.should be_falsey
 
     original_post = comment.post
     original_post.name.should == 'post1'
@@ -89,23 +88,23 @@ describe "BelongsToProxy" do
   it "should unset the association" do
     post = @post_class.new(:name => 'mongomapper')
     comment = @comment_class.new(:name => 'Foo!', :post => post)
-    comment.save.should be_true
+    comment.save.should be_truthy
 
     comment = comment.reload
     comment.post = nil
-    comment.post.nil?.should be_true
+    comment.post.nil?.should be_truthy
   end
 
   it "should return nil if id set but document not found" do
     id = BSON::ObjectId.new
-    @comment_class.new(:name => 'Foo', :post_id => id).post.nil?.should be_true
+    @comment_class.new(:name => 'Foo', :post_id => id).post.nil?.should be_truthy
   end
 
   it "should define foreign key if it doesn't exist" do
     @category_class = Doc()
     @post_class.belongs_to :category, :class => @category_class
 
-    @post_class.key?(:category_id).should be_true
+    @post_class.key?(:category_id).should be_truthy
   end
 
   it "should not define foreign key if it already exists" do
@@ -228,7 +227,7 @@ describe "BelongsToProxy" do
 
   context 'autosave' do
     it 'should not be true by default' do
-      @comment_class.associations[:post].options[:autosave].should_not be_true
+      @comment_class.associations[:post].options[:autosave].should_not be_truthy
     end
 
     it 'should save parent changes when true' do

data/spec/functional/associations/in_array_proxy_spec.rb

@@ -50,7 +50,7 @@ describe "InArrayProxy" do
       user = User.new(:name => 'John')
       list = List.new(:name => 'Foo')
       user.lists = [list]
-      user.save.should be_true
+      user.save.should be_truthy
 
       user.reload
       user.list_ids.should == [list.id]
@@ -144,7 +144,7 @@ describe "InArrayProxy" do
 
         it "should not hit the database if ids key is empty" do
           @user.list_ids = []
-          @user.lists.should_receive(:query).never
+          expect(@user.lists).to receive(:query).never
           @user.lists.all.should == []
         end
       end
@@ -160,7 +160,7 @@ describe "InArrayProxy" do
 
         it "should not hit the database if ids key is empty" do
           @user.list_ids = []
-          @user.lists.should_receive(:query).never
+          expect(@user.lists).to receive(:query).never
           @user.lists.first.should be_nil
         end
       end
@@ -176,7 +176,7 @@ describe "InArrayProxy" do
 
         it "should not hit the database if ids key is empty" do
           @user.list_ids = []
-          @user.lists.should_receive(:query).never
+          expect(@user.lists).to receive(:query).never
           @user.lists.last.should be_nil
         end
       end
@@ -230,7 +230,7 @@ describe "InArrayProxy" do
 
         it "should not hit the database if ids key is empty" do
           @user.list_ids = []
-          @user.lists.should_receive(:query).never
+          expect(@user.lists).to receive(:query).never
           @user.lists.paginate(:page => 1).should == []
         end
       end
@@ -293,7 +293,7 @@ describe "InArrayProxy" do
 
       it "should not hit the database if ids key is empty" do
         @user.list_ids = []
-        @user.lists.should_receive(:query).never
+        expect(@user.lists).to receive(:query).never
         @user.lists.count(:name => 'Foo 1').should == 0
       end
     end