myrrha 3.0.0.rc7 → 3.0.0

data/CHANGELOG.md

@@ -1,9 +1,10 @@
-# 3.0.0 / FIX ME
+# 3.0.0 / 2013-02-11
 
 * 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.
+* Fixed a to_ruby_literal bug that made JRuby using Marshall much too often.
 
 # 2.0.0 / 2012-09-26
 

data/Gemfile

@@ -1,21 +1,21 @@
 source 'http://rubygems.org'
 
 group :runtime do
-  gem "domain", "~> 1.0.0.rc3"
+  gem "domain", "~> 1.0"
 end
 
 group :test do
-  gem "rake", "~> 0.9.2"
-  gem "rspec", "~> 2.8.0"
+  gem "rake", "~> 10.0"
+  gem "rspec", "~> 2.10"
 end
 
 group :release do
-  gem "rake", "~> 0.9.2"
-  gem "rspec", "~> 2.8.0"
+  gem "rake", "~> 10.0"
+  gem "rspec", "~> 2.10"
   gem "wlang", "~> 0.10.2"
 end
 
 group :doc do
   gem "yard", "~> 0.7.4"
-  gem "bluecloth", "~> 2.2.0"
+  gem "bluecloth", "~> 2.2"
 end

data/Gemfile.lock

@@ -3,16 +3,16 @@ GEM
   specs:
     bluecloth (2.2.0)
     diff-lcs (1.1.3)
-    domain (1.0.0.rc3)
-    rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    domain (1.0.0)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
     wlang (0.10.2)
     yard (0.7.4)
 
@@ -21,9 +21,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bluecloth (~> 2.2.0)
-  domain (~> 1.0.0.rc3)
-  rake (~> 0.9.2)
-  rspec (~> 2.8.0)
+  bluecloth (~> 2.2)
+  domain (~> 1.0)
+  rake (~> 10.0)
+  rspec (~> 2.10)
   wlang (~> 0.10.2)
   yard (~> 0.7.4)

data/lib/myrrha/coercions.rb

@@ -229,7 +229,7 @@ module Myrrha
     #         otherwise.
     #
     def subdomain?(child, parent)
-      parent >= child rescue false
+      (child == parent) || (parent >= child rescue false)
     end
 
     # Extends existing rules

data/lib/myrrha/to_ruby_literal.rb

@@ -15,7 +15,7 @@ module Myrrha
     end
     
     # On safe .inspect 
-    safe = lambda{|x| TO_RUBY_THROUGH_INSPECT.include?(x.class)}
+    safe = lambda{|x,_| TO_RUBY_THROUGH_INSPECT.include?(x.class)}
     r.coercion(safe) do |s,t| 
       s.inspect
     end

data/lib/myrrha/version.rb

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

data/myrrha.gemspec

@@ -123,12 +123,12 @@ Gem::Specification.new do |s|
   # One call to add_development_dependency('gem_name', 'gem version requirement')
   # for each development dependency. These gems are required for developers
   #
-  s.add_development_dependency("rake", "~> 0.9.2")
-  s.add_development_dependency("rspec", "~> 2.8.0")
+  s.add_development_dependency("rake", "~> 10.0")
+  s.add_development_dependency("rspec", "~> 2.10")
   s.add_development_dependency("yard", "~> 0.7.4")
-  s.add_development_dependency("bluecloth", "~> 2.2.0")
+  s.add_development_dependency("bluecloth", "~> 2.2")
   s.add_development_dependency("wlang", "~> 0.10.2")
-  s.add_dependency("domain", "~> 1.0.0.rc3")
+  s.add_dependency("domain", "~> 1.0")
 
   # The version of ruby required by this gem
   #

data/myrrha.noespec

@@ -1,6 +1,6 @@
 template-info:
   name: rubygem.noe
-  version: 1.7.4
+  version: 2.0.1
   manifest:
     tasks/debug_mail.txt:
       safe-override: false
@@ -10,7 +10,7 @@ variables:
   upper:
     Myrrha
   version:
-    3.0.0.rc7
+    3.0.0
   summary: |-
     Myrrha provides the coercion framework which is missing to Ruby.
   description: |-
@@ -26,11 +26,11 @@ variables:
     - http://github.com/blambeau/myrrha
     - http://rubygems.org/gems/myrrha
   dependencies: 
-    - {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: domain,       version: "~> 1.0",       groups: [runtime]      }
+    - {name: rake,         version: "~> 10.0",      groups: [test, release]}
+    - {name: rspec,        version: "~> 2.10",      groups: [test, release]}
     - {name: yard,         version: "~> 0.7.4",     groups: [doc          ]}
-    - {name: bluecloth,    version: "~> 2.2.0",     groups: [doc          ]}
+    - {name: bluecloth,    version: "~> 2.2",       groups: [doc          ]}
     - {name: wlang,        version: "~> 0.10.2",    groups: [release      ]}
   rake_tasks:
     debug_mail:

data/spec/coercions/test_subdomain.rb

@@ -9,10 +9,15 @@ module Myrrha
       end
     end
 
-    specify {
+    it 'works as expected with modules and classes' do
       r.subdomain?(Symbol, Object).should be_true
       r.subdomain?(Class, Module).should be_true
-    }
+    end
+
+    it 'works as expected with Symbol target domains' do
+      r.subdomain?(:to_ruby_literal, :to_ruby_literal).should be_true
+      r.subdomain?(:to_ruby_literal, :none).should be_false
+    end
 
   end
 end

data/spec/test_to_ruby_literal.rb

@@ -1,12 +1,16 @@
 require 'spec_helper'
 describe "to_ruby_literal" do
 
+  it 'works on Symbols' do
+    Myrrha::ToRubyLiteral.apply(:name).should eq(':name')
+  end
+
   $VALUES.each do |value|
     describe "on #{value.inspect}" do
-      specify{ Kernel.eval(value.to_ruby_literal).should eq(value) }  
+      specify{ Kernel.eval(value.to_ruby_literal).should eq(value) }
     end
   end
-  
+
   it "should work on objects that implement to_ruby_literal" do
     class ToRubyLiteralizable
       def to_ruby_literal
@@ -15,5 +19,5 @@ describe "to_ruby_literal" do
     end
     Myrrha.to_ruby_literal(ToRubyLiteralizable.new).should eq(:foo)
   end
-  
+
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: myrrha
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc7
-  prerelease: 6
+  version: 3.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: wlang
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '1.0'
 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()
@@ -190,12 +190,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 509203281058914080
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24