typestrict 0.0.13 → 0.0.15

data/lib/base.rb

@@ -6,7 +6,8 @@ module Strict
       def initialize(error_list)
         enforce_primitive!(Array, error_list, "lib/typestrict")
         error_list.each {|item| enforce_primitive!(String, item, "lib/typestrict")}
-        @errors = error_list
+
+        @errors = error_list & error_list
       end
 
       def inspect
@@ -124,7 +125,19 @@ module Strict
       else
         if supertype.is_a? Symbol #distinct supertype
           if @@dynamic_handlers.has_key? supertype
+
+            raise_set_before = @@raise_exception
+            previous_errors = @@errors
+            setmode_catch!
+
             @@dynamic_handlers[supertype].call(data, context)
+
+            if raise_set_before
+              raise_hell!
+              setmode_raise!
+            else
+              @@errors.concat(previous_errors)
+            end
           else
             catch_error "undefined symbol-supertype encountered: #{supertype.inspect}"
           end

data/lib/supertypes.rb

@@ -18,12 +18,14 @@ module Strict
 
       @@handlers[:string] = proc do |data, context|
         enforce_primitive!(String, data, context)
-        catch_error "#{header(context, data)} can't be empty string" unless (data.size > 0)
+        if data.is_a? String
+          catch_error "#{header(context, data)} can't be empty string" unless (data.size > 0)
+        end
       end
 
       @@handlers[:natural_number] = proc do |data, context|
         enforce_primitive!(Fixnum, data, context)
-        catch_error "#{header(context, data)} must be > 0" unless (data > 0)
+        catch_error "#{header(context, data)} must be > 0" unless (data > 0) if data.is_a? Fixnum
       end
 
       @@handlers[:integer] = proc do |data, context|
@@ -44,7 +46,9 @@ module Strict
 
       @@handlers[:character] = proc do |data, context|
         enforce!(:string, data, context)
-        catch_error "#{header(context, data)} must be a single character!" unless data.size == 1
+        if data.is_a? String
+          catch_error "#{header(context, data)} must be a single character!" unless data.size == 1
+        end
       end
 
       @@handlers[:procedure] = proc do |data, context|
@@ -57,8 +61,10 @@ module Strict
 
       @@handlers[:hex_color] = proc do |data, context|
         enforce!(:string, data, context)
-        catch_error "#{header(context, data)} must be six characters long" unless (data.size == 6)
-        data.upcase.each_byte {|c| catch_error "#{header(context, data)} must contain only hexadecimal characters" unless ((48 <= c  and c <= 57) or (65 <= c and c <= 70))}
+        if data.is_a? String
+          catch_error "#{header(context, data)} must be six characters long" unless (data.size == 6)
+          data.upcase.each_byte {|c| catch_error "#{header(context, data)} must contain only hexadecimal characters" unless ((48 <= c  and c <= 57) or (65 <= c and c <= 70))}
+        end
       end
 
       @@handlers[:uri] = proc do |data, context|
@@ -68,32 +74,44 @@ module Strict
 
       @@handlers[:string_array] = proc do |data, context|
         enforce_primitive!(Array, data, context)
-        data.each {|item| enforce_primitive!(String, item, context)}
+        if data.is_a? Array
+          data.each {|item| enforce_primitive!(String, item, context)}
+        end
       end
 
       @@handlers[:numeric_array] = proc do |data, context|
         enforce_primitive!(Array, data, context)
-        data.each {|item| enforce_primitive!(Numeric, item, context)}
+        if data.is_a? Array
+          data.each {|item| enforce_primitive!(Numeric, item, context)}
+        end
       end
 
       @@handlers[:float_array] = proc do |data, context|
         enforce_primitive!(Array, data, context)
-        data.each {|item| enforce_primitive!(Float, item, context)}
+        if data.is_a? Array
+          data.each {|item| enforce_primitive!(Float, item, context)}
+        end
       end
 
       @@handlers[:integer_array] = proc do |data, context|
         enforce_primitive!(Array, data, context)
-        data.each {|item| enforce_primitive!(Fixnum, item, context)}
+        if data.is_a? Array
+          data.each {|item| enforce_primitive!(Fixnum, item, context)}
+        end
       end
 
       @@handlers[:hex_color_array] = proc do |data, context|
         enforce_primitive!(Array, data, context)
-        data.each {|item| enforce!(:hex_color, item, context)}
+        if data.is_a? Array
+          data.each {|item| enforce!(:hex_color, item, context)}
+        end
       end
 
       @@handlers[:uri_array] = proc do |data, context|
         enforce_primitive!(Array, data, context)
-        data.each {|item| enforce!(:uri, item, context)}
+        if data.is_a? Array
+          data.each {|item| enforce!(:uri, item, context)}
+        end
       end
 
       @@handlers.each do |supertype, handler|

data/lib/typestrict.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'base')
 require File.join(File.dirname(__FILE__), 'supertypes')
 
 module Strict
-  VERSION = '0.0.13'
+  VERSION = '0.0.15'
   include Strict::Base
   include Strict::SuperTypes
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typestrict
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Raeez Lorgat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 -07:00
+date: 2010-08-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency