ohm-contrib 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/ohm/contrib.rb

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

data/lib/ohm/contrib/typecast.rb

@@ -11,6 +11,8 @@ module Ohm
     end
 
     class Time < ::Time
+      ASSERTION = :assert_type_time
+
       def self.[](value)
         return value if value.to_s.empty?
 
@@ -20,6 +22,8 @@ module Ohm
     end
 
     class Date < ::Date
+      ASSERTION = :assert_type_date
+
       def self.[](value)
         return value if value.to_s.empty?
 
@@ -30,6 +34,7 @@ module Ohm
     end
 
     class Decimal < BigDecimal
+      ASSERTION = :assert_type_decimal
       CANONICAL = /^(\d+)?(\.\d+)?(E[+\-]\d+)?$/
 
       def self.[](value)
@@ -44,6 +49,8 @@ module Ohm
     end
 
     class Float < ::Float
+      ASSERTION = :assert_type_float
+
       def self.[](value)
         return value if value.to_s.empty?
 
@@ -54,6 +61,8 @@ module Ohm
     end
 
     class Integer < ::Integer
+      ASSERTION = :assert_type_integer
+
       def self.[](value)
         return value if value.to_s.empty?
 
@@ -92,21 +101,16 @@ module Ohm
     class MissingValidation < StandardError
       MESSAGE = "%s :%s is required in your #validate method"
 
-      attr :type
       attr :field
+      attr :assertion
 
-      def initialize(type, field)
-        @type, @field = type, field
+      def initialize(field, assertion)
+        @field, @assertion = field, assertion
       end
 
       def message
         MESSAGE % [assertion, field]
       end
-
-    protected
-      def assertion
-        'assert_type_%s' % type.name.split('::').last.downcase
-      end
     end
 
     include Types
@@ -117,7 +121,7 @@ module Ohm
     end
 
     module ClassMethods
-      def attribute(name, type = Ohm::Types::String)
+      def attribute(name, type = Ohm::Types::String, assertion = defined?(type::ASSERTION) ? type::ASSERTION : nil)
         define_method(name) do
           type[read_local(name)]
         end
@@ -131,7 +135,7 @@ module Ohm
         end
 
         attributes << name unless attributes.include?(name)
-        types[name] = type unless types.has_key?(name)
+        types[name] = [type, assertion] unless types.has_key?(name)
       end
       
       def types
@@ -142,13 +146,19 @@ module Ohm
     def valid?
       return unless super
 
-      self.class.types.each do |field, type|
+      self.class.types.each do |field, (type, assertion)|
         value = send(field)
         
         unless value.kind_of?(type)
-          raise MissingValidation.new(type, field)
+          raise MissingValidation.new(field, assertion)
         end
       end
     end
+
+    def validate
+      self.class.types.each do |field, (type, assertion)|
+        send assertion, field  if assertion
+      end
+    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.7"
+  s.version = "0.0.8"
 
   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

@@ -6,6 +6,10 @@ class TestOhmTypecast < Test::Unit::TestCase
       include Ohm::Typecast
 
       attribute :price, Decimal
+
+      # override validate and purposely forget super
+      def validate
+      end
     end
 
     should "properly preserve the right precision" do
@@ -41,12 +45,6 @@ class TestOhmTypecast < Test::Unit::TestCase
         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
@@ -63,6 +61,10 @@ class TestOhmTypecast < Test::Unit::TestCase
       include Ohm::Typecast
 
       attribute :start_of_sale, Time
+  
+      # we override validate and purposely forget to call super
+      def validate
+      end
     end
 
     test "read / write" do
@@ -107,12 +109,6 @@ class TestOhmTypecast < Test::Unit::TestCase
       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
@@ -127,6 +123,10 @@ class TestOhmTypecast < Test::Unit::TestCase
       include Ohm::Typecast
 
       attribute :date_bought, Date
+
+      # override validate and purposely forget super
+      def validate
+      end
     end
 
     test "read / write" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Cyril David