rails-ext 0.3.6 → 0.3.8

data/.git/logs/HEAD

@@ -55,3 +55,7 @@ d4faaed37686ae3ce16b636defd37eeacb38470d 978c0ddb7dbecadce5fbc740347598999ccc822
 978c0ddb7dbecadce5fbc740347598999ccc8223 804a20e92f38623945cdb50ed8864d014632cf44 alex <alex@amac.local> 1269602049 +0300	commit: upd
 804a20e92f38623945cdb50ed8864d014632cf44 161cacdd64a4f135d805f5a2f23d006592b8c835 alex <alex@amac.local> 1269602071 +0300	commit: upd
 161cacdd64a4f135d805f5a2f23d006592b8c835 a3ece30fb5827ed20d26a75253bb4854f657055a alex <alex@amac.local> 1269602138 +0300	commit: upd
+a3ece30fb5827ed20d26a75253bb4854f657055a 0538f41ddebf7fa8c71ebe99c5288d5e11c3fb86 alex <alex@amac.local> 1269866636 +0400	commit: upd
+0538f41ddebf7fa8c71ebe99c5288d5e11c3fb86 6a02fd5698264a4165c46af5175a39f5b130de9c alex <alex@amac.local> 1269956190 +0400	commit: update mongo scope
+6a02fd5698264a4165c46af5175a39f5b130de9c 8f53b7b2ab88b130763bc42b3ded7983d27bff7a alex <alex@amac.local> 1269956206 +0400	commit: update mongo scope
+8f53b7b2ab88b130763bc42b3ded7983d27bff7a b4343d9284a89e2971022f8d4acf7865d8341c6d alex <alex@amac.local> 1270054079 +0400	commit: upd

data/.git/logs/refs/heads/master

@@ -55,3 +55,7 @@ d4faaed37686ae3ce16b636defd37eeacb38470d 978c0ddb7dbecadce5fbc740347598999ccc822
 978c0ddb7dbecadce5fbc740347598999ccc8223 804a20e92f38623945cdb50ed8864d014632cf44 alex <alex@amac.local> 1269602049 +0300	commit: upd
 804a20e92f38623945cdb50ed8864d014632cf44 161cacdd64a4f135d805f5a2f23d006592b8c835 alex <alex@amac.local> 1269602071 +0300	commit: upd
 161cacdd64a4f135d805f5a2f23d006592b8c835 a3ece30fb5827ed20d26a75253bb4854f657055a alex <alex@amac.local> 1269602138 +0300	commit: upd
+a3ece30fb5827ed20d26a75253bb4854f657055a 0538f41ddebf7fa8c71ebe99c5288d5e11c3fb86 alex <alex@amac.local> 1269866636 +0400	commit: upd
+0538f41ddebf7fa8c71ebe99c5288d5e11c3fb86 6a02fd5698264a4165c46af5175a39f5b130de9c alex <alex@amac.local> 1269956190 +0400	commit: update mongo scope
+6a02fd5698264a4165c46af5175a39f5b130de9c 8f53b7b2ab88b130763bc42b3ded7983d27bff7a alex <alex@amac.local> 1269956206 +0400	commit: update mongo scope
+8f53b7b2ab88b130763bc42b3ded7983d27bff7a b4343d9284a89e2971022f8d4acf7865d8341c6d alex <alex@amac.local> 1270054079 +0400	commit: upd

data/.git/logs/refs/remotes/origin/master

@@ -42,3 +42,6 @@ f9cf98993bf7067d5b45b0f06dc36fdedba5ffcf 3b354d07a5bb5780eeffa4c12968214b1edb8b2
 3a95e5465ca8d93ae2f53d1a77b0215a10f18021 d4faaed37686ae3ce16b636defd37eeacb38470d alex <alex@amac.local> 1269316281 +0300	update by push
 d4faaed37686ae3ce16b636defd37eeacb38470d 161cacdd64a4f135d805f5a2f23d006592b8c835 alex <alex@amac.local> 1269602079 +0300	update by push
 161cacdd64a4f135d805f5a2f23d006592b8c835 a3ece30fb5827ed20d26a75253bb4854f657055a alex <alex@amac.local> 1269602143 +0300	update by push
+a3ece30fb5827ed20d26a75253bb4854f657055a 0538f41ddebf7fa8c71ebe99c5288d5e11c3fb86 alex <alex@amac.local> 1269866645 +0400	update by push
+0538f41ddebf7fa8c71ebe99c5288d5e11c3fb86 6a02fd5698264a4165c46af5175a39f5b130de9c alex <alex@amac.local> 1269956196 +0400	update by push
+6a02fd5698264a4165c46af5175a39f5b130de9c b4343d9284a89e2971022f8d4acf7865d8341c6d alex <alex@amac.local> 1270054087 +0400	update by push

data/.git/refs/heads/master

@@ -1 +1 @@
-a3ece30fb5827ed20d26a75253bb4854f657055a
+b4343d9284a89e2971022f8d4acf7865d8341c6d

data/.git/refs/remotes/origin/master

@@ -1 +1 @@
-a3ece30fb5827ed20d26a75253bb4854f657055a
+b4343d9284a89e2971022f8d4acf7865d8341c6d

data/Rakefile

@@ -18,7 +18,7 @@ require 'fileutils'
 
 spec = Gem::Specification.new do |s|
 	s.name = "rails-ext"
-	s.version = "0.3.6"
+	s.version = "0.3.8"
 	s.summary = "Set of common Ruby on Rails extensions"
 	s.description = "Set of common Ruby on Rails extensions"
 	s.author = "Alexey Petrushin"

data/lib/mongo_mapper_ext/plugins/default_scope.rb

@@ -3,11 +3,6 @@ module MongoMapper
     module DefaultScope
       
       module ClassMethods
-        def default_scope options = nil, &block          
-          options.should! :be_a, [NilClass, Hash]
-          self.write_inheritable_attribute(:default_scope, (options || block))
-        end
-        
         def find_one options = {}
           super default_scope_options.merge(options)
         end
@@ -20,10 +15,45 @@ module MongoMapper
           super default_scope_options.merge(options)
         end
         
+        def with_exclusive_scope options = {}, &block
+          Thread.current['mm_with_exclusive_scope'].should! :be_nil
+          
+          before = Thread.current['mm_with_exclusive_scope']
+          begin
+            Thread.current['mm_with_exclusive_scope'] = options
+            block.call if block
+          ensure
+            Thread.current['mm_with_exclusive_scope'] = before
+          end
+        end
+        
+        def with_scope options = {}, &block
+          Thread.current['mm_with_exclusive_scope'].should! :be_nil
+          
+          before = Thread.current['mm_with_scope']
+          begin
+            options = before.merge options if before
+            Thread.current['mm_with_scope'] = options
+            block.call if block
+          ensure
+            Thread.current['mm_with_scope'] = before
+          end
+        end
+        
         protected
+          def default_scope options = nil, &block          
+            options.should! :be_a, [NilClass, Hash]
+            self.write_inheritable_attribute(:default_scope, (options || block))
+          end
+                  
+        private
           def default_scope_options
             default_scope = self.read_inheritable_attribute(:default_scope)
-            if default_scope
+            
+            exclusive_options = Thread.current['mm_with_exclusive_scope']
+            return exclusive_options if exclusive_options
+            
+            options = if default_scope
               if default_scope.respond_to? :call
                 default_scope.call self
               else
@@ -32,6 +62,12 @@ module MongoMapper
             else
               {}
             end
+            
+            if scope_options = Thread.current['mm_with_scope']
+              options = options.merge scope_options
+            end
+            
+            options
           end
       end
       

data/lib/rails_ext/active_support/micelaneous.rb

@@ -1,4 +1,4 @@
-STRONG_NAME = /\A[a-zA-Z_][a-zA-Z_0-9]*\Z/
+STRONG_NAME = /\A[a-z_][a-z_0-9]*\Z/
 
 ActiveSupport::CoreExtensions::Module.class_eval do
   def model_name

data/lib/rails_ext/asset_packager/action_view.rb

@@ -8,6 +8,7 @@ ActionView::Base.class_eval do
   end
   
   protected
+    # TODO3 cache it
     def merged_packages thetype, package_names
       found_packages = {}
       
@@ -22,7 +23,7 @@ ActionView::Base.class_eval do
         end
       end
       
-      found_packages.size.should! :==, package_names.size
+      package_names.each{|name| found_packages.should! :include, name.to_s}
           
       if AssetPackager.merge_environments.include? Rails.env
         found_packages.collect do |name, files| 

data/spec/mongo_mapper_ext/scope_spec.rb

@@ -0,0 +1,118 @@
+require 'spec'
+require 'ruby_ext'
+require "#{File.dirname __FILE__}/../../lib/mongo_mapper_ext/plugins/default_scope"
+require "mongo_mapper"
+
+describe "MongoMapper Default Scope" do
+  before :all do
+    MongoMapper.database = 'test'
+  end
+  
+  before :each do 
+    class ::ScopeSample
+      include MongoMapper::Document
+      plugin MongoMapper::Plugins::DefaultScope
+      
+      key :name, String
+    end
+    
+    ScopeSample.delete_all
+    ScopeSample.create! :name => 'a'
+    ScopeSample.create! :name => 'b'
+  end
+  
+  after :each do 
+    Object.send :remove_const, :ScopeSample if Object.const_defined? :ScopeSample
+  end
+    
+  it "should not affect objects without default_scope" do
+    ScopeSample.count.should == 2
+    ScopeSample.all.count.should == 2
+  end
+  
+  it "default_scope" do
+    ScopeSample.send :default_scope, :name => 'a'
+    ScopeSample.count.should == 1
+    ScopeSample.all.count.should == 1
+    ScopeSample.first.name.should == 'a'
+  end
+  
+  it "default_scope as block" do
+    ScopeSample.send :default_scope do
+      {:name => 'a'}
+    end
+    ScopeSample.count.should == 1
+    ScopeSample.all.count.should == 1
+    ScopeSample.first.name.should == 'a'
+  end
+  
+  it "default_scope should be inherited" do
+    ScopeSample.send :default_scope, :name => 'a'
+    class ScopeSampleAncestor < ScopeSample
+    end
+        
+    ScopeSampleAncestor.count.should == 1
+    ScopeSampleAncestor.all.count.should == 1
+    ScopeSampleAncestor.first.name.should == 'a'
+  end
+  
+  it "ancestors should be able to override default_scope" do
+    ScopeSample.send :default_scope, :name => 'a'
+    class ScopeSampleAncestor2 < ScopeSample
+      default_scope :name => 'b'
+    end
+        
+    ScopeSampleAncestor2.count.should == 1
+    ScopeSampleAncestor2.all.count.should == 1
+    ScopeSampleAncestor2.first.name.should == 'b'
+  end
+  
+  it "shouldn't allow to nest with_exclusive_scope" do
+    lambda{
+      ScopeSample.with_exclusive_scope do
+        ScopeSample.with_exclusive_scope{}
+      end
+    }.should raise_error(AssertionError)
+    
+    lambda{
+      ScopeSample.with_exclusive_scope do
+        ScopeSample.with_scope{}
+      end
+    }.should raise_error(AssertionError)
+  end
+      
+  it "with_exclusive_scope should clear other scopes" do
+    ScopeSample.send :default_scope, :name => 'a'
+    
+    ScopeSample.with_scope :name => 'a' do
+      ScopeSample.with_exclusive_scope :name => 'b' do        
+        ScopeSample.count.should == 1
+        ScopeSample.first.name.should == 'b'
+      end
+    end
+  end
+  
+  it "with_scope" do
+    ScopeSample.with_scope :name => 'a' do
+      ScopeSample.count.should == 1
+      ScopeSample.first.name.should == 'a'
+    end
+  end
+  
+  it "with scope should merge scope" do
+    ScopeSample.class_eval do
+      key :name2, String
+      key :name3, String
+      default_scope :name => 'a'
+    end
+    ScopeSample.create! :name => 'a', :name2 => 'a2', :name3 => 'a3'
+    ScopeSample.create! :name => 'b', :name2 => 'b2', :name3 => 'b3'
+    
+    ScopeSample.with_scope :name2 => 'a2' do
+      ScopeSample.with_scope :name3 => 'a3' do
+        ScopeSample.count.should == 1
+        ScopeSample.first.name2.should == 'a2'
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Alexey Petrushin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 +03:00
+date: 2010-03-31 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,9 +65,11 @@ files:
 - .git/objects/00/e06caeaae19732437b0181b5dbdf916c2c59e3
 - .git/objects/00/e127e49ab0f08a8190bf5a95777c972603de9a
 - .git/objects/00/fd8045e0953bb11a521248dc27d4af2336c6d5
+- .git/objects/02/12d2da342b1ab3c0e7a7f2770686a7bb5d7806
 - .git/objects/02/469b717b4bd61ad27a3fe664ce0646a8325399
 - .git/objects/03/9e318355ab5ab32c3b6bc634d3d8e64f444ef8
 - .git/objects/04/cd62e7f8158fe54d21e6f63617c43b593b8b59
+- .git/objects/05/38f41ddebf7fa8c71ebe99c5288d5e11c3fb86
 - .git/objects/05/9bdc20ed12957701f4b3931e2b1779de7adccf
 - .git/objects/06/c2384aa5f8b5614038b48a726d1d4f98a00f3b
 - .git/objects/06/c3225bad9d5b80e7b3bde79ff3c2da591722bf
@@ -150,6 +152,7 @@ files:
 - .git/objects/2b/0fbe9a4022a4a112d2fa583f79dc6221ef2baf
 - .git/objects/2c/21f9d1b567c0d8f3d74e71b38beee67a53afdc
 - .git/objects/2c/633c11fb72405c6646493bc6c4d8c4fed0b9a6
+- .git/objects/2c/b04524ccd690f1cb4345586ca9138f9615afd5
 - .git/objects/2d/043376f1bc26b2dad3e79fc72ea14341ea437d
 - .git/objects/2e/3e3fc8e46949a9b944da3c36207c444aa2c9b7
 - .git/objects/2e/f02adc5485c579d75dfacf7034b20760f2fdf4
@@ -159,6 +162,7 @@ files:
 - .git/objects/31/de78f3710d86d0a5f494eb93405f497d8238fe
 - .git/objects/33/9755448515fb77f691d6197bd65d5b5d53fc24
 - .git/objects/34/e6093e9cd6ecc08b1a1834418e83bb277e8887
+- .git/objects/35/0b6a89c8f9704cb4f1e037ea638e952a487017
 - .git/objects/35/a5ef969e9dd65a06260954e2b66f7a7f107568
 - .git/objects/35/d78424bc393bb5acc12c52c031129aa3ceb8c5
 - .git/objects/36/66d56066f3aeb0f9fc342de42f25e298341a61
@@ -173,9 +177,11 @@ files:
 - .git/objects/3a/ff2a7bfdf3a677812899ede62d084369c7c5f4
 - .git/objects/3b/354d07a5bb5780eeffa4c12968214b1edb8b24
 - .git/objects/3b/cebd028c4b8312b2c36b14eddb57836c328a67
+- .git/objects/3b/da284efc6c07900db7dd00a9f3082d2c13d55e
 - .git/objects/3c/994e760012127915c1494a073cea51ef3b43e8
 - .git/objects/3d/5b84167d35cb75647f38a6d475a452ba3c6178
 - .git/objects/3d/ce52a15f01f1a8f99e65d148341bea71065129
+- .git/objects/3d/e882c2630c3cd215641a6c73ca83ad2d741b13
 - .git/objects/3e/c0da65fe2e572ad31203f9412baa09dfdf49d3
 - .git/objects/3e/cc8b7e1c4837559b36939612408b4d9def8fac
 - .git/objects/3e/f23cf310c5eebac930a19d36a0561dd362d3ee
@@ -184,6 +190,7 @@ files:
 - .git/objects/40/215c0554202fc46dc2fca94ed21e2920ce1e84
 - .git/objects/40/7adfb7f6188b0bb0b88cf9391943e1aaa32374
 - .git/objects/40/b5d1a81a061ce0e2f315b7e741ec70e0defe1d
+- .git/objects/43/6b9b73da4632657be4800b250741f37fdbb505
 - .git/objects/44/c96e2a778dcc62c10b3c329ab0211115a9f546
 - .git/objects/46/3353505eed0c799d05f025788437decbabafec
 - .git/objects/46/d12e0420cd6341a2720730cc45703fc835efb6
@@ -219,6 +226,7 @@ files:
 - .git/objects/53/b8187421c09e55e44b8d6fb3c4cd7feb0a51b2
 - .git/objects/54/713b018cb71a95e3f10510ea96b9f103ef0255
 - .git/objects/55/0dd68cd7e6918dd1473d609e8cafcde8f89009
+- .git/objects/55/45d0d521bb723db8feae0223fa838a183e38b7
 - .git/objects/55/6c13b26b6cecd286427a7f16c60c86c7df7885
 - .git/objects/55/d1f1efc344266d472094b1fd2f247b97de1c8b
 - .git/objects/56/b49aebdec66032571751e38f82d3ce550ccddf
@@ -231,6 +239,7 @@ files:
 - .git/objects/5a/c5589c8e02ab34cd516e172250c80d4ded5ce6
 - .git/objects/5c/95be85f2a2a984454fed4941a5ae00062634c5
 - .git/objects/5c/d7e89f2b29ed92fd51e2c6b2ee74db376d17d7
+- .git/objects/5d/c38b1f2d3893c8e41b05de2d121b525f888e5c
 - .git/objects/5f/483b0c41645f8882f549c1c6d0274bb592140a
 - .git/objects/60/74f4e0c668417e06938cb77640240e9c2b6e0e
 - .git/objects/60/a42d757f842f6ce1a27284630ffd3deb867857
@@ -254,6 +263,7 @@ files:
 - .git/objects/68/a8fc1e77fc27530430b55046609ee80cd9b2ad
 - .git/objects/69/02e8cbb5ad325c33b6abaac081d1df35d16202
 - .git/objects/69/ad159f329112a498fcc47c4943f4d9b59af1cc
+- .git/objects/6a/02fd5698264a4165c46af5175a39f5b130de9c
 - .git/objects/6a/2daaf6529a3841c7fd39683d9bcec79b48f79e
 - .git/objects/6a/90d6784ac3b6580ef470dac68c2d93c276d6a7
 - .git/objects/6a/cdfb69624140a67634b65ab8230cc5e0ffd543
@@ -300,6 +310,8 @@ files:
 - .git/objects/82/03c2c6cdd29e1e20e88fbb81e63b7ea1ec2899
 - .git/objects/83/6f33959bcf517b9952aefb3fdfdd7ff3c1f207
 - .git/objects/83/acf31cf1fc7e0e97878d11b2f5c1172bf2d0b2
+- .git/objects/83/fa8aa3ad64de1003adc5a1c7c31c3d98a7abf4
+- .git/objects/84/bfc21516dfc947e9aa64a47000b46da2c801d9
 - .git/objects/85/eee9f4c1a6f710ed87bf28a0531275777f8848
 - .git/objects/85/fd531f7352ad8f5ac030eed2204a662dd10a66
 - .git/objects/86/23de615f686de621ca23cbbff6a07885101df9
@@ -317,6 +329,7 @@ files:
 - .git/objects/8e/3cfb391de711b5fecfbdf2860fa37b019e8036
 - .git/objects/8e/69b6cf3ec8b49270091b4a206ccf326679dc20
 - .git/objects/8e/a47de58a27dd343b3ecd3dd5e0fab88e268a72
+- .git/objects/8f/53b7b2ab88b130763bc42b3ded7983d27bff7a
 - .git/objects/8f/5465ea782955ad019122d92a0f162945339f8e
 - .git/objects/90/57dd59aea225dd8f4b1dfa3e10c6096671fab9
 - .git/objects/90/5fe8a081a30b8d3d198590c434e8d0e3b0a4a2
@@ -329,6 +342,7 @@ files:
 - .git/objects/93/f9a6b596879347290cde161b03052bb22021de
 - .git/objects/94/72f3ac9e890231482aadd774bdc1c9ba742497
 - .git/objects/94/afd196cc89d60f0a06d4cad619eaa79921a9ae
+- .git/objects/94/ba2c1a45bc1a8cf3625f4889c507b39c664576
 - .git/objects/95/a9d4abd8363e64d221e0f7d47ae69cb055ea7b
 - .git/objects/96/47afbafd293f6994316b2cc0d3e813c1878f87
 - .git/objects/96/48a1590ab953b7ec3bc9d06e460c0004962b77
@@ -338,6 +352,7 @@ files:
 - .git/objects/97/8c0ddb7dbecadce5fbc740347598999ccc8223
 - .git/objects/98/6915a151ae2adb8f8e81e11038f7a1ca731bbc
 - .git/objects/98/8bfa77097695a4771be8e01d0aabd1a01c62fa
+- .git/objects/99/368683bd721c6c1b8db8eb1b468dffefa61a2e
 - .git/objects/99/8afa58b56034f5458b4aef2b8255daa53a5bb1
 - .git/objects/99/a23df6dd9c448928b25f2e749871c6fc696a32
 - .git/objects/9a/ef8f9aacfa5609934eac4de71d9440a23b1b9f
@@ -379,17 +394,20 @@ files:
 - .git/objects/ad/66aac16165dd71456e4488069248d6f10ebb8f
 - .git/objects/ae/536c345aad67cee8ce167dc91006263e63885f
 - .git/objects/ae/f24b73cf47992cde67e6b07544872df9bb2530
+- .git/objects/af/33f2833588e40e441f8b1f4dd26d5c93488334
 - .git/objects/b0/2c48116db702256abf27fab4236c84bd2d2dbc
 - .git/objects/b0/2d1be335e81533c7385970b28ea3b2a0ac5436
 - .git/objects/b0/39fcd38009980eb74d6bcef22d11e02639a530
 - .git/objects/b0/426bd4d76304278e6af43ce2d708ad26335514
 - .git/objects/b1/0d2b27582bb0d779efe6e17c45aaa671d32f3a
 - .git/objects/b1/2623653bc803aeab5b77efdc72f79fb8f9c80e
+- .git/objects/b1/8a3c6bf39b910b9805973578074e6d6b692a4a
 - .git/objects/b2/99ac9d0ac730461d7610161b99ee4191c7c2b8
 - .git/objects/b2/cd852090540d0b2450b901397edd924d8c0ba9
 - .git/objects/b3/c029798d5af50b4ab725aee6cf66ee11c4ff7a
 - .git/objects/b4/0345153922bfcdbbc4785cc3146e9e7c60dbbd
 - .git/objects/b4/228251babf3a84ac181d462fdd383816bd23b8
+- .git/objects/b4/343d9284a89e2971022f8d4acf7865d8341c6d
 - .git/objects/b4/eb909dd819bf870d2445bddc0d7f00678b11b6
 - .git/objects/b5/15828bb32356501aa81bb4e808ea5d7d77f068
 - .git/objects/b5/33c1c1bca9eae5b7e75c639fff8ec2c2f9fea1
@@ -451,10 +469,12 @@ files:
 - .git/objects/d6/ff7949e59f44649d35e95ed0240ead0ce94077
 - .git/objects/d7/a33fe1ff44a661941d742270c3299a862689ca
 - .git/objects/d7/dc82a39bd4d292230a212479dc4c0d7786474d
+- .git/objects/d8/bd32eafc1bcd962f7e2e1244071c921cd465fe
 - .git/objects/d9/0981681872c639fc00eb95ffa9dc17ad9f9599
 - .git/objects/db/64f75586d2786dd374615d935889e185f26fab
 - .git/objects/db/951c9a303fba608e0066e2aa68c3b7d8d9aea6
 - .git/objects/db/d962bcfbb85c6da46c868594983f3cda9fcad8
+- .git/objects/dc/0bcf757c5c24befef5c59eb7ec1589cfed184d
 - .git/objects/dc/773412a3a73c02f34edfaeadc89473cfe61c40
 - .git/objects/dc/d404a6183c1b2160add042127ada7ff83c9b7c
 - .git/objects/dc/e1fc65f9462792558151feab3fa64abf3a229f
@@ -464,11 +484,13 @@ files:
 - .git/objects/de/57906fbec41c830adf724743fd20dba762acab
 - .git/objects/df/f63029f32b25c2bf18d0f3f4e7907daa7c1bca
 - .git/objects/e0/444cc3908c5096319636ca42c403a78deda3f9
+- .git/objects/e0/7dd2a6b90bdde86477d621148f47bbba9e8427
 - .git/objects/e0/d8e7ab5a565d95d44f2a9a6246be6003a3de7b
 - .git/objects/e1/0c4f3ec5729fd4d2580d74e96a0489644a041a
 - .git/objects/e1/323977dc6cda25967e6ec6166430c2c0f08e32
 - .git/objects/e2/bc2615d3aa154bba2897c562a15ed19136d518
 - .git/objects/e2/c37248908c561be703c405e237fbf0c743977a
+- .git/objects/e3/153285548db5d39a615acbf0748cfa21e96ecb
 - .git/objects/e3/771a0d9f7b7be0df4f1ad709b7d6e0fe6536a9
 - .git/objects/e3/a7cacb84225125a2bc91b42394e7de7de7b205
 - .git/objects/e3/c22b30641292e851811969cbc0f9ceb5b1ac05
@@ -507,12 +529,14 @@ files:
 - .git/objects/f3/7784042bc99c16c02fd104dda82aafa42d4c9c
 - .git/objects/f4/2863a866b6cd3bb09d0482052cbf2da7fb4e5a
 - .git/objects/f4/2bc1aaa21ccdaa1bc0cfa8efb982b09b7eebb1
+- .git/objects/f5/8ca6b23d3ab90715ea6ba514546a416e50064e
 - .git/objects/f5/91a5c39e03e2102c9101db957b48c8c76e194c
 - .git/objects/f6/0fd8c2582e0f7688877f12f78ddb97a291046c
 - .git/objects/f6/3ad03a8daa1602df63aab3838947c18fa63797
 - .git/objects/f6/b9bcda0a6940c634c0ac0d6ac626028927e1da
 - .git/objects/f7/32b167a61d8db0328f0196af00b55147ebf756
 - .git/objects/f7/b177b2c6b25dd886d23d6be87bcf802af9b513
+- .git/objects/f8/9eb17d4ff10a745b70063cf5b8ff76ec66e102
 - .git/objects/f9/8d0f95460a7a3f63ab4c08ad5508fd32d1b5c2
 - .git/objects/f9/cf98993bf7067d5b45b0f06dc36fdedba5ffcf
 - .git/objects/f9/ef6dd08a60dec5d5e4e7a9b08f693ebf76da39
@@ -595,10 +619,10 @@ files:
 - lib/rails_ext/micelaneous/rails_require.rb
 - lib/rails_ext/micelaneous/safe_hash.rb
 - lib/rails_ext/micelaneous.rb
-- spec/mongo_mapper_ext/default_scope_spec.rb
 - spec/mongo_mapper_ext/micelaneous_plugin_spec.rb
 - spec/mongo_mapper_ext/micelaneous_spec.rb
 - spec/mongo_mapper_ext/mongo_mapper_migration_spec.rb
+- spec/mongo_mapper_ext/scope_spec.rb
 - spec/rails_ext/safe_hash_spec.rb
 - spec/spec.opts
 - public/rails_ext/rails_ext.css

data/spec/mongo_mapper_ext/default_scope_spec.rb

@@ -1,62 +0,0 @@
-require 'spec'
-require 'ruby_ext'
-require "#{File.dirname __FILE__}/../../lib/mongo_mapper_ext/plugins/default_scope"
-require "mongo_mapper"
-
-describe "MongoMapper Default Scope" do
-  before :all do
-    class ::DSBase
-      include MongoMapper::Document
-      plugin MongoMapper::Plugins::DefaultScope
-      
-      key :name, String
-    end
-    
-    class ::ObjectWithoutDefaultScope < DSBase
-    end
-    
-    class ::ObjectWithDefaultScope < DSBase
-      default_scope :name => 'special'
-    end
-    
-    class ::ObjectWithDynamicDefaultScope < DSBase
-      default_scope do
-        {:name => 'special'}
-      end
-    end
-    
-    class ::DefaultScopeInheritance < ObjectWithDefaultScope
-    end
-    
-    MongoMapper.database = 'test'
-  end
-  
-  after :all do
-    %w{DSBase ObjectWithoutDefaultScope ObjectWithDefaultScope DefaultScopeInheritance ObjectWithDynamicDefaultScope}.each do |obj_name|
-      Object.send :remove_const, obj_name if Object.const_defined? obj_name
-    end
-  end
-  
-  before :each do 
-    DSBase.delete_all
-    DSBase.create! :name => 'general'
-    DSBase.create! :name => 'special'
-  end
-    
-  it "should not affect objects without default_scope" do
-    ObjectWithoutDefaultScope.count.should == 2
-    ObjectWithoutDefaultScope.all.count.should == 2
-  end
-  
-  it "static default scope" do
-    ObjectWithDefaultScope.count.should == 1
-    ObjectWithDefaultScope.all.count.should == 1
-    ObjectWithDefaultScope.first.name.should == 'special'
-  end
-  
-  it "dynamic default scope" do
-    ObjectWithDynamicDefaultScope.count.should == 1
-    ObjectWithDynamicDefaultScope.all.count.should == 1
-    ObjectWithDynamicDefaultScope.first.name.should == 'special'
-  end
-end