ohm-contrib 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/ohm/contrib.rb

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

data/lib/ohm/contrib/typecast.rb

@@ -6,7 +6,7 @@ module Ohm
   module Types
     class String < ::String
       def self.[](value)
-        value
+        new(value)
       end
     end
 
@@ -29,14 +29,14 @@ module Ohm
       end
     end
 
-    class Decimal
+    class Decimal < BigDecimal
       CANONICAL = /^(\d+)?(\.\d+)?(E[+\-]\d+)?$/
 
       def self.[](value)
         return value if value.to_s.empty?
 
         if value.to_s =~ CANONICAL
-          BigDecimal(value)
+          new(value)
         else
           value
         end
@@ -63,26 +63,74 @@ module Ohm
       end
     end
   end
+  
+  module TypeAssertions
+
+  protected
+    def assert_type_decimal(att, error = [att, :not_decimal])
+      assert send(att).is_a?(Ohm::Types::Decimal), error
+    end
+
+    def assert_type_time(att, error = [att, :not_time])
+      assert send(att).is_a?(Ohm::Types::Time), error 
+    end
+
+    def assert_type_date(att, error = [att, :not_date])
+      assert send(att).is_a?(Ohm::Types::Date), error 
+    end
+
+    def assert_type_integer(att, error = [att, :not_integer])
+      assert send(att).is_a?(Ohm::Types::Integer), error
+    end
+
+    def assert_type_float(att, error = [att, :not_float])
+      assert send(att).is_a?(Ohm::Types::Float), error
+    end
+  end
 
   module Typecast
-    include Types
+    MissingValidation = Class.new(StandardError)
 
+    include Types
+    include TypeAssertions
+    
     def self.included(base)
-      base.extend Macros
+      base.extend ClassMethods
     end
 
-    module Macros
-      def attribute(name, type = String)
+    module ClassMethods
+      def attribute(name, type = Ohm::Types::String)
         define_method(name) do
           type[read_local(name)]
         end
 
         define_method(:"#{name}=") do |value|
-          write_local(name, value && value.to_s)
+          if type.respond_to?(:dump)
+            write_local(name, type.dump(value))
+          else
+            write_local(name, value && value.to_s)
+          end
         end
 
         attributes << name unless attributes.include?(name)
+        types[name] = type unless types.has_key?(name)
+      end
+      
+      def types
+        @types ||= {}
+      end
+    end
+
+    def valid?
+      return unless super
+
+      self.class.types.each do |field, type|
+        value = send(field)
+        
+        unless value.kind_of?(type)
+          raise MissingValidation, "#{field} expected to be #{type}, but was #{value.class}"
+        end
       end
     end
   end
-end
+end

data/ohm-contrib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ohm-contrib}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]
-  s.date = %q{2010-05-15}
+  s.date = %q{2010-05-18}
   s.description = %q{Highly decoupled drop-in functionality for Ohm models}
   s.email = %q{cyx.ucron@gmail.com}
   s.extra_rdoc_files = [

data/test/test_ohm_typecast.rb

@@ -16,6 +16,42 @@ class TestOhmTypecast < Test::Unit::TestCase
 
       assert_equal 0.1, sum
     end
+
+    context "given a non-decimal value FooBar" do
+      should "preseve the value FooBar" do
+        product = Product.new(:price => "FooBar")
+        assert_equal "FooBar", product.price
+      end
+
+      should "raise a MissingValidation error during validation" do
+        product = Product.new(:price => "FooBar")
+
+        assert_raise Ohm::Typecast::MissingValidation do
+          product.valid?
+        end
+      end
+    end
+
+    context "given a non-decimal value FooBar but with assert_type_decimal" do
+      class Post < Ohm::Model
+        include Ohm::Typecast
+
+        attribute :price, Decimal
+
+        def validate
+          super
+
+          assert_type_decimal :price
+        end
+      end
+
+      should "be invalid and have an error on the field" do
+        post = Post.new(:price => "FooBar")
+
+        assert ! post.valid?
+        assert_equal [[:price, :not_decimal]], post.errors
+      end
+    end
   end
 
   context "time typecasting" do
@@ -30,7 +66,7 @@ class TestOhmTypecast < Test::Unit::TestCase
       product = Product.create(:start_of_sale => @time)
       product = Product[product.id]
 
-      assert_equal @time, product.start_of_sale
+      assert_equal @time.to_s, product.start_of_sale.to_s
     end
 
     test "the retrieved value is a Time object" do
@@ -42,10 +78,9 @@ class TestOhmTypecast < Test::Unit::TestCase
     end
 
     test "an invalid string" do
-      product = Product.create(:start_of_sale => "invalid time")
-      product = Product[product.id]
-
-      assert_equal "invalid time", product.start_of_sale
+      assert_raise Ohm::Typecast::MissingValidation do
+        product = Product.create(:start_of_sale => "invalid time")
+      end
     end
 
     test "when nil" do
@@ -59,6 +94,26 @@ class TestOhmTypecast < Test::Unit::TestCase
     end
   end
 
+  context "time typecasting with assert_type_time" do
+    class Post < Ohm::Model
+      include Ohm::Typecast
+
+      attribute :start_of_sale, Time
+
+      def validate
+        super
+
+        assert_type_time :start_of_sale
+      end
+    end
+
+    should "be valid given invalid time value" do
+      post = Post.new(:start_of_sale => "FooBar")
+      assert ! post.valid?
+      assert_equal [[:start_of_sale, :not_time]], post.errors
+    end
+  end
+
   context "date typecasting" do
     class Product < Ohm::Model
       include Ohm::Typecast
@@ -82,10 +137,10 @@ class TestOhmTypecast < Test::Unit::TestCase
       assert_kind_of Date, product.date_bought
     end
 
-    test "assigning a string which is not a valid date before persisting" do
-      product = Product.create(:date_bought => "Bla Bla")
-
-      assert_equal "Bla Bla", product.date_bought
+    test "assigning a string which is not a valid date" do
+      assert_raise Ohm::Typecast::MissingValidation do
+        product = Product.create(:date_bought => "Bla Bla")
+      end
     end
 
     test "when nil" do
@@ -97,6 +152,25 @@ class TestOhmTypecast < Test::Unit::TestCase
     end
   end
 
+  context "date typecasting with assert_type_date" do
+    class Post < Ohm::Model
+      include Ohm::Typecast
+
+      attribute :created, Date
+
+      def validate
+        assert_type_date :created
+      end
+    end
+
+    should "have an invalid created field on save" do
+      post = Post.new(:created => "FooBar")
+      assert ! post.valid?
+      assert_equal [[:created, :not_date]], post.errors
+      assert_equal "FooBar", post.created
+    end
+  end
+
   context "integer typecasting" do
     class Product < Ohm::Model
       include Ohm::Typecast
@@ -125,6 +199,25 @@ class TestOhmTypecast < Test::Unit::TestCase
     end
   end
 
+  context "integer typecasting with assert_type_integer validation" do
+    class Post < Ohm::Model
+      include Ohm::Typecast
+
+      attribute :counter, Integer
+
+      def validate
+        assert_type_integer :counter
+      end
+    end
+
+    should "have an error on counter given a non-integer value" do
+      post = Post.new(:counter => "FooBar")
+      assert ! post.valid?
+      assert_equal [[:counter, :not_integer]], post.errors
+      assert_equal "FooBar", post.counter
+    end
+  end
+
   context "float typecasting" do
     class Product < Ohm::Model
       include Ohm::Typecast
@@ -157,6 +250,26 @@ class TestOhmTypecast < Test::Unit::TestCase
     end
   end
 
+  context "float typecasting with assert_type_float validation" do
+    class Post < Ohm::Model
+      include Ohm::Typecast
+
+      attribute :quotient, Float
+
+      def validate
+        assert_type_float :quotient
+      end
+    end
+
+    should "have an error on quotient given a non-float value" do
+      post = Post.new(:quotient => "FooBar")
+      assert ! post.valid?
+      assert_equal [[:quotient, :not_float]], post.errors
+      assert_equal "FooBar", post.quotient
+    end
+  end
+
+
   context "trying to validate numericality of a decimal" do
     class Item < Ohm::Model
       include Ohm::Typecast
@@ -177,4 +290,82 @@ class TestOhmTypecast < Test::Unit::TestCase
       assert_equal [[:price, :not_numeric]], @item.errors
     end
   end
-end
+
+  context "specifying a custom DataType without a #dump method" do
+    class ::FooBar < Struct.new(:value)
+      def self.[](str)
+        new(str)
+      end
+    end
+    
+    class Item < Ohm::Model
+      include Ohm::Typecast
+
+      attribute :foo, FooBar
+    end
+
+    should "use it as expected" do
+      item = Item.new(:foo => "bar")
+      assert_equal FooBar.new("bar"), item.foo
+    end
+  end
+
+  context "specifying a customer DataType but with a #dump method" do
+    class ::CSV < Array
+      def self.dump(arr)
+        arr.join(',')
+      end
+
+      def self.[](str)
+        new(str.split(','))
+      end
+
+      def to_s
+        join(',')
+      end
+    end
+
+    class Item < Ohm::Model
+      include Ohm::Typecast
+
+      attribute :csv, CSV
+    end
+
+
+    should "dump the appropriate value" do
+      item = Item.new(:csv => [ 'first', 'second', 'third'])
+      
+      assert_equal 'first,second,third', item.send(:read_local, :csv)
+    end
+
+    should "be able to retrieve it back properly" do
+      item = Item.create(:csv => [ 'first', 'second', 'third'])
+      item = Item[item.id]
+
+      assert_equal ['first', 'second', 'third'], item.csv
+    end
+
+    should "also be able to read/write with raw CSV" do
+      item = Item.create(:csv => CSV.new(['first', 'second', 'third']))
+      item = Item[item.id]
+
+      assert_equal ['first', 'second', 'third'], item.csv
+    end
+  end
+
+  context "defaut Strings" do
+    class Post < Ohm::Model
+      include Ohm::Typecast
+      
+      attribute :field1
+      attribute :field2
+      attribute :field3
+    end
+
+    should "not throw a validation missing exception during save" do
+      assert_nothing_raised Ohm::Typecast::MissingValidation do
+        Post.create :field1 => "field1", :field2 => "field2", :field3 => "fld3"
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Cyril David
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-15 00:00:00 +08:00
+date: 2010-05-18 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency