rails-ext 0.2.17 → 0.2.18

data/lib/mongo_mapper_ext/view_helpers.rb

@@ -1,3 +1,5 @@
+# TODO3 Move all this app_specific stuff to sm_commons
+
 # 
 # HTML helpers
 # 

data/lib/mongo_mapper_ext.rb

@@ -1,5 +1,25 @@
 require 'mongo_mapper'
 
-%w{fixes migration mongo_mapper multitenant object_id view_helpers}.each do |file|
+
+[
+  'fixes',
+  'migration',
+  'mongo_mapper',
+  'view_helpers',
+  'db_config',
+  
+  'plugins/default_scope',
+  'plugins/attributes_cache',
+  'plugins/micelaneous',  
+].each do |file|
   require "#{File.dirname __FILE__}/mongo_mapper_ext/#{file}"
-end
+end
+
+module CommonPluginsAddition
+  def self.included(model)
+    model.plugin MongoMapper::Plugins::DefaultScope
+    model.plugin MongoMapper::Plugins::AttributesCache
+    model.plugin MongoMapper::Plugins::Micelaneous
+  end
+end
+MongoMapper::Document.append_inclusions(CommonPluginsAddition)

data/lib/rails_ext/config_files/safe_hash.rb

@@ -60,6 +60,10 @@ class SafeHash < BlankSlate
     @hash.inspect
   end
   
+  def to_h
+    @hash
+  end
+  
   class SafeNil < BlankSlate
     include Singleton
 
@@ -86,11 +90,15 @@ class SafeHash < BlankSlate
     end
     
     def to_yaml *args
-      nil
+      nil.to_yaml *args
+    end
+    
+    def to_h
+      {}
     end
     
     def inspect
-      nil
+      nil.inspect
     end
   end
 end

data/spec/mongo_mapper_ext/default_scope_spec.rb

@@ -0,0 +1,62 @@
+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

data/spec/mongo_mapper_ext/mongo_mapper_migration_spec.rb

@@ -0,0 +1,74 @@
+require 'spec'
+require 'ruby_ext'
+require "#{File.dirname __FILE__}/../../lib/mongo_mapper_ext"
+require "#{File.dirname __FILE__}/../../lib/mongo_mapper_ext/spec_helper"
+
+
+describe "MongoMapper Migration" do
+  Migration = MongoMapper::Migration  
+  
+  before :all do
+    MongoMapper.db_config = {
+      'global' => {'name' => 'global_test'},
+      'accounts' => {'name' => "accounts_test"}
+    }
+    
+    class ::Sample
+      include MongoMapper::Document
+      use_database :global
+
+      key :name, String
+    end
+  end
+
+  after :all do
+    Object.send :remove_const, :Sample if Object.const_defined? :Sample
+  end
+  
+  before :each do
+    Migration.definitions.clear
+  end
+  
+  it "Shouldn't update if versions are the same" do
+    Migration.update(:global, 0).should be_false
+  end
+  
+  it "migration should provide access to current database" do
+    Sample.count.should == 0    
+    Migration.define :global, 1 do |m|
+      m.up do |db|
+        Sample.create :name => 'name'
+        coll = db.collection 'samples'
+        coll.find.count.should == 1
+      end
+    end
+  
+    Migration.update(:global, 1).should be_true    
+    Sample.count.should == 1
+  end
+
+  it "increase_db_version" do
+    Sample.count.should == 0
+    Migration.define :global, 1 do |m|
+      m.up{Sample.create :name => 'name'}
+    end
+  
+    Migration.update(:global, 1).should be_true    
+    Sample.count.should == 1
+    Migration.metadata(MongoMapper.databases[:global]).should == 1
+  end
+
+  it "decrease_db_version" do    
+    Migration.define :global, 1 do |m|
+      m.up{Sample.create :name => 'name'}
+      m.down{Sample.destroy_all}
+    end
+    Migration.update(:global, 1).should be_true
+    Sample.count.should == 1
+  
+    Migration.update(:global, 0).should be_true
+    Sample.count.should == 0
+    Migration.metadata(MongoMapper.databases[:global]).should == 0
+  end
+    
+end

data/spec/{safe_hash_spec.rb → rails_ext/safe_hash_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec'
 
 require 'active_support'
-require "#{File.dirname __FILE__}/../lib/rails_ext/config_files/safe_hash"
+require "#{File.dirname __FILE__}/../../lib/rails_ext/config_files/safe_hash"
 
 describe "SafeHash and SafeNil" do
   it "should allow check for value presence" do
@@ -19,7 +19,7 @@ describe "SafeHash and SafeNil" do
     h.b!.should == :c
   end
   
-  it "general bechaviour" do
+  it "general behaviour" do
     h = SafeHash.new :key => :value
     
     h.key.should == :value

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 17
-  version: 0.2.17
+  - 18
+  version: 0.2.18
 platform: ruby
 authors: 
 - Alexey Petrushin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +03:00
+date: 2010-03-16 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,8 @@ files:
 - .git/objects/00/cc0fab85c28c827b7489c092c7fdfacaab2c15
 - .git/objects/00/fd8045e0953bb11a521248dc27d4af2336c6d5
 - .git/objects/02/469b717b4bd61ad27a3fe664ce0646a8325399
+- .git/objects/04/cd62e7f8158fe54d21e6f63617c43b593b8b59
+- .git/objects/06/c2384aa5f8b5614038b48a726d1d4f98a00f3b
 - .git/objects/06/c3225bad9d5b80e7b3bde79ff3c2da591722bf
 - .git/objects/07/9ef6b10f536af792f4cf5d131857baa28751e7
 - .git/objects/07/f7d26527e58caa2fa99e33b29a7791b9eb8b3e
@@ -78,17 +80,21 @@ files:
 - .git/objects/0f/d3ac42b07c2d3102263bd939704f5633db304e
 - .git/objects/10/1f52d83027dfe5798f87aec1118f02d19e5cf8
 - .git/objects/10/bfe1230b9d96e23600091cc8b4b9d378068101
+- .git/objects/11/9db1e92a2d4c7ff2c6d9a58940aa25d8bd4bc3
 - .git/objects/13/882df4f2ef911454bf3b69a85742b372723366
 - .git/objects/13/d5e53963c37e20ff517035b00f6b404c0e8056
 - .git/objects/15/351f2f81548a7a0d9c4a6690894a42262fb7f5
 - .git/objects/15/3f845625a0f605a2a35487a32038d0349bc386
 - .git/objects/15/6d9fb4d4fd605969b37fea59e57eb486d8d06f
+- .git/objects/15/8eef048d128710bfc0cb60114f7405e45f9b6c
 - .git/objects/18/17673317d63a90369c9f7abdc6f0113f42050f
 - .git/objects/18/71ebea5ace362756ec45cff59a336df5d50725
 - .git/objects/18/77033b90ed3dd55a3034b7e3ca1c5c9f66868d
 - .git/objects/18/adbbbcd043a3ef3e19854df8476b02d69544d0
 - .git/objects/19/1f68644a3646d774f2546c4cd49ac7d66f4cc2
 - .git/objects/1b/83175202b0bdd9e8aac50c186533c1730aa220
+- .git/objects/1b/d7d8887251e9bd43d88a5da5115ff4f1f5f10d
+- .git/objects/1c/14e28ef05892ccfe61da3dc28e16f87040fe43
 - .git/objects/1c/65c12ac1816d1b56c7c3892acc61512696c673
 - .git/objects/1c/7fd48742e76d2cd6605e1a569e65e79ddd8f92
 - .git/objects/1d/d49713de2942dc974e55adc3684f55b2b817e2
@@ -96,6 +102,9 @@ files:
 - .git/objects/1f/1be5b8e4dce8787367b3a607b0695ca70d4e82
 - .git/objects/21/e143c036491275aaa7d6e45ed4683f5defdae2
 - .git/objects/23/926daa53cee50268bd329a8b4cbd853cb3a45b
+- .git/objects/24/62bd996e6c1b78d669a9eb3303c74217260f4b
+- .git/objects/25/ad912bcedeb900c551388c8d4f062812848af2
+- .git/objects/27/f8a63386b8acf5edba3ed9334644455045acd8
 - .git/objects/28/8e20f19c6662b1425e0a0797ae443f7eddcc4a
 - .git/objects/28/c44da9255a78bf7105a1c251e4e1cd643b8f44
 - .git/objects/29/7a2c413b11f78b69dd8caa4f334c9536088f8a
@@ -117,6 +126,7 @@ files:
 - .git/objects/3a/03b9d44de43472689300120ffb2a0a9a74f27f
 - .git/objects/3a/797683953be7e6d0ffa0e34514f3e8e9c3ceb0
 - .git/objects/3a/ff2a7bfdf3a677812899ede62d084369c7c5f4
+- .git/objects/3d/5b84167d35cb75647f38a6d475a452ba3c6178
 - .git/objects/3e/c0da65fe2e572ad31203f9412baa09dfdf49d3
 - .git/objects/3e/f23cf310c5eebac930a19d36a0561dd362d3ee
 - .git/objects/3f/3db6bb5a5204ae58e303959c4c0da3a70d8b35
@@ -124,10 +134,14 @@ files:
 - .git/objects/40/215c0554202fc46dc2fca94ed21e2920ce1e84
 - .git/objects/40/7adfb7f6188b0bb0b88cf9391943e1aaa32374
 - .git/objects/40/b5d1a81a061ce0e2f315b7e741ec70e0defe1d
+- .git/objects/44/c96e2a778dcc62c10b3c329ab0211115a9f546
+- .git/objects/46/3353505eed0c799d05f025788437decbabafec
 - .git/objects/46/d12e0420cd6341a2720730cc45703fc835efb6
 - .git/objects/47/28fde4426b545c73552bd5e0f79296a2b4be19
+- .git/objects/47/afb623cc9949394fc403bc977671307c1a9eda
 - .git/objects/48/0602886685e84f2a257eb8e95acfc8af1166b6
 - .git/objects/49/66cd792ea3e03d5091aa7a332f2a082e479a76
+- .git/objects/49/ca132451f70ee989ff7a7cf487b029fe706b28
 - .git/objects/4a/80705702f499ef1278630257a33c6088238ba3
 - .git/objects/4a/be35eba6ed159578e3f43f6ffa8ea7541598e2
 - .git/objects/4b/2bdb2dc6330ba9bafd9058ec8eaa925ef53f91
@@ -141,6 +155,7 @@ files:
 - .git/objects/52/5fcb274029ec36780b264166ea3d487d968997
 - .git/objects/53/2ff954f947901011d76dcc1e335c2d52e5706c
 - .git/objects/53/8aca7c60ef3cdfde25d4698e8e133ce18e512e
+- .git/objects/53/b8187421c09e55e44b8d6fb3c4cd7feb0a51b2
 - .git/objects/55/6c13b26b6cecd286427a7f16c60c86c7df7885
 - .git/objects/55/d1f1efc344266d472094b1fd2f247b97de1c8b
 - .git/objects/56/d4d25c979129176da0f447726f3eecf611973b
@@ -159,7 +174,9 @@ files:
 - .git/objects/63/e3ecfd9b00f7111c9d9bb8e734e0c04ab44583
 - .git/objects/64/96d7c4cc0c824e706bf757f9ec63b5553c9caf
 - .git/objects/65/51094fa3b996ff25b88d7ddb21d21a811d53fc
+- .git/objects/65/e77ca17328dfeb3477287af40fb834284c8f61
 - .git/objects/66/37f98202acb1895cb347d7c5fb5c414dd9e6db
+- .git/objects/66/95d9ac4648cdadd9922d3b355a1d6f56547f4c
 - .git/objects/67/2396778b142df8b0b7ab212b7564039c48cf39
 - .git/objects/67/850cf1ede94d80c9b07ceace074a4d62f15249
 - .git/objects/68/8ce506ac4f7c160bd6880d8507820761a3b3b7
@@ -168,14 +185,19 @@ files:
 - .git/objects/69/ad159f329112a498fcc47c4943f4d9b59af1cc
 - .git/objects/6a/90d6784ac3b6580ef470dac68c2d93c276d6a7
 - .git/objects/6a/cdfb69624140a67634b65ab8230cc5e0ffd543
+- .git/objects/6b/779e60dfa44ba3daa26badf65b3422f30c7b9b
+- .git/objects/6c/e5f7ee8ecbaa20a264bb2f2fb2fd821b5ad478
 - .git/objects/6d/6bfb690cccf36d947eaafd79a19b0974afb65a
 - .git/objects/6d/85efe0589aa745a632d38314b7b5902a8874c0
 - .git/objects/6d/f725e3519872a75bc763045f00d8844eb890cf
 - .git/objects/6e/a04c6c0a52b9c7da1de6364b530553dfd78c4a
+- .git/objects/6f/72c276ac50a5731aa5f7e7e01dd2793113fe5b
 - .git/objects/71/e6b43e9d41f9903992fd86d483b7d3e4dd28cd
 - .git/objects/73/667b7ae341d478513ba0bd6ec8af0aa1f62f0d
+- .git/objects/74/4d46a654ae9e0867055184f2011668c7e1acd2
 - .git/objects/74/ce4a58ebf96006e1e9be0980b99ac3b5b820c7
 - .git/objects/74/d8411c7276b4e1c1f614606af7f69ab4526d30
+- .git/objects/75/c64796b5ffb6107b861cfa77fa28e8e43a1156
 - .git/objects/75/d0b250bcdf241d981313b1d6eb153b96e4b05f
 - .git/objects/76/d3cd0f31cfb174c2411be5636a8257e7af613a
 - .git/objects/77/6e03ab9139aab1e0e8d551a75c3c0145fd9322
@@ -188,36 +210,49 @@ files:
 - .git/objects/7e/ca6f113845c2dcdf536daa084349445d608879
 - .git/objects/81/156e1461b12b90f0dc2604458317ca8f5d45c0
 - .git/objects/81/d4aa3b627dfc7397ce3f71577a8307324b8289
+- .git/objects/82/0190b802ed213aab7a56a928a09db06e2a90a2
 - .git/objects/82/03c2c6cdd29e1e20e88fbb81e63b7ea1ec2899
 - .git/objects/83/6f33959bcf517b9952aefb3fdfdd7ff3c1f207
 - .git/objects/85/eee9f4c1a6f710ed87bf28a0531275777f8848
 - .git/objects/85/fd531f7352ad8f5ac030eed2204a662dd10a66
+- .git/objects/86/23de615f686de621ca23cbbff6a07885101df9
 - .git/objects/86/b31b604469e9b261f4e5b927932504bca8c402
 - .git/objects/87/fc827fd223cac6b4e55d823a9ea86bb0726a3b
 - .git/objects/88/b888ea16fb14478c659390ce54e980b86198ef
 - .git/objects/89/2697494eb70fdccaf26bf547bb8d7428c0e5ff
+- .git/objects/8a/d2c8f5ee0627cf48aa39d5f10578f929bfc2c5
 - .git/objects/8b/7fd3b87e0f2fce82705c50e7c48f9496b7666e
 - .git/objects/8c/4648d7c914e9d60dc387ff801c97b2d19c97f7
 - .git/objects/8d/4dcde8df4da8f53f5f5313757b907e9aa1af66
 - .git/objects/8e/3cfb391de711b5fecfbdf2860fa37b019e8036
 - .git/objects/8e/69b6cf3ec8b49270091b4a206ccf326679dc20
 - .git/objects/8e/a47de58a27dd343b3ecd3dd5e0fab88e268a72
+- .git/objects/8f/5465ea782955ad019122d92a0f162945339f8e
 - .git/objects/90/ca84ea326afab5fcc92a50469c2052ebc46f11
 - .git/objects/92/e1c250edfca72ed0932934257ef3cfc7122ec5
 - .git/objects/92/e1f3936e7c33007d0a466b836804450992a1eb
 - .git/objects/93/f9a6b596879347290cde161b03052bb22021de
 - .git/objects/94/72f3ac9e890231482aadd774bdc1c9ba742497
+- .git/objects/94/afd196cc89d60f0a06d4cad619eaa79921a9ae
 - .git/objects/96/48a1590ab953b7ec3bc9d06e460c0004962b77
+- .git/objects/97/5b5b662b4c712668b3fe5dfe917000338e6b3e
 - .git/objects/98/6915a151ae2adb8f8e81e11038f7a1ca731bbc
+- .git/objects/99/a23df6dd9c448928b25f2e749871c6fc696a32
 - .git/objects/9b/a1a0e6e5050444fc8743a18341ae219c54aa9b
+- .git/objects/9c/20b1616810e3d1d5951ea6251ff2d28322dc16
+- .git/objects/9d/9f28ff50236f1e7f78cbd17b8aa25a0bf8b6fc
 - .git/objects/9e/a42bcef6b76af65d741384e13c24b8072637d1
 - .git/objects/9f/0f3e54458d429dd2a1c04e4671398cfa37d595
+- .git/objects/9f/91a2fdd59ecdfb4f8f5025fdbe590eb536e96f
+- .git/objects/a0/90ab2a9e739787b6090c187acf95fdd763afef
 - .git/objects/a0/d595c78f280787659a2a4400f5d63578b53dce
 - .git/objects/a1/7da5fcb263b86753b0dddb8f34472e61d25fa1
+- .git/objects/a2/d43a3a789e655cc306618d480193709d580c30
 - .git/objects/a3/4e4e8572d323de26965619321576f903fa7935
 - .git/objects/a3/5c311b625d863b50d51e2385259d487e277c90
 - .git/objects/a3/6956ff51b72b69d1ac2c1ad0d78bb9ad1ade75
 - .git/objects/a3/84715546f6a11dc7d56a32784dbdd5d7d92e8e
+- .git/objects/a4/c75ead5dcfe97a67d302464584be205e8c48b1
 - .git/objects/a5/4db1bec30f7dc8981c4d5ccf9c9a90c1e13662
 - .git/objects/a5/9472e8ecb5d06647adeec11ae931b956508191
 - .git/objects/a6/438da91846df9ac940b59f6d11d5019a5580be
@@ -228,6 +263,7 @@ files:
 - .git/objects/ab/825cde00e626431c6045e6886d470327c63001
 - .git/objects/ac/92bcf6c74d23824c3c7ce341f667507592c7f9
 - .git/objects/ac/a1ad63cec98e0b3dae23fbe088f5a5d2125a7a
+- .git/objects/ad/66aac16165dd71456e4488069248d6f10ebb8f
 - .git/objects/ae/536c345aad67cee8ce167dc91006263e63885f
 - .git/objects/b0/2c48116db702256abf27fab4236c84bd2d2dbc
 - .git/objects/b0/39fcd38009980eb74d6bcef22d11e02639a530
@@ -242,11 +278,15 @@ files:
 - .git/objects/b5/33c1c1bca9eae5b7e75c639fff8ec2c2f9fea1
 - .git/objects/b5/edd343ceb8e87d1a73922612aec210b393f839
 - .git/objects/b7/88e3ac322b164a2a223f80f8a6da0836d9d1dd
+- .git/objects/b8/aaaf4949881600102a72a60f17fd58918dbd7b
+- .git/objects/b8/efcaff7f11cc584ac44303449d96592853c528
+- .git/objects/b9/ecca04b12de69ffab2cc5d22cb52d5babef24f
 - .git/objects/ba/67eef0f58a44e4b39af605d45e1e958023588d
 - .git/objects/bb/05a580a8afe6e3078b8e6ec4cda41fdc266f5d
 - .git/objects/bb/23236d2e8340087cc495c66310e6eb90d6fe0a
 - .git/objects/bc/90a06dd2f2257e8da49989738db5747e2b78d8
 - .git/objects/bd/eab0ec8a914cdd8c9341340191c116a4bf2d3e
+- .git/objects/be/29c116694d85d48cf177cf30816aa159189536
 - .git/objects/c0/22e88f31b91cecfc45b1bae611c27f5b12ca15
 - .git/objects/c0/724bc45e241d336d6376f14d9b258c2e4744d4
 - .git/objects/c1/3cf3c2ea85ec40544fe31702b2cfe6091aed6e
@@ -284,6 +324,7 @@ files:
 - .git/objects/de/10bee1e91cfbd53ccaa073aada68cbfeac22d8
 - .git/objects/de/513632cf9d7755d57fa2cde261bc6822335d40
 - .git/objects/de/57906fbec41c830adf724743fd20dba762acab
+- .git/objects/df/f63029f32b25c2bf18d0f3f4e7907daa7c1bca
 - .git/objects/e0/444cc3908c5096319636ca42c403a78deda3f9
 - .git/objects/e0/d8e7ab5a565d95d44f2a9a6246be6003a3de7b
 - .git/objects/e2/bc2615d3aa154bba2897c562a15ed19136d518
@@ -302,12 +343,14 @@ files:
 - .git/objects/e8/8c08dea8850c34f14a6cb67660174d186f9e0a
 - .git/objects/e8/901c48443ed6999a3c1b86c435562d2ee54caf
 - .git/objects/e8/e3794adaa5886984bd0c0ff90980353de03c9b
+- .git/objects/e9/46302310acac8a7a6b64a58b47062934765ede
 - .git/objects/ea/50407bf8daef694d22268540dd55eb3a739bad
 - .git/objects/eb/950b1535bf0671019ba323386deea2598ce246
 - .git/objects/eb/9701e2dbe8fb606315f9514d789188160bdd67
 - .git/objects/ed/c690a7821df2da3c0ddeee24b87187b3a99d91
 - .git/objects/ee/ccaf0d272346a1dcc672a4131ba692a0027049
 - .git/objects/f0/af2f0e63f924f45e55af90e691f3588552ffc9
+- .git/objects/f1/9154fc5093f2fd56f2660f386975b2a79be76f
 - .git/objects/f2/196f15b2d432b2a2d641aed4ae5afe7190edb9
 - .git/objects/f2/efda050bcf5d33d3f8e8fb2848b0be926c1731
 - .git/objects/f3/3573a82a9e7dbf9bc7f5b3feded4c223701d1f
@@ -340,11 +383,13 @@ files:
 - lib/asset_packager/asset_packager.rb
 - lib/asset_packager/jsmin.rb
 - lib/asset_packager/tasks.rb
+- lib/mongo_mapper_ext/db_config.rb
 - lib/mongo_mapper_ext/fixes.rb
 - lib/mongo_mapper_ext/migration.rb
 - lib/mongo_mapper_ext/mongo_mapper.rb
-- lib/mongo_mapper_ext/multitenant.rb
-- lib/mongo_mapper_ext/object_id.rb
+- lib/mongo_mapper_ext/plugins/attributes_cache.rb
+- lib/mongo_mapper_ext/plugins/default_scope.rb
+- lib/mongo_mapper_ext/plugins/micelaneous.rb
 - lib/mongo_mapper_ext/spec_helper.rb
 - lib/mongo_mapper_ext/view_helpers.rb
 - lib/mongo_mapper_ext.rb
@@ -380,8 +425,9 @@ files:
 - lib/rails_ext/reload_page.rb
 - lib/rails_ext/user_error.rb
 - lib/rails_ext.rb
-- spec/mongo_mapper_migration_spec.rb
-- spec/safe_hash_spec.rb
+- spec/mongo_mapper_ext/default_scope_spec.rb
+- spec/mongo_mapper_ext/mongo_mapper_migration_spec.rb
+- spec/rails_ext/safe_hash_spec.rb
 - spec/spec.opts
 - public/rails_ext/rails_ext.css
 - public/rails_ext/rails_ext.js

data/lib/mongo_mapper_ext/multitenant.rb

@@ -1,8 +0,0 @@
-[MongoMapper::EmbeddedDocument::ClassMethods, MongoMapper::Document::ClassMethods].each do |aclass|
-  aclass.class_eval do
-    def connect_to_global_database!      
-      self.connection MongoMapper.global_connection
-      self.set_database_name MongoMapper.config.global_database.name
-    end
-  end
-end

data/lib/mongo_mapper_ext/object_id.rb

@@ -1,12 +0,0 @@
-# 
-# ObjectID
-# 
-Mongo::ObjectID.class_eval do  
-  def == other
-    self.to_s == other.to_s
-  end
-
-  def to_yaml *args
-    to_s.to_yaml *args
-  end
-end

data/spec/mongo_mapper_migration_spec.rb

@@ -1,137 +0,0 @@
-require 'spec'
-require 'ruby_ext'
-require "#{File.dirname __FILE__}/../lib/mongo_mapper_ext"
-
-MongoMapper.custom_config = {
-  :global_database => {
-    :name => 'global_development_test'
-  }.to_openobject,
-  :accounts_database => {
-    :name => "accounts_#{MongoMapper::ACCOUNT_TOKEN}_test"
-  }.to_openobject
-}.to_openobject
-require "#{File.dirname __FILE__}/../lib/mongo_mapper_ext/spec_helper"
-
-
-describe "MongoMapper Migration" do
-  Migration = MongoMapper::Migration
-  
-  before :each do
-    Migration.send :reset
-  end
-  
-  describe "Global Database" do    
-    before :all do
-      class GlobalSample
-        include MongoMapper::Document
-        connect_to_global_database! 
-  
-        key :name, String
-      end
-    end
-  
-    after :all do
-      Object.send :remove_const, :GlobalSample if defined?(GlobalSample)
-    end
-    
-    it "Shouldn't update if versions are the same" do
-      Migration.update_global_database_to(0).should be_false
-    end
-  
-    it "increase_db_version" do
-      GlobalSample.count.should == 0
-      Migration.define_global_migration 1 do |m|
-        m.up{GlobalSample.create :name => 'name'}
-      end
-    
-      Migration.update_global_database_to(1).should be_true    
-      GlobalSample.count.should == 1
-      Migration.metadata(MongoMapper.global_database).should == 1
-    end
-  
-    it "decrease_db_version" do    
-      Migration.define_global_migration 1 do |m|
-        m.up{GlobalSample.create :name => 'name'}
-        m.down{GlobalSample.destroy_all}
-      end
-      Migration.update_global_database_to(1).should be_true
-      GlobalSample.count.should == 1
-    
-      Migration.update_global_database_to(0).should be_true
-      GlobalSample.count.should == 0
-      Migration.metadata(MongoMapper.global_database).should == 0
-    end
-  end
-  
-  describe "Acccounts Database" do
-    before :all do
-      class Sample
-        include MongoMapper::Document
-  
-        key :name, String
-      end
-    end
-  
-    after :all do
-      Object.send :remove_const, :Sample if defined?(Sample)
-    end
-    
-    before :each do       
-      @account_db_name = 'accounts_development_test'
-      MongoMapper.accounts_names.each do |acccount_name|
-        next if acccount_name == 'development'
-        MongoMapper.account_connection.drop_database MongoMapper.account_database_name(acccount_name) 
-      end
-      MongoMapper.current_account_database.collection('stub').save('a' => 'b') # Creating empty database
-      MongoMapper.accounts_names.should == ['development']      
-    end
-    
-    after :each do
-      MongoMapper.account_database 'development'
-    end
-    
-    it "Shouldn't update if versions are the same" do
-      results = Migration.update_database_to(0)
-      results[@account_db_name].should be_false
-    end
-  
-    it "increase_db_version" do
-      Sample.count.should == 0
-      Migration.define_migration 1 do |m|
-        m.up{Sample.create :name => 'name'}
-      end
-    
-      results = Migration.update_database_to(1)
-      results.size.should == 1
-      results[@account_db_name].should be_true    
-      
-      MongoMapper.account_database 'development'
-      Sample.count.should == 1
-      Migration.metadata(MongoMapper.current_account_database).should == 1
-    end
-  
-    it "decrease_db_version" do    
-      Migration.define_migration 1 do |m|
-        m.up{Sample.create :name => 'name'}
-        m.down{Sample.destroy_all}
-      end
-      
-      # Up
-      results = Migration.update_database_to(1)
-      results.size.should == 1
-      results[@account_db_name].should be_true
-      
-      MongoMapper.account_database 'development'
-      Sample.count.should == 1
-    
-      # Down
-      results = Migration.update_database_to(0)
-      results.size.should == 1
-      results[@account_db_name].should be_true
-      
-      MongoMapper.account_database 'development'      
-      Sample.count.should == 0
-      Migration.metadata(MongoMapper.database).should == 0
-    end
-  end
-end