typed_attr 0.1.0 → 0.2.0

data/lib/typed_attr.rb

@@ -37,11 +37,11 @@ module TypedAttr
         names = h.keys
         name_to_type = h
       else
-      name_to_type = Hash[*types_and_names.reverse]
-      names =
-        (0 .. types_and_names.size).to_a.
-        keep_if(&:odd?).
-        map { | i | types_and_names[i] }
+        name_to_type = Hash[*types_and_names.reverse]
+        names =
+          (0 .. types_and_names.size).to_a.
+          keep_if(&:odd?).
+          map { | i | types_and_names[i] }
       end
       expr = <<"END"
 def initialize *__args

data/lib/typed_attr/composite_type.rb

@@ -6,16 +6,15 @@ class Module
     end
     def _a; @a; end
     def _b; @b; end
-    def to_s
-      @to_s ||= "#{@a}.#{op}(#{@b})".freeze
-    end
   end
 
   class ContainerType < CompositeType
     def === x
       @a === x and x.all?{|e| @b === e }
     end
-    def op; 'of'; end
+    def to_s
+      @to_s ||= "#{@a}.of(#{@b})".freeze
+    end
   end
 
   # Constructs a type of Enumeration of an element type.
@@ -29,7 +28,9 @@ class Module
     def === x
       Enumerable === x and @a === x[0] and @b === x[1]
     end
-    def op; 'with'; end
+    def to_s
+      @to_s ||= "#{@a}.with(#{@b})".freeze
+    end
   end
 
   # Constructs a type of Pairs.
@@ -73,7 +74,7 @@ class Module
 
   class NegativeType < CompositeType
     def === x
-       ! @a === x
+       ! (@a === x)
     end
     def to_s
       @to_s ||= "(~#{@a})".freeze
@@ -86,14 +87,16 @@ class Module
   def ~@
     case self
     when NegativeType
-      self.a
+      self._a
     else
       NegativeType.new(self)
     end
   end
 end
 
+# Numeric origin/continuum types.
 
+# Objects that are Numeric or respond to :to_numeric.
 module Numericlike
   def self.=== x
     case
@@ -105,18 +108,36 @@ module Numericlike
   end
 end
 
+# Objects that are Numericlike and > 0.
 module Positive
   def self.=== x
     n = Numericlike === x and n > 0
   end
 end
 
+# Objects that are Numericlike and < 0.
 module Negative
   def self.=== x
     n = Numericlike === x and n < 0
   end
 end
 
+# Objects that are Numericlike and <= 0.
+module NonPositive
+  def self.=== x
+    n = Numericlike === x and n <= 0
+  end
+end
+
+# Objects that are Numericlike and >= 0.
+module NonNegative
+  def self.=== x
+    n = Numericlike === x and n >= 0
+  end
+end
+
+# Objects that can do IO.
+#
 # Note: IO and StringIO do not share a common ancestor Module
 # that distingushes them as being capable of "IO".
 # So we create one here -- devdriven.com 2013/11/14

data/lib/typed_attr/version.rb

@@ -1,3 +1,3 @@
 module TypedAttr
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/lib/typed_attr/composite_type_spec.rb

@@ -130,6 +130,23 @@ describe Class::CompositeType do
     end
   end
 
+  context "NegativeType" do
+    it "~~A == A" do
+      a = Class.new
+      (~ ~ a).should == a
+    end
+
+    it "should be true for match" do
+      v = [ 1, :symbol ]
+      (Array.of(~NilClass) === v).should === true
+    end
+
+    it "should be false for match" do
+      v = [ 1, nil, :symbol ]
+      (Array.of(~NilClass) === v).should === false
+    end
+  end
+
   context "Negative" do
     it "should be true for negative Numeric" do
       v = -1234

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typed_attr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 891152326626141261
+      hash: -3017759551049438692
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 891152326626141261
+      hash: -3017759551049438692
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25