typestrict 0.0.11 → 0.0.12

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.0.12 / 2010-08-16
+* 3 major enhancements
+
+  * Introduced new supertypes: :uri, :uri_array, :procedure, :hash_map
+  * errors caught within a supertype's definition are now returned under setmode_catch! policy
+  * Introduced new policies: enforce_defaults!, enforce_map_optional
+
 === 0.0.9 / 2010-08-08
 * 1 major enhancement
 
@@ -15,7 +22,6 @@
   * Revamped implementation and architecture
   * Supertypes are now implemented using dynamic handlers + dynamic handlers
 
-
 === 0.0.5 / 2010-08-07
 * 2 major enhancements
 

data/lib/base.rb

@@ -1,7 +1,7 @@
 module Strict
   module Base
     
-    class StrictTypeError < Exception
+    class TypeError < Exception
       attr :errors
       def initialize(error_list)
         enforce_primitive!(Array, error_list, "lib/typestrict")
@@ -10,7 +10,7 @@ module Strict
       end
 
       def inspect
-        msg = "StrictTypeError#{@errors.size > 1 ? "s" : ""} caught:\n"
+        msg = "TypeError#{@errors.size > 1 ? "s" : ""} caught:\n"
         @errors.each do |e|
           msg += "#{e}\n"
         end
@@ -33,7 +33,7 @@ module Strict
 
     def catch_error error
       if @@raise_exception
-        t = StrictTypeError.new([error])
+        t = TypeError.new([error])
         raise(t, t.inspect, caller)
       else
         @@errors << error
@@ -42,7 +42,7 @@ module Strict
 
     def raise_hell!
       if @@errors.size > 0
-        t = StrictTypeError.new(@@errors)
+        t = TypeError.new(@@errors)
         setmode_raise!
         raise(t, t.inspect, caller)
       end
@@ -57,7 +57,7 @@ module Strict
     end
 
     def header(context, data)
-      "#{context}; #{data.class.inspect}::#{data.inspect}"
+      "#{context}> #{data.class.inspect}::#{data.inspect}"
     end
 
     def enforce_primitive!(type, data, context="Value")
@@ -124,7 +124,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
@@ -166,5 +178,16 @@ module Strict
       setmode_raise!
       return map
     end
+
+    def enforce_defaults!(matrix, map)
+      enforce_primitive!(Hash, matrix, "lib/typestrict")
+      enforce_primitive!(Hash, map, "lib/typestrict")
+
+      matrix.each do |param, default|
+        if !map.has_key? param
+          map[param] = default
+        end
+      end
+    end
   end
 end

data/lib/supertypes.rb

@@ -51,12 +51,21 @@ module Strict
         enforce_primitive!(Proc, data, context)
       end
 
+      @@handlers[:hash_map] = proc do |data, context|
+        enforce_primitive!(Hash, data, context)
+      end
+
       @@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))}
       end
 
+      @@handlers[:uri] = proc do |data, context|
+        enforce!(:string, data, context)
+      end
+
+
       @@handlers[:string_array] = proc do |data, context|
         enforce_primitive!(Array, data, context)
         data.each {|item| enforce_primitive!(String, item, context)}
@@ -78,8 +87,13 @@ module Strict
       end
 
       @@handlers[:hex_color_array] = proc do |data, context|
-        enforce_primitive!(Array, data)
-        data.each {|item| enforce!(:hex_color, item)}
+        enforce_primitive!(Array, data, context)
+        data.each {|item| enforce!(:hex_color, item, context)}
+      end
+
+      @@handlers[:uri_array] = proc do |data, context|
+        enforce_primitive!(Array, data, context)
+        data.each {|item| enforce!(:uri, item, context)}
       end
 
       @@handlers.each do |supertype, handler|
@@ -88,3 +102,6 @@ module Strict
     end
   end
 end
+
+# TODO implement uri correctly
+# make catch_error collect in base.rb for supertypes

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.11'
+  VERSION = '0.0.12'
   include Strict::Base
   include Strict::SuperTypes
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typestrict
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Raeez Lorgat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-12 00:00:00 -04:00
+date: 2010-08-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency