mongo_odm 0.2.3 → 0.2.4

data/Gemfile

@@ -1,16 +1,16 @@
 # Use `bundle install` in order to install these gems
 source 'http://rubygems.org'
 
-gem "activesupport", "~>3.0.0.rc2"
-gem "activemodel", "~>3.0.0.rc2"
-gem "mongo", "~>1.0.8"
-gem "bson_ext", "~>1.0.5"
-gem "tzinfo", "~>0.3.23"
+gem "activesupport", "~>3.0.3"
+gem "activemodel", "~>3.0.3"
+gem "mongo", "~>1.2.0"
+gem "bson_ext", "~>1.2.0"
+gem "tzinfo", "~>0.3.24"
 
 group :development do
-  gem 'jeweler', '~>1.4.0'
-  gem 'yard', '~>0.5.8'
-  gem 'rcov', '~>0.9.8'
-  gem 'rspec', '~>2.0.0.beta.20'
+  gem 'jeweler', '~>1.5.2'
+  gem 'yard', '~>0.6.4'
+  gem 'rcov', '~>0.9.9'
+  gem 'rspec', '2.4.0'
   gem 'watchr', '~>0.7'
 end

data/Gemfile.lock

@@ -1,51 +1,48 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.0.rc2)
-      activesupport (= 3.0.0.rc2)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activesupport (3.0.0.rc2)
-    bson (1.0.6)
-    bson_ext (1.0.6)
+      i18n (~> 0.4)
+    activesupport (3.0.3)
+    bson (1.2.0)
+    bson_ext (1.2.0)
     builder (2.1.2)
     diff-lcs (1.1.2)
-    gemcutter (0.6.1)
     git (1.2.5)
-    i18n (0.4.1)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
+    i18n (0.5.0)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
       git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
-    mongo (1.0.8)
-      bson (>= 1.0.5)
-    rcov (0.9.8)
-    rspec (2.0.0.beta.20)
-      rspec-core (= 2.0.0.beta.20)
-      rspec-expectations (= 2.0.0.beta.20)
-      rspec-mocks (= 2.0.0.beta.20)
-    rspec-core (2.0.0.beta.20)
-    rspec-expectations (2.0.0.beta.20)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.20)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    tzinfo (0.3.23)
+      rake
+    mongo (1.2.0)
+      bson (>= 1.2.0)
+    rake (0.8.7)
+    rcov (0.9.9)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    tzinfo (0.3.24)
     watchr (0.7)
-    yard (0.5.8)
+    yard (0.6.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (~> 3.0.0.rc2)
-  activesupport (~> 3.0.0.rc2)
-  bson_ext (~> 1.0.5)
-  jeweler (~> 1.4.0)
-  mongo (~> 1.0.8)
-  rcov (~> 0.9.8)
-  rspec (~> 2.0.0.beta.20)
-  tzinfo (~> 0.3.23)
+  activemodel (~> 3.0.3)
+  activesupport (~> 3.0.3)
+  bson_ext (~> 1.2.0)
+  jeweler (~> 1.5.2)
+  mongo (~> 1.2.0)
+  rcov (~> 0.9.9)
+  rspec (= 2.4.0)
+  tzinfo (~> 0.3.24)
   watchr (~> 0.7)
-  yard (~> 0.5.8)
+  yard (~> 0.6.4)

data/README.rdoc

@@ -12,12 +12,15 @@ Flexible persistence module for any Ruby class to MongoDB.
  * Automanage type conversions and default values
  * Keep it as simple as possible
  
-Other Mongo ODMs don't require to explicitly define the possible schema of a model. I think this is necessary to help with type conversions (instanciate the right class for each attribute, and convert them to a Mongo compatible type when persisted). But it's also possible to fill attributes with valid Mongo values without defining them as fields, and only the attributes whose values are different than the default values are stored as part of the document when saved.
- 
 = Basics
 
+Other Mongo ODMs don't require to explicitly define the possible schema of a model. I think this is necessary to help with type conversions (instanciate the right class for each attribute, and convert them to a Mongo compatible type when persisted). But it's also possible to fill attributes with valid Mongo values without defining them as fields, and only the attributes whose values are different than the default values are stored as part of the document when saved.
+
 A piece of code is better than a hundred of words:
 
+  # Establish connection; it uses localhost:27017 and database 'test' if not specified
+  MongoODM.config = {:host => 'localhost', :port => 27017, :database => "my_tests"}
+
   class Shape
     include MongoODM::Document
     field :name
@@ -88,6 +91,20 @@ Take a look at the Mongo Ruby driver documentation for the 'find' method to see
 
 http://api.mongodb.org/ruby/1.0.8/Mongo/Collection.html#find-instance_method
 
+= Collections
+
+By default, mongo_odm stores data on a collection with the same name than the class, pluralized. In case of class inheritance, it uses the name of the parent class. You can override this behavior by setting a different collection for a class:
+
+  class Shape
+    set_collection 'my_shapes'
+  end
+  
+Alternatively, you can pass a MongoODM::Collection instance to set_collection, to indicate not only a collection name, but also a different connection and/or database:
+
+  class Shape
+    set_collection MongoODM::Collection.new(MongoODM.connection.db('another_database'), 'my_shapes')
+  end
+
 = Associations
 
 To embed just one copy of another class, just define the field type of that class. The class just need to respond to the "type_cast" class method and the "to_mongo" instance method. Example:

data/lib/mongo_odm/criteria.rb

@@ -2,17 +2,36 @@
 module MongoODM
 
   class Criteria
+    delegate :inspect, :to_xml, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to => :to_a
+    
     def initialize(klass, selector = {}, opts = {})
       @klass, @selector, @opts = klass, selector, opts
+      @loaded = false
     end
     
     def find(selector = {}, opts = {})
       _merge_criteria(selector, opts)
     end
     
-    def method_missing(method_name, *args)
-      if @klass.methods.include?(method_name)
-        result = @klass.send(method_name, *args)
+    def loaded?
+      @loaded
+    end
+    
+    def ==(other)
+      case other
+      when Criteria
+        other.instance_variable_get("@selector") == @selector &&
+        other.instance_variable_get("@opts")     == @opts
+      when Array
+        to_a == other.to_a
+      end
+    end
+    
+    def method_missing(method_name, *args, &block)
+      if Array.method_defined?(method_name)
+        to_a.send(method_name, *args, &block)
+      elsif @klass.methods.include?(method_name)
+        result = @klass.send(method_name, *args, &block)
         if result.is_a?(Criteria)
           selector = result.instance_variable_get("@selector")
           opts = result.instance_variable_get("@opts")

data/lib/mongo_odm/document.rb

@@ -7,34 +7,29 @@ module MongoODM
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
 
-    #autoload :Associations
     autoload :AttributeMethods
     autoload :Callbacks
     autoload :Fields
     autoload :Inspect
     autoload :Persistence
     autoload :Validations
+    autoload :Equality
 
     included do
       include ActiveModel::Conversion
-      include ActiveModel::Serializers::JSON
-      include ActiveModel::Serializers::Xml
       include ActiveModel::Observing
       include ActiveModel::Translation
-      include MongoODM::Document::Persistence
-      include MongoODM::Document::AttributeMethods
-      include MongoODM::Document::Fields
-      include MongoODM::Document::Inspect
-      #include MongoODM::Document::Associations
-      include MongoODM::Document::Callbacks
-      include MongoODM::Document::Validations
-    end
-    
-    module InstanceMethods
-      def ==(other)
-        return false unless other.is_a?(MongoODM::Document)
-        attributes == other.attributes
-      end
+
+      include ActiveModel::Serializers::JSON
+      include ActiveModel::Serializers::Xml
+
+      include Document::Persistence
+      include Document::AttributeMethods
+      include Document::Fields
+      include Document::Inspect
+      include Document::Callbacks
+      include Document::Validations
+      include Document::Equality
     end
 
   end

data/lib/mongo_odm/document/attribute_methods.rb

@@ -17,12 +17,12 @@ module MongoODM
 
       included do
         include ActiveModel::AttributeMethods
-        include MongoODM::Document::AttributeMethods::Read
-        include MongoODM::Document::AttributeMethods::Write
-        include MongoODM::Document::AttributeMethods::Query
-        include MongoODM::Document::AttributeMethods::Dirty
-        include MongoODM::Document::AttributeMethods::Inspect
-        include MongoODM::Document::AttributeMethods::Localization
+        include AttributeMethods::Read
+        include AttributeMethods::Write
+        include AttributeMethods::Query
+        include AttributeMethods::Dirty
+        include AttributeMethods::Inspect
+        include AttributeMethods::Localization
       end
 
       module InstanceMethods

data/lib/mongo_odm/document/equality.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+module MongoODM
+  module Document
+    module Equality
+
+      extend ActiveSupport::Concern
+
+      module InstanceMethods
+        def eql?(other)
+          other.is_a?(self.class) && _id == other._id && attributes == other.attributes
+        end
+        alias :== :eql?
+        
+        def hash
+          _id.hash
+        end
+      end
+
+    end
+  end
+end

data/lib/mongo_odm/document/persistence.rb

@@ -16,6 +16,10 @@ module MongoODM
         def new_record?
           id.nil?
         end
+        
+        def persisted?
+          !new_record?
+        end
       
         def reload
           self.load_attributes_or_defaults(self.class.find_one(:_id => id).attributes) unless new_record?
@@ -56,6 +60,11 @@ module MongoODM
       end
     
       module ClassMethods
+        delegate :collection, :db, :hint, :hint=, :pk_factory, :[], :count, :create_index, :distinct,
+                 :drop, :drop_index, :drop_indexes, :find_and_modify, :find_one, :group,
+                 :index_information, :insert, :<<, :map_reduce, :mapreduce, :options, :remove, :rename,
+                 :save, :stats, :update, :to => :collection
+        
         def collection
           @collection ||= if self.superclass.included_modules.include?(MongoODM::Document)
                             self.superclass.collection
@@ -92,11 +101,6 @@ module MongoODM
           new(value)
         end
 
-        extend Forwardable
-        def_delegators :collection, :db, :hint, :hint=, :pk_factory, :[], :count, :create_index, :distinct,
-                       :drop, :drop_index, :drop_indexes, :find_and_modify, :find_one, :group,
-                       :index_information, :insert, :<<, :map_reduce, :mapreduce, :options, :remove, :rename,
-                       :save, :stats, :update
       end
 
     end

data/lib/mongo_odm/version.rb

@@ -2,6 +2,6 @@
 module MongoODM
   VERSION_MAJOR = "0"
   VERSION_MINOR = "2"
-  VERSION_BUILD = "3"
+  VERSION_BUILD = "4"
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_BUILD}"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Carlos Paramio
@@ -14,11 +14,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +02:00
+date: 2011-01-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -27,14 +28,13 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 0
-        - rc2
-        version: 3.0.0.rc2
+        - 3
+        version: 3.0.3
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,14 +43,13 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 0
-        - rc2
-        version: 3.0.0.rc2
+        - 3
+        version: 3.0.3
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mongo
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,14 +57,14 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
+        - 2
         - 0
-        - 8
-        version: 1.0.8
+        version: 1.2.0
   type: :runtime
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: bson_ext
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -73,14 +72,14 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
+        - 2
         - 0
-        - 5
-        version: 1.0.5
+        version: 1.2.0
   type: :runtime
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: tzinfo
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -89,13 +88,13 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 23
-        version: 0.3.23
+        - 24
+        version: 0.3.24
   type: :runtime
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -103,14 +102,14 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 4
-        - 0
-        version: 1.4.0
+        - 5
+        - 2
+        version: 1.5.2
   type: :development
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: yard
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -118,14 +117,14 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 5
-        - 8
-        version: 0.5.8
+        - 6
+        - 4
+        version: 0.6.4
   type: :development
-  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rcov
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -134,30 +133,28 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 8
-        version: 0.9.8
+        - 9
+        version: 0.9.9
   type: :development
-  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
+        - 4
         - 0
-        - 0
-        - beta
-        - 20
-        version: 2.0.0.beta.20
+        version: 2.4.0
   type: :development
-  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: watchr
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -168,8 +165,156 @@ dependencies:
         - 7
         version: "0.7"
   type: :development
-  prerelease: false
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 3
+        version: 3.0.3
+  type: :runtime
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: activemodel
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 3
+        version: 3.0.3
+  type: :runtime
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: mongo
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  type: :runtime
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  type: :runtime
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: tzinfo
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 24
+        version: 0.3.24
+  type: :runtime
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
+  type: :development
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 4
+        version: 0.6.4
+  type: :development
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 9
+        version: 0.9.9
+  type: :development
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 4
+        - 0
+        version: 2.4.0
+  type: :development
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  name: watchr
+  prerelease: false
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        version: "0.7"
+  type: :development
+  version_requirements: *id020
 description: mongo_odm is a flexible persistence module for any Ruby class to MongoDB.
 email: carlos@evolve.st
 executables: []
@@ -191,9 +336,6 @@ files:
 - lib/mongo_odm/criteria.rb
 - lib/mongo_odm/cursor.rb
 - lib/mongo_odm/document.rb
-- lib/mongo_odm/document/associations.rb
-- lib/mongo_odm/document/associations/has_many.rb
-- lib/mongo_odm/document/associations/has_one.rb
 - lib/mongo_odm/document/attribute_methods.rb
 - lib/mongo_odm/document/attribute_methods/dirty.rb
 - lib/mongo_odm/document/attribute_methods/inspect.rb
@@ -202,6 +344,7 @@ files:
 - lib/mongo_odm/document/attribute_methods/read.rb
 - lib/mongo_odm/document/attribute_methods/write.rb
 - lib/mongo_odm/document/callbacks.rb
+- lib/mongo_odm/document/equality.rb
 - lib/mongo_odm/document/fields.rb
 - lib/mongo_odm/document/inspect.rb
 - lib/mongo_odm/document/persistence.rb
@@ -234,8 +377,8 @@ homepage: http://github.com/carlosparamio/mongo_odm
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/lib/mongo_odm/document/associations.rb

@@ -1,32 +0,0 @@
-# encoding: utf-8
-
-module MongoODM
-  module Document
-    module Associations
-
-      extend ActiveSupport::Concern
-      extend ActiveSupport::Autoload
-      
-      autoload :HasOne
-      autoload :HasMany
-
-      included do
-        class_inheritable_accessor :associations
-        self.associations = {}
-
-        include MongoODM::Document::Associations::HasOne
-        include MongoODM::Document::Associations::HasMany
-      end
-    
-      module InstanceMethods
-        def associations
-          self.class.associations
-        end
-      end
-    
-      module ClassMethods
-      end
-    
-    end
-  end
-end

data/lib/mongo_odm/document/associations/has_many.rb

@@ -1,19 +0,0 @@
-# encoding: utf-8
-
-module MongoODM
-  module Document
-    module Associations
-      module HasMany
-
-        extend ActiveSupport::Concern
-    
-        module ClassMethods
-          def has_many
-            
-          end
-        end
-
-      end
-    end
-  end
-end

data/lib/mongo_odm/document/associations/has_one.rb

@@ -1,19 +0,0 @@
-# encoding: utf-8
-
-module MongoODM
-  module Document
-    module Associations
-      module HasOne
-
-        extend ActiveSupport::Concern
-    
-        module ClassMethods
-          def has_one
-            
-          end
-        end
-
-      end
-    end
-  end
-end