mongo_mapper 0.12.0 → 0.13.0.beta1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 157572885e8b22a43d1585eb772fcbf1c95f6aa1
+  data.tar.gz: 29cff77a4aba848e0ec1bde7a7fe2ba3f68b767a
+SHA512:
+  metadata.gz: cc75dcd206c828239a06f49cb9374497f9e0b425201921a5dcdcc169b5d1eba5a1005fbc2ad299ee908b311b046c42c2e5b97e339e668117f7a0c5ab815d98d4
+  data.tar.gz: 003c0ac6bb4aaec67634ee5aedaa252f4d81f9a40d6e496ab108b5c408d22891495ec969e07d9bdc8b8315d25e0e309ac1ccdd0f29c2feac70257857a2c0e2a5

data/README.rdoc

@@ -1,33 +1,55 @@
 = MongoMapper
 
+{<img src="https://badge.fury.io/rb/mongo_mapper.png" alt="RubyGem" />}[https://rubygems.org/gems/mongo_mapper]
+{<img src="https://travis-ci.org/jnunemaker/mongomapper.png?branch=master" alt="Build Status" />}[https://travis-ci.org/jnunemaker/mongomapper]
+{<img src="https://coveralls.io/repos/jnunemaker/mongomapper/badge.png" alt="Coverage Status" />}[https://coveralls.io/r/jnunemaker/mongomapper]
+
 A Ruby Object Mapper for Mongo.
 
 == Install
 
     $ gem install mongo_mapper
 
-== Contributing
+== Documentation
 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself in another branch so I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+http://mongomapper.com/documentation/
+
+http://rdoc.info/github/jnunemaker/mongomapper
+
+== Compatibility
+
+MongoMapper is tested against:
 
-== Development
+* MRI 1.8.7
+* MRI 1.9.3
+* MRI 2.0.0
+* JRuby (1.9)
 
-    $ gem install bundler (if you don't have it)
+Additionally, MongoMapper is tested against:
+
+* Rails 3.0.x
+* Rails 3.1.x
+* Rails 3.2.x
+* Rails 4.0.x
+
+== Contributing & Development
+
+    $ git clone https://github.com/jnunemaker/mongomapper && cd mongomapper
     $ bundle install
     $ bundle exec rake
 
+* Fork the project.
+* Make your feature addition or bug fix. All specs should pass.
+* Add specs for your changes. This is important so I don't break it in a future version unintentionally.
+* Commit, do not mess with Rakefile, version, or history. If you want to have your own version, that is fine but bump version in a commit by itself in another branch so a maintainer ignore it when your pull request is merged.
+* Send a pull request. Bonus points for topic branches.
+
 == Problems or Questions?
 
-Hit up the google group:
-http://groups.google.com/group/mongomapper
+Hit up the Google group: http://groups.google.com/group/mongomapper
 
-Hop on IRC:
-irc://chat.freenode.net/#mongomapper
+Hop on IRC: irc://chat.freenode.net/#mongomapper
 
-== Copyright
+== License & Copyright
 
 See LICENSE for details.

data/bin/mmconsole

@@ -31,7 +31,7 @@ Example 1:
   things.insert("name" => "Another Thing", "date" => Time.now)
 
   cursor = things.find("name" => "Raw Thing")
-  puts cursor.next_object.inspect
+  puts cursor.next.inspect
 
 Example 2:
   class Thing

data/lib/mongo_mapper.rb

@@ -14,12 +14,15 @@ module MongoMapper
   autoload :InvalidScheme,          'mongo_mapper/exceptions'
   autoload :DocumentNotValid,       'mongo_mapper/exceptions'
   autoload :AccessibleOrProtected,  'mongo_mapper/exceptions'
+  autoload :InvalidKey,             'mongo_mapper/exceptions'
+  autoload :NotSupported,           'mongo_mapper/exceptions'
 
   autoload :Document,               'mongo_mapper/document'
   autoload :EmbeddedDocument,       'mongo_mapper/embedded_document'
   autoload :Plugins,                'mongo_mapper/plugins'
   autoload :Translation,            'mongo_mapper/translation'
   autoload :Version,                'mongo_mapper/version'
+  autoload :Utils,                  'mongo_mapper/utils'
 
   module Middleware
     autoload :IdentityMap, 'mongo_mapper/middleware/identity_map'
@@ -35,6 +38,7 @@ module MongoMapper
     autoload :Dirty,              'mongo_mapper/plugins/dirty'
     autoload :Document,           'mongo_mapper/plugins/document'
     autoload :DynamicQuerying,    'mongo_mapper/plugins/dynamic_querying'
+    autoload :Dumpable,           'mongo_mapper/plugins/dumpable'
     autoload :EmbeddedCallbacks,  'mongo_mapper/plugins/embedded_callbacks'
     autoload :EmbeddedDocument,   'mongo_mapper/plugins/embedded_document'
     autoload :Equality,           'mongo_mapper/plugins/equality'

data/lib/mongo_mapper/connection.rb

@@ -10,7 +10,11 @@ module MongoMapper
 
     # @api public
     def connection
-      @@connection ||= Mongo::Connection.new
+      @@connection ||= Mongo::MongoClient.new
+    end
+
+    def connection?
+      !!@@connection
     end
 
     # @api public
@@ -65,18 +69,23 @@ module MongoMapper
       raise 'Set config before connecting. MongoMapper.config = {...}' if config.blank?
       env = config_for_environment(environment)
 
-      if env['options'].is_a? Hash
+      if env['options'].is_a?(Hash)
         options = env['options'].symbolize_keys.merge(options)
       end
+      options[:read] = options[:read].to_sym if options[:read].is_a? String
+
+      if env.key?('ssl')
+        options[:ssl] = env['ssl']
+      end
 
       MongoMapper.connection = if env['hosts']
         if env['hosts'].first.is_a?(String)
-          Mongo::ReplSetConnection.new( env['hosts'], options )
+          Mongo::MongoReplicaSetClient.new( env['hosts'], options )
         else
-          Mongo::ReplSetConnection.new( *env['hosts'].push(options) )
+          Mongo::MongoReplicaSetClient.new( *env['hosts'].push(options) )
         end
       else
-        Mongo::Connection.new(env['host'], env['port'], options)
+        Mongo::MongoClient.new(env['host'], env['port'], options)
       end
 
       MongoMapper.database = env['database']
@@ -90,11 +99,13 @@ module MongoMapper
     end
 
     def handle_passenger_forking
+      # :nocov:
       if defined?(PhusionPassenger)
         PhusionPassenger.on_event(:starting_worker_process) do |forked|
           connection.connect if forked
         end
       end
+      # :nocov:
     end
   end
-end
+end

data/lib/mongo_mapper/document.rb

@@ -6,6 +6,7 @@ module MongoMapper
 
     include Plugins::ActiveModel
     include Plugins::Document
+    include Plugins::Dumpable
     include Plugins::Querying # for now needs to be before associations (save_to_collection)
     include Plugins::Associations
     include Plugins::Caching

data/lib/mongo_mapper/exceptions.rb

@@ -12,10 +12,13 @@ module MongoMapper
   # raised when trying to do something not supported, mostly for edocs
   class NotSupported < Error; end
 
+  # raised when trying to create a key with an invalid name
+  class InvalidKey < Error; end
+
   # raised when document not valid and using !
   class DocumentNotValid < Error
     attr_reader :document
-  
+
     def initialize(document)
       @document = document
       super("Validation failed: #{document.errors.full_messages.join(", ")}")

data/lib/mongo_mapper/extensions/binary.rb

@@ -3,7 +3,7 @@ module MongoMapper
   module Extensions
     module Binary
       def to_mongo(value)
-        if value.is_a?(::BSON::Binary)
+        if value.instance_of?(::BSON::Binary)
           value
         else
           value.nil? ? nil : ::BSON::Binary.new(value)

data/lib/mongo_mapper/extensions/boolean.rb

@@ -3,37 +3,34 @@ module MongoMapper
   module Extensions
     module Boolean
       Mapping = {
-        true    => true, 
-        'true'  => true, 
-        'TRUE'  => true, 
-        'True'  => true, 
-        't'     => true, 
-        'T'     => true, 
-        '1'     => true, 
-        1       => true, 
+        true    => true,
+        'true'  => true,
+        'TRUE'  => true,
+        'True'  => true,
+        't'     => true,
+        'T'     => true,
+        '1'     => true,
+        1       => true,
         1.0     => true,
-        false   => false, 
-        'false' => false, 
-        'FALSE' => false, 
-        'False' => false, 
-        'f'     => false, 
-        'F'     => false, 
-        '0'     => false, 
-        0       => false, 
-        0.0     => false, 
+        false   => false,
+        'false' => false,
+        'FALSE' => false,
+        'False' => false,
+        'f'     => false,
+        'F'     => false,
+        '0'     => false,
+        0       => false,
+        0.0     => false,
         nil     => nil
       }
 
       def to_mongo(value)
-        if value.is_a?(Boolean)
-          value
-        else
-          Mapping[value]
-        end
+        Mapping[value]
       end
 
       def from_mongo(value)
-        value.nil? ? nil : !!value
+        return nil if value == nil
+        !!value
       end
     end
   end

data/lib/mongo_mapper/extensions/date.rb

@@ -3,10 +3,10 @@ module MongoMapper
   module Extensions
     module Date
       def to_mongo(value)
-        if value.nil? || value == ''
+        if value.nil? || (value.instance_of?(String) && '' === value)
           nil
         else
-          date = value.is_a?(::Date) || value.is_a?(::Time) ? value : ::Date.parse(value.to_s)
+          date = value.instance_of?(::Date) || value.instance_of?(::Time) ? value : ::Date.parse(value.to_s)
           ::Time.utc(date.year, date.month, date.day)
         end
       rescue
@@ -14,7 +14,7 @@ module MongoMapper
       end
 
       def from_mongo(value)
-        value.to_date if value.present?
+        value.to_date if value
       end
     end
   end

data/lib/mongo_mapper/extensions/integer.rb

@@ -10,10 +10,14 @@ module MongoMapper
           value_to_i
         end
       end
+
+      def from_mongo(value)
+        value && value.to_i
+      end
     end
   end
 end
 
 class Integer
   extend MongoMapper::Extensions::Integer
-end
+end

data/lib/mongo_mapper/extensions/kernel.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# :nocov:
 module Kernel
   # Returns the object's singleton class.
   def singleton_class
@@ -7,3 +8,4 @@ module Kernel
     end
   end unless respond_to?(:singleton_class) # exists in 1.9.2
 end
+# :nocov:

data/lib/mongo_mapper/extensions/ordered_hash.rb

@@ -0,0 +1,23 @@
+# encoding: UTF-8
+# This class exists to make sure that Hash's extensions don't end up giving us unordered hashes.
+# :nocov:
+if RUBY_VERSION < "1.9"
+  module MongoMapper
+    module Extensions
+      module OrderedHash
+        def to_mongo(value)
+          value
+        end
+
+        def from_mongo(value)
+          value
+        end
+      end
+    end
+  end
+
+  class BSON::OrderedHash
+    extend MongoMapper::Extensions::OrderedHash
+  end
+end
+# :nocov:

data/lib/mongo_mapper/extensions/string.rb

@@ -3,11 +3,11 @@ module MongoMapper
   module Extensions
     module String
       def to_mongo(value)
-        value.nil? ? nil : value.to_s
+        value && value.to_s
       end
 
       def from_mongo(value)
-        value.nil? ? nil : value.to_s
+        value && value.to_s
       end
     end
   end

data/lib/mongo_mapper/extensions/time.rb

@@ -1,20 +1,22 @@
+require 'active_support/core_ext/time/zones'
+
 # encoding: UTF-8
 module MongoMapper
   module Extensions
     module Time
       def to_mongo(value)
-        if value.nil? || value == ''
+        if !value || '' == value
           nil
         else
-          time_class = ::Time.try(:zone).present? ? ::Time.zone : ::Time
+          time_class = ::Time.zone || ::Time
           time = value.is_a?(::Time) ? value : time_class.parse(value.to_s)
-          at(time.to_f).utc if time # ensure milliseconds are preserved with to_f (issue #308)
+          at(time.to_i, time.usec / 1000 * 1000).utc
         end
       end
 
       def from_mongo(value)
-        if ::Time.try(:zone).present? && value.present?
-          value.in_time_zone(::Time.zone)
+        if value and zone = ::Time.zone
+          value.in_time_zone(zone)
         else
           value
         end

data/lib/mongo_mapper/middleware/identity_map.rb

@@ -9,15 +9,14 @@ module MongoMapper
     # You have to insert after callbacks so the entire request is wrapped.
     class IdentityMap
       class Body
+        extend Forwardable
+        def_delegator :@target, :each
+
         def initialize(target, original)
           @target   = target
           @original = original
         end
 
-        def each(&block)
-          @target.each(&block)
-        end
-
         def close
           @target.close if @target.respond_to?(:close)
         ensure

data/lib/mongo_mapper/plugins.rb

@@ -14,7 +14,7 @@ module MongoMapper
       plugins << mod
     end
 
-    def included(base = nil, &block)
+    def included(base = nil)
       direct_descendants << base if base
       super
     end

data/lib/mongo_mapper/plugins/associations.rb

@@ -27,15 +27,22 @@ module MongoMapper
         end
 
         def associations=(hash)
+          @embedded_associations = nil
           @associations = hash
         end
 
+        def embedded_associations
+          @embedded_associations ||= associations.values.select { |assoc| assoc.embeddable? }
+        end
+
         def associations_module_defined?
+          # :nocov:
           if method(:const_defined?).arity == 1 # Ruby 1.9 compat check
             const_defined?('MongoMapperAssociations')
           else
             const_defined?('MongoMapperAssociations', false)
           end
+          # :nocov:
         end
 
         def associations_module
@@ -51,6 +58,7 @@ module MongoMapper
 
         private
           def create_association(association)
+            @embedded_associations = nil
             associations[association.name] = association
             association.setup(self)
           end
@@ -61,7 +69,7 @@ module MongoMapper
       end
 
       def embedded_associations
-        associations.values.select { |assoc| assoc.embeddable? }
+        self.class.embedded_associations
       end
 
       def build_proxy(association)
@@ -72,10 +80,8 @@ module MongoMapper
       end
 
       def get_proxy(association)
-        unless proxy = self.instance_variable_get(association.ivar)
-          proxy = build_proxy(association)
-        end
-        proxy
+        proxy = self.instance_variable_get(association.ivar) if instance_variable_defined?(association.ivar)
+        proxy ||= build_proxy(association)
       end
 
       def save_to_collection(options={})