myrrha 3.0.0.rc6 → 3.0.0.rc7

data/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 * Implementation of domains has been moved to the domain gem. The syntax to create domains
   has therefore changed. Myrrha::Domain does no longer exists.
+* An error handler can now be set on Coercions rules. The default one raises a
+  Myrrha::Error, preserving backward compatibility.
 
 # 2.0.0 / 2012-09-26
 

data/lib/myrrha/coercions.rb

@@ -6,6 +6,9 @@ module Myrrha
     # @return [Domain] The main target domain, if any
     attr_accessor :main_target_domain
 
+    # @return [Proc] the proc that handles coercion errors
+    attr_accessor :error_handler
+
     # Creates an empty list of coercion rules
     def initialize(&defn)
       @definitions = []
@@ -14,6 +17,9 @@ module Myrrha
       @fallbacks = []
       @appender = :<<
       @main_target_domain = nil
+      @error_handler = lambda{|value, target_domain, cause|
+        raise Error.new("Unable to coerce `#{value}` to #{target_domain}", cause)
+      }
       extend_rules(:<<, defn) if defn
     end
 
@@ -180,7 +186,7 @@ module Myrrha
           error = ex unless error
         end
       end
-      raise Error.new("Unable to coerce `#{value}` to #{target_domain}", error)
+      error_handler.call(value, target_domain, error)
     end
     alias :apply :coerce
 

data/lib/myrrha/errors.rb

@@ -2,7 +2,7 @@ module Myrrha
 
   # Raised when a coercion fails
   class Error < StandardError
-    attr_reader :cause
+    attr_accessor :cause
     def initialize(msg, cause = $!)
       super(msg)
       @cause = cause

data/lib/myrrha/ext/domain.rb

@@ -2,16 +2,19 @@ module Domain
   module CoercionMethods
 
     def coercions(&bl)
-      @coercions ||= ::Myrrha::Coercions.new{|c| c.main_target_domain = self}
+      @coercions ||= ::Myrrha::Coercions.new{|c|
+        c.main_target_domain = self
+        c.error_handler = lambda{|v,t,c|
+          raise c if TypeError===c
+          domain_error!(v)
+        }
+      }
       @coercions.append(&bl) if bl
       @coercions
     end
 
     def coerce(arg)
       coercions.coerce(arg, self)
-    rescue Myrrha::Error => ex
-      raise ex.cause if ex.cause
-      domain_error!(arg)
     end
     alias_method :[], :coerce
 

data/lib/myrrha/version.rb

@@ -3,7 +3,7 @@ module Myrrha
 
     MAJOR = 3
     MINOR = 0
-    TINY  = "0.rc6"
+    TINY  = "0.rc7"
 
     def self.to_s
       [ MAJOR, MINOR, TINY ].join('.')

data/myrrha.noespec

@@ -10,7 +10,7 @@ variables:
   upper:
     Myrrha
   version:
-    3.0.0.rc6
+    3.0.0.rc7
   summary: |-
     Myrrha provides the coercion framework which is missing to Ruby.
   description: |-

data/spec/coercions/test_error_handler.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+module Myrrha
+  describe Coercions, "error_handler" do
+
+    subject{ rules.apply(12, Float) }
+
+    context 'with the default error handler' do
+      let(:rules){ 
+        Coercions.new
+      }
+
+      it "raises a Myrrha::Error when coercion fails" do
+        lambda{
+          subject
+        }.should raise_error(Myrrha::Error, /Unable to coerce `12` to Float/)
+      end
+    end
+
+    context 'with a user-defined error handler' do
+      let(:rules){ 
+        Coercions.new{|c|
+          c.error_handler = lambda{|*args| args }
+        }
+      }
+
+      it "calls the handler when coercion fails" do
+        subject.should eq([12, Float, nil])
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myrrha
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc6
+  version: 3.0.0.rc7
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -150,6 +150,7 @@ files:
 - spec/coercions/test_convert.rb
 - spec/coercions/test_delegate.rb
 - spec/coercions/test_dup.rb
+- spec/coercions/test_error_handler.rb
 - spec/coercions/test_subdomain.rb
 - spec/ext/domain/test_coerce.rb
 - spec/ext/domain/test_coercions.rb
@@ -207,6 +208,7 @@ test_files:
 - spec/coercions/test_convert.rb
 - spec/coercions/test_delegate.rb
 - spec/coercions/test_dup.rb
+- spec/coercions/test_error_handler.rb
 - spec/coercions/test_subdomain.rb
 - spec/ext/domain/test_coerce.rb
 - spec/ext/domain/test_coercions.rb