mongo_odm 0.1.9 → 0.2.0

data/Gemfile

@@ -1,16 +1,16 @@
 # Use `bundle install` in order to install these gems
 source 'http://rubygems.org'
 
-gem "activesupport", "3.0.0.beta3"
-gem "activemodel", "3.0.0.beta3"
-gem "mongo", "~>1.0.2"
-gem "bson_ext", "~>1.0.1"
-gem "tzinfo", "~>0.3.22"
+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"
 
 group :development do
-  gem 'jeweler', '1.4.0'
-  gem 'yard', '0.5.6'
-  gem 'rcov', '0.9.8'
-  gem 'rspec', '2.0.0.beta.12'
-  gem 'watchr', '~>0.6'
+  gem 'jeweler', '~>1.4.0'
+  gem 'yard', '~>0.5.8'
+  gem 'rcov', '~>0.9.8'
+  gem 'rspec', '~>2.0.0.beta.20'
+  gem 'watchr', '~>0.7'
 end

data/Gemfile.lock

@@ -0,0 +1,51 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.0.rc2)
+      activesupport (= 3.0.0.rc2)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activesupport (3.0.0.rc2)
+    bson (1.0.6)
+    bson_ext (1.0.6)
+    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)
+      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)
+    watchr (0.7)
+    yard (0.5.8)
+
+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)
+  watchr (~> 0.7)
+  yard (~> 0.5.8)

data/README.rdoc

@@ -4,14 +4,19 @@ Flexible persistence module for any Ruby class to MongoDB.
 
 = Why another ODM for MongoDB?
 
-MongoMapper, Mongoid, and others, are amazing projects. But I still think it's too much for an ODM for MongoDB.
-The Mongo Ruby driver allows you to query the database with a nice interface, the only required thing is a way to instanciate
-the results as objects of predefined classes, so you can encapsulate all the logic under a particular class and don't have to
-worry about type conversions.
-
+ * Fully compatible with Rails 3
+ * Use the Mongo ruby driver when possible (query syntax, cursors, indexes management...)
+ * Allow lazy loading of collections and queries nesting (concatenation of 'find' calls) to emulate ActiveRecord 3
+ * No association methods (for now): Just declare your own methods on models to fetch the related items
+ * Give support for dirty objects, validations, etc. through ActiveModel 3
+ * 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
 
-A piece of code is better than a hundred words:
+A piece of code is better than a hundred of words:
 
   class Shape
     include MongoODM::Document
@@ -32,8 +37,7 @@ A piece of code is better than a hundred words:
   #   "name"   : "Point"
   # }
   
-  class Circle < Shape
-    set_collection :shapes # Because we don't want them to be saved on a separated collection
+  class Circle < Shape # This items are stored on the 'shapes' collection
     field :radius, Float, :default => 1.0
   end
   
@@ -194,10 +198,10 @@ To reference the associated objects instead of embed them, for now you need to d
 
   class Flag
     include MongoODM::Document
-    field :colors, Array
+    field :colors_ids, Array
     
     def colors
-      Color.find(:_id => {'$in' => read_attribute(:colors)})
+      Color.find(:_id => {'$in' => colors_ids})
     end
   end
 
@@ -209,18 +213,18 @@ To reference the associated objects instead of embed them, for now you need to d
   Color.new(:name => "red").save
   Color.new(:name => "green").save
 
-  flag = Flag.new(:colors => [ Color.find_one(:name => "red").id, Color.find_one(:name => "green").id ])
+  flag = Flag.new(:colors_ids => [ Color.find_one(:name => "red").id, Color.find_one(:name => "green").id ])
   flag.save
 
   # Saves:
-  # { "_id"    : ObjectId("4be96c15715dd2c4be000003"),
-  #   "_class" : "Flag",
-  #   "colors" : [ ObjectId("4be96bfe715dd2c4be000001"), ObjectId("4be96c08715dd2c4be000002") ]
+  # { "_id"        : ObjectId("4be96c15715dd2c4be000003"),
+  #   "_class"     : "Flag",
+  #   "colors_ids" : [ ObjectId("4be96bfe715dd2c4be000001"), ObjectId("4be96c08715dd2c4be000002") ]
   # }
   
   flag.colors
   
-  # Returns a cursor
+  # Returns a criteria object that wraps a cursor
   
   flag.colors.to_a
   
@@ -248,4 +252,10 @@ All the dirty object methods defined in ActiveModel::Dirty are included
 
 = Copyright
 
-Copyright © 2010 Carlos Paramio. See LICENSE for details.
+Copyright © 2010 Carlos Paramio. See LICENSE for details.
+
+= Credits
+
+Carlos Paramio
+
+http://h1labs.com

data/Rakefile

@@ -15,7 +15,7 @@ if Gem.available? 'jeweler'
     gemspec.authors = ["Carlos Paramio"]
     gemspec.files =  FileList["[A-Z]*", "{lib,spec}/**/*"]
     gemspec.version = MongoODM::VERSION
-    bundle = Bundler::Definition.from_gemfile('Gemfile')
+    bundle = Bundler.definition
     bundle.dependencies.each do |dependency|
       if dependency.groups.include?(:default)
         gemspec.add_dependency(dependency.name, dependency.requirement.to_s)

data/lib/mongo_odm.rb

@@ -8,7 +8,6 @@ require 'active_model'
 module MongoODM
 
   extend ActiveSupport::Autoload
-  include ActiveSupport::Configurable
 
   autoload :VERSION
   autoload :Criteria
@@ -29,9 +28,13 @@ module MongoODM
     connection.db(config[:database] || 'test')
   end
   
+  def self.config
+    @_config ||= {}
+  end
+  
   def self.config=(value)
     self.connection = nil
-    super
+    @_config = value
   end
   
   def self.instanciate(value)

data/lib/mongo_odm/core_ext/conversions.rb

@@ -14,24 +14,11 @@ require 'active_support/core_ext/time/conversions'
 #  * An attribute of the same class is sent to the Mongo driver
 
 # @private
-class Mongo::ObjectID
+class BSON::ObjectId
   def self.type_cast(value)
     return nil if value.nil?
-    return value if value.is_a?(Mongo::ObjectID)
-    value.to_s
-  end
-  
-  def to_mongo
-    self
-  end
-end
-
-# @private
-class BSON::ObjectID
-  def self.type_cast(value)
-    return nil if value.nil?
-    return value if value.is_a?(BSON::ObjectID)
-    value.to_s
+    return value if value.is_a?(BSON::ObjectId)
+    BSON::ObjectId(value)
   end
   
   def to_mongo
@@ -66,8 +53,12 @@ end
 # @private
 class Symbol
   def self.type_cast(value)
-    return nil if value.nil?
-    value.to_s.intern
+    case value
+      when nil then nil
+      when Symbol then value
+      when String then value.intern
+      else value.inspect.intern
+    end
   end
   
   def to_mongo
@@ -114,8 +105,11 @@ end
 # @private
 class String
   def self.type_cast(value)
-    return nil if value.nil?
-    value.to_s
+    case value
+      when nil then nil
+      when String, Symbol then value.to_s
+      else value.inspect
+    end
   end
   
   def to_mongo

data/lib/mongo_odm/document/attribute_methods/dirty.rb

@@ -39,7 +39,7 @@ module MongoODM
       
           def reload_with_dirty(*args)
             reload_without_dirty(*args).tap do
-              previously_changed_attributes.clear
+              @previously_changed = nil
               changed_attributes.clear
             end
           end

data/lib/mongo_odm/document/inspect.rb

@@ -19,7 +19,7 @@ module MongoODM
         end
       
         def inspect
-          "#<#{self.class.name} #{attributes.except(*private_attribute_names).keys.map{|k| inspect_attribute(k)}.join(", ")}>"
+          "#<#{self.class.name} #{attributes.except(*private_attribute_names).keys.sort.map{|k| inspect_attribute(k)}.join(", ")}>"
         end
       end
 

data/lib/mongo_odm/document/persistence.rb

@@ -23,7 +23,7 @@ module MongoODM
       
         # Save a document to its collection.
         #
-        # @return [ObjectID] the _id of the saved document.
+        # @return [ObjectId] the _id of the saved document.
         #
         # @option opts [Boolean] :safe (+false+) 
         #   If true, check that the save succeeded. OperationFailure
@@ -48,7 +48,7 @@ module MongoODM
         end
       
         def to_mongo
-          attributes.inject({}.with_indifferent_access) do |attrs, (key, value)|
+          attributes.inject({}) do |attrs, (key, value)|
             attrs[key] = value.to_mongo unless value.nil? # self.class.fields[key].default == value
             attrs
           end

data/lib/mongo_odm/version.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module MongoODM
   VERSION_MAJOR = "0"
-  VERSION_MINOR = "1"
-  VERSION_BUILD = "9"
+  VERSION_MINOR = "2"
+  VERSION_BUILD = "0"
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_BUILD}"
 end

data/spec/mongo_odm/core_ext/conversions_spec.rb

@@ -3,6 +3,10 @@ require "spec_helper"
 
 describe "Conversions" do
   
+  before do
+    Time.zone = 'UTC'
+  end
+  
   describe Array do
 
     describe ".type_cast" do
@@ -74,6 +78,8 @@ describe "Conversions" do
       
       it "tries to convert any other value to a symbol" do
         Symbol.type_cast("test").should == :test
+        Symbol.type_cast(1).should == :"1"
+        Symbol.type_cast(3.14).should == :"3.14"
         Symbol.type_cast([1, 2]).should == :"[1, 2]"
         Symbol.type_cast({:a => 1, :b => 2}).should == :"{:a=>1, :b=>2}"
       end
@@ -199,13 +205,13 @@ describe "Conversions" do
   describe Date do
     
     describe ".type_cast" do
-      
+            
       it "returns nil when called with nil" do
         Date.type_cast(nil).should == nil
       end
       
       it "tries to convert any other value to a date" do
-        Date.type_cast("1/2/1980").should == Date.new(1980, 2, 1)
+        Date.type_cast("2/1/1980").should == Date.new(1980, 1, 2)
       end
       
     end
@@ -229,8 +235,8 @@ describe "Conversions" do
         DateTime.type_cast(nil).should == nil
       end
       
-      it "tries to convert any other value to a date" do
-        DateTime.type_cast("1/2/1980 11:30").should == DateTime.new(1980, 2, 1, 11, 30)
+      it "tries to convert any other value to a datetime" do
+        DateTime.type_cast("2/1/1980 11:30").should == DateTime.new(1980, 1, 2, 11, 30)
       end
       
     end
@@ -306,8 +312,8 @@ describe "Conversions" do
         Time.type_cast(nil).should == nil
       end
       
-      it "tries to convert any other value to a date" do
-        Time.type_cast("1/2/1980 11:30").should == Time.utc(1980, 2, 1, 11, 30)
+      it "tries to convert any other value to a timestamp" do
+        Time.type_cast("2/1/1980 11:30").should == Time.utc(1980, 1, 2, 11, 30)
       end
       
     end

data/spec/mongo_odm/document/inspect_spec.rb

@@ -19,7 +19,7 @@ describe MongoODM::Document::Inspect do
   describe "#inspect" do
     it "returns a string with the name of the class that includes the MongoODM::Document module and a list of its attributes with values" do
       circle = Circle.new(:x => 10, :y => 12.5, :radius => 1.2)
-      circle.inspect.should == "#<Circle x: 10.0, y: 12.5, color: nil, radius: 1.2>"
+      circle.inspect.should == "#<Circle color: nil, radius: 1.2, x: 10.0, y: 12.5>"
     end
   end
   

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 9
-  version: 0.1.9
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Carlos Paramio
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 +02:00
+date: 2010-08-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,14 +22,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - rc2
+        version: 3.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -38,14 +38,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - rc2
+        version: 3.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -59,8 +59,8 @@ dependencies:
         segments: 
         - 1
         - 0
-        - 2
-        version: 1.0.2
+        - 8
+        version: 1.0.8
   type: :runtime
   prerelease: false
   version_requirements: *id003
@@ -74,8 +74,8 @@ dependencies:
         segments: 
         - 1
         - 0
-        - 1
-        version: 1.0.1
+        - 5
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: *id004
@@ -89,8 +89,8 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 22
-        version: 0.3.22
+        - 23
+        version: 0.3.23
   type: :runtime
   prerelease: false
   version_requirements: *id005
@@ -99,7 +99,7 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -114,13 +114,13 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 5
-        - 6
-        version: 0.5.6
+        - 8
+        version: 0.5.8
   type: :development
   prerelease: false
   version_requirements: *id007
@@ -129,7 +129,7 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -144,15 +144,15 @@ dependencies:
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 12
-        version: 2.0.0.beta.12
+        - 20
+        version: 2.0.0.beta.20
   type: :development
   prerelease: false
   version_requirements: *id009
@@ -165,8 +165,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 6
-        version: "0.6"
+        - 7
+        version: "0.7"
   type: :development
   prerelease: false
   version_requirements: *id010
@@ -181,6 +181,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile