mongoid 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/mongoid/criteria.rb

@@ -268,7 +268,7 @@ module Mongoid #:nodoc:
     #
     # Returns: <tt>self</tt>
     def select(*args)
-      @options[:fields] = args.flatten; self
+      @options[:fields] = args.flatten if args.any?; self
     end
 
     # Adds a criterion to the +Criteria+ that specifies how many results to skip

data/lib/mongoid/extensions.rb

@@ -1,29 +1,56 @@
 require "mongoid/extensions/array/conversions"
 require "mongoid/extensions/array/parentization"
+require "mongoid/extensions/boolean/conversions"
+require "mongoid/extensions/date/conversions"
+require "mongoid/extensions/float/conversions"
 require "mongoid/extensions/hash/accessors"
+require "mongoid/extensions/integer/conversions"
 require "mongoid/extensions/object/conversions"
 require "mongoid/extensions/object/parentization"
+require "mongoid/extensions/string/conversions"
 require "mongoid/extensions/string/inflections"
 require "mongoid/extensions/symbol/inflections"
+require "mongoid/extensions/time/conversions"
 
 class Array #:nodoc:
   include Mongoid::Extensions::Array::Conversions
   include Mongoid::Extensions::Array::Parentization
 end
 
+class Boolean #:nodoc
+  extend Mongoid::Extensions::Boolean::Conversions
+end
+
+class Date #:nodoc
+  extend Mongoid::Extensions::Date::Conversions
+end
+
+class Float #:nodoc
+  extend Mongoid::Extensions::Float::Conversions
+end
+
 class Hash #:nodoc
   include Mongoid::Extensions::Hash::Accessors
 end
 
+class Integer #:nodoc
+  extend Mongoid::Extensions::Integer::Conversions
+end
+
 class Object #:nodoc:
   include Mongoid::Extensions::Object::Conversions
   include Mongoid::Extensions::Object::Parentization
 end
 
 class String #:nodoc
+  extend Mongoid::Extensions::String::Conversions
   include Mongoid::Extensions::String::Inflections
 end
 
 class Symbol #:nodoc
   include Mongoid::Extensions::Symbol::Inflections
 end
+
+class Time #:nodoc
+  extend Mongoid::Extensions::Time::Conversions
+end

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

@@ -0,0 +1,12 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Boolean #:nodoc:
+      module Conversions #:nodoc:
+        def cast(value)
+          return true if value == "true"
+          false
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Date #:nodoc:
+      module Conversions #:nodoc:
+        def cast(value)
+          parse(value.to_s)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Float #:nodoc:
+      module Conversions #:nodoc:
+        def cast(value)
+          value.to_f
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Integer #:nodoc:
+      module Conversions #:nodoc:
+        def cast(value)
+          value.to_i
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module String #:nodoc:
+      module Conversions #:nodoc:
+        def cast(value)
+          value.to_s
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Time #:nodoc:
+      module Conversions #:nodoc:
+        def cast(value)
+          value.to_time
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/field.rb

@@ -3,7 +3,8 @@ module Mongoid #:nodoc:
 
     attr_reader \
       :default,
-      :name
+      :name,
+      :type
 
     # Create the new field with a name and optional additional options. Valid
     # options are :default
@@ -19,12 +20,13 @@ module Mongoid #:nodoc:
     def initialize(name, options = {})
       @name = name
       @default = options[:default]
+      @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 ? object : default
+      object ? type.cast(object) : default
     end
 
   end

data/lib/mongoid/timestamps.rb

@@ -4,8 +4,8 @@ module Mongoid
     def self.included(base)
       base.class_eval do
         include InstanceMethods
-        field :created_at
-        field :modified_at
+        field :created_at, :type => Time
+        field :modified_at, :type => Time
         before_create :update_created_at, :update_modified_at
         before_save :update_modified_at
       end

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
@@ -40,11 +40,18 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions.rb",
      "lib/mongoid/extensions/array/conversions.rb",
      "lib/mongoid/extensions/array/parentization.rb",
+     "lib/mongoid/extensions/boolean/conversions.rb",
+     "lib/mongoid/extensions/date/conversions.rb",
+     "lib/mongoid/extensions/float/conversions.rb",
      "lib/mongoid/extensions/hash/accessors.rb",
+     "lib/mongoid/extensions/integer/conversions.rb",
+     "lib/mongoid/extensions/object/casting.rb",
      "lib/mongoid/extensions/object/conversions.rb",
      "lib/mongoid/extensions/object/parentization.rb",
+     "lib/mongoid/extensions/string/conversions.rb",
      "lib/mongoid/extensions/string/inflections.rb",
      "lib/mongoid/extensions/symbol/inflections.rb",
+     "lib/mongoid/extensions/time/conversions.rb",
      "lib/mongoid/field.rb",
      "lib/mongoid/timestamps.rb",
      "mongoid.gemspec",
@@ -68,11 +75,17 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
      "spec/unit/mongoid/extensions/array/parentization_spec.rb",
+     "spec/unit/mongoid/extensions/boolean/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/date/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/float/conversions_spec.rb",
      "spec/unit/mongoid/extensions/hash/accessors_spec.rb",
+     "spec/unit/mongoid/extensions/integer/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/parentization_spec.rb",
+     "spec/unit/mongoid/extensions/string/conversions_spec.rb",
      "spec/unit/mongoid/extensions/string/inflections_spec.rb",
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
+     "spec/unit/mongoid/extensions/time/conversions_spec.rb",
      "spec/unit/mongoid/field_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb"
   ]
@@ -101,11 +114,17 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
      "spec/unit/mongoid/extensions/array/parentization_spec.rb",
+     "spec/unit/mongoid/extensions/boolean/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/date/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/float/conversions_spec.rb",
      "spec/unit/mongoid/extensions/hash/accessors_spec.rb",
+     "spec/unit/mongoid/extensions/integer/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/parentization_spec.rb",
+     "spec/unit/mongoid/extensions/string/conversions_spec.rb",
      "spec/unit/mongoid/extensions/string/inflections_spec.rb",
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
+     "spec/unit/mongoid/extensions/time/conversions_spec.rb",
      "spec/unit/mongoid/field_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb"
   ]

data/spec/unit/mongoid/criteria_spec.rb

@@ -332,13 +332,26 @@ describe Mongoid::Criteria do
 
   describe "#select" do
 
-    it "adds the options for limiting by fields" do
-      @criteria.select(:title, :text)
-      @criteria.options.should == { :fields => [ :title, :text ] }
+    context "when args are provided" do
+
+      it "adds the options for limiting by fields" do
+        @criteria.select(:title, :text)
+        @criteria.options.should == { :fields => [ :title, :text ] }
+      end
+
+      it "returns self" do
+        @criteria.select.should == @criteria
+      end
+
     end
 
-    it "returns self" do
-      @criteria.select.should == @criteria
+    context "when no args provided" do
+
+      it "does not add the field option" do
+        @criteria.select
+        @criteria.options[:fields].should be_nil
+      end
+
     end
 
   end

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

@@ -0,0 +1,25 @@
+require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+
+describe Mongoid::Extensions::Boolean::Conversions do
+
+  describe "#cast" do
+
+    context "when 'true'" do
+
+      it "returns true" do
+        Boolean.cast("true").should be_true
+      end
+
+    end
+
+    context "when 'false'" do
+
+      it "returns false" do
+        Boolean.cast("false").should be_false
+      end
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,24 @@
+require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+
+describe Mongoid::Extensions::Date::Conversions do
+
+  describe "#cast" do
+
+    context "when string provided" do
+
+      it "parses the string" do
+        Date.cast("1976/11/19").should == Date.new(1976, 11, 19)
+      end
+
+    end
+
+    context "when time provided" do
+
+      it "parses the time" do
+        Date.cast(30.seconds.ago).should == Date.today
+      end
+
+    end
+  end
+
+end

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

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

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

@@ -0,0 +1,11 @@
+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
+    end
+  end
+
+end

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

@@ -0,0 +1,10 @@
+require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+
+describe Mongoid::Extensions::String::Conversions do
+
+  describe "#cast" do
+    it "returns the object to_s" do
+      String.cast(1).should == "1"
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+
+describe Mongoid::Extensions::Time::Conversions do
+
+  describe "#cast" 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
+      end
+    end
+  end
+
+end

data/spec/unit/mongoid/field_spec.rb

@@ -26,10 +26,23 @@ describe Mongoid::Field do
 
   end
 
+  describe "#type" do
+
+    before do
+      @field = Mongoid::Field.new(:name)
+    end
+
+    it "defaults to String" do
+      @field.type.should == String
+    end
+
+  end
+
   describe "#value" do
 
     before do
-      @field = Mongoid::Field.new(:score, :default => 10)
+      @type = mock
+      @field = Mongoid::Field.new(:score, :default => 10, :type => @type)
     end
 
     context "nil is provided" do
@@ -42,8 +55,9 @@ describe Mongoid::Field do
 
     context "value is provided" do
 
-      it "returns the value" do
-        @field.value(30).should == 30
+      it "casts the value" do
+        @type.expects(:cast).with("30").returns(30)
+        @field.value("30").should == 30
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Durran Jordan
@@ -86,11 +86,18 @@ files:
 - lib/mongoid/extensions.rb
 - lib/mongoid/extensions/array/conversions.rb
 - lib/mongoid/extensions/array/parentization.rb
+- lib/mongoid/extensions/boolean/conversions.rb
+- lib/mongoid/extensions/date/conversions.rb
+- lib/mongoid/extensions/float/conversions.rb
 - lib/mongoid/extensions/hash/accessors.rb
+- lib/mongoid/extensions/integer/conversions.rb
+- lib/mongoid/extensions/object/casting.rb
 - lib/mongoid/extensions/object/conversions.rb
 - lib/mongoid/extensions/object/parentization.rb
+- lib/mongoid/extensions/string/conversions.rb
 - lib/mongoid/extensions/string/inflections.rb
 - lib/mongoid/extensions/symbol/inflections.rb
+- lib/mongoid/extensions/time/conversions.rb
 - lib/mongoid/field.rb
 - lib/mongoid/timestamps.rb
 - mongoid.gemspec
@@ -114,11 +121,17 @@ files:
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/extensions/array/conversions_spec.rb
 - spec/unit/mongoid/extensions/array/parentization_spec.rb
+- spec/unit/mongoid/extensions/boolean/conversions_spec.rb
+- spec/unit/mongoid/extensions/date/conversions_spec.rb
+- spec/unit/mongoid/extensions/float/conversions_spec.rb
 - spec/unit/mongoid/extensions/hash/accessors_spec.rb
+- spec/unit/mongoid/extensions/integer/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/parentization_spec.rb
+- spec/unit/mongoid/extensions/string/conversions_spec.rb
 - spec/unit/mongoid/extensions/string/inflections_spec.rb
 - spec/unit/mongoid/extensions/symbol/inflections_spec.rb
+- spec/unit/mongoid/extensions/time/conversions_spec.rb
 - spec/unit/mongoid/field_spec.rb
 - spec/unit/mongoid/timestamps_spec.rb
 has_rdoc: true
@@ -169,10 +182,16 @@ test_files:
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/extensions/array/conversions_spec.rb
 - spec/unit/mongoid/extensions/array/parentization_spec.rb
+- spec/unit/mongoid/extensions/boolean/conversions_spec.rb
+- spec/unit/mongoid/extensions/date/conversions_spec.rb
+- spec/unit/mongoid/extensions/float/conversions_spec.rb
 - spec/unit/mongoid/extensions/hash/accessors_spec.rb
+- spec/unit/mongoid/extensions/integer/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/parentization_spec.rb
+- spec/unit/mongoid/extensions/string/conversions_spec.rb
 - spec/unit/mongoid/extensions/string/inflections_spec.rb
 - spec/unit/mongoid/extensions/symbol/inflections_spec.rb
+- spec/unit/mongoid/extensions/time/conversions_spec.rb
 - spec/unit/mongoid/field_spec.rb
 - spec/unit/mongoid/timestamps_spec.rb