typed 0.2.4 → 0.2.5

data/lib/typed/schema.rb

@@ -52,9 +52,11 @@ module Typed
         when Explicit
           raise TypeError, "%s has already been declared as `%s'" % [key, @types[key.to_s].value.inspect]
         when Implicit
-          # update schema if same or sub-class, otherwise raises
-          declare.value == @types[key.to_s].value or # need this hack due to bug of Must#struct?
-          declare.value.must.struct?(@types[key.to_s].value) or
+          type = @types[key.to_s].value
+          # update schema if same or sub-class or ancestor, otherwise raises
+          declare.value == type            or # need this hack due to bug of Must#struct?
+          declare.value.must.struct?(type) or # sub-class
+          type.must.struct?(declare.value) or # ancestor
             raise TypeError, "%s has already been typed as `%s'" % [key, @types[key.to_s].value.inspect]
           explicit(key, declare)
         else          

data/lib/typed/version.rb

@@ -1,3 +1,3 @@
 module Typed
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/hash_spec.rb

@@ -136,6 +136,36 @@ describe Typed::Hash do
       }.should_not raise_error
     end
 
+    it "should accept atomic ancestor class (like Numeric) for its schema" do
+      data[:foo] = 1
+      data.schema(:foo).should == Fixnum # implicitly defined
+      lambda {
+        data[:foo] = Numeric
+      }.should_not raise_error
+      data.schema(:foo).should == Numeric
+    end
+
+=begin
+    it "should accept atomic ancestor class (like Object) for its schema" do
+      data[:foo] = [:a]
+      data.schema(:foo).should == [Symbol] # implicitly defined
+      lambda {
+        data[:foo] = Object
+      }.should_not raise_error
+      data.schema(:foo).should == Object
+      data[:foo] = 1
+      data[:foo].should == 1
+    end
+=end
+
+    it "should reject atomic non-ancestor class (like String) for its schema" do
+      data[:foo] = 1
+      data.schema(:foo).should == Fixnum # implicitly defined
+      lambda {
+        data[:foo] = String
+      }.should raise_error(TypeError)
+    end
+
     it "should accept complex classes (like [Fixnum]) for its schema" do
       data[:foo] = [1]
       lambda {
@@ -150,6 +180,24 @@ describe Typed::Hash do
       }.should_not raise_error
     end
 
+=begin
+    it "should accept complex ancestor class (like {String=>Integer}) for its schema" do
+      data[:foo] = {"a" => 1}
+      data.schema(:foo).should == {String => Fixnum} # implicitly defined
+      lambda {
+        data[:foo] = {String => Integer}
+      }.should_not raise_error
+      data.schema(:foo).should == {String => Integer}
+    end
+=end
+
+    it "should reject complex non-ancestor class (like String) for its schema" do
+      data[:foo] = {"a" => 1}
+      lambda {
+        data[:foo] = {String => Symbol}
+      }.should raise_error(TypeError)
+    end
+
     it "can override implicitly declared schema by sub-struct schema" do
       data[:foo] = {}
       data[:foo].should == {}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typed
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - maiha
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-02 00:00:00 Z
+date: 2012-08-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport