mongoid 0.5.5 → 0.5.6

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/lib/mongoid/attributes.rb

@@ -4,9 +4,11 @@ module Mongoid #:nodoc:
     # field exists for them on the +Document+.
     def process(fields, params)
       attributes = HashWithIndifferentAccess.new(params)
-      attributes.each_pair do |key, value|
-        attributes[key] = fields[key].value(value) if fields[key]
+      fields.values.each do |field|
+        value = field.set(attributes[field.name])
+        attributes[field.name] = value if value
       end
+      attributes
     end
 
   end

data/lib/mongoid/document.rb

@@ -209,7 +209,7 @@ module Mongoid #:nodoc:
 
     # Read from the attributes hash.
     def read_attribute(name)
-      fields[name].value(@attributes[name])
+      fields[name].get(@attributes[name])
     end
 
     # Returns the id of the Document
@@ -225,7 +225,7 @@ module Mongoid #:nodoc:
 
     # Write to the attributes hash.
     def write_attribute(name, value)
-      @attributes[name] = fields[name].value(value)
+      @attributes[name] = fields[name].set(value)
       notify
     end
 

data/lib/mongoid/extensions/boolean/conversions.rb

@@ -2,9 +2,11 @@ module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Boolean #:nodoc:
       module Conversions #:nodoc:
-        def cast(value)
-          return true if value == "true"
-          false
+        def set(value)
+          value == "true"
+        end
+        def get(value)
+          value
         end
       end
     end

data/lib/mongoid/extensions/date/conversions.rb

@@ -2,8 +2,11 @@ module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Date #:nodoc:
       module Conversions #:nodoc:
-        def cast(value)
-          parse(value.to_s)
+        def set(value)
+          value.to_time.utc
+        end
+        def get(value)
+          value.to_date
         end
       end
     end

data/lib/mongoid/extensions/float/conversions.rb

@@ -2,9 +2,12 @@ module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Float #:nodoc:
       module Conversions #:nodoc:
-        def cast(value)
+        def set(value)
           value.to_f
         end
+        def get(value)
+          value
+        end
       end
     end
   end

data/lib/mongoid/extensions/integer/conversions.rb

@@ -2,9 +2,12 @@ module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Integer #:nodoc:
       module Conversions #:nodoc:
-        def cast(value)
+        def set(value)
           value =~ /\d/ ? value.to_i : value
         end
+        def get(value)
+          value
+        end
       end
     end
   end

data/lib/mongoid/extensions/string/conversions.rb

@@ -2,9 +2,12 @@ module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module String #:nodoc:
       module Conversions #:nodoc:
-        def cast(value)
+        def set(value)
           value.to_s
         end
+        def get(value)
+          value
+        end
       end
     end
   end

data/lib/mongoid/extensions/time/conversions.rb

@@ -2,9 +2,12 @@ module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Time #:nodoc:
       module Conversions #:nodoc:
-        def cast(value)
+        def set(value)
           value.to_time
         end
+        def get(value)
+          value
+        end
       end
     end
   end

data/lib/mongoid/field.rb

@@ -23,10 +23,15 @@ module Mongoid #:nodoc:
       @type = options[:type] || String
     end
 
-    # Gets the value for the supplied object. If the object is nil, then the
-    # default value will be returned.
-    def value(object)
-      object ? type.cast(object) : default
+    # Used for setting an object in the attributes hash. If nil is provided the
+    # default will get returned if it exists.
+    def set(object)
+      object ? type.set(object) : default
+    end
+
+    # Used for retrieving the object out of the attributes hash.
+    def get(object)
+      type.get(object)
     end
 
   end

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]

data/spec/integration/mongoid/document_spec.rb

@@ -149,4 +149,19 @@ describe Mongoid::Document do
 
   end
 
+  context "typecasting" do
+
+    before do
+      @date = Date.new(1976, 7, 4)
+      @person = Person.new(:dob => @date)
+      @person.save
+    end
+
+    it "properly casts dates and times" do
+      person = Person.first
+      person.dob.should == @date
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -19,7 +19,8 @@ class Person < Mongoid::Document
   include Mongoid::Timestamps
   field :title
   field :terms, :type => Boolean
-  field :age, :type => Integer
+  field :age, :type => Integer, :default => 100
+  field :dob, :type => Date
   has_many :addresses
   has_many :phone_numbers, :class_name => "Phone"
   has_one :name

data/spec/unit/mongoid/attributes_spec.rb

@@ -20,7 +20,6 @@ describe Mongoid::Attributes do
             { :_id => "4", :street => "Second Street" }
           ]
         }
-        @fields = Person.fields.values
       end
 
       it "returns a properly cast HashWithIndifferentAccess" do

data/spec/unit/mongoid/document_spec.rb

@@ -212,7 +212,7 @@ describe Mongoid::Document do
   describe "#first" do
 
     before do
-      @attributes = {}
+      @attributes = HashWithIndifferentAccess.new(:age => 100)
     end
 
     context "when a selector is provided" do
@@ -297,9 +297,10 @@ describe Mongoid::Document do
 
     context "with no attributes" do
 
-      it "does not set any attributes" do
+      it "sets default attributes" do
         person = Person.new
-        person.attributes.empty?.should be_true
+        person.attributes.empty?.should be_false
+        person.age.should == 100
       end
 
     end
@@ -446,12 +447,11 @@ describe Mongoid::Document do
     context "when attribute does not exist" do
 
       before do
-        Person.field :weight, :default => 100
         @person = Person.new
       end
 
       it "returns the default value" do
-        @person.weight.should == 100
+        @person.age.should == 100
       end
 
     end
@@ -481,13 +481,12 @@ describe Mongoid::Document do
     context "when attribute does not exist" do
 
       before do
-        Person.field :weight, :default => 100, :type => Integer
         @person = Person.new
       end
 
       it "returns the default value" do
-        @person.weight = nil
-        @person.weight.should == 100
+        @person.age = nil
+        @person.age.should == 100
       end
 
     end

data/spec/unit/mongoid/extensions/array/conversions_spec.rb

@@ -7,8 +7,8 @@ describe Mongoid::Extensions::Array::Conversions do
     it "collects each of its attributes" do
       array = [Person.new(:title => "Sir"), Person.new(:title => "Madam")]
       array.mongoidize.should ==
-        [HashWithIndifferentAccess.new({ :title => "Sir" }),
-         HashWithIndifferentAccess.new({ :title => "Madam" })]
+        [HashWithIndifferentAccess.new({ :title => "Sir", :age => 100 }),
+         HashWithIndifferentAccess.new({ :title => "Madam", :age => 100 })]
     end
 
   end

data/spec/unit/mongoid/extensions/boolean/conversions_spec.rb

@@ -2,12 +2,12 @@ require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
 
 describe Mongoid::Extensions::Boolean::Conversions do
 
-  describe "#cast" do
+  describe "#set" do
 
     context "when 'true'" do
 
       it "returns true" do
-        Boolean.cast("true").should be_true
+        Boolean.set("true").should be_true
       end
 
     end
@@ -15,11 +15,19 @@ describe Mongoid::Extensions::Boolean::Conversions do
     context "when 'false'" do
 
       it "returns false" do
-        Boolean.cast("false").should be_false
+        Boolean.set("false").should be_false
       end
 
     end
 
   end
 
+  describe "#get" do
+
+    it "returns the boolean" do
+      Boolean.get(false).should be_false
+    end
+
+  end
+
 end

data/spec/unit/mongoid/extensions/date/conversions_spec.rb

@@ -2,23 +2,44 @@ require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
 
 describe Mongoid::Extensions::Date::Conversions do
 
-  describe "#cast" do
+  before do
+    @time = Date.today.to_time.utc
+  end
+
+  describe "#set" do
 
     context "when string provided" do
 
-      it "parses the string" do
-        Date.cast("1976/11/19").should == Date.new(1976, 11, 19)
+      it "returns a time from the string" do
+        Date.set(@time.to_s).should == @time
       end
 
     end
 
     context "when time provided" do
 
-      it "parses the time" do
-        Date.cast(30.seconds.ago).should == Date.today
+      it "returns the time" do
+        Date.set(@time).should == @time
+      end
+
+    end
+
+    context "when a date provided" do
+
+      it "returns a time from the date" do
+        Date.set(@time.to_date).should == @time
       end
 
     end
+
+  end
+
+  describe "#get" do
+
+    it "converts the time back to a date" do
+      Date.get(@time).should == @time.to_date
+    end
+
   end
 
 end

data/spec/unit/mongoid/extensions/float/conversions_spec.rb

@@ -2,10 +2,18 @@ require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
 
 describe Mongoid::Extensions::Float::Conversions do
 
-  describe "#cast" do
+  describe "#set" do
 
     it "converts the string to a float" do
-      Float.cast("3.45").should == 3.45
+      Float.set("3.45").should == 3.45
+    end
+
+  end
+
+  describe "#get" do
+
+    it "returns the float" do
+      Float.get(3.45).should == 3.45
     end
 
   end

data/spec/unit/mongoid/extensions/integer/conversions_spec.rb

@@ -2,12 +2,12 @@ require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
 
 describe Mongoid::Extensions::Integer::Conversions do
 
-  describe "#cast" do
+  describe "#set" do
 
     context "when string is a number" do
 
       it "converts the string to an Integer" do
-        Integer.cast("32").should == 32
+        Integer.set("32").should == 32
       end
 
     end
@@ -15,10 +15,19 @@ describe Mongoid::Extensions::Integer::Conversions do
     context "when string is not a number" do
 
       it "returns the string" do
-        Integer.cast("foo").should == "foo"
+        Integer.set("foo").should == "foo"
       end
 
     end
+
+  end
+
+  describe "#get" do
+
+    it "returns the integer" do
+      Integer.get(44).should == 44
+    end
+
   end
 
 end

data/spec/unit/mongoid/extensions/object/conversions_spec.rb

@@ -6,7 +6,7 @@ describe Mongoid::Extensions::Object::Conversions do
 
     it "returns its attributes" do
       Person.new(:title => "Sir").mongoidize.should ==
-        HashWithIndifferentAccess.new({ :title => "Sir" })
+        HashWithIndifferentAccess.new({ :title => "Sir", :age => 100 })
     end
 
   end

data/spec/unit/mongoid/extensions/string/conversions_spec.rb

@@ -2,9 +2,16 @@ require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
 
 describe Mongoid::Extensions::String::Conversions do
 
-  describe "#cast" do
+  describe "#set" do
     it "returns the object to_s" do
-      String.cast(1).should == "1"
+      String.set(1).should == "1"
     end
   end
+
+  describe "#get" do
+    it "returns the string" do
+      String.get("test").should == "test"
+    end
+  end
+
 end

data/spec/unit/mongoid/extensions/time/conversions_spec.rb

@@ -2,13 +2,22 @@ require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
 
 describe Mongoid::Extensions::Time::Conversions do
 
-  describe "#cast" do
+  before do
+    @time = Time.local(1976, 11, 19).utc
+  end
+
+  describe "#set" do
     context "when value is a string" do
       it "converts to a time" do
-        time = Time.local(1976, 11, 19).utc
-        Time.cast(time.to_s).should == time
+        Time.set(@time.to_s).should == @time
       end
     end
   end
 
+  describe "#get" do
+    it "returns the time" do
+      Time.get(@time).should == @time
+    end
+  end
+
 end

data/spec/unit/mongoid/field_spec.rb

@@ -38,7 +38,7 @@ describe Mongoid::Field do
 
   end
 
-  describe "#value" do
+  describe "#set" do
 
     before do
       @type = mock
@@ -48,20 +48,34 @@ describe Mongoid::Field do
     context "nil is provided" do
 
       it "returns the default value" do
-        @field.value(nil).should == 10
+        @field.set(nil).should == 10
       end
 
     end
 
     context "value is provided" do
 
-      it "casts the value" do
-        @type.expects(:cast).with("30").returns(30)
-        @field.value("30").should == 30
+      it "sets the value" do
+        @type.expects(:set).with("30").returns(30)
+        @field.set("30").should == 30
       end
 
     end
 
   end
 
+  describe "#get" do
+
+    before do
+      @type = mock
+      @field = Mongoid::Field.new(:score, :default => 10, :type => @type)
+    end
+
+    it "returns the value" do
+      @type.expects(:get).with(30).returns(30)
+      @field.get(30).should == 30
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Durran Jordan