ohm-contrib 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/ohm/contrib.rb

@@ -1,6 +1,6 @@
 module Ohm
   module Contrib
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 
   autoload :Boundaries,        "ohm/contrib/boundaries"

data/lib/ohm/contrib/typecast.rb

@@ -3,15 +3,72 @@ require 'time'
 require 'date'
 
 module Ohm
+  module Types
+    class String < ::String
+      def self.[](value)
+        value
+      end
+    end
+
+    class Time < ::Time
+      def self.[](value)
+        return value if value.to_s.empty?
+
+        ret = parse(value)
+        ret.to_s == value ? ret : value
+      end
+    end
+
+    class Date < ::Date
+      def self.[](value)
+        return value if value.to_s.empty?
+        
+        parse(value)
+      rescue ArgumentError
+        value
+      end
+    end
+
+    class Decimal
+      def self.[](value)
+        return value if value.to_s.empty?
+
+        BigDecimal(value)
+      end
+    end
+
+    class Float < ::Float
+      def self.[](value)
+        return value if value.to_s.empty?
+
+        Float(value)
+      rescue ArgumentError
+        value
+      end
+    end
+
+    class Integer < ::Integer
+      def self.[](value)
+        return value if value.to_s.empty?
+
+        Integer(value)
+      rescue ArgumentError
+        value
+      end
+    end
+  end
+
   module Typecast
+    include Types
+
     def self.included(base)
-      base.extend Macros 
+      base.extend Macros
     end
-
+    
     module Macros
-      def attribute(name, type = :string)
+      def attribute(name, type = String)
         define_method(name) do
-          typecast(read_local(name), type)
+          type[read_local(name)]
         end
 
         define_method(:"#{name}=") do |value|
@@ -21,28 +78,5 @@ module Ohm
         attributes << name unless attributes.include?(name)
       end
     end
-
-  protected
-    def typecast(val, type)
-      return val if val.to_s.empty?
-
-      case type
-      when :integer then Integer(val)
-      when :float   then Float(val)
-      when :decimal then BigDecimal(val)
-      when :time    
-        ret = Time.parse(val)
-        ret.to_s == val ? ret : val
-
-      when :date    then Date.parse(val)
-      when :string  then val
-      end
-  
-    # All of the casting methods used above raises an ArgumentError
-    # if it fails to parse the value properly. If this happens,
-    # the least surprising behavior is to return the original value
-    rescue ArgumentError
-      val
-    end
   end
 end

data/ohm-contrib.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ohm-contrib}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]

data/test/test_ohm_typecast.rb

@@ -5,7 +5,7 @@ class TestOhmTypecast < Test::Unit::TestCase
     class Product < Ohm::Model
       include Ohm::Typecast
 
-      attribute :price, :decimal
+      attribute :price, Decimal
     end
 
     should "properly preserve the right precision" do
@@ -22,7 +22,7 @@ class TestOhmTypecast < Test::Unit::TestCase
     class Product < Ohm::Model
       include Ohm::Typecast
 
-      attribute :start_of_sale, :time
+      attribute :start_of_sale, Time
     end
 
     test "read / write" do
@@ -37,8 +37,8 @@ class TestOhmTypecast < Test::Unit::TestCase
       @time = Time.now.utc
       product = Product.create(:start_of_sale => @time)
       product = Product[product.id]
-      
-      assert_instance_of Time, product.start_of_sale
+       
+      assert_kind_of Time, product.start_of_sale
     end
 
     test "an invalid string" do
@@ -63,7 +63,7 @@ class TestOhmTypecast < Test::Unit::TestCase
     class Product < Ohm::Model
       include Ohm::Typecast
 
-      attribute :date_bought, :date
+      attribute :date_bought, Date
     end
 
     test "read / write" do
@@ -79,7 +79,7 @@ class TestOhmTypecast < Test::Unit::TestCase
       product = Product.create(:date_bought => @date)
       product = Product[product.id]
       
-      assert_instance_of Date, product.date_bought
+      assert_kind_of Date, product.date_bought
     end
 
     test "assigning a string which is not a valid date before persisting" do
@@ -101,7 +101,7 @@ class TestOhmTypecast < Test::Unit::TestCase
     class Product < Ohm::Model
       include Ohm::Typecast
 
-      attribute :stock_count, :integer
+      attribute :stock_count, Integer
     end
 
     test "when nil" do
@@ -129,7 +129,7 @@ class TestOhmTypecast < Test::Unit::TestCase
     class Product < Ohm::Model
       include Ohm::Typecast
 
-      attribute :vat, :float
+      attribute :vat, Float
     end
 
     test "when nil" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Cyril David