myrrha 3.0.0.rc3 → 3.0.0.rc4

data/lib/myrrha/ext/domain.rb

@@ -9,21 +9,11 @@ module Domain
 
     def coerce(arg)
       coercions.coerce(arg, self)
-    rescue Myrrha::Error
+    rescue Myrrha::Error => ex
       domain_error!(arg)
     end
+    alias_method :[], :coerce
 
-    def [](first = NOT_PROVIDED, *args)
-      if first == NOT_PROVIDED
-        coerce([])
-      elsif args.empty?
-        coerce(first)
-      else
-        coerce(args.unshift(first))
-      end
-    end
-
-    NOT_PROVIDED = Object.new
   end # module CoercionMethods
   include CoercionMethods
 end # module Domain

data/lib/myrrha/version.rb

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

data/myrrha.noespec

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

data/spec/ext/domain/test_coerce.rb

@@ -1,39 +1,46 @@
 require 'spec_helper'
 describe Domain, "coerce" do
 
-  let(:domain){ Domain.scalar(:x, :y) }
+  class Point
+    extend Domain::Scalar.new(:x, :y)
 
-  let(:expected){ domain.new(1, 2) }
-
-  before do
-    domain.coercions do |c|
-      c.coercion(String){|v,_| expected }
-      c.coercion(Array) {|v,_| expected }
+    coercions do |c|
+      c.coercion(String){|v,_| Point.new(*v.split(',').map(&:to_i)) }
+      c.coercion(Array) {|v,_| Point.new(*v) }
     end
+
+    EMPTY = Point.new(0, 0)
   end
 
+  let(:point_1_1){ Point.new(1, 1) }
+  let(:point_2_2){ Point.new(2, 2) }
+
   it 'should delegate to coercions' do
-    domain.coerce("blah").should be(expected)
+    Point.coerce("1, 1").should eq(point_1_1)
   end
 
   it 'raises a TypeError if something goes wrong' do
     lambda{
-      domain.coerce(12)
+      Point.coerce(12)
     }.should raise_error(TypeError, /Can't convert `12`/)
   end
 
   describe "the [] alias" do
 
     it 'delegates to coerce when one argument' do
-      domain["12"].should be(expected)
+      Point["1,1"].should eq(point_1_1)
+    end
+
+    it 'supports Array' do
+      Point[[2, 2]].should eq(point_2_2)
     end
 
     it 'supports Array literals' do
-      domain[1, 3].should eq(expected)
+      Point[2, 2].should eq(point_2_2)
     end
 
     it 'supports empty Array literals' do
-      domain[].should eq(expected)
+      Point[].should be(Point::EMPTY)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myrrha
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc3
+  version: 3.0.0.rc4
   prerelease: 6
 platform: ruby
 authors: