myrrha 3.0.0.rc1 → 3.0.0.rc2

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 group :runtime do
-  gem "domain", "= 1.0.0.rc1"
+  gem "domain", "~> 1.0.0.rc2"
 end
 
 group :test do

data/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     bluecloth (2.2.0)
     diff-lcs (1.1.3)
-    domain (1.0.0.rc1)
+    domain (1.0.0.rc2)
     rake (0.9.2.2)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -22,7 +22,7 @@ PLATFORMS
 
 DEPENDENCIES
   bluecloth (~> 2.2.0)
-  domain (= 1.0.0.rc1)
+  domain (~> 1.0.0.rc2)
   rake (~> 0.9.2)
   rspec (~> 2.8.0)
   wlang (~> 0.10.2)

data/examples/sbyc_domain.rb

@@ -13,7 +13,7 @@ PosInt.new(10)
 begin
   PosInt.new(-10)
   raise "Unexpected case: PosInt.new(-10) succeeds"
-rescue ArgumentError => ex
+rescue TypeError => ex
   puts ex.message
 end
 

data/lib/myrrha/ext/domain.rb

@@ -9,6 +9,12 @@ module Domain
 
     def coerce(arg)
       coercions.coerce(arg, self)
+    rescue Myrrha::Error
+      domain_error!(arg)
+    end
+
+    def [](first, *args)
+      args.empty? ? coerce(first) : coerce(args.unshift(first))
     end
 
   end # module CoercionMethods

data/lib/myrrha/version.rb

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

data/myrrha.gemspec

@@ -128,7 +128,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("yard", "~> 0.7.4")
   s.add_development_dependency("bluecloth", "~> 2.2.0")
   s.add_development_dependency("wlang", "~> 0.10.2")
-  s.add_dependency("domain", "= 1.0.0.rc1")
+  s.add_dependency("domain", "~> 1.0.0.rc2")
 
   # The version of ruby required by this gem
   #

data/myrrha.noespec

@@ -10,7 +10,7 @@ variables:
   upper:
     Myrrha
   version:
-    3.0.0.rc1
+    3.0.0.rc2
   summary: |-
     Myrrha provides the coercion framework which is missing to Ruby.
   description: |-
@@ -26,12 +26,12 @@ variables:
     - http://github.com/blambeau/myrrha
     - http://rubygems.org/gems/myrrha
   dependencies: 
-    - {name: domain,       version: "= 1.0.0.rc1", groups: [runtime]      }
-    - {name: rake,         version: "~> 0.9.2",    groups: [test, release]}
-    - {name: rspec,        version: "~> 2.8.0",    groups: [test, release]}
-    - {name: yard,         version: "~> 0.7.4",    groups: [doc          ]}
-    - {name: bluecloth,    version: "~> 2.2.0",    groups: [doc          ]}
-    - {name: wlang,        version: "~> 0.10.2",   groups: [release      ]}
+    - {name: domain,       version: "~> 1.0.0.rc2", groups: [runtime]      }
+    - {name: rake,         version: "~> 0.9.2",     groups: [test, release]}
+    - {name: rspec,        version: "~> 2.8.0",     groups: [test, release]}
+    - {name: yard,         version: "~> 0.7.4",     groups: [doc          ]}
+    - {name: bluecloth,    version: "~> 2.2.0",     groups: [doc          ]}
+    - {name: wlang,        version: "~> 0.10.2",    groups: [release      ]}
   rake_tasks:
     debug_mail:
       rx_changelog_sections: /^# /

data/spec/ext/domain/test_coerce.rb

@@ -3,14 +3,34 @@ describe Domain, "coerce" do
 
   let(:domain){ Domain.scalar(:x, :y) }
 
+  let(:expected){ domain.new(1, 2) }
+
   before do
     domain.coercions do |c|
-      c.coercion(String){|v,_| domain.new(1,2) }
+      c.coercion(String){|v,_| expected       }
+      c.coercion(Array) {|v,_| domain.new(*v) }
     end
   end
 
   it 'should delegate to coercions' do
-    domain.coerce("blah").should eq(domain.new(1,2))
+    domain.coerce("blah").should be(expected)
+  end
+
+  it 'raises a TypeError if something goes wrong' do
+    lambda{
+      domain.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)
+    end
+
+    it 'supports Array literals' do
+      domain[1, 3].should eq(domain.new(1, 3))
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myrrha
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,17 +96,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
 description: ! "Myrrha provides the coercion framework which is missing to Ruby. Coercions\nare
   simply defined as a set of rules for converting values from source to target\ndomains
   (in an abstract sense). As a typical and useful example, it comes with \na coerce()