mongomodel 0.3.4 → 0.3.5

data/Appraisals

@@ -1,9 +1,19 @@
 appraise "rails-3.0" do
-  gem "activesupport", "3.0.9"
-  gem "activemodel", "3.0.9"
+  gem "activesupport", "3.0.10"
+  gem "activemodel", "3.0.10"
 end
 
-appraise "rails-3.1" do
+appraise "rails-3.1-rc6" do
+  gem "activesupport", "3.1.0.rc6"
+  gem "activemodel", "3.1.0.rc6"
+end
+
+appraise "rails-3.1-latest" do
   gem "activesupport", :git => "https://github.com/rails/rails.git", :branch => "3-1-stable"
   gem "activemodel", :git => "https://github.com/rails/rails.git", :branch => "3-1-stable"
 end
+
+appraise "rails-edge" do
+  gem "activesupport", :git => "https://github.com/rails/rails.git"
+  gem "activemodel", :git => "https://github.com/rails/rails.git"
+end

data/gemfiles/rails-3.0.gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 
 gem "appraisal", "~> 0.3.6"
 gem "bson_ext", "~> 1.3.0"
-gem "activesupport", "3.0.9"
-gem "activemodel", "3.0.9"
+gem "activesupport", "3.0.10"
+gem "activemodel", "3.0.10"
 
 gemspec :path=>"../"

data/gemfiles/rails-3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/sam/Development/MongoDB/mongomodel
+  remote: /Users/sam/Work/mongomodel
   specs:
-    mongomodel (0.3.3)
+    mongomodel (0.3.4)
       activemodel (~> 3.0)
       activesupport (~> 3.0)
       mongo (~> 1.3.0)
@@ -10,11 +10,11 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activesupport (3.0.9)
+    activesupport (3.0.10)
     appraisal (0.3.6)
       aruba (~> 0.4.2)
       bundler
@@ -58,14 +58,14 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     term-ansicolor (1.0.5)
-    will_paginate (2.3.15)
+    will_paginate (2.3.16)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (= 3.0.9)
-  activesupport (= 3.0.9)
+  activemodel (= 3.0.10)
+  activesupport (= 3.0.10)
   appraisal (~> 0.3.6)
   bson_ext (~> 1.3.0)
   bundler (>= 1.0.0)

data/gemfiles/{rails-3.1.gemfile.lock → rails-3.1-edge.gemfile.lock}

@@ -1,20 +1,20 @@
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 07ea84a03b2a2c753768965a840913b4d4d42cee
+  revision: 633a5693a7c304ec242488dc5aa11c8956b3b294
   branch: 3-1-stable
   specs:
-    activemodel (3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+    activemodel (3.1.0.rc6)
+      activesupport (= 3.1.0.rc6)
       bcrypt-ruby (~> 2.1.4)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activesupport (3.1.0.rc4)
+    activesupport (3.1.0.rc6)
       multi_json (~> 1.0)
 
 PATH
-  remote: /Users/sam/Development/MongoDB/mongomodel
+  remote: /Users/sam/Work/mongomodel
   specs:
-    mongomodel (0.3.3)
+    mongomodel (0.3.4)
       activemodel (~> 3.0)
       activesupport (~> 3.0)
       mongo (~> 1.3.0)
@@ -23,42 +23,19 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    appraisal (0.3.6)
-      aruba (~> 0.4.2)
+    appraisal (0.3.8)
       bundler
       rake
-    aruba (0.4.3)
-      bcat (>= 0.6.1)
-      childprocess (>= 0.1.9)
-      cucumber (>= 0.10.7)
-      rdiscount (>= 1.6.8)
-      rspec (>= 2.6.0)
-    bcat (0.6.1)
-      rack (~> 1.0)
     bcrypt-ruby (2.1.4)
     bson (1.3.1)
     bson_ext (1.3.1)
     builder (3.0.0)
-    childprocess (0.1.9)
-      ffi (~> 1.0.6)
-    cucumber (1.0.0)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.1)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
-    ffi (1.0.9)
-    gherkin (2.4.1)
-      json (>= 1.4.6)
     i18n (0.6.0)
-    json (1.5.3)
     mongo (1.3.1)
       bson (>= 1.3.1)
     multi_json (1.0.3)
-    rack (1.3.0)
     rake (0.9.2)
-    rdiscount (1.6.8)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -67,8 +44,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    term-ansicolor (1.0.5)
-    will_paginate (2.3.15)
+    will_paginate (2.3.16)
 
 PLATFORMS
   ruby

data/gemfiles/rails-3.1-latest.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 0.3.6"
+gem "bson_ext", "~> 1.3.0"
+gem "activesupport", :git=>"https://github.com/rails/rails.git", :branch=>"3-1-stable"
+gem "activemodel", :git=>"https://github.com/rails/rails.git", :branch=>"3-1-stable"
+
+gemspec :path=>"../"

data/gemfiles/rails-3.1-latest.gemfile.lock

@@ -0,0 +1,59 @@
+GIT
+  remote: https://github.com/rails/rails.git
+  revision: 633a5693a7c304ec242488dc5aa11c8956b3b294
+  branch: 3-1-stable
+  specs:
+    activemodel (3.1.0.rc6)
+      activesupport (= 3.1.0.rc6)
+      bcrypt-ruby (~> 2.1.4)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.0.rc6)
+      multi_json (~> 1.0)
+
+PATH
+  remote: /Users/sam/Work/mongomodel
+  specs:
+    mongomodel (0.3.4)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      mongo (~> 1.3.0)
+      will_paginate (~> 2.3.15)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    appraisal (0.3.8)
+      bundler
+      rake
+    bcrypt-ruby (2.1.4)
+    bson (1.3.1)
+    bson_ext (1.3.1)
+    builder (3.0.0)
+    diff-lcs (1.1.2)
+    i18n (0.6.0)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    multi_json (1.0.3)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    will_paginate (2.3.16)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel!
+  activesupport!
+  appraisal (~> 0.3.6)
+  bson_ext (~> 1.3.0)
+  bundler (>= 1.0.0)
+  mongomodel!
+  rspec (~> 2.6.0)

data/gemfiles/rails-3.1-rc6.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 0.3.6"
+gem "bson_ext", "~> 1.3.0"
+gem "activesupport", "3.1.0.rc6"
+gem "activemodel", "3.1.0.rc6"
+
+gemspec :path=>"../"

data/gemfiles/rails-3.1-rc6.gemfile.lock

@@ -0,0 +1,53 @@
+PATH
+  remote: /Users/sam/Work/mongomodel
+  specs:
+    mongomodel (0.3.4)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      mongo (~> 1.3.0)
+      will_paginate (~> 2.3.15)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.1.0.rc6)
+      activesupport (= 3.1.0.rc6)
+      bcrypt-ruby (~> 2.1.4)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.0.rc6)
+      multi_json (~> 1.0)
+    appraisal (0.3.8)
+      bundler
+      rake
+    bcrypt-ruby (2.1.4)
+    bson (1.3.1)
+    bson_ext (1.3.1)
+    builder (3.0.0)
+    diff-lcs (1.1.2)
+    i18n (0.6.0)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    multi_json (1.0.3)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    will_paginate (2.3.16)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (= 3.1.0.rc6)
+  activesupport (= 3.1.0.rc6)
+  appraisal (~> 0.3.6)
+  bson_ext (~> 1.3.0)
+  bundler (>= 1.0.0)
+  mongomodel!
+  rspec (~> 2.6.0)

data/gemfiles/rails-edge.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 0.3.6"
+gem "bson_ext", "~> 1.3.0"
+gem "activesupport", :git=>"https://github.com/rails/rails.git"
+gem "activemodel", :git=>"https://github.com/rails/rails.git"
+
+gemspec :path=>"../"

data/gemfiles/rails-edge.gemfile.lock

@@ -0,0 +1,59 @@
+GIT
+  remote: https://github.com/rails/rails.git
+  revision: 22e611ed5b0a708d17ef2e7574bcdf2edf2db01b
+  specs:
+    activemodel (3.2.0.beta)
+      activesupport (= 3.2.0.beta)
+      bcrypt-ruby (~> 2.1.4)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.2.0.beta)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+
+PATH
+  remote: /Users/sam/Work/mongomodel
+  specs:
+    mongomodel (0.3.4)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      mongo (~> 1.3.0)
+      will_paginate (~> 2.3.15)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    appraisal (0.3.8)
+      bundler
+      rake
+    bcrypt-ruby (2.1.4)
+    bson (1.3.1)
+    bson_ext (1.3.1)
+    builder (3.0.0)
+    diff-lcs (1.1.2)
+    i18n (0.6.0)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    multi_json (1.0.3)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    will_paginate (2.3.16)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel!
+  activesupport!
+  appraisal (~> 0.3.6)
+  bson_ext (~> 1.3.0)
+  bundler (>= 1.0.0)
+  mongomodel!
+  rspec (~> 2.6.0)

data/lib/mongomodel/concerns/associations/base/association.rb

@@ -19,12 +19,12 @@ module MongoModel
           proxy.target = obj
           proxy
         end
-      
-      protected
+        
         def ensure_class(value)
           raise AssociationTypeMismatch, "expected instance of #{klass} but got #{value.class}" unless value.is_a?(klass)
         end
-        
+      
+      protected
         def proxy_class
           self.class.parent::Proxy rescue Base::Proxy
         end

data/lib/mongomodel/concerns/associations/has_many_by_foreign_key.rb

@@ -90,6 +90,10 @@ module MongoModel
         def scoped
           definition.scope.where(foreign_key => instance.id).on_load { |doc| set_inverse_association(doc) }
         end
+        
+        def ensure_class(array)
+          array.is_a?(Array) ? array.each { |i| super(i) } : super
+        end
       
       protected
         def new_documents
@@ -104,10 +108,6 @@ module MongoModel
           end
         end
         
-        def ensure_class(array)
-          array.is_a?(Array) ? array.each { |i| super(i) } : super
-        end
-        
         def proxy_class
           Proxy
         end

data/lib/mongomodel/concerns/associations/has_many_by_ids.rb

@@ -66,6 +66,10 @@ module MongoModel
           definition.scope.where(:id.in => ids)
         end
         
+        def ensure_class(array)
+          array.is_a?(Array) ? array.each { |i| super(i) } : super
+        end
+        
       protected
         def new_documents
           @new_documents ||= []
@@ -74,10 +78,6 @@ module MongoModel
         def new_document_ids
           new_documents.map { |doc| doc.id }
         end
-      
-        def ensure_class(array)
-          array.is_a?(Array) ? array.each { |i| super(i) } : super
-        end
         
         def proxy_class
           Proxy

data/lib/mongomodel/document/collection_modifiers.rb

@@ -3,6 +3,22 @@ module MongoModel
     module CollectionModifiers
       extend ActiveSupport::Concern
       
+      METHODS = [ :increase!, :set!, :unset!, :push!, :push_all!, :add_to_set!, :pull!, :pull_all!, :pop!, :shift!, :rename! ]
+      
+      module InstanceMethods
+        # Define methods manually rather than use Module#delegate as it raises false deprecation warnings.
+        METHODS.each do |modifier|
+          define_method(modifier) do |*args|
+            instance_scope.send(modifier, *args)
+          end
+        end
+        
+      private
+        def instance_scope
+          self.class.where(:id => id)
+        end
+      end
+      
       module ClassMethods
         # Post.increase!(:hits => 1, :available => -1)
         def increase!(args)
@@ -69,15 +85,6 @@ module MongoModel
           collection.update(selector, { modifier => args.stringify_keys! }, :multi => true)
         end
       end
-
-      module InstanceMethods
-        delegate :increase!, :set!, :unset!, :push!, :push_all!, :add_to_set!, :pull!, :pull_all!, :pop!, :shift!, :rename!, :to => :instance_scope
-        
-      private
-        def instance_scope
-          self.class.where(:id => id)
-        end
-      end
     end
   end
 end

data/lib/mongomodel/document/scopes.rb

@@ -49,6 +49,10 @@ module MongoModel
           default_scoping << previous_scope.merge(scope)
         end
         
+        def current_scope
+          current_scopes.last || unscoped
+        end
+        
         def scopes
           @_scopes ||= {}
         end
@@ -83,10 +87,6 @@ module MongoModel
         end
         
       private
-        def current_scope
-          current_scopes.last || unscoped
-        end
-        
         def current_scopes
           Thread.current[:"#{self}_scopes"] ||= default_scoping.dup
         end

data/lib/mongomodel/railtie.rb

@@ -6,6 +6,10 @@ module MongoModel
       load "mongomodel/tasks/database.rake"
     end
     
+    console do
+      MongoModel.logger = Logger.new(STDERR)
+    end
+    
     initializer "mongomodel.logger" do
       MongoModel.logger ||= ::Rails.logger
     end

data/lib/mongomodel/support/instrumented_collection.rb

@@ -98,9 +98,9 @@ module MongoModel
       end
     end
     
-    def group(key, condition, initial, reduce, finalize=nil)
-      instrument("group(#{key.inspect}, #{condition.inspect})") do
-        collection.group(key, condition, initial, reduce, finalize)
+    def group(options, condition={}, initial={}, reduce=nil, finalize=nil)
+      instrument("group(#{options.inspect})") do
+        collection.group(options, condition, initial, reduce, finalize)
       end
     end
     

data/lib/mongomodel/support/mongo_order.rb

@@ -21,6 +21,11 @@ module MongoModel
     def ==(other)
       other.is_a?(self.class) && clauses == other.clauses
     end
+    alias eql? ==
+    
+    def hash
+      clauses.hash
+    end
     
     def reverse
       self.class.new(*clauses.map { |c| c.reverse })
@@ -63,6 +68,11 @@ module MongoModel
       def ==(other)
         other.is_a?(self.class) && field == other.field && order == other.order
       end
+      alias eql? ==
+      
+      def hash
+        [field, order].hash
+      end
       
       def self.parse(clause)
         case clause

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,94 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongomodel
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.5
   prerelease: 
-  version: 0.3.4
 platform: ruby
-authors: 
+authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-06 00:00:00 +09:30
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2161444420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2161444420
+- !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2161443960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2161443960
+- !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2161443500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2161443500
+- !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2161443040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.15
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2161443040
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2161442520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2161442520
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2161442060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *id006
-description: MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and DataMapper.
-email: 
+  version_requirements: *2161442060
+description: MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and
+  DataMapper.
+email:
 - sam@sampohlenz.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Appraisals
 - Gemfile
@@ -99,8 +95,14 @@ files:
 - bin/console
 - gemfiles/rails-3.0.gemfile
 - gemfiles/rails-3.0.gemfile.lock
-- gemfiles/rails-3.1.gemfile
-- gemfiles/rails-3.1.gemfile.lock
+- gemfiles/rails-3.1-edge.gemfile
+- gemfiles/rails-3.1-edge.gemfile.lock
+- gemfiles/rails-3.1-latest.gemfile
+- gemfiles/rails-3.1-latest.gemfile.lock
+- gemfiles/rails-3.1-rc6.gemfile
+- gemfiles/rails-3.1-rc6.gemfile.lock
+- gemfiles/rails-edge.gemfile
+- gemfiles/rails-edge.gemfile.lock
 - lib/mongomodel.rb
 - lib/mongomodel/attributes/mongo.rb
 - lib/mongomodel/attributes/store.rb
@@ -243,36 +245,31 @@ files:
 - spec/support/matchers/respond_to_boolean.rb
 - spec/support/matchers/run_callbacks.rb
 - spec/support/models.rb
-has_rdoc: true
 homepage: http://www.mongomodel.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -3936197743219655173
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3331252429033650364
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: mongomodel
-rubygems_version: 1.5.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: MongoDB ORM for Ruby/Rails
 test_files: []
-