mongomodel 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 730ec72969141979066d7a38f450b9622485bb55
-  data.tar.gz: b72b388e3b6b6d041dd4f6431233d25c0aeddd8c
+  metadata.gz: 3d006082bc3f5bf2357182fecea49893a06e5994
+  data.tar.gz: d53384261c1968e770c65c4eb4e8faa32ade2c22
 SHA512:
-  metadata.gz: b954cd2ce4ed17b3dc9406572d8523092db0d249dfe9c1c61418b96b15702a91df7e740e4ed9af3581d41e5f37c8497447fceb794f7c01f661aa935007999f39
-  data.tar.gz: 0a92c9c4215cea8d312d9ecd13684c8bf9d54cfada4410e6587902506edc6093314672a39e448ce07659bf1991b82eb24e77879227f15eebce938e8f6f0dbc3c
+  metadata.gz: e97ed321bde11ad2f30311b4e80a8ea853894e720673d2634142b3e29e1f5088286185169d95fa9bd233aab9637a1d28f69c1b3bd9ef726f69d3b5f6f089a2ff
+  data.tar.gz: b787c2bdaa482398da09028b9093ac4514bc596a446a115d58879ab103fd8c116a078415ba0c85022bd9ca14638421a5dfd4ac4844a42d65b1e4bd59d5e9b1c1

data/lib/mongomodel/concerns/attribute_methods/nested.rb

@@ -59,6 +59,8 @@ module MongoModel
         end
         
         collection = send(property)
+        collection.clear if options[:clear]
+        
         attributes_collection.each_with_index do |attributes, index|
           if collection[index]
             collection[index].attributes = attributes
@@ -85,6 +87,8 @@ module MongoModel
         end
         
         association = send(association)
+        association.clear if options[:clear]
+        
         attributes_collection.each do |attributes|
           association.build(attributes)
         end

data/lib/mongomodel/document/indexes.rb

@@ -55,6 +55,7 @@ module MongoModel
     def initialize(*keys)
       options = keys.extract_options!
       
+      @name   = options.delete(:name)
       @unique = options.delete(:unique)
       @min    = options.delete(:min)
       @max    = options.delete(:max)
@@ -82,6 +83,7 @@ module MongoModel
     
     def to_args
       args = []
+      options = {}
       
       if geo2d?
         args << [[keys.keys.first, Mongo::GEO2D]]
@@ -92,11 +94,14 @@ module MongoModel
       end
       
       if geo2d? && @min && @max
-        args << { :min => @min, :max => @max }
-      elsif unique?
-        args << { :unique => true } 
+        options[:min] = @min
+        options[:max] = @max
       end
       
+      options[:unique] = true if unique?
+      options[:name] = @name if @name
+      
+      args << options if options.any?
       args
     end
     

data/lib/mongomodel/document/persistence.rb

@@ -102,14 +102,11 @@ module MongoModel
         end
         
         def collection_name
-          if superclass.abstract_class?
-            @_collection_name || name.tableize.gsub(/\//, '.')
-          else
-            superclass.collection_name
-          end
+          @_collection_name || inferred_collection_name
         end
         
         def collection_name=(name)
+          @_collection = nil
           @_collection_name = name
         end
         
@@ -130,12 +127,21 @@ module MongoModel
         end
         
         def save_safely?
-          @_save_safely
+          defined?(@_save_safely) ? @_save_safely : true
         end
         
         def save_safely=(val)
           @_save_safely = val
         end
+      
+      protected
+        def inferred_collection_name
+          if superclass.abstract_class?
+            name.tableize.gsub(/\//, '.')
+          else
+            superclass.collection_name
+          end
+        end
       end
     
     private

data/lib/mongomodel/document/validations/uniqueness.rb

@@ -40,17 +40,16 @@ module MongoModel
         def setup!(klass)
           @klass = klass
           
-          # Enable safety checks on save
-          klass.save_safely = true
-          
-          # Create unique indexes to deal with race condition
-          attributes.each do |attr_name|
-            if options[:case_sensitive]
-              klass.index *[attr_name] + Array.wrap(options[:scope]) << { :unique => true }
-            else
-              lowercase_key = "_lowercase_#{attr_name}"
-              klass.before_save { attributes[lowercase_key] = send(attr_name).downcase }
-              klass.index *[lowercase_key] + Array.wrap(options[:scope]) << { :unique => true }
+          unless options[:index] == false
+            # Create unique indexes to deal with race condition
+            attributes.each do |attr_name|
+              if options[:case_sensitive]
+                klass.index *[attr_name] + Array.wrap(options[:scope]) << { :unique => true }
+              else
+                lowercase_key = "_lowercase_#{attr_name}"
+                klass.before_save { attributes[lowercase_key] = send(attr_name).downcase }
+                klass.index *[lowercase_key] + Array.wrap(options[:scope]) << { :unique => true }
+              end
             end
           end
         end
@@ -93,6 +92,7 @@ module MongoModel
         # * <tt>:message</tt> - Specifies a custom error message (default is: "has already been taken").
         # * <tt>:scope</tt> - One or more properties by which to limit the scope of the uniqueness constraint.
         # * <tt>:case_sensitive</tt> - Looks for an exact match. Ignored by non-text columns (+true+ by default).
+        # * <tt>:index</tt> - If set to false, disables the unique index constraint (default is +true+).
         # * <tt>:allow_nil</tt> - If set to true, skips this validation if the attribute is +nil+ (default is +false+).
         # * <tt>:allow_blank</tt> - If set to true, skips this validation if the attribute is blank (default is +false+).
         # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if the validation should

data/lib/mongomodel/support/configuration.rb

@@ -27,9 +27,12 @@ module MongoModel
       options['password']
     end
     
+    def replicas
+      options['replicas'] || []
+    end
+    
     def establish_connection
-      @connection ||= Mongo::Connection.new(host, port, connection_options)
-      @database = @connection.db(database)
+      @database = connection.db(database)
       @database.authenticate(username, password) if username.present?
       @database
     end
@@ -39,8 +42,16 @@ module MongoModel
       establish_connection
     end
     
+    def connection
+      if replicas.any?
+        @connection ||= Mongo::MongoReplicaSetClient.new(replicas, connection_options)
+      else
+        @connection ||= Mongo::MongoClient.new(host, port, connection_options)
+      end
+    end
+    
     def connection_options
-      options.except('host', 'port', 'database', 'username', 'password').symbolize_keys
+      options.except('host', 'port', 'database', 'username', 'password', 'replicas').symbolize_keys
     end
     
     def options

data/lib/mongomodel/support/scope.rb

@@ -80,9 +80,13 @@ module MongoModel
     end
     
     def update_all(updates)
-      selector = MongoOptions.new(klass, :conditions => finder_conditions).selector
-      collection.update(selector, { "$set" => updates }, { :multi => true })
-      reset
+      if updates.any?
+        selector = MongoOptions.new(klass, :conditions => finder_conditions).selector
+        collection.update(selector, { "$set" => updates }, { :multi => true })
+        reset
+      else
+        self
+      end
     end
     
     def update(ids, updates)

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

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

@@ -22,7 +22,7 @@ module MongoModel
       end
       define_class(:IllustratedChapter, :Chapter)
       define_class(:Book, Document) do
-        has_many :chapters, :by => :foreign_key, :limit => 5
+        has_many :chapters, :by => :foreign_key, :limit => 5, :order => :id.asc
       end
       define_class(:NonChapter, Document)
       

data/spec/mongomodel/concerns/attribute_methods/nested_spec.rb

@@ -96,6 +96,21 @@ module MongoModel
         end
       end
       
+      describe "embedded collection with :clear => true" do
+        define_user(EmbeddedDocument)
+        define_class(:Account, described_class) do
+          property :owners, Collection[User]
+          accepts_nested_attributes_for :owners, :clear => true
+        end
+        
+        subject { Account.new(:owners => [User.new, User.new]) }
+        
+        it "clears the collection first when assigning attributes" do
+          subject.owners_attributes = [{ :age => 18 }]
+          subject.owners.size.should == 1
+        end
+      end
+      
       describe "belongs_to association" do
         define_user(Document)
         define_class(:Account, described_class) do
@@ -175,6 +190,20 @@ module MongoModel
           }.should raise_error(MongoModel::TooManyDocuments, "Maximum 2 documents are allowed. Got 3 documents instead.")
         end
       end
+      
+      describe "has_many association with :clear => true" do
+        define_class(:Account, described_class) do
+          has_many :owners, :class => User
+          accepts_nested_attributes_for :owners, :clear => true
+        end
+        
+        subject { Account.new(:owners => [User.new, User.new]) }
+
+        it "clears the collection first when assigning attributes" do
+          subject.owners_attributes = [{ :age => 18 }]
+          subject.owners.size.should == 1
+        end
+      end
     end
   end
 end

data/spec/mongomodel/document/indexes_spec.rb

@@ -87,46 +87,58 @@ module MongoModel
   end
   
   describe Index do
-    it "converts index with single key to arguments for Mongo::Collection#create_index" do
-      Index.new(:title).to_args.should == [:title]
-    end
+    describe "#to_args" do
+      it "converts index with single key" do
+        Index.new(:title).to_args.should == [:title]
+      end
     
-    it "converts nested index with single key to arguments for Mongo::Collection#create_index" do
-      Index.new('page.title').to_args.should == [:'page.title']
-    end
+      it "converts nested index with single key" do
+        Index.new('page.title').to_args.should == [:'page.title']
+      end
     
-    it "converts index with unique option to arguments for Mongo::Collection#create_index" do
-      Index.new(:title, :unique => true).to_args.should == [:title, { :unique => true }]
-    end
+      it "converts index with unique option" do
+        Index.new(:title, :unique => true).to_args.should == [:title, { :unique => true }]
+      end
+      
+      it "converts index with name option" do
+        Index.new(:title, :name => "my_name").to_args.should == [:title, { :name => "my_name" }]
+      end
+      
+      it "converts index with multiple options" do
+        Index.new(:title, :name => "my_name", :unique => true).to_args.should == [:title, { :name => "my_name", :unique => true }]
+      end
     
-    it "converts index with descending key to arguments for Mongo::Collection#create_index" do
-      Index.new(:title => :descending).to_args.should == [[[:title, Mongo::DESCENDING]]]
-    end
+      it "converts index with descending key" do
+        Index.new(:title => :descending).to_args.should == [[[:title, Mongo::DESCENDING]]]
+      end
     
-    it "converts index with multiple keys to arguments for Mongo::Collection#create_index" do
-      Index.new(:title, :age).to_args.should == [[[:age, Mongo::ASCENDING], [:title, Mongo::ASCENDING]]]
-    end
+      it "converts index with multiple keys" do
+        Index.new(:title, :age).to_args.should == [[[:age, Mongo::ASCENDING], [:title, Mongo::ASCENDING]]]
+      end
     
-    it "converts index with multiple keys (ascending and descending) to arguments for Mongo::Collection#create_index" do
-      Index.new(:title => :ascending, :age => :descending).to_args.should == [[[:age, Mongo::DESCENDING], [:title, Mongo::ASCENDING]]]
-    end
+      it "converts index with multiple keys (ascending and descending)" do
+        Index.new(:title => :ascending, :age => :descending).to_args.should == [[[:age, Mongo::DESCENDING], [:title, Mongo::ASCENDING]]]
+      end
     
-    it "converts geospatial index with no options" do
-      Index.new(:position => :geo2d).to_args.should == [[[:position, Mongo::GEO2D]]]
-    end
+      it "converts geospatial index with no options" do
+        Index.new(:position => :geo2d).to_args.should == [[[:position, Mongo::GEO2D]]]
+      end
     
-    it "converts geospatial index with min/max options" do
-      Index.new(:position => :geo2d, :min => -50, :max => 50).to_args.should == [[[:position, Mongo::GEO2D]], { :min => -50, :max => 50 }]
+      it "converts geospatial index with min/max options" do
+        Index.new(:position => :geo2d, :min => -50, :max => 50).to_args.should == [[[:position, Mongo::GEO2D]], { :min => -50, :max => 50 }]
+      end
     end
     
-    it "is equal to an equivalent index" do
-      Index.new(:title).should == Index.new(:title)
-      Index.new(:title, :age).should == Index.new(:title => :ascending, :age => :ascending)
-    end
+    describe "equality" do
+      it "is equal to an equivalent index" do
+        Index.new(:title).should == Index.new(:title)
+        Index.new(:title, :age).should == Index.new(:title => :ascending, :age => :ascending)
+      end
     
-    it "is not equal to an non-equivalent index" do
-      Index.new(:title).should_not == Index.new(:age)
-      Index.new(:title, :age).should_not == Index.new(:title => :ascending, :age => :descending)
+      it "is not equal to an non-equivalent index" do
+        Index.new(:title).should_not == Index.new(:age)
+        Index.new(:title, :age).should_not == Index.new(:title => :ascending, :age => :descending)
+      end
     end
   end
 end

data/spec/mongomodel/document/persistence_spec.rb

@@ -94,6 +94,15 @@ module MongoModel
 
           ::CustomCollectionNameSubclass.collection_name.should == 'foobar'
         end
+        
+        it "allows subclasses to set a custom collection name" do
+          class ::CustomCollectionName < Document; end
+          class ::CustomCollectionNameSubclass < ::CustomCollectionName
+            self.collection_name = 'custom'
+          end
+
+          ::CustomCollectionNameSubclass.collection_name.should == 'custom'
+        end
       end
 
       describe "#collection" do
@@ -104,6 +113,12 @@ module MongoModel
         it "uses the correct collection name" do
           User.collection.name.should == 'users'
         end
+        
+        it "is updated when the collection name changes" do
+          collection = User.collection
+          User.collection_name = "custom"
+          User.collection.name.should == "custom"
+        end
       end
 
       describe "#database" do

data/spec/mongomodel/document/validations/uniqueness_spec.rb

@@ -31,6 +31,32 @@ module MongoModel
         end
       end
       
+      describe "indexes" do
+        define_class(:Article, Document) do
+          property :title, String
+        end
+        
+        it "creates an index on the attribute" do
+          Article.should_receive(:index).with(:title, :unique => true)
+          Article.validates_uniqueness_of :title
+        end
+        
+        it "creates an index on the lowercase attribute if :case_sensitive => false" do
+          Article.should_receive(:index).with("_lowercase_title", :unique => true)
+          Article.validates_uniqueness_of :title, :case_sensitive => false
+        end
+        
+        it "creates a compound index when a scope is passed" do
+          Article.should_receive(:index).with(:title, :author_id, :unique => true)
+          Article.validates_uniqueness_of :title, :scope => :author_id
+        end
+        
+        it "does not create an index if :index => false" do
+          Article.should_not_receive(:index)
+          Article.validates_uniqueness_of :title, :index => false
+        end
+      end
+      
       describe "basic case" do
         define_class(:Article, Document) do
           property :title, String

data/spec/mongomodel/support/configuration_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+module MongoModel
+  describe Configuration do
+    it "uses a standard connection (Mongo::MongoClient) if no replicas are specified" do
+      Configuration.new({}).connection.should be_an_instance_of(Mongo::MongoClient)
+    end
+    
+    it "uses a replica set connection (Mongo::MongoReplicaSetClient) if replicas are specified" do
+      Configuration.new({ :replicas => ['127.0.0.1:27017'], :connect => false }).connection.should be_an_instance_of(Mongo::MongoReplicaSetClient)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongomodel
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -259,6 +259,7 @@ files:
 - spec/mongomodel/embedded_document_spec.rb
 - spec/mongomodel/mongomodel_spec.rb
 - spec/mongomodel/support/collection_spec.rb
+- spec/mongomodel/support/configuration_spec.rb
 - spec/mongomodel/support/map_spec.rb
 - spec/mongomodel/support/mongo_operator_spec.rb
 - spec/mongomodel/support/mongo_options_spec.rb