myrrha 1.1.0 → 1.2.0

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+# 1.2.0 / 2011-08-15
+
+* Added the ability to created SByC domains through simple module extension:
+
+      NegInt = Myrrha.domain(Integer){|i| i < 0}
+      
+  can also be built the following way:
+
+      class NegInt < Integer
+        extend Myrrha::Domain
+        
+        def self.predicate
+          @predicate ||= lambda{|i| i < 0}
+        end
+        
+      end
+
+* Cleaned the development dependencies, travis-ci.org continuous integration,
+  and ruby.noe template.
+
 # 1.1.0 / 2011-07-28
 
 ## Enhancements to coerce()

data/Gemfile

@@ -1,2 +1,18 @@
 source 'http://rubygems.org'
-gemspec :name => "myrrha"
+
+group :test do
+  gem "rake", "~> 0.9.2"
+  gem "rspec", "~> 2.6.0"
+end
+
+group :release do
+  gem "rake", "~> 0.9.2"
+  gem "rspec", "~> 2.6.0"
+  gem "wlang", "~> 0.10.1"
+end
+
+group :doc do
+  gem "yard", "~> 0.7.2"
+  gem "bluecloth", "~> 2.1.0"
+end
+

data/Gemfile.lock

@@ -1,19 +1,8 @@
-PATH
-  remote: .
-  specs:
-    myrrha (1.1.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
     bluecloth (2.1.0)
     diff-lcs (1.1.2)
-    highline (1.6.2)
-    noe (1.3.0)
-      highline (~> 1.6.0)
-      quickl (~> 0.2.0)
-      wlang (~> 0.10.1)
-    quickl (0.2.2)
     rake (0.9.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -32,9 +21,6 @@ PLATFORMS
 
 DEPENDENCIES
   bluecloth (~> 2.1.0)
-  bundler (~> 1.0)
-  myrrha!
-  noe (~> 1.3.0)
   rake (~> 0.9.2)
   rspec (~> 2.6.0)
   wlang (~> 0.10.1)

data/README.md

@@ -17,7 +17,7 @@ a numeric, a boolean, a date, a time, an URI, and so on.
     # Bug fixes (tiny) do not even add new default rules to coerce and 
     # to\_ruby\_literal. Minor version can, which could break your code. 
     # Therefore, please always use:
-    gem "myrrha", "~> 1.0.0"
+    gem "myrrha", "~> 1.1.0"
 
 ## Links
 
@@ -456,6 +456,15 @@ reasoning on types and value:
     # and correctly fails in each case!
     rules.coerce("-12", Integer)  # => -12
     rules.coerce("-12", PosInt)   # => ArgumentError, "Invalid value -12 for PosInt"
-    
-    
-    
+
+Note that if you want to provide additional tooling to your factored domain, 
+the following way of creating them also works:
+
+    class PosInt < Integer
+      extend Myrrha::Domain
+      
+      def self.predicate
+        @predicate ||= lambda{|i| i > 0}
+      end
+      
+    end

data/lib/myrrha.rb

@@ -18,8 +18,8 @@ module Myrrha
   def self.domain(superdom = Object, subdoms=nil, &pred) 
     dom = Class.new(superdom).extend(Domain)
     dom.instance_eval {
-      @sub_domains = subdoms 
-      @super_domain = superdom
+      @subdomains = subdoms 
+      @superdomain = superdom
       @predicate = pred
     }
     dom
@@ -66,14 +66,14 @@ module Myrrha
     
     # (see Class.superclass)
     def superclass
-      @super_domain
+      superdomain || super
     end
     
     #
-    # Checks if `value` belongs to this domain
-    # 
-    def ===(value)
-      (superclass === value) && @predicate.call(value)
+    # Returns the super domain if installed
+    #
+    def superdomain
+      @superdomain
     end
     
     #
@@ -81,7 +81,14 @@ module Myrrha
     # case in Ruby.
     #
     def superdomain_of?(child)
-      Array(@sub_domains).include?(child)
+      Array(@subdomains).include?(child)
+    end
+    
+    #
+    # Checks if `value` belongs to this domain
+    # 
+    def ===(value)
+      (superclass === value) && predicate.call(value)
     end
     
     #

data/lib/myrrha/version.rb

@@ -2,7 +2,7 @@ module Myrrha
   module Version
   
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
   
     def self.to_s

data/myrrha.gemspec

@@ -21,13 +21,13 @@ Gem::Specification.new do |s|
   # A short summary of this gem
   #
   # This is displayed in `gem list -d`.
-  s.summary = "Myrrha provides the coercion framework which is missing to Ruby, IMHO."
+  s.summary = "Myrrha provides the coercion framework which is missing to Ruby."
 
   # A long description of this gem (required)
   #
   # The description should be more detailed than the summary.  For example,
   # you might wish to copy the entire README into the description.
-  s.description = "Myrrha provides the coercion framework which is missing to Ruby, IMHO. 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 bundled\nwith a coerce() method providing a unique entry point for converting a string to \na numeric, a boolean, a date, a time, an URI, and so on.  "
+  s.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() method providing a unique entry point for converting a string to \na numeric, a boolean, a date, a time, an URI, and so on.  "
   
   # The URL of this gem home page (optional)
   s.homepage = "http://rubydoc.info/github/blambeau/myrrha/master/frames"
@@ -124,12 +124,10 @@ Gem::Specification.new do |s|
   # for each development dependency. These gems are required for developers
   #
   s.add_development_dependency("rake", "~> 0.9.2")
-  s.add_development_dependency("bundler", "~> 1.0")
   s.add_development_dependency("rspec", "~> 2.6.0")
   s.add_development_dependency("yard", "~> 0.7.2")
   s.add_development_dependency("bluecloth", "~> 2.1.0")
   s.add_development_dependency("wlang", "~> 0.10.1")
-  s.add_development_dependency("noe", "~> 1.3.0")
   
 
   # The version of ruby required by this gem

data/myrrha.noespec

@@ -3,20 +3,23 @@
 template-info:
   name: "ruby"
   version: 1.3.0
+  manifest:
+    tasks/debug_mail.txt:
+      safe-override: false
 variables:
   lower: 
     myrrha
   upper:
     Myrrha
   version:
-    1.1.0
+    1.2.0
   summary: |-
-    Myrrha provides the coercion framework which is missing to Ruby, IMHO.
+    Myrrha provides the coercion framework which is missing to Ruby.
   description: |-
-    Myrrha provides the coercion framework which is missing to Ruby, IMHO. Coercions
+    Myrrha provides the coercion framework which is missing to Ruby. Coercions
     are simply defined as a set of rules for converting values from source to target
-    domains (in an abstract sense). As a typical and useful example, it comes bundled
-    with a coerce() method providing a unique entry point for converting a string to 
+    domains (in an abstract sense). As a typical and useful example, it comes with 
+    a coerce() method providing a unique entry point for converting a string to 
     a numeric, a boolean, a date, a time, an URI, and so on.  
   authors: 
     - {name: Bernard Lambeau, email: blambeau@gmail.com}
@@ -25,13 +28,13 @@ variables:
     - http://github.com/blambeau/myrrha
     - http://rubygems.org/gems/myrrha
   dependencies: 
-    - {name: rake,         version: "~> 0.9.2",  groups: [development]}
-    - {name: bundler,      version: "~> 1.0",    groups: [development]}
-    - {name: rspec,        version: "~> 2.6.0",  groups: [development]}
-    - {name: yard,         version: "~> 0.7.2",  groups: [development]}
-    - {name: bluecloth,    version: "~> 2.1.0",  groups: [development]}
-    - {name: wlang,        version: "~> 0.10.1", groups: [development]}
-    - {name: noe,          version: "~> 1.3.0",  groups: [development]}
+    - {name: rake,         version: "~> 0.9.2",  groups: [test, release]}
+    - {name: rspec,        version: "~> 2.6.0",  groups: [test, release]}
+    - {name: yard,         version: "~> 0.7.2",  groups: [doc          ]}
+    - {name: bluecloth,    version: "~> 2.1.0",  groups: [doc          ]}
+    - {name: wlang,        version: "~> 0.10.1", groups: [release      ]}
   rake_tasks:
+    debug_mail:
+      rx_changelog_sections: /^# /
     spec_test:
-      pattern: spec/**/test_*.rb
+      pattern: spec/**/test_*.rb

data/spec/myrrha/test_domain.rb

@@ -48,6 +48,43 @@ module Myrrha
       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

data/spec/spec_helper.rb

@@ -5,29 +5,28 @@ require 'myrrha/to_ruby_literal'
 require 'date'
 require 'shared/a_value'
 
-unless defined?(SAFE_VALUES)
-  SAFE_VALUES = {
-    NilClass   => [ nil ],
-    TrueClass  => [ true ],
-    FalseClass => [ false ],
-    Fixnum     => [ -(2**(0.size * 8 - 2)), -1, 0, 1, 10, (2**(0.size * 8 - 2) - 1)],
-    Bignum     => [ -(2**(0.size * 8 - 2)) - 1, (2**(0.size * 8 - 2)) ],
-    Float      => [ -0.10, 0.0, 0.10 ],
-    String     => ['', 'hello'],
-    Symbol     => [ :hello, :"s-b-y-c", :"12" ],
-    Class      => [ Integer, ::Struct::Tms ],
-    Module     => [ Kernel, Myrrha ],
-    Regexp     => [ /a-z/, /^$/, /\s*/, /[a-z]{15}/ ],
-    Range      => [ 0..10, 0...10 ],
-    Array      => [ [], [nil], [1, "hello"] ],
-    Hash       => [ {}, {1 => 2, :hello => "world"} ]
-  }
-  UNSAFE_VALUES = {
-    Date  => [ Date.today ],
-    Time  => [ Time.now   ],
-    Array => [ [Date.today, Time.now] ],
-    Hash  => [ {Date.today => Time.now} ],
-    Range => [ Date.today..(Date.today+1) ]
-  }
-  VALUES = SAFE_VALUES.values.inject([], :+) + UNSAFE_VALUES.values.inject([], :+)
-end
+$SAFE_VALUES = {
+  NilClass   => [ nil ],
+  TrueClass  => [ true ],
+  FalseClass => [ false ],
+  Fixnum     => [ -(2**(0.size * 8 - 2)), -1, 0, 1, 10, (2**(0.size * 8 - 2) - 1)],
+  Bignum     => [ -(2**(0.size * 8 - 2)) - 1, (2**(0.size * 8 - 2)) ],
+  Float      => [ -0.10, 0.0, 0.10 ],
+  String     => ['', 'hello'],
+  Symbol     => [ :hello, :"s-b-y-c", :"12" ],
+  Class      => [ Integer, ::Struct::Tms ],
+  Module     => [ Kernel, Myrrha ],
+  Regexp     => [ /a-z/, /^$/, /\s*/, /[a-z]{15}/ ],
+  Range      => [ 0..10, 0...10 ],
+  Array      => [ [], [nil], [1, "hello"] ],
+  Hash       => [ {}, {1 => 2, :hello => "world"} ]
+}
+$UNSAFE_VALUES = {
+  Date  => [ Date.today ],
+  Time  => [ Time.now   ],
+  Array => [ [Date.today, Time.now] ],
+  Hash  => [ {Date.today => Time.now} ],
+  Range => [ Date.today..(Date.today+1) ]
+}
+$VALUES = $SAFE_VALUES.values.inject([], :+) + 
+          $UNSAFE_VALUES.values.inject([], :+)

data/spec/test_to_ruby_literal.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 describe "to_ruby_literal" do
 
-  VALUES.each do |value|
+  $VALUES.each do |value|
     describe "on #{value.inspect}" do
       specify{ Kernel.eval(value.to_ruby_literal).should eq(value) }  
     end

data/spec/test_value.rb

@@ -1,4 +1,5 @@
-VALUES.each do |value|
+require 'spec_helper'
+$VALUES.each do |value|
   describe "#{value} (#{value.class})" do
     subject{ value }
     it_should_behave_like "a value" 

data/tasks/debug_mail.rake

@@ -56,7 +56,7 @@ begin
     # Load interesting changesets
     changes, end_found = [], 0
     File.readlines(logs.first).select{|line|
-      if line =~ /^#/
+      if line =~ /^# /
         break if end_found >= 1
         end_found += 1
       end

data/tasks/examples.rake

@@ -1,7 +1,8 @@
 task :examples do
+  lib = File.expand_path('../../lib', __FILE__)
   dir = File.expand_path('../../examples', __FILE__)
   Dir["#{dir}/*.rb"].each do |file|
-    str = `ruby #{file}`
+    str = `ruby -I#{lib} #{file}`
     if $?.exitstatus == 0
       print '.'
     else

data/tasks/unit_test.rake

@@ -45,7 +45,7 @@ begin
     t.warning = false
 
     # Glob pattern to match test files. (default is 'test/test*.rb')
-    t.pattern = "test/test*.rb"
+    t.pattern = "test/test_*.rb"
 
     # Style of test loader to use.  Options are:
     #
@@ -68,7 +68,7 @@ begin
   end
 rescue LoadError => ex
   task :unit_test do
-    abort 'rspec is not available. In order to run spec, you must: gem install rspec'
+    abort "rake/testtask does not seem available...\n  #{ex.message}"
   end
 ensure
   desc "Run all tests"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myrrha
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-28 00:00:00.000000000Z
+date: 2011-08-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &85576310 !ruby/object:Gem::Requirement
+  requirement: &85166390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *85576310
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &85575520 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: *85575520
+  version_requirements: *85166390
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &85574670 !ruby/object:Gem::Requirement
+  requirement: &85166110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *85574670
+  version_requirements: *85166110
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &85573700 !ruby/object:Gem::Requirement
+  requirement: &85165560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +43,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *85573700
+  version_requirements: *85165560
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &85572820 !ruby/object:Gem::Requirement
+  requirement: &85165280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +54,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *85572820
+  version_requirements: *85165280
 - !ruby/object:Gem::Dependency
   name: wlang
-  requirement: &85550940 !ruby/object:Gem::Requirement
+  requirement: &85164980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,23 +65,12 @@ dependencies:
         version: 0.10.1
   type: :development
   prerelease: false
-  version_requirements: *85550940
-- !ruby/object:Gem::Dependency
-  name: noe
-  requirement: &85550220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: *85550220
-description: ! "Myrrha provides the coercion framework which is missing to Ruby, IMHO.
-  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
-  bundled\nwith a coerce() method providing a unique entry point for converting a
-  string to \na numeric, a boolean, a date, a time, an URI, and so on.  "
+  version_requirements: *85164980
+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()
+  method providing a unique entry point for converting a string to \na numeric, a
+  boolean, a date, a time, an URI, and so on.  "
 email:
 - blambeau@gmail.com
 executables: []
@@ -167,22 +145,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -900430961
+      hash: 140841041
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -900430961
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: Myrrha provides the coercion framework which is missing to Ruby, IMHO.
+summary: Myrrha provides the coercion framework which is missing to Ruby.
 test_files:
 - spec/spec_helper.rb
 - spec/myrrha/test_coercions.rb