adts 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b992248512bdf339ed09533686f885cdf32aa383
-  data.tar.gz: e593219e866f7d467262ed87e12e60e4f34940d3
+  metadata.gz: 4162fbb5e18982b4036110f988f631d07eed48b9
+  data.tar.gz: d96dd1f30153023ea1f390f6d0a4351c15283c6a
 SHA512:
-  metadata.gz: 72186a0a9d0e18aa592f26c58910bc66ccba042d02139703b263dd35d0d0596e4f28e15a69bbd3f64a8ccf3d35df0b5892660c1c1878aab76c2c794b7792fc35
-  data.tar.gz: 27bffe2175227aaaca19af3026a6eeec3490f45382a716f5dc10044e2f91a4d49d9e21944318fd5e6cdd234de7eb67a770b80e23563ba367d49211dc8eefd1b9
+  metadata.gz: 04d46f79094e626edd1369bb192db2708108eb15766e8117f553d31233214c70ab260bc1f31d279119ecc7103c332a6635a99a6f25278b2ba80c8f61f5d3c87c
+  data.tar.gz: b50b446aaf64d21917f107467dd6a15891ddba0a284b128d61c4a0bd7886be296f46ead77e1903e023472d017611818378f19f1658b4c845916acc73a8aef586

data/README.md

@@ -11,9 +11,9 @@ require 'adts'
 
 Shape = ADT do
   Void() |
-  Square(width: Fixnum) |
-  Rectangle(width: Fixnum, height: Fixnum) |
-  Circle(radius: Fixnum) {
+  Square(width: Numeric) |
+  Rectangle(width: Numeric, height: Numeric) |
+  Circle(radius: Numeric) {
     def area
       Math::PI * radius * radius
     end

data/lib/adt/constructor.rb

@@ -11,8 +11,10 @@ module ADT
         attr_reader #{keys.map { |n| ":#{n}" }.join(', ')}
 
         def initialize(#{keys.join(", ")})
-          types = [#{keys.join(", ")}].map(&:class)
-          raise TypeError, 'Types mismatch: given ' + types.join(', ') + ', expected #{types.join(", ")}' unless types == [#{types.join(", ")}]
+          arg_types = [#{keys.join(", ")}].map(&:class)
+          unless arg_types.zip([#{types.join(", ")}]).all? { |arg_type, type| arg_type <= type }
+            raise TypeError, 'Types mismatch: given ' + arg_types.join(', ') + ', expected #{types.join(", ")}'
+          end
           #{keys.empty? ? "" : keys.map{ |n| "@#{n}" }.join(',') + " = " + keys.join(", ")}
         end
 

data/lib/adt/version.rb

@@ -1,3 +1,3 @@
 module ADT
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/adts.rb

@@ -0,0 +1 @@
+require 'adt'

data/spec/adt_spec.rb

@@ -1,10 +1,10 @@
 require 'rspec'
-require 'adt'
+require 'adts'
 
 Shape = ADT do
   Void() |
   Square(width: Fixnum) |
-  Rectangle(width: Fixnum, height: Fixnum) |
+  Rectangle(width: Numeric, height: Numeric) |
   Circle(radius: Fixnum) {
     def area
       Math::PI * radius * radius
@@ -22,6 +22,11 @@ describe ADT do
     expect { Shape::Square("foo") }.to raise_exception(TypeError)
   end
 
+  it 'allows inherited types' do
+    expect { Shape::Rectangle(23, 45.1) }.to_not raise_exception
+    expect { Shape::Rectangle("foo", "bar") }.to raise_exception(TypeError)
+  end
+
   it 'implements equality by type and value' do
     expect(Shape::Square(23)).to eq(Shape::Square(23))
     expect(Shape::Circle(23)).to_not eq(Shape::Square(23))
@@ -39,4 +44,4 @@ describe ADT do
   it 'uses subtyping' do
     expect(Shape::Circle(1)).to be_kind_of(Shape)
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adts
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Josep M. Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -70,6 +70,7 @@ files:
 - lib/adt.rb
 - lib/adt/constructor.rb
 - lib/adt/version.rb
+- lib/adts.rb
 - spec/adt_spec.rb
 - spec/spec_helper.rb
 homepage: http://blog.txus.io/adts