mongomodel 0.4.8 → 0.4.9

data/Appraisals

@@ -1,26 +1,46 @@
+RAILS_3_1 = "3.1.10"
+RAILS_3_2 = "3.2.11"
+
 appraise "rails-3.1" do
-  gem "activesupport", "3.1.8"
-  gem "activemodel", "3.1.8"
+  gem "activesupport", RAILS_3_1
+  gem "activemodel", RAILS_3_1
 end
 
 appraise "rails-3.2" do
-  gem "activesupport", "3.2.8"
-  gem "activemodel", "3.2.8"
+  gem "activesupport", RAILS_3_2
+  gem "activemodel", RAILS_3_2
 end
 
-appraise "rails-4" do
-  gem "activesupport", :git => "https://github.com/rails/rails.git"
-  gem "activemodel", :git => "https://github.com/rails/rails.git"
-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", "3.2.8"
-  gem "activemodel", "3.2.8"
+  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", "3.2.8"
-  gem "activemodel", "3.2.8"
+  gem "activesupport", RAILS_3_2
+  gem "activemodel", RAILS_3_2
 end

data/Gemfile

@@ -3,5 +3,5 @@ source "http://rubygems.org"
 gemspec
 
 gem "appraisal", "~> 0.3.6"
-gem "bson_ext", "~> 1.5"
+gem "bson_ext", "~> 1.8"
 gem "tzinfo"

data/bin/console

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

data/gemfiles/mongo_mapper.gemfile

@@ -3,10 +3,10 @@
 source "http://rubygems.org"
 
 gem "appraisal", "~> 0.3.6"
-gem "bson_ext", "~> 1.5"
+gem "bson_ext", "~> 1.8"
 gem "tzinfo"
 gem "mongo_mapper"
-gem "activesupport", "3.2.8"
-gem "activemodel", "3.2.8"
+gem "activesupport", "3.2.11"
+gem "activemodel", "3.2.11"
 
 gemspec :path=>"../"

data/gemfiles/mongoid.gemfile

@@ -3,10 +3,10 @@
 source "http://rubygems.org"
 
 gem "appraisal", "~> 0.3.6"
-gem "bson_ext", "~> 1.5"
+gem "bson_ext", "~> 1.8"
 gem "tzinfo"
 gem "mongoid"
-gem "activesupport", "3.2.8"
-gem "activemodel", "3.2.8"
+gem "activesupport", "3.2.11"
+gem "activemodel", "3.2.11"
 
 gemspec :path=>"../"

data/gemfiles/rails-3.1.gemfile

@@ -3,9 +3,9 @@
 source "http://rubygems.org"
 
 gem "appraisal", "~> 0.3.6"
-gem "bson_ext", "~> 1.5"
+gem "bson_ext", "~> 1.8"
 gem "tzinfo"
-gem "activesupport", "3.1.8"
-gem "activemodel", "3.1.8"
+gem "activesupport", "3.1.10"
+gem "activemodel", "3.1.10"
 
 gemspec :path=>"../"

data/gemfiles/rails-3.2.gemfile

@@ -3,9 +3,9 @@
 source "http://rubygems.org"
 
 gem "appraisal", "~> 0.3.6"
-gem "bson_ext", "~> 1.5"
+gem "bson_ext", "~> 1.8"
 gem "tzinfo"
-gem "activesupport", "3.2.8"
-gem "activemodel", "3.2.8"
+gem "activesupport", "3.2.11"
+gem "activemodel", "3.2.11"
 
 gemspec :path=>"../"

data/gemfiles/rails-4-observers.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 0.3.6"
+gem "bson_ext", "~> 1.8"
+gem "tzinfo"
+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"
+
+gemspec :path=>"../"

data/gemfiles/rails-4-protected-attributes.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 0.3.6"
+gem "bson_ext", "~> 1.8"
+gem "tzinfo"
+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"
+
+gemspec :path=>"../"

data/gemfiles/rails-4.gemfile

@@ -3,9 +3,10 @@
 source "http://rubygems.org"
 
 gem "appraisal", "~> 0.3.6"
-gem "bson_ext", "~> 1.5"
+gem "bson_ext", "~> 1.8"
 gem "tzinfo"
 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"
 
 gemspec :path=>"../"

data/lib/mongomodel.rb

@@ -9,6 +9,18 @@ require 'mongomodel/log_subscriber'
 
 require 'active_support/core_ext/module/attribute_accessors'
 
+begin
+  require "rails/observers/active_model/active_model"
+rescue LoadError
+  # Either ActiveModel < 4 or rails-observers gem is not available
+end
+
+begin
+  require "protected_attributes"
+rescue LoadError
+  # Either ActiveModel < 4 or protected_attributes gem is not available
+end
+
 module MongoModel
   autoload :VERSION,          'mongomodel/version'
   
@@ -103,7 +115,7 @@ module MongoModel
     @_database ||= configuration.establish_connection
   end
   
-  require 'mongomodel/railtie' if defined?(Rails)
+  require 'mongomodel/railtie' if defined?(Rails::Railtie)
   
   require 'mongomodel/compatibility/mongoid' if defined?(Mongoid)
   require 'mongomodel/compatibility/mongo_mapper' if defined?(MongoMapper)

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

@@ -3,25 +3,29 @@ module MongoModel
     module Protected
       extend ActiveSupport::Concern
       
-      include ActiveModel::MassAssignmentSecurity
+      if defined?(ActiveModel::MassAssignmentSecurity)
+        include ActiveModel::MassAssignmentSecurity
 
-      module ClassMethods
-        def property(name, *args, &block)#:nodoc:
-          property = super(name, *args, &block)
+        module ClassMethods
+          def property(name, *args, &block)#:nodoc:
+            property = super(name, *args, &block)
 
-          attr_protected(name) if property.options[:protected]
-          attr_accessible(name) if property.options[:accessible]
+            attr_protected(name) if property.options[:protected]
+            attr_accessible(name) if property.options[:accessible]
           
-          property
+            property
+          end
         end
-      end
       
-      def assign_attributes(attrs, options={})
-        if options[:without_protection]
-          super
-        else
-          super(sanitize_for_mass_assignment(attrs, options[:as] || :default))
+        def assign_attributes(attrs, options={})
+          if options[:without_protection]
+            super
+          else
+            super(sanitize_for_mass_assignment(attrs, options[:as] || :default))
+          end
         end
+      elsif defined?(ActiveModel::DeprecatedMassAssignmentSecurity)
+        include ActiveModel::DeprecatedMassAssignmentSecurity
       end
     end
   end

data/lib/mongomodel/concerns/observing.rb

@@ -1,35 +1,35 @@
-module MongoModel
-  module Observing
-    extend ActiveSupport::Concern
-    include ActiveModel::Observing
-  end
-
-  class Observer < ActiveModel::Observer
-  protected
-    def observed_classes
-      klasses = super
-      klasses + klasses.map { |klass| klass.descendants }.flatten
-    end
-
-    def add_observer!(klass)
-      super
-      define_callbacks(klass)
-    end
-
-    def define_callbacks(klass)
-      observer = self
-      observer_name = observer.class.name.underscore.gsub('/', '__')
-
-      MongoModel::Callbacks::CALLBACKS.each do |callback|
-        next unless respond_to?(callback)
-        callback_meth = :"_notify_#{observer_name}_for_#{callback}"
-        unless klass.respond_to?(callback_meth)
-          klass.send(:define_method, callback_meth) do |&block|
-            observer.update(callback, self, &block)
-          end
-          klass.send(callback, callback_meth)
-        end
-      end
-    end
-  end
-end
+module MongoModel
+  module Observing
+    extend ActiveSupport::Concern
+    include ActiveModel::Observing
+  end
+
+  class Observer < ActiveModel::Observer
+  protected
+    def observed_classes
+      klasses = super
+      klasses + klasses.map { |klass| klass.descendants }.flatten
+    end
+
+    def add_observer!(klass)
+      super
+      define_callbacks(klass)
+    end
+
+    def define_callbacks(klass)
+      observer = self
+      observer_name = observer.class.name.underscore.gsub('/', '__')
+
+      MongoModel::Callbacks::CALLBACKS.each do |callback|
+        next unless respond_to?(callback)
+        callback_meth = :"_notify_#{observer_name}_for_#{callback}"
+        unless klass.respond_to?(callback_meth)
+          klass.send(:define_method, callback_meth) do |&block|
+            observer.update(callback, self, &block)
+          end
+          klass.send(callback, callback_meth)
+        end
+      end
+    end
+  end
+end

data/lib/mongomodel/document/persistence.rb

@@ -153,7 +153,7 @@ module MongoModel
       end
       
       def save_to_collection
-        collection.save(to_mongo, :safe => self.class.save_safely?)
+        collection.save(to_mongo, :w => self.class.save_safely? ? 1 : 0)
         set_new_record(false)
         true
       rescue Mongo::OperationFailure => e

data/lib/mongomodel/embedded_document.rb

@@ -10,7 +10,7 @@ module MongoModel
     include Translation
     include Validations
     include Callbacks
-    include Observing
+    include Observing if defined?(ActiveModel::Observing)
     
     include Associations
     

data/lib/mongomodel/support/types/date_time.rb

@@ -32,7 +32,7 @@ module MongoModel
       # Define our own to_time method as DateTime.to_time in ActiveSupport may return
       # the DateTime object unchanged, whereas BSON expects an actual Time object.
       def to_time(dt)
-        ::Time.utc_time(dt.year, dt.month, dt.day, dt.hour, dt.min, dt.sec)
+        ::Time.utc(dt.year, dt.month, dt.day, dt.hour, dt.min, dt.sec)
       end
     end
   end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

data/mongomodel.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   
   s.add_dependency "activesupport", ">= 3.1"
   s.add_dependency "activemodel",   ">= 3.1"
-  s.add_dependency "mongo",         "~> 1.5"
+  s.add_dependency "mongo",         "~> 1.8"
 
   s.add_development_dependency "bundler",     ">= 1.0.0"
   s.add_development_dependency "rspec",       "~> 2.8"

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

@@ -1,84 +1,86 @@
 require 'spec_helper'
 
 module MongoModel
-  specs_for(Document, EmbeddedDocument) do
-    define_class(:TestDocument, described_class) do
-      property :foo, String
-      property :bar, String
-    end
+  if ActiveModel::VERSION::STRING < '4.0' || Gem.loaded_specs['protected_attributes']
+    specs_for(Document, EmbeddedDocument) do
+      define_class(:TestDocument, described_class) do
+        property :foo, String
+        property :bar, String
+      end
     
-    subject { TestDocument.new }
+      subject { TestDocument.new }
     
-    describe "#attr_protected" do
-      before(:each) do
-        TestDocument.attr_protected :foo
-      end
+      describe "#attr_protected" do
+        before(:each) do
+          TestDocument.attr_protected :foo
+        end
       
-      it "disallows the attribute to be mass-assigned via attributes=" do
-        subject.attributes = { :foo => 'value of foo' }
-        subject.foo.should be_nil
-      end
+        it "disallows the attribute to be mass-assigned via attributes=" do
+          subject.attributes = { :foo => 'value of foo' }
+          subject.foo.should be_nil
+        end
       
-      it "does not disallow the attribute to be assigned individually" do
-        subject.foo = 'value of foo'
-        subject.foo.should == 'value of foo'
-      end
+        it "does not disallow the attribute to be assigned individually" do
+          subject.foo = 'value of foo'
+          subject.foo.should == 'value of foo'
+        end
       
-      it "does not disallow other attributes to be mass-assigned via attributes=" do
-        subject.attributes = { :bar => 'value of bar' }
-        subject.bar.should == 'value of bar'
-      end
+        it "does not disallow other attributes to be mass-assigned via attributes=" do
+          subject.attributes = { :bar => 'value of bar' }
+          subject.bar.should == 'value of bar'
+        end
       
-      it "accepts multiple attributes" do
-        TestDocument.attr_protected :foo, :bar
+        it "accepts multiple attributes" do
+          TestDocument.attr_protected :foo, :bar
         
-        subject.attributes = { :foo => 'value of foo', :bar => 'value of bar' }
-        subject.foo.should be_nil
-        subject.bar.should be_nil
+          subject.attributes = { :foo => 'value of foo', :bar => 'value of bar' }
+          subject.foo.should be_nil
+          subject.bar.should be_nil
+        end
       end
-    end
     
-    describe "#attr_accessible" do
-      before(:each) do
-        TestDocument.attr_accessible :foo
-      end
+      describe "#attr_accessible" do
+        before(:each) do
+          TestDocument.attr_accessible :foo
+        end
       
-      it "allows the attribute to be mass-assigned via attributes=" do
-        subject.attributes = { :foo => 'value of foo' }
-        subject.foo.should == 'value of foo'
-      end
+        it "allows the attribute to be mass-assigned via attributes=" do
+          subject.attributes = { :foo => 'value of foo' }
+          subject.foo.should == 'value of foo'
+        end
       
-      it "does not disallow other attributes to be mass-assigned via attributes=" do
-        subject.attributes = { :bar => 'value of bar' }
-        subject.bar.should be_nil
-      end
+        it "does not disallow other attributes to be mass-assigned via attributes=" do
+          subject.attributes = { :bar => 'value of bar' }
+          subject.bar.should be_nil
+        end
       
-      it "does not disallow others attributes to be assigned individually" do
-        subject.bar = 'value of bar'
-        subject.bar.should == 'value of bar'
-      end
+        it "does not disallow others attributes to be assigned individually" do
+          subject.bar = 'value of bar'
+          subject.bar.should == 'value of bar'
+        end
       
-      it "accepts multiple attributes" do
-        TestDocument.attr_accessible :foo, :bar
+        it "accepts multiple attributes" do
+          TestDocument.attr_accessible :foo, :bar
         
-        subject.attributes = { :foo => 'value of foo', :bar => 'value of bar' }
-        subject.foo.should == 'value of foo'
-        subject.bar.should == 'value of bar'
+          subject.attributes = { :foo => 'value of foo', :bar => 'value of bar' }
+          subject.foo.should == 'value of foo'
+          subject.bar.should == 'value of bar'
+        end
       end
-    end
     
-    describe "#property" do
-      context "with :protected option" do
-        it "makes the attribute protected" do
-          TestDocument.should_receive(:attr_protected).with(:baz)
-          TestDocument.property :baz, String, :protected => true
+      describe "#property" do
+        context "with :protected option" do
+          it "makes the attribute protected" do
+            TestDocument.should_receive(:attr_protected).with(:baz)
+            TestDocument.property :baz, String, :protected => true
+          end
         end
-      end
       
-      context "with :accessible option" do
-        it "makes the attribute accessible" do
-          TestDocument.should_receive(:attr_accessible).with(:baz)
-          TestDocument.property :baz, String, :accessible => true
+        context "with :accessible option" do
+          it "makes the attribute accessible" do
+            TestDocument.should_receive(:attr_accessible).with(:baz)
+            TestDocument.property :baz, String, :accessible => true
+          end
         end
       end
     end

data/spec/mongomodel/concerns/observing_spec.rb

@@ -1,32 +1,34 @@
-require 'spec_helper'
-
-module MongoModel
-  specs_for(Document) do
-    describe "observing" do
-      define_class(:TestDocument, described_class)
-      define_class(:TestObserver, Observer) do
-        observe :test_document
-        
-        attr_accessor :callback
-
-        def after_save(model)
-          @callback.call(model) unless @callback.nil?
-        end
-      end
-
-      subject { TestDocument.new }
-
-      it "has an #instance method to access the observer singleton" do
-        TestObserver.instance.should eq(TestObserver.instance)
-      end
-      
-      it "invokes the TestObserver singleton's after_save method after saving" do
-        callback = stub
-        callback.should_receive(:call).with(subject)
-        
-        TestObserver.instance.callback = callback
-        subject.save
-      end
-    end
-  end
+require 'spec_helper'
+
+module MongoModel
+  if ActiveModel::VERSION::STRING < '4.0' || Gem.loaded_specs['rails-observers']
+    specs_for(Document) do
+      describe "observing" do
+        define_class(:TestDocument, described_class)
+        define_class(:TestObserver, Observer) do
+          observe :test_document
+        
+          attr_accessor :callback
+
+          def after_save(model)
+            @callback.call(model) unless @callback.nil?
+          end
+        end
+
+        subject { TestDocument.new }
+
+        it "has an #instance method to access the observer singleton" do
+          TestObserver.instance.should eq(TestObserver.instance)
+        end
+      
+        it "invokes the TestObserver singleton's after_save method after saving" do
+          callback = stub
+          callback.should_receive(:call).with(subject)
+        
+          TestObserver.instance.callback = callback
+          subject.save
+        end
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
-Bundler.require
+Bundler.setup
 
 require 'rspec'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongomodel
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,8 @@ files:
 - gemfiles/mongoid.gemfile
 - gemfiles/rails-3.1.gemfile
 - gemfiles/rails-3.2.gemfile
+- gemfiles/rails-4-observers.gemfile
+- gemfiles/rails-4-protected-attributes.gemfile
 - gemfiles/rails-4.gemfile
 - lib/mongomodel.rb
 - lib/mongomodel/attributes/mongo.rb
@@ -298,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1652112125246390451
+      hash: -157518307966196905
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: