mongoid 0.5.3 → 0.5.4

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/mongoid.rb

@@ -33,6 +33,7 @@ require "active_support/core_ext"
 require "will_paginate/collection"
 require "mongo"
 require "mongoid/associations"
+require "mongoid/attributes"
 require "mongoid/commands"
 require "mongoid/criteria"
 require "mongoid/extensions"

data/lib/mongoid/attributes.rb

@@ -0,0 +1,13 @@
+module Mongoid #:nodoc:
+  module Attributes #:nodoc:
+    # Process the provided attributes casting them to their proper values if a
+    # 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]
+      end
+    end
+
+  end
+end

data/lib/mongoid/document.rb

@@ -1,7 +1,7 @@
 module Mongoid #:nodoc:
   class Document
     include ActiveSupport::Callbacks
-    include Commands, Observable, Validatable
+    include Attributes, Commands, Observable, Validatable
     extend Associations
 
     attr_accessor :association_name, :parent
@@ -184,11 +184,10 @@ module Mongoid #:nodoc:
       @attributes[:_id]
     end
 
-    # Instantiate a new Document, setting the Document's attirbutes if given.
+    # Instantiate a new Document, setting the Document's attributes if given.
     # If no attributes are provided, they will be initialized with an empty Hash.
     def initialize(attributes = {})
-      @attributes = HashWithIndifferentAccess.new(attributes) if attributes
-      @attributes = HashWithIndifferentAccess.new unless attributes
+      @attributes = process(fields, attributes)
       generate_key
     end
 
@@ -226,7 +225,7 @@ module Mongoid #:nodoc:
 
     # Write to the attributes hash.
     def write_attribute(name, value)
-      @attributes[name] = value
+      @attributes[name] = fields[name].value(value)
       notify
     end
 

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

@@ -3,7 +3,7 @@ module Mongoid #:nodoc:
     module Integer #:nodoc:
       module Conversions #:nodoc:
         def cast(value)
-          value.to_i
+          value =~ /\d/ ? value.to_i : value
         end
       end
     end

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/associations/factory.rb",
      "lib/mongoid/associations/has_many_association.rb",
      "lib/mongoid/associations/has_one_association.rb",
+     "lib/mongoid/attributes.rb",
      "lib/mongoid/commands.rb",
      "lib/mongoid/commands/create.rb",
      "lib/mongoid/commands/delete.rb",
@@ -64,6 +65,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/associations/has_many_association_spec.rb",
      "spec/unit/mongoid/associations/has_one_association_spec.rb",
      "spec/unit/mongoid/associations_spec.rb",
+     "spec/unit/mongoid/attributes_spec.rb",
      "spec/unit/mongoid/commands/create_spec.rb",
      "spec/unit/mongoid/commands/delete_all_spec.rb",
      "spec/unit/mongoid/commands/delete_spec.rb",
@@ -103,6 +105,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/associations/has_many_association_spec.rb",
      "spec/unit/mongoid/associations/has_one_association_spec.rb",
      "spec/unit/mongoid/associations_spec.rb",
+     "spec/unit/mongoid/attributes_spec.rb",
      "spec/unit/mongoid/commands/create_spec.rb",
      "spec/unit/mongoid/commands/delete_all_spec.rb",
      "spec/unit/mongoid/commands/delete_spec.rb",

data/spec/spec_helper.rb

@@ -18,8 +18,8 @@ end
 class Person < Mongoid::Document
   include Mongoid::Timestamps
   field :title
-  field :terms
-  field :age
+  field :terms, :type => Boolean
+  field :age, :type => Integer
   has_many :addresses
   has_one :name
 end

data/spec/unit/mongoid/attributes_spec.rb

@@ -0,0 +1,36 @@
+require File.join(File.dirname(__FILE__), "/../../spec_helper.rb")
+
+describe Mongoid::Attributes do
+
+  describe "#process" do
+
+    context "when supplied hash has values" do
+
+      before do
+        @attributes = {
+          :_id => "1",
+          :title => "value",
+          :age => "30",
+          :terms => "true",
+          :name => {
+            :_id => "2", :first_name => "Test", :last_name => "User"
+          },
+          :addresses => [
+            { :_id => "3", :street => "First Street" },
+            { :_id => "4", :street => "Second Street" }
+          ]
+        }
+        @fields = Person.fields.values
+      end
+
+      it "returns a properly cast HashWithIndifferentAccess" do
+        attrs = Person.new(@attributes).attributes
+        attrs[:age].should == 30
+        attrs[:terms].should == true
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/mongoid/document_spec.rb

@@ -307,12 +307,25 @@ describe Mongoid::Document do
     context "with attributes" do
 
       before do
-        @attributes = HashWithIndifferentAccess.new({ :test => "test" })
-      end
-
-      it "sets the attributes hash on the object" do
+        @attributes = {
+          :_id => "1",
+          :title => "value",
+          :age => "30",
+          :terms => "true",
+          :name => {
+            :_id => "2", :first_name => "Test", :last_name => "User"
+          },
+          :addresses => [
+            { :_id => "3", :street => "First Street" },
+            { :_id => "4", :street => "Second Street" }
+          ]
+        }
+      end
+
+      it "sets the attributes hash on the object properly casted" do
         person = Person.new(@attributes)
-        person.attributes.should == @attributes
+        person.attributes[:age].should == 30
+        person.attributes[:terms].should be_true
       end
 
     end
@@ -468,7 +481,7 @@ describe Mongoid::Document do
     context "when attribute does not exist" do
 
       before do
-        Person.field :weight, :default => 100
+        Person.field :weight, :default => 100, :type => Integer
         @person = Person.new
       end
 

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

@@ -3,8 +3,21 @@ require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
 describe Mongoid::Extensions::Integer::Conversions do
 
   describe "#cast" do
-    it "converts the string to an Integer" do
-      Integer.cast("32").should == 32
+
+    context "when string is a number" do
+
+      it "converts the string to an Integer" do
+        Integer.cast("32").should == 32
+      end
+
+    end
+
+    context "when string is not a number" do
+
+      it "returns the string" do
+        Integer.cast("foo").should == "foo"
+      end
+
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Durran Jordan
@@ -74,6 +74,7 @@ files:
 - lib/mongoid/associations/factory.rb
 - lib/mongoid/associations/has_many_association.rb
 - lib/mongoid/associations/has_one_association.rb
+- lib/mongoid/attributes.rb
 - lib/mongoid/commands.rb
 - lib/mongoid/commands/create.rb
 - lib/mongoid/commands/delete.rb
@@ -110,6 +111,7 @@ files:
 - spec/unit/mongoid/associations/has_many_association_spec.rb
 - spec/unit/mongoid/associations/has_one_association_spec.rb
 - spec/unit/mongoid/associations_spec.rb
+- spec/unit/mongoid/attributes_spec.rb
 - spec/unit/mongoid/commands/create_spec.rb
 - spec/unit/mongoid/commands/delete_all_spec.rb
 - spec/unit/mongoid/commands/delete_spec.rb
@@ -171,6 +173,7 @@ test_files:
 - spec/unit/mongoid/associations/has_many_association_spec.rb
 - spec/unit/mongoid/associations/has_one_association_spec.rb
 - spec/unit/mongoid/associations_spec.rb
+- spec/unit/mongoid/attributes_spec.rb
 - spec/unit/mongoid/commands/create_spec.rb
 - spec/unit/mongoid/commands/delete_all_spec.rb
 - spec/unit/mongoid/commands/delete_spec.rb