mongomodel 0.4.6 → 0.4.7

data/Appraisals

@@ -12,3 +12,15 @@ appraise "rails-4" do
   gem "activesupport", :git => "https://github.com/rails/rails.git"
   gem "activemodel", :git => "https://github.com/rails/rails.git"
 end
+
+appraise "mongoid" do
+  gem "mongoid"
+  gem "activesupport", "3.2.8"
+  gem "activemodel", "3.2.8"
+end
+
+appraise "mongo_mapper" do
+  gem "mongo_mapper"
+  gem "activesupport", "3.2.8"
+  gem "activemodel", "3.2.8"
+end

data/bin/console

@@ -4,14 +4,13 @@ puts "Loading MongoModel sandbox..."
 
 require "rubygems"
 require "bundler/setup"
+Bundler.require
 
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'irb'
 require 'irb/completion'
 
-require 'mongomodel'
-
 MongoModel.logger = ActiveSupport::BufferedLogger.new(STDERR)
 
 IRB.setup(nil)

data/gemfiles/mongo_mapper.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 0.3.6"
+gem "bson_ext", "~> 1.5"
+gem "tzinfo"
+gem "mongo_mapper"
+gem "activesupport", "3.2.8"
+gem "activemodel", "3.2.8"
+
+gemspec :path=>"../"

data/gemfiles/mongoid.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 0.3.6"
+gem "bson_ext", "~> 1.5"
+gem "tzinfo"
+gem "mongoid"
+gem "activesupport", "3.2.8"
+gem "activemodel", "3.2.8"
+
+gemspec :path=>"../"

data/lib/mongomodel.rb

@@ -103,6 +103,9 @@ module MongoModel
   end
   
   require 'mongomodel/railtie' if defined?(Rails)
+  
+  require 'mongomodel/compatibility/mongoid' if defined?(Mongoid)
+  require 'mongomodel/compatibility/mongo_mapper' if defined?(MongoMapper)
 end
 
 I18n.load_path << File.dirname(__FILE__) + '/mongomodel/locale/en.yml'

data/lib/mongomodel/compatibility/mongo_mapper.rb

@@ -0,0 +1,23 @@
+class SymbolOperator
+  def to_mongo_operator
+    MongoModel::MongoOperator.new(field, operator)
+  end
+  
+  def to_mongo_order_clause
+    MongoModel::MongoOrder::Clause.new(field, operator.to_s == 'asc' ? :ascending : :descending)
+  end
+  
+  def eql?(other)
+    self == other
+  end
+  
+  def hash
+    field.hash ^ operator.hash
+  end
+end
+
+class NilClass
+  def to_mongo(value=nil)
+    value
+  end
+end

data/lib/mongomodel/compatibility/mongoid.rb

@@ -0,0 +1,17 @@
+class Origin::Key
+  def to_mongo_operator
+    MongoModel::MongoOperator.new(name, operator.sub(/^\$/, ""))
+  end
+  
+  def to_mongo_order_clause
+    MongoModel::MongoOrder::Clause.new(name, operator == 1 ? :ascending : :descending)
+  end
+  
+  def eql?(other)
+    self == other
+  end
+  
+  def hash
+    name.hash ^ operator.hash
+  end
+end

data/lib/mongomodel/concerns/properties.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/duplicable'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/hash/except'
@@ -81,6 +82,10 @@ module MongoModel
         as =~ /^_/ || options[:internal]
       end
       
+      def validate?
+        options[:validate] != false
+      end
+      
     private
       def type_converter
         @type_converter ||= Types.converter_for(type)

data/lib/mongomodel/concerns/validations.rb

@@ -8,9 +8,11 @@ module MongoModel
       def property(name, *args, &block) #:nodoc:
         property = super
         
-        validates_associated(name) if property.embeddable?
-        validates_presence_of(name) if property.options[:required]
-        validates_format_of(name, property.options[:format]) if property.options[:format]
+        if property.validate?
+          validates_associated(name) if property.embeddable?
+          validates_presence_of(name) if property.options[:required]
+          validates_format_of(name, property.options[:format]) if property.options[:format]
+        end
         
         property
       end

data/lib/mongomodel/support/core_extensions.rb

@@ -1,10 +1,10 @@
-class Boolean < TrueClass; end
+class Boolean; end unless defined?(Boolean)
 
 class Symbol
   [:lt, :lte, :gt, :gte, :ne, :in, :nin, :mod, :all, :size, :exists, :near].each do |operator|
-    define_method(operator) { MongoModel::MongoOperator.new(self, operator) }
+    define_method(operator) { MongoModel::MongoOperator.new(self, operator) } unless method_defined?(operator)
   end
   
-  define_method(:asc) { MongoModel::MongoOrder::Clause.new(self, :ascending) }
-  define_method(:desc) { MongoModel::MongoOrder::Clause.new(self, :descending) }
+  define_method(:asc) { MongoModel::MongoOrder::Clause.new(self, :ascending) } unless method_defined?(:asc)
+  define_method(:desc) { MongoModel::MongoOrder::Clause.new(self, :descending) } unless method_defined?(:desc)
 end

data/lib/mongomodel/support/mongo_options.rb

@@ -26,7 +26,9 @@ module MongoModel
       result = {}
       
       (options[:conditions] || {}).each do |k, v|
-        key = k.is_a?(MongoOperator) ? k.field : k
+        k = k.to_mongo_operator if k.respond_to?(:to_mongo_operator)
+        
+        key = k.respond_to?(:field) ? k.field : k
         
         if @model.respond_to?(:properties) && property = @model.properties[key]
           key = property.as
@@ -35,7 +37,7 @@ module MongoModel
           value = Types.converter_for(v.class).to_mongo(v)
         end
 
-        if k.is_a?(MongoOperator)
+        if k.respond_to?(:to_mongo_selector)
           selector = k.to_mongo_selector(value)
           
           if result[key].is_a?(Hash)

data/lib/mongomodel/support/mongo_order.rb

@@ -43,6 +43,8 @@ module MongoModel
         new(*order.split(',').map { |c| Clause.parse(c) })
       when Array
         new(*order.map { |c| Clause.parse(c) })
+      else
+        new(order.to_mongo_order_clause) if order.respond_to?(:to_mongo_order_clause)
       end
     end
     
@@ -81,6 +83,8 @@ module MongoModel
         when String, Symbol
           field, order = clause.to_s.strip.split(/ /)
           new(field, order =~ /^desc/i ? :descending : :ascending)
+        else
+          clause.to_mongo_order_clause if clause.respond_to?(:to_mongo_order_clause)
         end
       end
     end

data/lib/mongomodel/support/scope.rb

@@ -141,7 +141,7 @@ module MongoModel
     end
     
     def options_for_create
-      @options_for_create ||= finder_conditions.reject { |k, v| k.is_a?(MongoModel::MongoOperator) }
+      @options_for_create ||= finder_conditions.reject { |k, v| k.is_a?(MongoModel::MongoOperator) || k.respond_to?(:to_mongo_operator) }
     end
     
     def respond_to?(method, include_private = false)

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

data/spec/mongomodel/attributes/store_spec.rb

@@ -31,12 +31,12 @@ module MongoModel
     
     subject { Attributes::Store.new(instance) }
     
-    it "should set default property values" do
+    it "sets default property values" do
       subject.keys.should == properties.keys
       subject[:default].should == 'Default'
     end
     
-    it "should set default property value using mongomodel_default if defined by class" do
+    it "sets default property value using mongomodel_default if defined by class" do
       subject[:custom_default].should == CustomClassWithDefault.new("Custom class default")
     end
     
@@ -49,7 +49,7 @@ module MongoModel
       end
     end
         
-    it "should set attributes that aren't properties" do
+    it "sets attributes that aren't properties" do
       subject[:non_property] = "Hello World"
       subject[:non_property].should == "Hello World"
     end
@@ -168,12 +168,12 @@ module MongoModel
         context "assigning to #{type} property" do
           examples.each do |assigned, expected|
             if expected.is_a?(Proc)
-              it "should cast #{assigned.inspect} to match proc" do
+              it "casts #{assigned.inspect} to match proc" do
                 subject[type] = assigned
                 expected.call(subject[type]).should be_true
               end
             else
-              it "should cast #{assigned.inspect} to #{expected.inspect}" do
+              it "casts #{assigned.inspect} to #{expected.inspect}" do
                 subject[type] = assigned
                 subject[type].should == expected
               end
@@ -187,12 +187,12 @@ module MongoModel
           @custom = CustomClass.new('instance name')
         end
       
-        it "should not alter instances of CustomClass" do
+        it "does not alter instances of CustomClass" do
           subject[:custom] = @custom
           subject[:custom].should == @custom
         end
       
-        it "should cast strings to CustomClass" do
+        it "casts strings to CustomClass" do
           subject[:custom] = "foobar"
           subject[:custom].should == CustomClass.new('foobar')
         end
@@ -217,7 +217,7 @@ module MongoModel
       BeforeTypeCastExamples.each do |type, examples|
         context "assigning to #{type} property" do
           examples.each do |example|
-            it "should access pre-typecast value of #{example.inspect}" do
+            it "accesses pre-typecast value of #{example.inspect}" do
               subject[type] = example
               subject.before_type_cast(type).should == example
             end
@@ -260,7 +260,7 @@ module MongoModel
       TrueExamples.each do |type, examples|
         context "assigning to #{type} property" do
           examples.each do |example|
-            it "should return true for #{example.inspect}" do
+            it "returns true for #{example.inspect}" do
               subject[type] = example
               subject.has?(type).should == true
             end
@@ -271,7 +271,7 @@ module MongoModel
       FalseExamples.each do |type, examples|
         context "assigning to #{type} property" do
           examples.each do |example|
-            it "should return false for #{example.inspect}" do
+            it "returns false for #{example.inspect}" do
               subject[type] = example
               subject.has?(type).should == false
             end
@@ -281,7 +281,7 @@ module MongoModel
     end
         
     describe "serialization" do
-      it "should convert to mongo representation" do
+      it "converts to mongo representation" do
         subject[:string] = 'string'
         subject[:integer] = 42
         subject[:float] = 123.45
@@ -317,7 +317,7 @@ module MongoModel
         })
       end
     
-      it "should load from mongo representation" do
+      it "loads from mongo representation" do
         subject.from_mongo!({
           'string' => 'string',
           'integer' => 42,

data/spec/mongomodel/concerns/associations/belongs_to_spec.rb

@@ -9,21 +9,21 @@ module MongoModel
     let(:special_user) { SpecialUser.create! }
     
     context "when uninitialized" do
-      it "should be nil" do
+      it "is nil" do
         subject.user.should be_nil
       end
       
-      it "should be settable" do
+      it "is settable" do
         subject.user = user
         subject.user.should == user
       end
       
-      it "should not be truthy" do
+      it "is not truthy" do
         subject.user.should_not be_truthy
       end
       
       describe "setting a subclass type" do
-        it "should set successfully" do
+        it "sets successfully" do
           subject.user = special_user
           subject.user.should == special_user
         end
@@ -45,15 +45,15 @@ module MongoModel
         let(:reloaded) { Article.find(subject.id) }
       end
       
-      it "should access the user through the association" do
+      it "accesses the user through the association" do
         reloaded.user.should == user
       end
       
-      it "should be truthy" do
+      it "is truthy" do
         subject.user.should be_truthy
       end
       
-      it "should allow the user to be reloaded" do
+      it "allows the user to be reloaded" do
         user = reloaded.user.target
         
         user.should equal(reloaded.user.target)
@@ -64,7 +64,7 @@ module MongoModel
       describe "setting a subclass type" do
         subject { Article.new(:user => special_user) }
         
-        it "should load successfully" do
+        it "loads successfully" do
           reloaded.user.should == special_user
         end
       end
@@ -86,7 +86,7 @@ module MongoModel
         
         let(:non_user) { NonUser.create! }
         
-        it "should raise a AssociationTypeMismatch exception" do
+        it "raises a AssociationTypeMismatch exception" do
           lambda { subject.user = non_user }.should raise_error(AssociationTypeMismatch, "expected instance of User but got NonUser")
         end
       end
@@ -94,7 +94,7 @@ module MongoModel
       describe "#build_user" do
         let(:user) { subject.build_user(:id => '123') }
         
-        it "should return a new unsaved user with the given attributes" do
+        it "returns a new unsaved user with the given attributes" do
           user.should be_an_instance_of(User)
           user.should be_a_new_record
           user.id.should == '123'
@@ -102,7 +102,7 @@ module MongoModel
       end
       
       describe "#create_user" do
-        it "should return a new saved user with the given attributes" do
+        it "returns a new saved user with the given attributes" do
           user = subject.create_user(:id => '123')
           user.should be_an_instance_of(User)
           user.should_not be_a_new_record
@@ -125,7 +125,7 @@ module MongoModel
       it_should_behave_like "assigning correct class to belongs_to association"
       
       describe "setting a different class type" do
-        it "should set successfully" do
+        it "sets successfully" do
           subject.user = non_user
           subject.user.should == non_user
         end
@@ -149,7 +149,7 @@ module MongoModel
         describe "setting a different class type" do
           subject { Article.new(:user => non_user) }
           
-          it "should load successfully" do
+          it "loads successfully" do
             reloaded.user.should == non_user
           end
         end

data/spec/mongomodel/concerns/associations/has_many_by_foreign_key_spec.rb

@@ -7,11 +7,11 @@ module MongoModel
         has_many :chapters
       end
       
-      it "should default to :by => :foreign_key" do
+      it "defaults to :by => :foreign_key" do
         MyBook.associations[:chapters].should be_a(Associations::HasManyByForeignKey)
       end
       
-      it "should set default inverse_of value" do
+      it "sets default inverse_of value" do
         MyBook.associations[:chapters].inverse_of.should == :my_book
       end
     end
@@ -34,46 +34,46 @@ module MongoModel
       context "when uninitialized" do
         subject { Book.new }
         
-        it "should be empty" do
+        it "is empty" do
           subject.chapters.should be_empty
         end
       end
       
       shared_examples_for "accessing and manipulating a has_many :by => :foreign_key association" do
-        it "should access chapters" do
+        it "accesses chapters" do
           subject.chapters.should include(chapter1, chapter2)
         end
         
-        it "should access chapter ids through association" do
+        it "accesses chapter ids through association" do
           subject.chapters.ids.should include(chapter1.id, chapter2.id)
         end
         
-        it "should add chapters with <<" do
+        it "adds chapters with <<" do
           subject.chapters << chapter3
           subject.chapters.should include(chapter1, chapter2, chapter3)
           chapter3.book.should == subject
         end
         
-        it "should add/change chapters with []=" do
+        it "adds/change chapters with []=" do
           subject.chapters[2] = chapter3
           subject.chapters.should include(chapter1, chapter2, chapter3)
           chapter3.book.should == subject
         end
         
-        it "should replace chapters with []=" do
+        it "replaces chapters with []=" do
           subject.chapters[1] = chapter3
           subject.chapters.should include(chapter1, chapter3)
           subject.chapters.should_not include(chapter2)
           #chapter2.book.should be_nil
         end
         
-        it "should add chapters with concat" do
+        it "adds chapters with concat" do
           subject.chapters.concat([chapter3])
           subject.chapters.should include(chapter1, chapter2, chapter3)
           chapter3.book.should == subject
         end
         
-        it "should insert chapters" do
+        it "inserts chapters" do
           subject.chapters.insert(1, chapter3)
           subject.chapters.should include(chapter1, chapter2, chapter3)
           chapter3.book.should == subject
@@ -85,13 +85,13 @@ module MongoModel
         #   subject.chapter_ids.should == [chapter2.id, chapter3.id]
         # end
         
-        it "should add chapters with push" do
+        it "adds chapters with push" do
           subject.chapters.push(chapter3)
           subject.chapters.should include(chapter1, chapter2, chapter3)
           chapter3.book.should == subject
         end
         
-        it "should add chapters with unshift" do
+        it "adds chapters with unshift" do
           subject.chapters.unshift(chapter3)
           subject.chapters.should include(chapter3, chapter1, chapter2)
           chapter3.book.should == subject
@@ -103,13 +103,13 @@ module MongoModel
         #   [chapter1, chapter2].each { |c| c.book.should be_nil }
         # end
         
-        it "should remove chapters with delete" do
+        it "removes chapters with delete" do
           subject.chapters.delete(chapter1)
           subject.chapters.should == [chapter2]
           chapter1.book.should be_nil
         end
         
-        it "should remove chapters with delete_at" do
+        it "removes chapters with delete_at" do
           subject.chapters.delete_at(0)
           subject.chapters.should == [chapter2]
           #chapter1.book.should be_nil
@@ -121,7 +121,7 @@ module MongoModel
         #   subject.chapter_ids.should == [chapter2.id]
         # end
         
-        it "should build a chapter" do
+        it "builds a chapter" do
           chapter4 = subject.chapters.build(:id => '4')
           subject.chapters.should include(chapter1, chapter2, chapter4)
           
@@ -131,7 +131,7 @@ module MongoModel
           chapter4.book_id.should == subject.id
         end
         
-        it "should create a chapter" do
+        it "creates a chapter" do
           chapter4 = subject.chapters.create(:id => '4')
           subject.chapters.should == [chapter1, chapter2, chapter4]
           
@@ -141,7 +141,7 @@ module MongoModel
           chapter4.book_id.should == subject.id
         end
         
-        it "should find chapters" do
+        it "finds chapters" do
           # Create bogus chapters
           Chapter.create!(:id => '999')
           Chapter.create!(:id => '998')
@@ -150,18 +150,18 @@ module MongoModel
           result.should == [chapter2, chapter1]
         end
         
-        it "should find chapters with association options" do
+        it "finds chapters with association options" do
           # Create bogus chapters
           10.times { subject.chapters.create! }
           
           subject.chapters.all.size.should == 5 # limit clause
         end
         
-        it "should support scope select method" do
+        it "supports scope select method" do
           subject.chapters.select(:id, :_type, :book_id).should == [chapter1, chapter2]
         end
         
-        it "should support array select method" do
+        it "supports array select method" do
           subject.chapters.select { |c| c.is_a?(IllustratedChapter) }.should == [chapter2]
         end
       end
@@ -185,7 +185,7 @@ module MongoModel
         subject { Book.create!(:chapters => [chapter1, chapter2, chapter3]) }
         
         context "when the parent object is destroyed" do
-          it "should call destroy on the child objects" do
+          it "calls destroy on the child objects" do
             chapter1.should_receive(:destroy)
             chapter2.should_receive(:destroy)
             chapter3.should_receive(:destroy)
@@ -193,7 +193,7 @@ module MongoModel
             subject.destroy
           end
           
-          it "should remove the child objects from their collection" do
+          it "removes the child objects from their collection" do
             subject.destroy
             
             Chapter.exists?(chapter1.id).should be_false
@@ -211,7 +211,7 @@ module MongoModel
         subject { Book.create!(:chapters => [chapter1, chapter2, chapter3]) }
         
         context "when the parent object is destroyed" do
-          it "should not call destroy on the child objects" do
+          it "does not call destroy on the child objects" do
             chapter1.should_not_receive(:destroy)
             chapter2.should_not_receive(:destroy)
             chapter3.should_not_receive(:destroy)
@@ -219,7 +219,7 @@ module MongoModel
             subject.destroy
           end
           
-          it "should remove the child objects from their collection" do
+          it "removes the child objects from their collection" do
             subject.destroy
             
             Chapter.exists?(chapter1.id).should be_false
@@ -235,7 +235,7 @@ module MongoModel
     describe "defining a has_many :by => :foreign_key association" do
       define_class(:Book, EmbeddedDocument)
       
-      it "should raise an exception" do
+      it "raises an exception" do
         lambda { Book.has_many :chapters, :by => :foreign_key }.should raise_error
       end
     end