myrrha 1.2.2 → 2.0.0

data/spec/myrrha/test_coercions.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 describe "Myrrha.coercions" do
   
   it "should support using user-defined domains" do
-    name = Myrrha.domain{|s| s.is_a?(Symbol)}
+    name = Myrrha::Domain.sbyc{|s| s.is_a?(Symbol)}
     rules = Myrrha.coercions do |r|
       r.coercion String, name, lambda{|s,t| s.to_sym}
       r.coercion name, String, lambda{|s,t| s.to_s}

data/spec/test_myrrha.rb

@@ -19,9 +19,6 @@ describe Myrrha do
     lambda{ 
       rules.coerce(true, Integer) 
     }.should raise_error(Myrrha::Error, "Unable to coerce `true` to Integer")
-    lambda{ 
-      rules.coerce("12.2", Integer)
-    }.should raise_error(Myrrha::Error, /^Unable to coerce `12.2` to Integer \(invalid value /)
   end
   
   it "should support upon rules" do

data/tasks/examples.rake

@@ -1,4 +1,4 @@
-task :examples do
+task :examples => :spec_test do
   lib = File.expand_path('../../lib', __FILE__)
   dir = File.expand_path('../../examples', __FILE__)
   Dir["#{dir}/*.rb"].each do |file|
@@ -10,6 +10,7 @@ task :examples do
       raise "Example #{file} failed." 
     end
   end
+  puts
 end
 task :spec => :examples
 task :test => :examples

data/tasks/gem.rake

@@ -25,13 +25,18 @@
 #
 begin
   require 'rubygems/package_task'
-  Gem::PackageTask.new($gemspec) do |t|
+
+  # Dynamically load the gem spec
+  gemspec_file = File.expand_path('../../myrrha.gemspec', __FILE__)
+  gemspec      = Kernel.eval(File.read(gemspec_file))
+
+  Gem::PackageTask.new(gemspec) do |t|
 
     # Name of the package
-    t.name = $gemspec.name
+    t.name = gemspec.name
 
     # Version of the package
-    t.version = $gemspec.version
+    t.version = gemspec.version
 
     # Directory used to store the package files
     t.package_dir = "pkg"
@@ -49,7 +54,7 @@ begin
     t.need_zip = false
 
     # List of files to be included in the package.
-    t.package_files = $gemspec.files
+    t.package_files = gemspec.files
 
     # Tar command for gzipped or bzip2ed archives.
     t.tar_command = "tar"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myrrha
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &75384950 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *75384950
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &75384660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *75384660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &75384390 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.7.4
   type: :development
   prerelease: false
-  version_requirements: *75384390
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &75384020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *75384020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: wlang
-  requirement: &75383730 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +85,12 @@ dependencies:
         version: 0.10.2
   type: :development
   prerelease: false
-  version_requirements: *75383730
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.2
 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()
@@ -80,48 +105,59 @@ extra_rdoc_files:
 - CHANGELOG.md
 - LICENCE.md
 files:
-- examples/to_ruby_literal_foo.rb
-- examples/coerce_foo.rb
-- examples/coerce_noext.rb
 - examples/coerce.rb
-- examples/friendly_but_safe_api.rb
+- examples/coerce_foo.rb
+- examples/coerce_foo2.rb
+- examples/coerce_foo3.rb
 - examples/coerce_intro.rb
-- examples/to_ruby_literal_foo2.rb
-- examples/to_ruby_literal.rb
-- examples/String#toXXX.rb
+- examples/coerce_noext.rb
 - examples/examples_helper.rb
-- examples/coerce_foo2.rb
+- examples/friendly_but_safe_api.rb
 - examples/sbyc_domain.rb
+- examples/String#toXXX.rb
+- examples/to_ruby_literal.rb
+- examples/to_ruby_literal_foo.rb
+- examples/to_ruby_literal_foo2.rb
 - examples/to_ruby_literal_foo3.rb
 - examples/to_ruby_literal_noext.rb
-- examples/coerce_foo3.rb
 - lib/myrrha/coerce.rb
-- lib/myrrha/to_ruby_literal.rb
+- lib/myrrha/coercions.rb
+- lib/myrrha/domain/coercion_methods.rb
+- lib/myrrha/domain/impl.rb
+- lib/myrrha/domain/sbyc.rb
+- lib/myrrha/domain/value_methods.rb
+- lib/myrrha/domain.rb
+- lib/myrrha/errors.rb
 - lib/myrrha/loader.rb
-- lib/myrrha/with_core_ext.rb
+- lib/myrrha/to_ruby_literal.rb
 - lib/myrrha/version.rb
+- lib/myrrha/with_core_ext.rb
 - lib/myrrha.rb
-- spec/spec_helper.rb
-- spec/myrrha/test_coercions.rb
-- spec/myrrha/test_domain.rb
-- spec/test_myrrha.rb
-- spec/test_to_ruby_literal.rb
-- spec/test_value.rb
-- spec/coercions/test_convert.rb
 - spec/coercions/test_append.rb
 - spec/coercions/test_belongs_to.rb
+- spec/coercions/test_convert.rb
+- spec/coercions/test_delegate.rb
 - spec/coercions/test_dup.rb
 - spec/coercions/test_subdomain.rb
-- spec/test_coerce.rb
+- spec/domain/impl/test_behavior.rb
+- spec/domain/impl/test_value_methods.rb
+- spec/domain/sbyc/test_behavior.rb
+- spec/domain/test_sbyc.rb
+- spec/myrrha/test_coercions.rb
 - spec/shared/a_value.rb
+- spec/spec_helper.rb
 - spec/test_assumptions.rb
+- spec/test_coerce.rb
+- spec/test_myrrha.rb
+- spec/test_to_ruby_literal.rb
+- spec/test_value.rb
 - tasks/debug_mail.rake
-- tasks/yard.rake
+- tasks/debug_mail.txt
 - tasks/examples.rake
 - tasks/gem.rake
 - tasks/spec_test.rake
 - tasks/unit_test.rake
-- tasks/debug_mail.txt
+- tasks/yard.rake
 - Rakefile
 - CHANGELOG.md
 - Gemfile
@@ -145,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 657683567
+      hash: -1652815196407861424
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,22 +190,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Myrrha provides the coercion framework which is missing to Ruby.
 test_files:
-- spec/spec_helper.rb
-- spec/myrrha/test_coercions.rb
-- spec/myrrha/test_domain.rb
-- spec/test_myrrha.rb
-- spec/test_to_ruby_literal.rb
-- spec/test_value.rb
-- spec/coercions/test_convert.rb
 - spec/coercions/test_append.rb
 - spec/coercions/test_belongs_to.rb
+- spec/coercions/test_convert.rb
+- spec/coercions/test_delegate.rb
 - spec/coercions/test_dup.rb
 - spec/coercions/test_subdomain.rb
-- spec/test_coerce.rb
+- spec/domain/impl/test_behavior.rb
+- spec/domain/impl/test_value_methods.rb
+- spec/domain/sbyc/test_behavior.rb
+- spec/domain/test_sbyc.rb
+- spec/myrrha/test_coercions.rb
 - spec/shared/a_value.rb
+- spec/spec_helper.rb
 - spec/test_assumptions.rb
+- spec/test_coerce.rb
+- spec/test_myrrha.rb
+- spec/test_to_ruby_literal.rb
+- spec/test_value.rb

data/spec/myrrha/test_domain.rb

@@ -1,116 +0,0 @@
-require 'spec_helper'
-module Myrrha
-  describe "#domain" do
-    
-    specify "the basic contract" do
-      subject = Myrrha.domain{|s| s == 12}
-      subject.should be_a(Class) 
-      subject.superclass.should eq(Object)
-      (subject === 12).should be_true
-      (subject === 13).should be_false
-    end
-    
-    specify "with a ruby superclass" do
-      subject = Myrrha.domain(Integer){|i| i > 0}
-      subject.should be_a(Class) 
-      subject.superclass.should eq(Integer)
-      (subject === 12).should be_true
-      (subject === 0).should be_false
-    end
-    
-    describe "A factored sub domain of Integer" do
-      PosInt = Myrrha.domain(Integer){|i| i > 0}
-      specify("#name") {
-        PosInt.name.should eq("Myrrha::PosInt")
-      }
-      specify("#new") {
-        PosInt.new(12).should eq(12)
-        lambda {
-          PosInt.new(0)
-        }.should raise_error(ArgumentError)
-      }
-      specify("#superclass"){
-        PosInt.superclass.should eql(Integer)
-      }
-      specify("#superdomain_of?"){
-        PosInt.superdomain_of?(Object).should be_false
-        PosInt.superdomain_of?(Integer).should be_false
-      }
-      it "should be usable in a case" do
-        [-12, 12].collect{|i|
-          case i
-          when PosInt
-            :posint
-          when Integer
-            :integer
-          end
-        }.should eq([:integer, :posint])
-      end
-    end
-      
-    describe "A factored domain by module inclusion" do
-      class NegInt < Integer
-        extend Myrrha::Domain
-        
-        def self.predicate
-          @predicate ||= lambda{|i| i<0}
-        end
-        
-      end
-      specify("#name") {
-        NegInt.name.should eq("Myrrha::NegInt")
-      }
-      specify("#new") {
-        NegInt.new(-12).should eq(-12)
-        lambda {
-          NegInt.new(12)
-        }.should raise_error(ArgumentError)
-      }
-      specify("#superclass"){
-        NegInt.superclass.should eql(Integer)
-      }
-      specify("#superdomain_of?"){
-        NegInt.superdomain_of?(Object).should be_false
-        NegInt.superdomain_of?(Integer).should be_false
-      }
-      it "should be usable in a case" do
-        [-12, 12].collect{|i|
-          case i
-          when NegInt
-            :negint
-          when Integer
-            :integer
-          end
-        }.should eq([:negint, :integer])
-      end
-    end
-    
-    describe "A factored sub domain of a user-defined Class" do
-      class Color
-        attr_reader :r
-        attr_reader :g
-        attr_reader :b
-        def initialize(r,g,b)
-          raise ArgumentError unless [r,g,b].all?{|i| i.is_a?(Integer)}
-          @r, @g, @b = r, g, b
-        end
-      end
-      RedToZero = Myrrha.domain(Color){|c| c.r == 0}
-      specify("#===") {
-        (RedToZero === Color.new(0,1,1)).should be_true
-        (RedToZero === Color.new(1,1,1)).should be_false
-      }
-      specify("#new") {
-        RedToZero.new(Color.new(0,1,1)).should be_a(Color)
-        RedToZero.new(0, 1, 1).should be_a(Color)
-        lambda{
-          RedToZero.new(Color.new(1,1,1))
-        }.should raise_error(ArgumentError)
-        lambda{
-          RedToZero.new(1, 1, 1)
-        }.should raise_error(ArgumentError)
-      }
-    end
-    
-  end
-end