mongomodel 0.4.9 → 0.5.0

data/spec/mongomodel/concerns/attributes_spec.rb

@@ -11,9 +11,10 @@ module MongoModel
     Array => [ 1, 2, 3, "hello", :world, [99, 100] ],
     Hash => { :rabbit => 'hat', 'hello' => 12345 }.with_indifferent_access,
     Date => Date.today,
+    CustomClass => CustomClass.new('hello'),
+    # Pre-cast Time and DateTime to remove microseconds
     Time => Types::Time.new.cast(Time.now),
-    DateTime => Types::DateTime.new.cast(DateTime.now),
-    CustomClass => CustomClass.new('hello')
+    DateTime => Types::DateTime.new.cast(DateTime.now.in_time_zone)
   }
   
   specs_for(Document, EmbeddedDocument) do
@@ -117,6 +118,14 @@ module MongoModel
         subject.attributes = { :non_property => 'property value' }
         subject.read_attribute(:non_property).should == 'property value'
       end
+      
+      if defined?(ActiveModel::ForbiddenAttributesProtection)
+        it "raises ActiveModel::ForbiddenAttributesError when passed an unpermitted strong_params hash" do
+          expect {
+            subject.attributes = double(:permitted? => false)
+          }.to raise_error(ActiveModel::ForbiddenAttributesError)
+        end
+      end
     end
     
     describe "#new" do

data/spec/mongomodel/concerns/logging_spec.rb

@@ -5,7 +5,7 @@ module MongoModel
     describe "logging" do
       define_class(:TestDocument, described_class)
       
-      let(:logger) { mock('logger').as_null_object }
+      let(:logger) { double('logger').as_null_object }
       before(:each) { MongoModel.logger = logger }
       
       it "has a logger reader on the class" do

data/spec/mongomodel/concerns/observing_spec.rb

@@ -22,7 +22,7 @@ module MongoModel
         end
       
         it "invokes the TestObserver singleton's after_save method after saving" do
-          callback = stub
+          callback = double
           callback.should_receive(:call).with(subject)
         
           TestObserver.instance.callback = callback

data/spec/mongomodel/concerns/serialization/json_serialization_spec.rb

@@ -15,18 +15,21 @@ module MongoModel
     end
     
     let(:instance) do
-      TestModel.new(:name => 'Hello World', :age => 25, :paid => true, :prefs => { :foo => 'bar' }, :internal => 'hideme')
+      TestModel.new(:id => "abc-123", :name => 'Hello World', :age => 25, :paid => true, :prefs => { :foo => 'bar' }, :internal => 'hideme')
     end
     
-    it "includes root in json" do
-      begin
-        TestModel.include_root_in_json = true
-        
-        json = instance.to_json
-        json.should match(/^\{"test_model":\{/)
-      ensure
-        TestModel.include_root_in_json = false
-      end
+    it "includes root in the JSON response when include_root_in_json = true" do
+      TestModel.include_root_in_json = true
+      
+      json = instance.to_json
+      json.should match(/^\{"test_model":\{/)
+    end
+    
+    it "does not include root in the JSON response when include_root_in_json = false" do
+      TestModel.include_root_in_json = false
+      
+      json = instance.to_json
+      json.should_not match(/^\{"test_model":\{/)
     end
     
     it "encodes all public attributes" do
@@ -37,6 +40,13 @@ module MongoModel
       json.should match(/"prefs":\{"foo":"bar"\}/)
     end
     
+    if described_class == Document
+      it "encodes the id" do
+        json = instance.to_json
+        json.should match(/"id":"abc-123"/)
+      end
+    end
+    
     it "does not encode internal attributes" do
       json = instance.to_json
       json.should_not match(/"internal":"hideme"/)
@@ -63,5 +73,11 @@ module MongoModel
       json.should match(/"hello":"Hi friend!"/)
       json.should match(/"type":"TestModel"/)
     end
+    
+    it "encodes keys in the serializable_hash as strings" do
+      hash = instance.serializable_hash(:methods => :hello)
+      hash.should have_key("name")
+      hash.should have_key("hello")
+    end
   end
 end

data/spec/mongomodel/concerns/timestamps_spec.rb

@@ -39,7 +39,7 @@ module MongoModel
       
       before(:each) do
         @now = Types::Time.new.cast(Time.now)
-        Time.stub!(:now).and_return(@now)
+        Time.stub(:now).and_return(@now)
       end
       
       it "sets the updated_at property to the current time when saved" do
@@ -92,7 +92,7 @@ module MongoModel
       
       before(:each) do
         @now = Types::Time.new.cast(Time.now)
-        Time.stub!(:now).and_return(@now)
+        Time.stub(:now).and_return(@now)
       end
       
       it "sets the created_at property to the current time when created" do
@@ -103,11 +103,11 @@ module MongoModel
       it "does not change the created_at property when updated" do
         @next = 1.day.from_now
         
-        Time.stub!(:now).and_return(@now)
+        Time.stub(:now).and_return(@now)
         
         doc.save
         
-        Time.stub!(:now).and_return(@next)
+        Time.stub(:now).and_return(@next)
         
         doc.save
         subject.created_at.should == @now
@@ -152,7 +152,7 @@ module MongoModel
         @today = Date.today
         @tomorrow = 1.day.from_now
         
-        Time.stub!(:now).and_return(@tomorrow)
+        Time.stub(:now).and_return(@tomorrow)
         
         doc.save
         subject.created_on.should == @today

data/spec/mongomodel/document/indexes_spec.rb

@@ -18,7 +18,7 @@ module MongoModel
       end
     
       it "inherits indexes from parent classes" do
-        index = mock('index')
+        index = double('index')
         Article.indexes << index
         subclass(Article).indexes.should include(index)
       end

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

@@ -5,7 +5,7 @@ module MongoModel
     describe "validates_uniqueness_of" do
       shared_examples_for "beating the race condition" do
         before(:each) do
-          subject.stub!(:valid?).and_return(true, false)
+          subject.stub(:valid?).and_return(true, false)
         end
         
         describe "save" do

data/spec/mongomodel/document/validations_spec.rb

@@ -21,7 +21,7 @@ module MongoModel
   
         describe "#save!" do
           before(:each) do
-            subject.errors.stub!(:full_messages).and_return(["first error", "second error"])
+            subject.errors.stub(:full_messages).and_return(["first error", "second error"])
           end
     
           it "raises a MongoModel::DocumentInvalid exception" do

data/spec/mongomodel/document_spec.rb

@@ -10,7 +10,7 @@ module MongoModel
       property = Document.properties[:id]
       property.name.should == :id
       property.as.should == '_id'
-      property.default(mock('instance', :generate_id => 'abc-123')).should == 'abc-123'
+      property.default(double('instance', :generate_id => 'abc-123')).should == 'abc-123'
     end
     
     describe "equality" do

data/spec/mongomodel/mongomodel_spec.rb

@@ -42,7 +42,7 @@ describe MongoModel do
   end
   
   it "has a logger accessor" do
-    logger = mock('logger').as_null_object
+    logger = double('logger').as_null_object
     MongoModel.logger = logger
     MongoModel.logger.should == logger
   end

data/spec/mongomodel/support/mongo_order_spec.rb

@@ -14,7 +14,7 @@ module MongoModel
   
     describe "#to_sort" do
       it "converts to mongo sort array" do
-        model = mock('model', :properties => mock('properties', :[] => nil))
+        model = double('model', :properties => double('properties', :[] => nil))
         subject.to_sort(model).should == [['name', :ascending], ['age', :descending]]
       end
     end
@@ -94,7 +94,7 @@ module MongoModel
     describe "#to_sort" do
       context "given property" do
         it "uses property as value to convert to mongo sort" do
-          property = mock('property', :as => '_name')
+          property = double('property', :as => '_name')
           subject.to_sort(property).should == ['_name', :ascending]
         end
       end

data/spec/mongomodel/support/paginator_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 module MongoModel
   describe Paginator do
-    let(:entries) { [stub] * 10 }
-    let(:scope) { stub(:count => 35, :limit => entries).as_null_object }
+    let(:entries) { [double] * 10 }
+    let(:scope) { double(:count => 35, :limit => entries).as_null_object }
     let(:page) { 2 }
     let(:per_page) { 10 }
     
@@ -32,7 +32,7 @@ module MongoModel
     end
     
     context "last page" do
-      let(:entries) { [stub] * 5 }
+      let(:entries) { [double] * 5 }
       before { scope.stub(:count => nil) }
       
       let(:page) { 4 }

data/spec/mongomodel/support/property_spec.rb

@@ -19,7 +19,7 @@ module MongoModel
         end
       
         it "defaults to nil" do
-          subject.default(mock('document instance')).should be_nil
+          subject.default(double('document instance')).should be_nil
         end
       
         it "equals a property with the same name and type" do
@@ -47,7 +47,7 @@ module MongoModel
         end
       
         it "defaults to custom default" do
-          subject.default(mock('document instance')).should == 21
+          subject.default(double('document instance')).should == 21
         end
       
         it "equals a property with the same name, type and options" do
@@ -61,10 +61,16 @@ module MongoModel
         end
       
         context "with callable default" do
-          subject { Property.new(:age, Integer, :default => lambda { |doc| doc.answer }) }
-
-          it "calls lambda with given instance" do
-            subject.default(mock('document instance', :answer => 42)).should == 42
+          let(:document) { double('document instance', :answer => 42) }
+          
+          it "calls the proc yielding the instance" do
+            property = Property.new(:age, Integer, :default => lambda { |doc| doc.answer })
+            property.default(document).should == 42
+          end
+          
+          it "calls the proc in the context of the instance" do
+            property = Property.new(:age, Integer, :default => proc { answer })
+            property.default(document).should == 42
           end
         end
         

data/spec/mongomodel/support/scope_spec.rb

@@ -278,23 +278,33 @@ module MongoModel
       end
       
       describe "#select" do
-        it "returns a new scope" do
-          subject.select(:author).should be_an_instance_of(Scope)
-        end
+        context "when no block is given" do
+          it "returns a new scope" do
+            subject.select(:author).should be_an_instance_of(Scope)
+          end
         
-        it "is not loaded" do
-          subject.to_a
-          subject.select(:author).should_not be_loaded
-        end
+          it "is not loaded" do
+            subject.to_a
+            subject.select(:author).should_not be_loaded
+          end
+        
+          it "adds individual select values" do
+            select_scope = subject.select(:author)
+            select_scope.select_values.should == subject.select_values + [:author]
+          end
         
-        it "adds individual select values" do
-          select_scope = subject.select(:author)
-          select_scope.select_values.should == subject.select_values + [:author]
+          it "adds multiple select values" do
+            select_scope = subject.select(:author, :published)
+            select_scope.select_values.should == subject.select_values + [:author, :published]
+          end
         end
         
-        it "adds multiple select values" do
-          select_scope = subject.select(:author, :published)
-          select_scope.select_values.should == subject.select_values + [:author, :published]
+        context "when a block given" do
+          it "passed block to to_a#select" do
+            blk = lambda { |*args| true }
+            subject.to_a.should_receive(:select).with(&blk)
+            subject.select(&blk)
+          end
         end
       end
       
@@ -780,7 +790,7 @@ module MongoModel
         it "loads total entries using count when auto-detection not possible" do
           paginator = nil
           
-          subject.stub!(:count).and_return(57)
+          subject.stub(:count).and_return(57)
           model.should_find(finder_options.merge(:offset => 0, :limit => 5), posts) {
             paginator = subject.paginate(:per_page => 5)
           }

data/spec/support/helpers/document_finder_stubs.rb

@@ -4,13 +4,13 @@ module DocumentFinderStubs
   include RSpec::Mocks::ExampleMethods
   
   def stub_find(result)
-    find_result = mock('find result', :to_a => result.map { |doc| doc.to_mongo }, :count => result.size).as_null_object
-    collection.stub!(:find).and_return(find_result)
+    find_result = double('find result', :to_a => result.map { |doc| doc.to_mongo }, :count => result.size).as_null_object
+    collection.stub(:find).and_return(find_result)
   end
   
   def should_find(expected={}, result=[])
     selector, options = MongoModel::MongoOptions.new(self, expected).to_a
-    find_result = mock('find result', :to_a => result.map { |doc| doc.to_mongo }).as_null_object
+    find_result = double('find result', :to_a => result.map { |doc| doc.to_mongo }).as_null_object
     collection.should_receive(:find).once.with(selector, options).and_return(find_result)
     yield if block_given?
   end
@@ -22,7 +22,7 @@ module DocumentFinderStubs
 
   def should_count(expected={}, result=[])
     selector, options = MongoModel::MongoOptions.new(self, expected).to_a
-    find_result = mock('find result', :count => result).as_null_object
+    find_result = double('find result', :count => result).as_null_object
     collection.should_receive(:find).once.with(selector, options).and_return(find_result)
     yield if block_given?
   end
@@ -33,7 +33,7 @@ module DocumentFinderStubs
   end
   
   def stub_delete
-    collection.stub!(:remove)
+    collection.stub(:remove)
   end
   
   def should_delete(conditions={})

data/spec/support/matchers/find_with.rb

@@ -4,7 +4,7 @@ RSpec::Matchers.define(:find_with) do |find_options|
   match do |klass|
     selector, options = MongoModel::MongoOptions.new(klass, find_options).to_a
     
-    result = mock('find result', :to_a => (@result || []).map { |d| d.to_mongo })
+    result = double('find result', :to_a => (@result || []).map { |d| d.to_mongo })
     klass.collection.should_receive(:find).once.with(selector, options).and_return(result)
     
     true
@@ -21,7 +21,7 @@ RSpec::Matchers.define(:count_with) do |find_options|
   
   match do |klass|
     selector, options = MongoModel::MongoOptions.new(klass, find_options).to_a
-    result = mock('find result')
+    result = double('find result')
     
     klass.collection.should_receive(:find).once.with(selector, options).and_return(result)
     result.should_receive(:count).once.and_return(@count || 5)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongomodel
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,7 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- Appraisals
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE
@@ -148,6 +148,7 @@ files:
 - lib/mongomodel/concerns/attribute_methods.rb
 - lib/mongomodel/concerns/attribute_methods/before_type_cast.rb
 - lib/mongomodel/concerns/attribute_methods/dirty.rb
+- lib/mongomodel/concerns/attribute_methods/forbidden.rb
 - lib/mongomodel/concerns/attribute_methods/multi_parameter_assignment.rb
 - lib/mongomodel/concerns/attribute_methods/nested.rb
 - lib/mongomodel/concerns/attribute_methods/protected.rb
@@ -196,6 +197,7 @@ files:
 - lib/mongomodel/support/paginator.rb
 - lib/mongomodel/support/reference.rb
 - lib/mongomodel/support/scope.rb
+- lib/mongomodel/support/scope/array_methods.rb
 - lib/mongomodel/support/scope/batches.rb
 - lib/mongomodel/support/scope/dynamic_finders.rb
 - lib/mongomodel/support/scope/finder_methods.rb
@@ -300,7 +302,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -157518307966196905
+      hash: -3084382199068025224
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/Appraisals

@@ -1,46 +0,0 @@
-RAILS_3_1 = "3.1.10"
-RAILS_3_2 = "3.2.11"
-
-appraise "rails-3.1" do
-  gem "activesupport", RAILS_3_1
-  gem "activemodel", RAILS_3_1
-end
-
-appraise "rails-3.2" do
-  gem "activesupport", RAILS_3_2
-  gem "activemodel", RAILS_3_2
-end
-
-if RUBY_VERSION >= "1.9"
-  appraise "rails-4" do
-    gem "activesupport", :git => "https://github.com/rails/rails.git"
-    gem "activemodel", :git => "https://github.com/rails/rails.git"
-    gem "journey", :git => "https://github.com/rails/journey.git"
-  end
-
-  appraise "rails-4-protected-attributes" do
-    gem "activesupport", :git => "https://github.com/rails/rails.git"
-    gem "activemodel", :git => "https://github.com/rails/rails.git"
-    gem "protected_attributes", :git=>"https://github.com/rails/protected_attributes.git"
-    gem "journey", :git => "https://github.com/rails/journey.git"
-  end
-
-  appraise "rails-4-observers" do
-    gem "activesupport", :git => "https://github.com/rails/rails.git"
-    gem "activemodel", :git => "https://github.com/rails/rails.git"
-    gem "rails-observers", :git => "https://github.com/rails/rails-observers.git"
-    gem "journey", :git => "https://github.com/rails/journey.git"
-  end
-
-  appraise "mongoid" do
-    gem "mongoid"
-    gem "activesupport", RAILS_3_2
-    gem "activemodel", RAILS_3_2
-  end
-end
-
-appraise "mongo_mapper" do
-  gem "mongo_mapper"
-  gem "activesupport", RAILS_3_2
-  gem "activemodel", RAILS_3_2
-end