assert_type 0.0.4 → 0.0.5

data/lib/assert_type/type_node.rb

@@ -8,5 +8,13 @@ module AssertType
       @children = []
     end
 
+    def first
+      @children.first
+    end
+
+    def self.root
+      new "_root"
+    end
+
   end
 end

data/lib/assert_type/type_string_parser.rb

@@ -14,11 +14,9 @@ module AssertType
     end
 
     def parse
-      first_token = tokens.shift
-      main_type = first_token.value
-      node = TypeNode.new main_type
-      previous_word = node
-      current_words = []
+      root = TypeNode.root
+      previous_word = root
+      current_words = [root]
       tokens.each do |token|
         case token.name
           when :open_angle
@@ -31,7 +29,7 @@ module AssertType
             # ignore commas
         end
       end
-      node
+      root
     end
 
     def tokens

data/lib/assert_type/type_validator.rb

@@ -2,15 +2,35 @@ module AssertType
   class TypeValidator
     class << self
 
-      # @param type_node [AssertType::TypeNode]
+      # @param type_node [AssertType::TypeNode, Array<AssertType::TypeNode>]
       # @param value [Object]
       def valid? type_node, value
-        type_node.name == value.class.to_s &&
-        children_valid?(type_node, value)
+        if type_node.name == "_root"
+          type_node.children.any? do |node|
+            valid? node, value
+          end
+        else
+          type_matches?(type_node.name, value) &&
+          children_valid?(type_node, value)
+        end
       end
 
       private
 
+      def type_matches? type_name, value
+        case type_name
+          when "nil"
+            value == nil
+          when "true"
+            value == true
+          when "false"
+            value == false
+          else
+            type_name == value.class.to_s
+        end
+
+      end
+
       def children_valid? type_node, value
         type_node.children.empty? ||
         value_empty?(value) ||

data/lib/assert_type/version.rb

@@ -1,3 +1,3 @@
 module AssertType
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/assert_type_spec.rb

@@ -19,6 +19,16 @@ describe AssertType do
     expect { at_assert_type [Fixnum, String], 1.1 }.to raise_error(AssertType::AssertionError) { |error|
       error.message.should include %{expected Fixnum or String but was 1.1}
     }
+    at_assert_type "Array<Fixnum>, nil", [1,2,3]
+    at_assert_type "Array<Fixnum>, nil", []
+    at_assert_type "Array<Fixnum>, nil", nil
+    at_assert_type "String, Symbol", "hello"
+    expect { at_assert_type "Array<Fixnum>, nil", false }.to raise_error(AssertType::AssertionError)
+    expect { at_assert_type "Array<Fixnum>, nil", [nil] }.to raise_error(AssertType::AssertionError)
+
+    at_assert_type "String, Symbol", "hello"
+    at_assert_type "String, Symbol", :Symbol
+    expect { at_assert_type "String, Symbol", 42 }.to raise_error(AssertType::AssertionError)
 
   end
 

data/spec/type_string_parser_spec.rb

@@ -7,36 +7,46 @@ module AssertType
     context "converts string to node tree" do
 
       it "example: Array" do
-        node = TypeStringParser.parse("Array")
-        node.name.should == "Array"
-        node.children.length.should == 0
+        root = TypeStringParser.parse("Array")
+        root.first.name.should == "Array"
+        root.first.children.length.should == 0
       end
 
       it "example: Array<Fixnum>" do
-        node = TypeStringParser.parse("Array<Fixnum>")
-        node.name.should == "Array"
-        node.children.length.should == 1
-        node.children.first.name.should == "Fixnum"
+        root = TypeStringParser.parse("Array<Fixnum>")
+        root.first.name.should == "Array"
+        root.first.children.length.should == 1
+        root.first.children.first.name.should == "Fixnum"
       end
 
       it "example: Array<Fixnum, String>" do
-        node = TypeStringParser.parse("Array<Fixnum, String>")
-        node.name.should == "Array"
-        node.children.length.should == 2
-        node.children[0].name.should == "Fixnum"
-        node.children[1].name.should == "String"
+        root = TypeStringParser.parse("Array<Fixnum, String>")
+        root.first.name.should == "Array"
+        root.first.children.length.should == 2
+        root.first.children[0].name.should == "Fixnum"
+        root.first.children[1].name.should == "String"
       end
 
       it "example: Array<Array<Fixnum>, Array<String>>" do
-        node = TypeStringParser.parse("Array<Array<Fixnum>, Array<String>>")
-        node.name.should == "Array"
-        node.children.length.should == 2
-        node.children[0].name.should == "Array"
-        node.children[1].name.should == "Array"
-        node.children[0].children.length.should == 1
-        node.children[0].children[0].name.should == "Fixnum"
-        node.children[1].children.length.should == 1
-        node.children[1].children[0].name.should == "String"
+        root = TypeStringParser.parse("Array<Array<Fixnum>, Array<String>>")
+        root.first.name.should == "Array"
+        root.first.children.length.should == 2
+        root.first.children[0].name.should == "Array"
+        root.first.children[1].name.should == "Array"
+        root.first.children[0].children.length.should == 1
+        root.first.children[0].children[0].name.should == "Fixnum"
+        root.first.children[1].children.length.should == 1
+        root.first.children[1].children[0].name.should == "String"
+      end
+
+      it "example: Array<Fixnum>, nil" do
+        root = TypeStringParser.parse("Array<Fixnum>, nil")
+        root.children.length.should == 2
+        root.children[0].name.should == "Array"
+        root.children[0].children.length.should == 1
+        root.children[0].children.first.name.should == "Fixnum"
+        root.children[1].name.should == "nil"
+        root.children[1].children.length.should == 0
       end
 
     end

data/spec/type_string_tokeniser_spec.rb

@@ -14,6 +14,10 @@ module AssertType
         [:word, "Array"], [:open_angle, "<"], [:word, "Fixnum"], [:comma, ","], [:word, "String"], [:close_angle, ">"]
       ]
 
+      TypeStringTokeniser.tokenise("Array<Fixnum>, nil").collect{|t|[t.name,t.value]}.should == [
+        [:word, "Array"], [:open_angle, "<"], [:word, "Fixnum"], [:close_angle, ">"], [:comma, ","], [:word, "nil"]
+      ]
+
     end
 
   end

data/spec/type_validator_spec.rb

@@ -5,7 +5,9 @@ module AssertType
   describe TypeValidator do
 
     it "example: Array" do
-      node = stub("TypeNode", :name => "Array", :children => [])
+      node = stub("TypeNode", :name => "_root", :children => [
+        stub("TypeNode", :name => "Array", :children => [])
+      ])
       TypeValidator.valid?(node, []).should be_true
       TypeValidator.valid?(node, [1,2,3]).should be_true
       TypeValidator.valid?(node, ["one","two","three"]).should be_true
@@ -13,7 +15,9 @@ module AssertType
     end
 
     it "example: Set" do
-      node = stub("TypeNode", :name => "Set", :children => [])
+      node = stub("TypeNode", :name => "_root", :children => [
+        stub("TypeNode", :name => "Set", :children => [])
+      ])
       TypeValidator.valid?(node, Set.new).should be_true
       TypeValidator.valid?(node, Set.new([1,2,3])).should be_true
       TypeValidator.valid?(node, Set.new(["one","two","three"])).should be_true
@@ -24,7 +28,9 @@ module AssertType
     end
 
     it "example: Hash" do
-      node = stub("TypeNode", :name => "Hash", :children => [])
+      node = stub("TypeNode", :name => "_root", :children => [
+        stub("TypeNode", :name => "Hash", :children => [])
+      ])
       TypeValidator.valid?(node, {}).should be_true
       TypeValidator.valid?(node, {:one => 1, :two => 2}).should be_true
       TypeValidator.valid?(node, []).should be_false
@@ -33,8 +39,10 @@ module AssertType
     end
 
     it "example: Array<Fixnum>" do
-      node = stub("TypeNode", :name => "Array", :children => [
-        stub("TypeNode", :name => "Fixnum", :children => [])
+      node = stub("TypeNode", :name => "_root", :children => [
+        stub("TypeNode", :name => "Array", :children => [
+          stub("TypeNode", :name => "Fixnum", :children => [])
+        ])
       ])
       TypeValidator.valid?(node, [1,2,3]).should be_true
       TypeValidator.valid?(node, []).should be_true
@@ -42,9 +50,11 @@ module AssertType
     end
 
     it "example: Array<Fixnum, String>" do
-      node = stub("TypeNode", :name => "Array", :children => [
-        stub("TypeNode", :name => "Fixnum", :children => []),
-        stub("TypeNode", :name => "String", :children => [])
+      node = stub("TypeNode", :name => "_root", :children => [
+        stub("TypeNode", :name => "Array", :children => [
+          stub("TypeNode", :name => "Fixnum", :children => []),
+          stub("TypeNode", :name => "String", :children => [])
+        ])
       ])
       TypeValidator.valid?(node, [1,2,3]).should be_true
       TypeValidator.valid?(node, ["one", "two", "three"]).should be_true
@@ -53,9 +63,11 @@ module AssertType
     end
 
     it "example: Array<Array<Fixnum>>" do
-      node = stub("TypeNode", :name => "Array", :children => [
+      node = stub("TypeNode", :name => "_root", :children => [
         stub("TypeNode", :name => "Array", :children => [
-          stub("TypeNode", :name => "Fixnum", :children => [])
+          stub("TypeNode", :name => "Array", :children => [
+            stub("TypeNode", :name => "Fixnum", :children => [])
+          ])
         ])
       ])
       TypeValidator.valid?(node, [[1,2,3]]).should be_true
@@ -68,9 +80,11 @@ module AssertType
     end
 
     it "example: Array<Set<Fixnum>>" do
-      node = stub("TypeNode", :name => "Array", :children => [
-        stub("TypeNode", :name => "Set", :children => [
-          stub("TypeNode", :name => "Fixnum", :children => []),
+      node = stub("TypeNode", :name => "_root", :children => [
+        stub("TypeNode", :name => "Array", :children => [
+          stub("TypeNode", :name => "Set", :children => [
+            stub("TypeNode", :name => "Fixnum", :children => []),
+          ])
         ])
       ])
 
@@ -82,6 +96,19 @@ module AssertType
       TypeValidator.valid?(node, [[]]).should be_false
     end
 
+    it "example: Array<Fixnum>, nil" do
+      node = stub("TypeNode", :name => "_root", :children => [
+        stub("TypeNode", :name => "Array", :children => [
+          stub("TypeNode", :name => "Fixnum", :children => []),
+        ]),
+        stub("TypeNode", :name => "nil", :children => [])
+      ])
+      TypeValidator.valid?(node, []).should be_true
+      TypeValidator.valid?(node, [1,2,3]).should be_true
+      TypeValidator.valid?(node, nil).should be_true
+      TypeValidator.valid?(node, false).should be_false
+    end
+
     ## Note: we can't parse this yet
     #xit "example: Hash{Symbol => Fixnum}" do
     #  node = stub("TypeNode", :name => "Hash", :children => [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assert_type
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Joel Plane