ohm-contrib 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/ohm/contrib.rb

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

data/lib/ohm/contrib/typecast.rb

@@ -89,7 +89,25 @@ module Ohm
   end
 
   module Typecast
-    MissingValidation = Class.new(StandardError)
+    class MissingValidation < StandardError
+      MESSAGE = "%s :%s is required in your #validate method"
+
+      attr :type
+      attr :field
+
+      def initialize(type, field)
+        @type, @field = type, field
+      end
+
+      def message
+        MESSAGE % [assertion, field]
+      end
+
+    protected
+      def assertion
+        'assert_type_%s' % type.name.split('::').last.downcase
+      end
+    end
 
     include Types
     include TypeAssertions
@@ -128,7 +146,7 @@ module Ohm
         value = send(field)
         
         unless value.kind_of?(type)
-          raise MissingValidation, "#{field} expected to be #{type}, but was #{value.class}"
+          raise MissingValidation.new(type, field)
         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.6"
+  s.version = "0.0.7"
 
   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

@@ -26,8 +26,12 @@ class TestOhmTypecast < Test::Unit::TestCase
       should "raise a MissingValidation error during validation" do
         product = Product.new(:price => "FooBar")
 
-        assert_raise Ohm::Typecast::MissingValidation do
+        begin
           product.valid?
+        rescue Ohm::Typecast::MissingValidation => ex
+          assert_match(/assert_type_decimal :price is required in your #validate method/, ex.message)
+        else
+          flunk "Should have raised MissingValidation"
         end
       end
     end
@@ -78,8 +82,12 @@ class TestOhmTypecast < Test::Unit::TestCase
     end
 
     test "an invalid string" do
-      assert_raise Ohm::Typecast::MissingValidation do
-        product = Product.create(:start_of_sale => "invalid time")
+      begin
+        Product.create(:start_of_sale => "invalid time")
+      rescue Ohm::Typecast::MissingValidation => ex
+        assert_match(/assert_type_time :start_of_sale is required in your #validate method/, ex.message)
+      else
+        flunk "Should have raised MissingValidation"
       end
     end
 
@@ -138,8 +146,12 @@ class TestOhmTypecast < Test::Unit::TestCase
     end
 
     test "assigning a string which is not a valid date" do
-      assert_raise Ohm::Typecast::MissingValidation do
-        product = Product.create(:date_bought => "Bla Bla")
+      begin
+        Product.create(:date_bought => "Bla Bla")
+      rescue Ohm::Typecast::MissingValidation => ex
+        assert_match(/assert_type_date :date_bought is required in your #validate method/, ex.message)
+      else
+        flunk "Should have raised MissingValidation"
       end
     end
 

metadata

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