mongo_odm 0.1.8 → 0.1.9

data/Gemfile

@@ -1,3 +1,4 @@
+# Use `bundle install` in order to install these gems
 source 'http://rubygems.org'
 
 gem "activesupport", "3.0.0.beta3"
@@ -6,6 +7,10 @@ gem "mongo", "~>1.0.2"
 gem "bson_ext", "~>1.0.1"
 gem "tzinfo", "~>0.3.22"
 
-group :test do
-  gem 'rspec', '~>1.3.0'
+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'
 end

data/Rakefile

@@ -4,6 +4,7 @@ require 'rake'
 ## gem building
 require File.dirname(__FILE__) + "/lib/mongo_odm/version.rb"
 if Gem.available? 'jeweler'
+  require 'bundler'
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "mongo_odm"
@@ -14,11 +15,14 @@ if Gem.available? 'jeweler'
     gemspec.authors = ["Carlos Paramio"]
     gemspec.files =  FileList["[A-Z]*", "{lib,spec}/**/*"]
     gemspec.version = MongoODM::VERSION
-    gemspec.add_dependency 'activesupport', ['3.0.0.beta3']
-    gemspec.add_dependency 'activemodel', ['3.0.0.beta3']
-    gemspec.add_dependency 'mongo', ['1.0.1']
-    gemspec.add_dependency 'bson', ['1.0.1']
-    gemspec.add_dependency 'bson_ext', ['1.0.1']
+    bundle = Bundler::Definition.from_gemfile('Gemfile')
+    bundle.dependencies.each do |dependency|
+      if dependency.groups.include?(:default)
+        gemspec.add_dependency(dependency.name, dependency.requirement.to_s)
+      elsif dependency.groups.include?(:development)
+        gemspec.add_development_dependency(dependency.name, dependency.requirement.to_s)
+      end
+    end
   end
   Jeweler::GemcutterTasks.new
 else
@@ -27,19 +31,18 @@ end
 
 ## rspec tasks
 if Gem.available? 'rspec'
-  require 'spec/rake/spectask'
+  require "rspec"
+  require "rspec/core/rake_task"
   desc "Run all specs"
-  Spec::Rake::SpecTask.new('spec') do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
+  Rspec::Core::RakeTask.new(:spec) do |spec|
+    spec.pattern = "spec/**/*_spec.rb"
   end
   
   ## rcov task
   if Gem.available? 'rcov'
     require 'rcov/rcovtask'
-    Spec::Rake::SpecTask.new(:rcov) do |spec|
-      spec.libs << "lib" << "spec"
+    Rspec::Core::RakeTask.new(:rcov) do |spec|
       spec.pattern = "spec/**/*_spec.rb"
-      spec.spec_opts = ["--options", "spec/spec.opts"]
       spec.rcov = true
     end
   end
@@ -51,7 +54,7 @@ end
 if Gem.available? 'yard'
   require 'yard'
   YARD::Rake::YardocTask.new do |yard|
-    docfiles = FileList['lib/**/*.rb', 'README.rdoc']
+    docfiles = FileList['lib/**/*.rb']
     yard.files = docfiles
     yard.options = ["--no-private"]
   end

data/lib/mongo_odm.rb

@@ -11,6 +11,7 @@ module MongoODM
   include ActiveSupport::Configurable
 
   autoload :VERSION
+  autoload :Criteria
   autoload :Cursor
   autoload :Collection
   autoload :Document
@@ -34,15 +35,12 @@ module MongoODM
   end
   
   def self.instanciate(value)
-    return nil if value.nil?
-    return instanciate_doc(value) if value.is_a?(Hash)
-    return value if value.class.included_modules.include?(MongoODM::Document)
+    return value if value.is_a?(MongoODM::Document)
+    if value.is_a?(Hash)
+      klass = value["_class"] || value[:_class]
+      return klass.constantize.new(value) if klass
+    end
     value.class.type_cast(value.to_mongo)
   end
-  
-  def self.instanciate_doc(doc)
-    return doc if doc["_class"].nil?
-    doc["_class"].constantize.new(doc)
-  end
 
 end

data/lib/mongo_odm/criteria.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+module MongoODM
+
+  class Criteria
+    def initialize(collection, selector = {}, opts = {})
+      @collection, @selector, @opts = collection, selector, opts
+    end
+    
+    def find(selector = {}, opts = {})
+      @selector.merge!(selector)
+      @opts.merge!(opts)
+      self
+    end
+    
+    def method_missing(method_name, *args)
+      @collection.find(@selector, @opts).send(method_name, *args)
+    end
+  end
+
+end

data/lib/mongo_odm/cursor.rb

@@ -4,7 +4,7 @@ module MongoODM
   class Cursor < Mongo::Cursor  
     def next_document
       doc = super
-      MongoODM.instanciate_doc(doc)
+      MongoODM.instanciate(doc)
     end
   end
 

data/lib/mongo_odm/document.rb

@@ -7,7 +7,7 @@ module MongoODM
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
 
-    autoload :Associations
+    #autoload :Associations
     autoload :AttributeMethods
     autoload :Callbacks
     autoload :Fields
@@ -25,10 +25,17 @@ module MongoODM
       include MongoODM::Document::AttributeMethods
       include MongoODM::Document::Fields
       include MongoODM::Document::Inspect
-      include MongoODM::Document::Associations
+      #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
+    end
 
   end
 end

data/lib/mongo_odm/document/associations.rb

@@ -25,13 +25,6 @@ module MongoODM
       end
     
       module ClassMethods
-        def associate(type, options)
-          name = options.name.to_s
-          associations[name] = MetaData.new(type, options)
-          define_method(name) { memoized(name) { type.instantiate(self, options) } }
-          define_method("#{name}=") { |object| reset(name) { type.update(object, self, options) } }
-        end
-        protected :associate
       end
     
     end

data/lib/mongo_odm/document/attribute_methods.rb

@@ -12,6 +12,7 @@ module MongoODM
       autoload :Write
       autoload :Query
       autoload :Dirty
+      autoload :Inspect
       autoload :Localization
 
       included do
@@ -20,6 +21,7 @@ module MongoODM
         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
       end
 

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

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+module MongoODM
+  module Document
+    module AttributeMethods
+      module Inspect
+
+        extend ActiveSupport::Concern
+        
+        module InstanceMethods
+          def inspect_attribute(attr_name)
+            "#{attr_name}: #{read_attribute(attr_name).inspect}"
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -10,54 +10,58 @@ module MongoODM
 
         included do
           attribute_method_suffix "_localized?"
-          attribute_method_suffix "_without_localization"
-
-          alias_method_chain :read_attribute, :localization
-          alias_method_chain :write_attribute, :localization
-          alias_method_chain :inspect, :localization
+          attribute_method_suffix "_localized"
+          attribute_method_suffix "_localized="
+          
+          alias_method_chain :inspect_attribute, :localization
         end
         
         module ClassMethods
-          def define_method_attribute_localized?(attr_name)
-            generated_attribute_methods.module_eval("def #{attr_name}_localized?; localized_attribute?('#{attr_name}'); end", __FILE__, __LINE__)
-          end
-          protected :define_method_attribute_localized?
-          
-          def define_method_attribute_without_localization(attr_name)
-            generated_attribute_methods.module_eval("def #{attr_name}_without_localization; read_attribute_without_localization('#{attr_name}'); end", __FILE__, __LINE__)
-          end
-          protected :define_method_attribute_localized?
-        end
-
-        module InstanceMethods
           def localized_attribute?(attr_name)
-            field = self.class.fields[attr_name]
+            field = fields[attr_name]
             localized = field ? !!field.options[:localized] : false
             raise MongoODM::Errors::InvalidLocalizedField.new(field.name, field.type) if localized && field && field.type != Hash
             localized
           end
           
-          def read_attribute_with_localization(attr_name, locale = nil)
+          def define_method_attribute_localized?(attr_name)
+            generated_attribute_methods.module_eval("def #{attr_name}_localized?; self.class.localized_attribute?('#{attr_name}'); end", __FILE__, __LINE__)
+          end
+          protected :define_method_attribute_localized?
+          
+          def define_method_attribute_localized(attr_name)
             if localized_attribute?(attr_name)
-              locale = I18n.locale || I18n.default_locale if locale.nil?
-              (read_attribute_without_localization(attr_name) || {}.with_indifferent_access)[locale]
-            else
-              read_attribute_without_localization(attr_name)
+              generated_attribute_methods.module_eval("def #{attr_name}_localized; read_localized_attribute('#{attr_name}'); end", __FILE__, __LINE__)
             end
           end
-
-          def write_attribute_with_localization(attr_name, value, locale = nil)
+          protected :define_method_attribute_localized
+          
+          def define_method_attribute_localized=(attr_name)
             if localized_attribute?(attr_name)
-              locale = I18n.locale || I18n.default_locale if locale.nil?
-              current_value = read_attribute_without_localization(attr_name) || {}.with_indifferent_access
-              write_attribute_without_localization(attr_name, current_value.merge(locale => value))
-            else
-              write_attribute_without_localization(attr_name, value)
+              generated_attribute_methods.module_eval("def #{attr_name}_localized=(new_value); write_localized_attribute('#{attr_name}', new_value); end", __FILE__, __LINE__)
             end
           end
+          protected :define_method_attribute_localized=
+        end
+
+        module InstanceMethods        
+          def read_localized_attribute(attr_name, locale = nil)
+            locale = I18n.locale || I18n.default_locale if locale.nil?
+            (read_attribute(attr_name) || {}.with_indifferent_access)[locale]
+          end
+
+          def write_localized_attribute(attr_name, value, locale = nil)
+            locale = I18n.locale || I18n.default_locale if locale.nil?
+            current_value = read_attribute(attr_name) || {}.with_indifferent_access
+            write_attribute(attr_name, current_value.merge(locale => value))
+          end
           
-          def inspect_with_localization
-            "#<#{self.class.name} #{attributes.except(*private_attribute_names).keys.map{|k| "#{localized_attribute?(k) ? "#{k}[#{I18n.locale}]" : k}: #{read_attribute(k).inspect}"}.join(", ")}>"
+          def inspect_attribute_with_localization(attr_name)
+            if self.class.localized_attribute?(attr_name)
+              "#{attr_name}[:#{I18n.locale}]: #{read_localized_attribute(attr_name).inspect}"
+            else
+              inspect_attribute_without_localization(attr_name)
+            end
           end
         end
 

data/lib/mongo_odm/document/fields.rb

@@ -23,9 +23,9 @@ module MongoODM
         # @param [Hash] options configuration options.
         # @option options [Object, Proc] :default (nil) a default value for the field, or a lambda to evaluate when providing the default.
         def initialize(name, type, options = {})
-          @options = options.to_options
           @name = name.to_sym
           @type = type
+          @options = options.to_options
         end
 
         # @return [Object] The default value for this field if defined, or nil.

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| "#{k}: #{read_attribute(k).inspect}"}.join(", ")}>"
+          "#<#{self.class.name} #{attributes.except(*private_attribute_names).keys.map{|k| inspect_attribute(k)}.join(", ")}>"
         end
       end
 

data/lib/mongo_odm/document/persistence.rb

@@ -49,7 +49,7 @@ module MongoODM
       
         def to_mongo
           attributes.inject({}.with_indifferent_access) do |attrs, (key, value)|
-            attrs[key] = value.to_mongo unless value.nil?
+            attrs[key] = value.to_mongo unless value.nil? # self.class.fields[key].default == value
             attrs
           end
         end
@@ -57,7 +57,11 @@ module MongoODM
     
       module ClassMethods
         def collection
-          @collection ||= MongoODM::Collection.new(MongoODM.database, name.tableize)
+          @collection ||= if self.superclass.included_modules.include?(MongoODM::Document)
+                            self.superclass.collection
+                          else
+                            MongoODM::Collection.new(MongoODM.database, name.tableize)
+                          end
         end
       
         def set_collection(name_or_collection)
@@ -71,6 +75,10 @@ module MongoODM
                         end
         end
         
+        def find(*args)
+          MongoODM::Criteria.new(collection, *args)
+        end
+        
         def destroy_all(*args)
           documents = find(*args)
           count = documents.count
@@ -86,7 +94,7 @@ module MongoODM
 
         extend Forwardable
         def_delegators :collection, :db, :hint, :hint=, :pk_factory, :[], :count, :create_index, :distinct,
-                       :drop, :drop_index, :drop_indexes, :find, :find_and_modify, :find_one, :group,
+                       :drop, :drop_index, :drop_indexes, :find_and_modify, :find_one, :group,
                        :index_information, :insert, :<<, :map_reduce, :mapreduce, :options, :remove, :rename,
                        :save, :stats, :update
       end

data/lib/mongo_odm/version.rb

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

data/spec/models/02-circle.rb

@@ -2,6 +2,5 @@
 class Circle < Shape
   include MongoODM::Document
 
-  set_collection :shapes
   field :radius, Float, :default => 1.0
 end

data/spec/models/03-big_red_circle.rb

@@ -1,8 +1,7 @@
 # encoding: utf-8
 class BigRedCircle < Circle
   include MongoODM::Document
-  
-  set_collection :shapes
+
   field :radius, Float, :default => 20.0
   field :color, String, :default => "red"
 end

data/spec/mongo_odm/collection_spec.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe MongoODM::Collection do
+    
+end

data/spec/mongo_odm/core_ext/conversions_spec.rb

@@ -12,22 +12,26 @@ describe "Conversions" do
       end
       
       it "tries to convert any other value to an array" do
-        Array.type_cast({:a => 1, :b => 2}).should == [[:a, 1], [:b, 2]]
         Array.type_cast([1, 2]).should == [1, 2]
+        Array.type_cast({:a => 1, :b => 2}).should == [[:a, 1], [:b, 2]]
+      end
+      
+      it "tries to instantiate each of its values, recursively" do
+        Array.type_cast([3.1415, {"_class" => "Shape", "x" => 2.0, "y" => 3.0 } ]).should == [3.1415, Shape.new(:x => 2.0, :y => 3.0)]
+        Array.type_cast(["test", [ {"_class" => "Shape", "x" => 2.0, "y" => 3.0 } ]]).should == ["test", [ Shape.new(:x => 2.0, :y => 3.0) ]]
       end
 
     end
 
     describe "#to_mongo" do
 
-      it "tries to instanciate each of its elements sending MongoODM.instanciate to its classes" do
+      it "tries to convert each of its elements to valid BSON" do
         num = 1
         float = 2.3
         string = "test"
         time = Time.now
         klass = Shape.new
-        [num, float, string, time, klass].each{|i| i.should_receive(:to_mongo).once }
-        [num, float, string, time, klass].to_mongo
+        [num, float, string, time, klass].to_mongo.should == [1, 2.3, "test", time.utc, {"_class"=>"Shape", "x"=>1.0, "y"=>1.0}]
       end
       
     end
@@ -370,6 +374,12 @@ describe "Conversions" do
         Hash.type_cast({:a => 1}).should == {:a => 1}
       end
       
+      it "tries to instantiate each of its keys and values, recursively" do
+        result = Hash.type_cast({"_class" => "Circle", "x" => 2.0, "y" => 3.0, "radius" => 5.0 } => { "test" => {"_class" => "Shape", "x" => 2.0, "y" => 3.0 }} )
+        result.keys.first.should == Circle.new(:x => 2.0, :y => 3.0, :radius => 5.0)
+        result.values.first.values.first.should == Shape.new(:x => 2.0, :y => 3.0)
+      end
+      
     end
     
     describe "#to_mongo" do

data/spec/mongo_odm/cursor_spec.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe MongoODM::Cursor do
+    
+end

data/spec/mongo_odm/document/attribute_methods/dirty_spec.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe MongoODM::Document::AttributeMethods::Dirty do
+    
+end

data/spec/mongo_odm/document/attribute_methods/localization_spec.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe MongoODM::Document::AttributeMethods::Localization do
+    
+end

data/spec/mongo_odm/document/attribute_methods/query_spec.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe MongoODM::Document::AttributeMethods::Query do
+    
+end

data/spec/mongo_odm/document/attribute_methods/read_spec.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe MongoODM::Document::AttributeMethods::Read do
+    
+end

data/spec/mongo_odm/document/attribute_methods/write_spec.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe MongoODM::Document::AttributeMethods::Write do
+    
+end

data/spec/mongo_odm/document/attribute_methods_spec.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe MongoODM::Document::AttributeMethods do
+    
+end

data/spec/mongo_odm/document/callbacks_spec.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe MongoODM::Document::Callbacks do
+    
+end

data/spec/mongo_odm/document/fields_spec.rb

@@ -8,16 +8,12 @@ describe MongoODM::Document::Fields do
     context "with a name and no type" do
       
       before do
-        BlankSlate.field(:testing_no_type)
-      end
-      
-      after do
-        BlankSlate.instance_variable_set(:@fields, nil)
+        class TestingNoType < BlankSlate; field :testing_no_type; end
       end
       
       it "adds a String field to the class" do
-        BlankSlate.fields[:testing_no_type].should be_kind_of(MongoODM::Document::Fields::Field)
-        BlankSlate.fields[:testing_no_type].type.should == String
+        TestingNoType.fields[:testing_no_type].should be_kind_of(MongoODM::Document::Fields::Field)
+        TestingNoType.fields[:testing_no_type].type.should == String
       end
       
     end
@@ -25,12 +21,12 @@ describe MongoODM::Document::Fields do
     context "with a name and a type" do
       
       before do
-        BlankSlate.field(:testing_float, Float)
+        class TestingFloat < BlankSlate; field :testing_float, Float; end
       end
       
       it "adds the typed field to the class" do
-        BlankSlate.fields[:testing_float].should be_kind_of(MongoODM::Document::Fields::Field)
-        BlankSlate.fields[:testing_float].type.should == Float
+        TestingFloat.fields[:testing_float].should be_kind_of(MongoODM::Document::Fields::Field)
+        TestingFloat.fields[:testing_float].type.should == Float
       end
       
     end
@@ -41,51 +37,37 @@ describe MongoODM::Document::Fields do
 
     context "on classes without defined fields" do
       
-      before do
-        @klass = BlankSlate
-      end
-      
       it "returns an empty hash" do
-        @klass.fields.should == {}
+        BlankSlate.fields.should == {}
       end
       
     end
     
     context "on parent classes" do
       
-      before do
-        @klass = Shape
-      end
-      
       it "returns a hash with the defined fields" do
-        expected_fields = [:x, :y, :color]
-        expected_fields.each do |field_name|
-          @klass.fields[field_name].should be_kind_of(MongoODM::Document::Fields::Field)
+        [:x, :y, :color].each do |field_name|
+          Shape.fields[field_name].should be_kind_of(MongoODM::Document::Fields::Field)
         end
       end
       
       it "allows indifferent access to the hash" do
-        @klass.fields[:x].should == @klass.fields["x"]
+        Shape.fields[:x].should == Shape.fields["x"]
       end
       
     end
     
     context "on subclasses" do
       
-      before do
-        @klass = BigRedCircle
-      end
-      
       it "returns all the fields defined on the class and its subclasses" do
-        expected_fields = [:x, :y, :radius, :color]
-        expected_fields.each do |field_name|
-          @klass.fields[field_name].should be_kind_of(MongoODM::Document::Fields::Field)
+        [:x, :y, :radius, :color].each do |field_name|
+          BigRedCircle.fields[field_name].should be_kind_of(MongoODM::Document::Fields::Field)
         end
       end
       
       it "overrides field descriptions on any parent class" do
-        @klass.fields[:color].default.should == "red"
-        @klass.fields[:radius].default.should == 20.0
+        BigRedCircle.fields[:color].default.should == "red"
+        BigRedCircle.fields[:radius].default.should == 20.0
       end
       
     end
@@ -176,7 +158,7 @@ describe MongoODM::Document::Fields::Field do
         @field = MongoODM::Document::Fields::Field.new(:invalid, InvalidClass)
       end
       
-      it "returns the raw value" do
+      it "raises MongoODM::Errors::TypeCastMissing" do
         lambda { @field.type_cast("whatever") }.should raise_error(MongoODM::Errors::TypeCastMissing)
       end
       

data/spec/mongo_odm/document/inspect_spec.rb

@@ -9,6 +9,13 @@ describe MongoODM::Document::Inspect do
     end
   end
   
+  describe "#private_attribute_names" do
+    it "returns ['_class']" do
+      circle = Circle.new
+      circle.private_attribute_names.should == ['_class']
+    end
+  end
+  
   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)

data/spec/mongo_odm/document/persistence_spec.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe MongoODM::Document::Persistence do
+    
+end

data/spec/mongo_odm/document/validations_spec.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe MongoODM::Document::Validations do
+    
+end

data/spec/mongo_odm/document_spec.rb

@@ -2,11 +2,19 @@
 require "spec_helper"
 
 describe MongoODM::Document do
-  # TODO: See ActiveModel::Lint::Tests for a minimal set of tests
-  # test_valid?
-  # test_new_record?
-  # test_destroyed?
-  # test_model_naming
-  # test_errors_aref
-  # test_errors_full_messages
+  # TODO: Test global behavior
+  
+  describe "#==" do
+    it "returns false if the compared element is not a MongoODM::Document" do
+      (Shape.new == 1).should be_false
+    end
+    
+    it "returns true if the compared document has the same attribute values" do
+      (Shape.new(:x => 2, :y => 3) == Shape.new(:x => 2, :y => 3)).should be_true
+    end
+    
+    it "returns false if the compared document hasn't the same attribute values" do
+      (Shape.new(:x => 2, :y => 3) == Shape.new(:x => 1, :y => 3)).should be_false
+    end
+  end
 end

data/spec/mongo_odm/mongo_odm_spec.rb

@@ -2,8 +2,31 @@
 require "spec_helper"
 
 describe MongoODM do
-  
-  describe "included modules" do
+
+  describe "#config" do
+    
+    context "when no configuration was passed" do
+      it "returns an empty hash" do
+        MongoODM.config.should == {}
+      end
+      
+    end
+    
+    context "when a custom configuration was passed" do
+      
+      before do
+        MongoODM.config = {:host => "localhost", :port => 9000}
+      end
+      
+      after do
+        MongoODM.config = {}
+      end
+      
+      it "should return the configuration as a hash" do
+        MongoODM.config.should == {:host => "localhost", :port => 9000}
+      end
+      
+    end
     
   end
   
@@ -53,32 +76,4 @@ describe MongoODM do
     end
   end
 
-  describe "#config" do
-    
-    context "when no configuration was passed" do
-      
-      it "returns an empty hash" do
-        MongoODM.config.should == {}
-      end
-      
-    end
-    
-    context "when a custom configuration was passed" do
-      
-      before do
-        MongoODM.config = {:host => "localhost", :port => 9000}
-      end
-      
-      after do
-        MongoODM.config = {}
-      end
-      
-      it "should return the configuration as a hash" do
-        MongoODM.config.should == {:host => "localhost", :port => 9000}
-      end
-      
-    end
-    
-  end
-
 end

data/spec/spec_helper.rb

@@ -3,8 +3,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
 require "rubygems"
-require "spec"
-require "spec/mocks"
+require "rspec"
 require "mongo_odm"
 
 # Load all example models

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Carlos Paramio
@@ -14,12 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 +02:00
+date: 2010-06-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,10 +31,10 @@ dependencies:
         - beta3
         version: 3.0.0.beta3
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,29 +47,29 @@ dependencies:
         - beta3
         version: 3.0.0.beta3
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mongo
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 0
-        - 1
-        version: 1.0.1
+        - 2
+        version: 1.0.2
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bson
-  prerelease: false
+  name: bson_ext
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -78,22 +77,99 @@ dependencies:
         - 1
         version: 1.0.1
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
-  prerelease: false
+  name: tzinfo
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 0
-        - 1
-        version: 1.0.1
+        - 3
+        - 22
+        version: 0.3.22
   type: :runtime
+  prerelease: false
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: yard
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 6
+        version: 0.5.6
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  type: :development
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  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
+  type: :development
+  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: watchr
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        version: "0.6"
+  type: :development
+  prerelease: false
+  version_requirements: *id010
 description: mongo_odm is a flexible persistence module for any Ruby class to MongoDB.
 email: carlos@evolve.st
 executables: []
@@ -111,6 +187,7 @@ files:
 - lib/mongo_odm.rb
 - lib/mongo_odm/collection.rb
 - lib/mongo_odm/core_ext/conversions.rb
+- lib/mongo_odm/criteria.rb
 - lib/mongo_odm/cursor.rb
 - lib/mongo_odm/document.rb
 - lib/mongo_odm/document/associations.rb
@@ -118,6 +195,7 @@ files:
 - 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
 - lib/mongo_odm/document/attribute_methods/localization.rb
 - lib/mongo_odm/document/attribute_methods/query.rb
 - lib/mongo_odm/document/attribute_methods/read.rb
@@ -133,12 +211,22 @@ files:
 - spec/models/01-shape.rb
 - spec/models/02-circle.rb
 - spec/models/03-big_red_circle.rb
+- spec/mongo_odm/collection_spec.rb
 - spec/mongo_odm/core_ext/conversions_spec.rb
+- spec/mongo_odm/cursor_spec.rb
+- spec/mongo_odm/document/attribute_methods/dirty_spec.rb
+- spec/mongo_odm/document/attribute_methods/localization_spec.rb
+- spec/mongo_odm/document/attribute_methods/query_spec.rb
+- spec/mongo_odm/document/attribute_methods/read_spec.rb
+- spec/mongo_odm/document/attribute_methods/write_spec.rb
+- spec/mongo_odm/document/attribute_methods_spec.rb
+- spec/mongo_odm/document/callbacks_spec.rb
 - spec/mongo_odm/document/fields_spec.rb
 - spec/mongo_odm/document/inspect_spec.rb
+- spec/mongo_odm/document/persistence_spec.rb
+- spec/mongo_odm/document/validations_spec.rb
 - spec/mongo_odm/document_spec.rb
 - spec/mongo_odm/mongo_odm_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/carlosparamio/mongo_odm
@@ -177,9 +265,20 @@ test_files:
 - spec/models/01-shape.rb
 - spec/models/02-circle.rb
 - spec/models/03-big_red_circle.rb
+- spec/mongo_odm/collection_spec.rb
 - spec/mongo_odm/core_ext/conversions_spec.rb
+- spec/mongo_odm/cursor_spec.rb
+- spec/mongo_odm/document/attribute_methods/dirty_spec.rb
+- spec/mongo_odm/document/attribute_methods/localization_spec.rb
+- spec/mongo_odm/document/attribute_methods/query_spec.rb
+- spec/mongo_odm/document/attribute_methods/read_spec.rb
+- spec/mongo_odm/document/attribute_methods/write_spec.rb
+- spec/mongo_odm/document/attribute_methods_spec.rb
+- spec/mongo_odm/document/callbacks_spec.rb
 - spec/mongo_odm/document/fields_spec.rb
 - spec/mongo_odm/document/inspect_spec.rb
+- spec/mongo_odm/document/persistence_spec.rb
+- spec/mongo_odm/document/validations_spec.rb
 - spec/mongo_odm/document_spec.rb
 - spec/mongo_odm/mongo_odm_spec.rb
 - spec/spec_helper.rb

data/spec/spec.opts

@@ -1,4 +0,0 @@
---colour
---format nested
---loadby mtime
---reverse