modelish 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## O.1.1 (2011-03-28)
+
+* Add DateTime to standard supported property types.
+
+## 0.1.0 (2011-03-28)
+
+* Initial release, extending hashie to add property types and validations.

data/lib/modelish/property_types.rb

@@ -29,6 +29,7 @@ module Modelish
       #   * +Float+
       #   * +Array+
       #   * +Date+ -- converts using Date.parse on value.to_s
+      #   * +DateTime+ -- converts using DateTime.parse on value.to_s
       #   * +Symbol+ -- also converts from camel case to snake case
       #   * +String+
       #   * any arbitrary +Class+ -- will attempt conversion by passing the raw
@@ -112,8 +113,8 @@ module Modelish
       end
 
       def value_converter(property_type)
-        if property_type == Date
-          lambda { |val| Date.parse(val.to_s) }
+        if [Date, DateTime].include?(property_type)
+          lambda { |val| property_type.parse(val.to_s) }
         elsif property_type == Symbol
           lambda { |val| val.to_s.strip.gsub(/([A-Z]+)([A-Z][a-z])/, '\\1_\\2').
                                           gsub(/([a-z\d])([A-Z])/, '\\1_\\2').

data/lib/modelish/validations.rb

@@ -172,6 +172,7 @@ module Modelish
       #   * +Integer+
       #   * +Float+
       #   * +Date+
+      #   * +DateTime+
       #   * +Symbol+ 
       #   * any arbitrary +Class+ -- validates based on the results of is_a?
       # @return [ArgumentError] when validation fails
@@ -185,8 +186,8 @@ module Modelish
               is_valid = (value.is_a?(Integer) || value.to_s =~ /^\-?\d+$/)
             elsif type == Float
               is_valid = (value.is_a?(Float) || value.to_s =~ /^\-?\d+\.?\d*$/)
-            elsif type == Date
-              is_valid = (value.is_a?(Date) || Date.parse(value)) 
+            elsif [Date, DateTime].include?(type)
+              is_valid = value.is_a?(type) || (type.parse(value.to_s) rescue false)
             elsif type == Symbol
               is_valid = value.respond_to?(:to_sym)
             else

data/lib/modelish/version.rb

@@ -1,3 +1,3 @@
 module Modelish
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/modelish/property_types_spec.rb

@@ -55,6 +55,16 @@ describe Modelish::PropertyTypes do
       end
     end
 
+    context "when property_type is DateTime" do
+      let(:property_type) { DateTime }
+
+      it_should_behave_like 'a typed property', :my_property, DateTime do
+        let(:valid_string) { '2011-02-24T14:09:43-07:00' }
+        let(:valid_typed_value) { DateTime.civil(2011, 2, 24, 14, 9, 43, Rational(-7, 24)) }
+        let(:invalid_value) { 'foo' }
+      end
+    end
+
     context "when property_type is String" do
       let(:property_type) { String }
 

data/spec/modelish/validations_spec.rb

@@ -389,6 +389,37 @@ describe Modelish::Validations do
       end
     end
 
+    context "for type DateTime" do
+      let(:property_type) { DateTime }
+
+      context "with nil value" do
+        let(:property_value) { nil }
+
+        it { should be_nil }
+      end
+
+      context "with valid string" do
+        let(:property_value) { '2011-03-10T03:15:23-05:00' }
+
+        it { should be_nil }
+      end
+
+      context "with valid DateTime" do
+        let(:property_value) { DateTime.civil(2011, 3, 10, 3, 15, 23, Rational(-5, 24)) }
+
+        it { should be_nil }
+      end
+
+      context "with invalid value" do
+        let(:property_value) { 'this is not a date time' }
+
+        it { should be_an ArgumentError }
+        its(:message) { should match(/#{property_name}/i) }
+        its(:message) { should match(/#{property_value.inspect}/i) }
+        its(:message) { should match(/#{property_type}/i) }
+      end
+    end
+
     context "for a Symbol type" do
       let(:property_type) { Symbol }
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: modelish
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Maeve Revels
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -39,6 +41,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 5
@@ -53,6 +56,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 6
@@ -67,6 +71,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 2
         - 0
@@ -82,6 +87,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -100,6 +106,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -132,6 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -140,13 +148,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: modelish
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A lightweight pseudo-modeling not-quite-framework