typed 0.2.3 → 0.2.4

data/lib/typed/hash.rb

@@ -132,6 +132,10 @@ module Typed
       self[key].must.coerced(Time, Fixnum=>proc{|i| Time.at(i)})
     end
 
+    def utc(key)
+      Time.at(self[key].to_i).utc
+    end
+
     ######################################################################
     ### Utils
 

data/lib/typed/schema.rb

@@ -52,11 +52,14 @@ 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 sub-class, otherwise raises
+          # 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
             raise TypeError, "%s has already been typed as `%s'" % [key, @types[key.to_s].value.inspect]
+          explicit(key, declare)
+        else          
+          explicit(key, declare)
         end
-        explicit(key, declare)
 
       when Implicit
         case @types[key.to_s]

data/lib/typed/version.rb

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

data/spec/hash_spec.rb

@@ -129,6 +129,27 @@ describe Typed::Hash do
       }.should raise_error(TypeError)
     end
 
+    it "should accept atomic class (like Fixnum) for its schema" do
+      data[:foo] = 1
+      lambda {
+        data[:foo] = Fixnum
+      }.should_not raise_error
+    end
+
+    it "should accept complex classes (like [Fixnum]) for its schema" do
+      data[:foo] = [1]
+      lambda {
+        data[:foo] = [Fixnum]
+      }.should_not raise_error
+    end
+
+    it "should accept complex classes (like {String=>Fixnum}) for its schema" do
+      data[:foo] = {"a" => 1}
+      lambda {
+        data[:foo] = {String => Fixnum}
+      }.should_not raise_error
+    end
+
     it "can override implicitly declared schema by sub-struct schema" do
       data[:foo] = {}
       data[:foo].should == {}

data/spec/time_spec.rb

@@ -22,5 +22,12 @@ describe Typed::Hash do
       }.should raise_error(Must::Invalid)
     end
   end
+
+  describe "#utc" do
+    subject { data["now"] = 100; data.utc("now") }
+    its(:class) { should == Time  }
+    its(:zone)  { should == "UTC" }
+    its(:to_i)  { should == 100   }
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typed
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - maiha
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-31 00:00:00 +09:00
-default_executable: 
+date: 2012-07-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -94,7 +93,6 @@ files:
 - spec/spec_helper.rb
 - spec/time_spec.rb
 - typed.gemspec
-has_rdoc: true
 homepage: https://github.com/maiha/typed
 licenses: []
 
@@ -124,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: typed
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A Ruby library for Typed variables