durran-mongoid 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/mongoid.rb

@@ -22,7 +22,7 @@ require "rubygems"
 
 gem "activesupport", "2.3.4"
 gem "mongodb-mongo", "0.14.1"
-gem "hashrocket-validatable", "1.7.4"
+gem "durran-validatable", "1.7.5"
 
 require "validatable"
 require "active_support/callbacks"

data/lib/mongoid/associations/has_many_association.rb

@@ -2,17 +2,17 @@ module Mongoid #:nodoc:
   module Associations #:nodoc:
     class HasManyAssociation < DelegateClass(Array) #:nodoc:
 
-      # Creates the new association by finding the attributes in 
-      # the parent document with its name, and instantiating a 
-      # new document for each one found. These will then be put in an 
+      # Creates the new association by finding the attributes in
+      # the parent document with its name, and instantiating a
+      # new document for each one found. These will then be put in an
       # internal array.
       #
-      # This then delegated all methods to the array class since this is 
+      # This then delegated all methods to the array class since this is
       # essentially a proxy to an array itself.
       def initialize(association_name, document)
         @klass = association_name.to_s.classify.constantize
         attributes = document.attributes[association_name]
-        @documents = attributes ? attributes.collect do |attribute| 
+        @documents = attributes ? attributes.collect do |attribute|
           child = @klass.new(attribute)
           child.parent = document
           child

data/lib/mongoid/associations/has_one_association.rb

@@ -2,6 +2,9 @@ module Mongoid #:nodoc:
   module Associations #:nodoc:
     class HasOneAssociation #:nodoc:
 
+      attr_reader :document
+      delegate :valid?, :to => :document
+
       # Creates the new association by finding the attributes in 
       # the parent document with its name, and instantiating a 
       # new document for it.
@@ -13,12 +16,18 @@ module Mongoid #:nodoc:
         attributes = document.attributes[association_name]
         @document = klass.new(attributes)
         @document.parent = document
+        decorate!
       end
 
-      # All calls to this association will be delegated straight
-      # to the encapsulated document.
-      def method_missing(method, *args)
-        @document.send(method, *args)
+      private
+      def decorate!
+        @document.public_methods(false).each do |method|
+          (class << self; self; end).class_eval do
+            define_method method do |*args|
+              @document.send method, *args
+            end
+          end
+        end
       end
 
     end

data/lib/mongoid/document.rb

@@ -56,8 +56,8 @@ module Mongoid #:nodoc:
       def find(*args)
         type, selector = args[0], args[1]
         case type
-        when :all then find_all(selector)
-        when :first then find_first(selector)
+        when :all then find_all(selector[:conditions])
+        when :first then find_first(selector[:conditions])
         else find_first(Mongo::ObjectID.from_string(type.to_s))
         end
       end
@@ -100,8 +100,8 @@ module Mongoid #:nodoc:
 
       # Find all documents in paginated fashion given the supplied arguments.
       # If no parameters are passed just default to offset 0 and limit 20.
-      def paginate(selector = nil, params = {})
-        collection.find(selector, Mongoid::Paginator.new(params).options).collect { |doc| new(doc) }
+      def paginate(selector = {}, params = {})
+        collection.find(selector[:conditions], Mongoid::Paginator.new(params).options).collect { |doc| new(doc) }
       end
 
     end
@@ -181,7 +181,6 @@ module Mongoid #:nodoc:
 
       # Takes the supplied raw grouping of documents and alters it to a
       # grouping of actual document objects.
-      # TODO: Me no likey this...
       def group!(docs)
         docs["group"] = docs["group"].collect { |attrs| new(attrs) }; docs
       end

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-09-23}
+  s.date = %q{2009-09-27}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ Mongoid.connect_to("mongoid_test")
 
 Spec::Runner.configure do |config|
   config.mock_with :mocha
+  Mocha::Configuration.prevent(:stubbing_non_existent_method)
 end
 
 class Person < Mongoid::Document

data/spec/unit/mongoid/document_spec.rb

@@ -120,8 +120,8 @@ describe Mongoid::Document do
     context "when finding first" do
 
       it "delegates to find_first" do
-        @collection.expects(:find_one).with(:test => "Test").returns(@attributes)
-        Person.find(:first, :test => "Test")
+        @collection.expects(:find_one).with(:test => "Test" ).returns(@attributes)
+        Person.find(:first, :conditions => { :test => "Test" })
       end
 
     end
@@ -136,7 +136,7 @@ describe Mongoid::Document do
       it "delegates to find_all" do
         @collection.expects(:find).with(:test => "Test").returns(@cursor)
         @cursor.expects(:collect).returns(@people)
-        Person.find(:all, :test => "Test")
+        Person.find(:all, :conditions => { :test => "Test" })
       end
 
     end
@@ -368,7 +368,7 @@ describe Mongoid::Document do
 
       it "delegates offset and limit to find_all" do
         @collection.expects(:find).with({ :test => "Test" }, {:limit => 20, :offset => 20}).returns([])
-        Person.paginate({ :test => "Test" }, { :page => 2, :per_page => 20 })
+        Person.paginate({ :conditions => { :test => "Test" } }, { :page => 2, :per_page => 20 })
       end
 
     end
@@ -377,7 +377,7 @@ describe Mongoid::Document do
 
       it "passes the default offset and limit to find_all" do
         @collection.expects(:find).with({ :test => "Test" }, {:limit => 20, :offset => 0}).returns([])
-        Person.paginate({ :test => "Test" })
+        Person.paginate(:conditions => { :test => "Test" })
       end
 
     end
@@ -472,83 +472,200 @@ describe Mongoid::Document do
 
   context "validations" do
 
-    after do
-      Person.validations.clear
-    end
+    context "when defining using macros" do
+
+      after do
+        Person.validations.clear
+      end
 
-    describe "#validates_acceptance_of" do
+      describe "#validates_acceptance_of" do
 
-      it "adds the acceptance validation" do
-        Person.class_eval do
-          validates_acceptance_of :terms
+        it "adds the acceptance validation" do
+          Person.class_eval do
+            validates_acceptance_of :terms
+          end
+          Person.validations.first.should be_a_kind_of(Validatable::ValidatesAcceptanceOf)
         end
-        Person.validations.first.should be_a_kind_of(Validatable::ValidatesAcceptanceOf)
+
       end
 
-    end
+      describe "#validates_associated" do
 
-    describe "#validates_associated" do
+        it "adds the associated validation" do
+          Person.class_eval do
+            validates_associated :name
+          end
+          Person.validations.first.should be_a_kind_of(Validatable::ValidatesAssociated)
+        end
 
-      it "adds the associated validation" do
-        Person.class_eval do
-          validates_associated :name
+      end
+
+      describe "#validates_format_of" do
+
+        it "adds the format validation" do
+          Person.class_eval do
+            validates_format_of :title, :with => /[A-Za-z]/
+          end
+          Person.validations.first.should be_a_kind_of(Validatable::ValidatesFormatOf)
         end
-        Person.validations.first.should be_a_kind_of(Validatable::ValidatesAssociated)
+
       end
 
-    end
+      describe "#validates_length_of" do
+
+        it "adds the length validation" do
+          Person.class_eval do
+            validates_length_of :title, :minimum => 10
+          end
+          Person.validations.first.should be_a_kind_of(Validatable::ValidatesLengthOf)
+        end
+
+      end
 
-    describe "#validates_format_of" do
+      describe "#validates_numericality_of" do
 
-      it "adds the format validation" do
-        Person.class_eval do
-          validates_format_of :title, :with => /[A-Za-z]/
+        it "adds the numericality validation" do
+          Person.class_eval do
+            validates_numericality_of :age
+          end
+          Person.validations.first.should be_a_kind_of(Validatable::ValidatesNumericalityOf)
         end
-        Person.validations.first.should be_a_kind_of(Validatable::ValidatesFormatOf)
+
       end
 
-    end
+      describe "#validates_presence_of" do
+
+        it "adds the presence validation" do
+          Person.class_eval do
+            validates_presence_of :title
+          end
+          Person.validations.first.should be_a_kind_of(Validatable::ValidatesPresenceOf)
+        end
+
+      end
 
-    describe "#validates_length_of" do
+      describe "#validates_true_for" do
 
-      it "adds the length validation" do
-        Person.class_eval do
-          validates_length_of :title, :minimum => 10
+        it "adds the true validation" do
+          Person.class_eval do
+            validates_true_for :title, :logic => lambda { title == "Esquire" }
+          end
+          Person.validations.first.should be_a_kind_of(Validatable::ValidatesTrueFor)
         end
-        Person.validations.first.should be_a_kind_of(Validatable::ValidatesLengthOf)
+
       end
 
     end
 
-    describe "#validates_numericality_of" do
+    context "when running validations" do
+
+      before do
+        @person = Person.new
+      end
+
+      after do
+        Person.validations.clear
+      end
+
+      describe "#validates_acceptance_of" do
 
-      it "adds the numericality validation" do
-        Person.class_eval do
-          validates_numericality_of :age
+        it "fails if field not accepted" do
+          Person.class_eval do
+            validates_acceptance_of :terms
+          end
+          @person.valid?.should be_false
+          @person.errors.on(:terms).should_not be_nil
         end
-        Person.validations.first.should be_a_kind_of(Validatable::ValidatesNumericalityOf)
+
       end
 
-    end
+      describe "#validates_associated" do
+
+        context "when association is a has_many" do
+
+          it "fails when any association fails validation"
 
-    describe "#validates_presence_of" do
+        end
+
+        context "when association is a has_one" do
+
+          it "fails when the association fails validation" do
+            Person.class_eval do
+              validates_associated :name
+            end
+            Name.class_eval do
+              validates_presence_of :first_name
+            end
+            @person.name = Name.new
+            @person.valid?.should be_false
+            @person.errors.on(:name).should_not be_nil
+          end
 
-      it "adds the presence validation" do
-        Person.class_eval do
-          validates_presence_of :title
         end
-        Person.validations.first.should be_a_kind_of(Validatable::ValidatesPresenceOf)
+
       end
 
-    end
+      describe "#validates_format_of" do
+
+        it "fails if the field is in the wrong format" do
+          Person.class_eval do
+            validates_format_of :title, :with => /[A-Za-z]/
+          end
+          @person.title = 10
+          @person.valid?.should be_false
+          @person.errors.on(:title).should_not be_nil
+        end
 
-    describe "#validates_true_for" do
+      end
 
-      it "adds the true validation" do
-        Person.class_eval do
-          validates_true_for :title, :logic => lambda { title == "Esquire" }
+      describe "#validates_length_of" do
+
+        it "fails if the field is the wrong length" do
+          Person.class_eval do
+            validates_length_of :title, :minimum => 10
+          end
+          @person.title = "Testing"
+          @person.valid?.should be_false
+          @person.errors.on(:title).should_not be_nil
         end
-        Person.validations.first.should be_a_kind_of(Validatable::ValidatesTrueFor)
+
+      end
+
+      describe "#validates_numericality_of" do
+
+        it "fails if the field is not a number" do
+          Person.class_eval do
+            validates_numericality_of :age
+          end
+          @person.age = "foo"
+          @person.valid?.should be_false
+          @person.errors.on(:age).should_not be_nil
+        end
+
+      end
+
+      describe "#validates_presence_of" do
+
+        it "fails if the field is nil" do
+          Person.class_eval do
+            validates_presence_of :title
+          end
+          @person.valid?.should be_false
+          @person.errors.on(:title).should_not be_nil
+        end
+
+      end
+
+      describe "#validates_true_for" do
+
+        it "fails if the logic returns false" do
+          Person.class_eval do
+            validates_true_for :title, :logic => lambda { title == "Esquire" }
+          end
+          @person.valid?.should be_false
+          @person.errors.on(:title).should_not be_nil
+        end
+
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: durran-mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-23 00:00:00 -07:00
+date: 2009-09-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency