mongomodel 0.4.9 → 0.5.0

data/.travis.yml

@@ -0,0 +1,30 @@
+language: ruby
+
+services:
+  - mongodb
+
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+
+gemfile:
+  - gemfiles/rails-3.1.gemfile
+  - gemfiles/rails-3.2.gemfile
+  - gemfiles/rails-4.gemfile
+  - gemfiles/rails-4-observers.gemfile
+  - gemfiles/rails-4-protected-attributes.gemfile
+  - gemfiles/mongo_mapper.gemfile
+  - gemfiles/mongoid.gemfile
+
+matrix:
+  exclude:
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails-4.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails-4-observers.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails-4-protected-attributes.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/mongoid.gemfile
+      

data/Gemfile

@@ -2,6 +2,6 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "appraisal", "~> 0.3.6"
 gem "bson_ext", "~> 1.8"
 gem "tzinfo"
+gem "rake"

data/README.md

@@ -3,6 +3,8 @@ MongoModel
 
 MongoModel is a Ruby ORM for interfacing with [MongoDB](http://www.mongodb.org/) databases.
 
+[![Build Status](https://travis-ci.org/spohlenz/mongomodel.png?branch=master)](https://travis-ci.org/spohlenz/mongomodel)
+
 
 Installation
 ============
@@ -19,7 +21,11 @@ For performance, you should probably also install the BSON C extensions:
 Using with Rails 3
 ==================
 
-Setup config/mongomodel.yml:
+Add MongoModel to your Gemfile (and run `bundle install`):
+
+    gem 'mongomodel'
+
+Create the configuration file `config/mongomodel.yml`:
 
     rails generate mongo_model:config DATABASENAME
 

data/Rakefile

@@ -1,8 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'appraisal'
-
 task :default => :spec
 
 begin

data/gemfiles/mongo_mapper.gemfile

@@ -1,12 +1,11 @@
-# This file was generated by Appraisal
+source "https://rubygems.org"
 
-source "http://rubygems.org"
+gem "activesupport", "3.2.13"
+gem "activemodel", "3.2.13"
+gem "mongo_mapper"
 
-gem "appraisal", "~> 0.3.6"
 gem "bson_ext", "~> 1.8"
 gem "tzinfo"
-gem "mongo_mapper"
-gem "activesupport", "3.2.11"
-gem "activemodel", "3.2.11"
+gem "rake"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/mongoid.gemfile

@@ -1,12 +1,11 @@
-# This file was generated by Appraisal
+source "https://rubygems.org"
 
-source "http://rubygems.org"
+gem "activesupport", "3.2.13"
+gem "activemodel", "3.2.13"
+gem "mongoid"
 
-gem "appraisal", "~> 0.3.6"
 gem "bson_ext", "~> 1.8"
 gem "tzinfo"
-gem "mongoid"
-gem "activesupport", "3.2.11"
-gem "activemodel", "3.2.11"
+gem "rake"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails-3.1.gemfile

@@ -1,11 +1,10 @@
-# This file was generated by Appraisal
+source "https://rubygems.org"
 
-source "http://rubygems.org"
+gem "activesupport", "3.1.12"
+gem "activemodel", "3.1.12"
 
-gem "appraisal", "~> 0.3.6"
 gem "bson_ext", "~> 1.8"
 gem "tzinfo"
-gem "activesupport", "3.1.10"
-gem "activemodel", "3.1.10"
+gem "rake"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails-3.2.gemfile

@@ -1,11 +1,10 @@
-# This file was generated by Appraisal
+source "https://rubygems.org"
 
-source "http://rubygems.org"
+gem "activesupport", "3.2.13"
+gem "activemodel", "3.2.13"
 
-gem "appraisal", "~> 0.3.6"
 gem "bson_ext", "~> 1.8"
 gem "tzinfo"
-gem "activesupport", "3.2.11"
-gem "activemodel", "3.2.11"
+gem "rake"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails-4-observers.gemfile

@@ -1,13 +1,11 @@
-# This file was generated by Appraisal
+source "https://rubygems.org"
 
-source "http://rubygems.org"
+gem "activesupport", :github => "rails/rails", :branch => "4-0-stable"
+gem "activemodel", :github => "rails/rails", :branch => "4-0-stable"
+gem "rails-observers", :github => "rails/rails-observers"
 
-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"
+gem "rake"
 
-gemspec :path=>"../"
+gemspec :path => "../"

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

@@ -1,13 +1,11 @@
-# This file was generated by Appraisal
+source "https://rubygems.org"
 
-source "http://rubygems.org"
+gem "activesupport", :github => "rails/rails", :branch => "4-0-stable"
+gem "activemodel", :github => "rails/rails", :branch => "4-0-stable"
+gem "protected_attributes", :github => "rails/protected_attributes"
 
-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"
+gem "rake"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails-4.gemfile

@@ -1,12 +1,10 @@
-# This file was generated by Appraisal
+source "https://rubygems.org"
 
-source "http://rubygems.org"
+gem "activesupport", :github => "rails/rails", :branch => "4-0-stable"
+gem "activemodel", :github => "rails/rails", :branch => "4-0-stable"
 
-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 "journey", :git=>"https://github.com/rails/journey.git"
+gem "rake"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/lib/mongomodel.rb

@@ -66,6 +66,7 @@ module MongoModel
     autoload :Query,          'mongomodel/concerns/attribute_methods/query'
     autoload :BeforeTypeCast, 'mongomodel/concerns/attribute_methods/before_type_cast'
     autoload :Protected,      'mongomodel/concerns/attribute_methods/protected'
+    autoload :Forbidden,      'mongomodel/concerns/attribute_methods/forbidden'
     autoload :Dirty,          'mongomodel/concerns/attribute_methods/dirty'
     autoload :Nested,         'mongomodel/concerns/attribute_methods/nested'
     autoload :MultiParameterAssignment, 'mongomodel/concerns/attribute_methods/multi_parameter_assignment'

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

@@ -49,7 +49,12 @@ module MongoModel
         end
         
         def find_target
-          ids.any? ? Array.wrap(definition.scope.find(ids - new_document_ids)) + new_documents : []
+          if ids.any?
+            docs = Array.wrap(definition.scope.where(:id.in => (ids - new_document_ids))) + new_documents
+            docs.sort_by { |doc| ids.index(doc.id) }
+          else
+            []
+          end
         end
         
         def build(*args, &block)

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

@@ -0,0 +1,17 @@
+require "active_model/forbidden_attributes_protection"
+
+module MongoModel
+  module AttributeMethods
+    module Forbidden
+      extend ActiveSupport::Concern
+      
+      def assign_attributes(attrs, options={})
+        if attrs.respond_to?(:permitted?) && !attrs.permitted?
+          raise ActiveModel::ForbiddenAttributesError
+        else
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@ module MongoModel
     module MultiParameterAssignment
       extend ActiveSupport::Concern
       
-      def attributes=(attrs)#:nodoc:
+      def assign_attributes(attrs, options={})#:nodoc:
         super(transform_multiparameter_attributes(attrs))
       end
     

data/lib/mongomodel/concerns/attributes.rb

@@ -63,6 +63,11 @@ module MongoModel
       
       docs
     end
+  
+  protected
+    def sanitize_for_mass_assignment(attrs, options={})
+      attrs
+    end
     
     module ClassMethods
       def from_mongo(hash)

data/lib/mongomodel/concerns/properties.rb

@@ -59,8 +59,8 @@ module MongoModel
           
           if default.is_a?(Proc)
             case default.arity
-            when 0 then default.call
-            else        default.call(instance)
+            when 0 then instance.instance_exec(&default)
+            else        instance.instance_exec(instance, &default)
             end
           else
             default.duplicable? ? default.dup : default

data/lib/mongomodel/concerns/serialization.rb

@@ -7,11 +7,11 @@ module MongoModel
     def serializable_hash(given_options = nil)
       options = given_options ? given_options.dup : {}
 
-      options[:only]   = Array.wrap(options[:only]).map { |n| n.to_s }
-      options[:except] = Array.wrap(options[:except]).map { |n| n.to_s }
+      options[:only]    = Array.wrap(options[:only]).map { |n| n.to_s }
+      options[:except]  = Array.wrap(options[:except]).map { |n| n.to_s }
+      options[:methods] = Array.wrap(options[:methods]).map { |n| n.to_s }
 
-      attribute_names = attributes.keys.map { |k| k.to_s }.sort
-      attribute_names -= self.class.internal_properties.map { |p| p.name.to_s }
+      attribute_names = attributes_for_serialization
       
       if options[:only].any?
         attribute_names &= options[:only]
@@ -19,8 +19,8 @@ module MongoModel
         attribute_names -= options[:except]
       end
 
-      method_names = Array.wrap(options[:methods]).inject([]) do |methods, name|
-        methods << name if respond_to?(name.to_s)
+      method_names = options[:methods].inject([]) do |methods, name|
+        methods << name if respond_to?(name)
         methods
       end
 
@@ -29,5 +29,14 @@ module MongoModel
         hash
       }
     end
+  
+  protected
+    def attributes_for_serialization
+      properties.reject { |name, property|
+        property.internal? && name != :id
+      }.map { |name, property|
+        name.to_s
+      }.sort
+    end
   end
 end

data/lib/mongomodel/embedded_document.rb

@@ -23,6 +23,7 @@ module MongoModel
     include AttributeMethods::Dirty
     include AttributeMethods::Nested
     include AttributeMethods::MultiParameterAssignment
+    include AttributeMethods::Forbidden if defined?(ActiveModel::ForbiddenAttributesProtection)
     
     include Logging
     include RecordStatus

data/lib/mongomodel/railtie.rb

@@ -58,12 +58,14 @@ module MongoModel
     end
     
     initializer "mongomodel.observers" do |app|
-      MongoModel::EmbeddedDocument.observers = app.config.mongomodel.observers || []
+      if defined?(ActiveModel::Observing)
+        MongoModel::EmbeddedDocument.observers = app.config.mongomodel.observers || []
+      end
     end
-
-    # Lazily initialize observer instances
-    config.after_initialize do
-      ActiveSupport.on_load(:mongomodel) do
+    
+    # Initialize observer instances if available
+    ActiveSupport.on_load(:mongomodel) do
+      if respond_to?(:instantiate_observers)
         instantiate_observers
 
         ActionDispatch::Reloader.to_prepare do

data/lib/mongomodel/support/scope.rb

@@ -5,6 +5,7 @@ module MongoModel
     MULTI_VALUE_METHODS = [ :select, :order, :where ]
     SINGLE_VALUE_METHODS = [ :limit, :offset, :from ]
     
+    autoload :ArrayMethods,   'mongomodel/support/scope/array_methods'
     autoload :SpawnMethods,   'mongomodel/support/scope/spawn_methods'
     autoload :QueryMethods,   'mongomodel/support/scope/query_methods'
     autoload :FinderMethods,  'mongomodel/support/scope/finder_methods'
@@ -13,7 +14,7 @@ module MongoModel
     autoload :Pagination,     'mongomodel/support/scope/pagination'
     autoload :Batches,        'mongomodel/support/scope/batches'
     
-    include Batches, Pagination, DynamicFinders, LoadMethods, FinderMethods, QueryMethods, SpawnMethods
+    include Batches, Pagination, DynamicFinders, LoadMethods, FinderMethods, ArrayMethods, QueryMethods, SpawnMethods
     
     delegate :inspect, :as_json, :to => :to_a
     
@@ -53,14 +54,6 @@ module MongoModel
       loaded? ? @documents.empty? : count.zero?
     end
     
-    def any?(&block)
-      if block_given?
-        to_a.any?(&block)
-      else
-        !empty?
-      end
-    end
-    
     def count
       _find.count
     end

data/lib/mongomodel/support/scope/array_methods.rb

@@ -0,0 +1,21 @@
+module MongoModel
+  class Scope
+    module ArrayMethods
+      def any?(&block)
+        if block_given?
+          to_a.any?(&block)
+        else
+          !empty?
+        end
+      end
+      
+      def select(*args, &block)
+        if block_given?
+          to_a.select(&block)
+        else
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -13,7 +13,7 @@ module MongoModel
         when ::String
           cast(::DateTime.parse(value))
         else
-          value.to_datetime.change(:usec => 0)
+          round_microseconds(value.to_datetime.utc) if value
         end
       rescue
         nil
@@ -23,16 +23,29 @@ module MongoModel
         to_time(value.utc) if value
       end
       
-      def from_mongo(value)
-        time = value.respond_to?(:in_time_zone) ? value.in_time_zone : value
-        time.to_datetime
+      def from_mongo(t)
+        ::DateTime.civil(t.year, t.month, t.day, t.hour, t.min, t.sec + Rational(t.usec, 1000000)) if t
       end
     
     private
       # 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(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, sec_fraction(dt).to_f * 1000000)
+      end
+      
+      def sec_fraction(dt)
+        if RUBY_VERSION <= "1.8.7"
+          # Ruby 1.8.7 DateTime#sec_fraction unit is in days
+          dt.sec_fraction * 86400
+        else
+          dt.sec_fraction
+        end
+      end
+      
+      def round_microseconds(dt)
+        seconds = dt.sec + sec_fraction(dt)
+        dt.change(:sec => Rational((seconds * 1000).round, 1000))
       end
     end
   end