myrrha 3.0.0.rc5 → 3.0.0.rc6

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 group :runtime do
-  gem "domain", "~> 1.0.0.rc2"
+  gem "domain", "~> 1.0.0.rc3"
 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.rc2)
+    domain (1.0.0.rc3)
     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.rc2)
+  domain (~> 1.0.0.rc3)
   rake (~> 0.9.2)
   rspec (~> 2.8.0)
   wlang (~> 0.10.2)

data/README.md

@@ -308,12 +308,13 @@ A set of coercion rules can simply be created from scratch as follows:
 
         # PRE: - user wants to coerce `value` to a requested_domain
         #      - belongs_to?(value, SourceDomain)
-        #      - subdomain?(TargetDomain, requested_domain)
+        #      - TargetDomain <=> requested_domain
 
         # implement the coercion or throw(:newrule)
         returned_value = something(value)
 
-        # POST: returned_value belongs to requested_domain
+        # POST: returned_value belongs either to TorgetDomain or to
+        #       requested_domain (very smart converter)
 
       end
 

data/lib/myrrha/coercions.rb

@@ -172,7 +172,7 @@ module Myrrha
               got = convert(value, target_domain, converter)
               return got
             elsif subdomain?(target_domain, to)
-              got = convert(value, to, converter)
+              got = convert(value, target_domain, converter)
               return got if belongs_to?(got, target_domain)
             end
           end
@@ -223,15 +223,7 @@ module Myrrha
     #         otherwise.
     #
     def subdomain?(child, parent)
-      if child == parent
-        true
-      elsif parent.respond_to?(:super_domain_of?)
-        parent.super_domain_of?(child)
-      elsif child.respond_to?(:superclass) && child.superclass
-        subdomain?(child.superclass, parent)
-      else
-        false
-      end
+      parent >= child rescue false
     end
 
     # Extends existing rules

data/lib/myrrha/version.rb

@@ -3,7 +3,7 @@ module Myrrha
 
     MAJOR = 3
     MINOR = 0
-    TINY  = '0.rc5'
+    TINY  = "0.rc6"
 
     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.rc2")
+  s.add_dependency("domain", "~> 1.0.0.rc3")
 
   # The version of ruby required by this gem
   #

data/myrrha.noespec

@@ -10,7 +10,7 @@ variables:
   upper:
     Myrrha
   version:
-    3.0.0.rc5
+    3.0.0.rc6
   summary: |-
     Myrrha provides the coercion framework which is missing to Ruby.
   description: |-
@@ -26,7 +26,7 @@ variables:
     - http://github.com/blambeau/myrrha
     - http://rubygems.org/gems/myrrha
   dependencies: 
-    - {name: domain,       version: "~> 1.0.0.rc2", groups: [runtime]      }
+    - {name: domain,       version: "~> 1.0.0.rc3", 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          ]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myrrha
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc5
+  version: 3.0.0.rc6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0.rc3
 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()