typed 0.2.0 → 0.2.1

data/lib/typed/default.rb

@@ -9,7 +9,13 @@ module Typed
       @kvs[key.to_s] = val
     end
 
-    def regsiter_lazy(key, block)
+    def merge!(hash)
+      hash.each_pair do |key, val|
+        self[key] = val
+      end
+    end
+
+    def register_lazy(key, block)
       return if @kvs.exist?(key.to_s)
       raise ArgumentError, "Lazy default value needs block: #{key}" unless block
       @kvs[key.to_s] = Schema::LazyValue.new(block)

data/lib/typed/hash.rb

@@ -24,7 +24,7 @@ module Typed
 
     def default(key = nil, &block)
       if key
-        @default.regsiter_lazy(key, block)
+        @default.register_lazy(key, block)
       else
         @default
       end
@@ -113,6 +113,21 @@ module Typed
       keys.map{|key| self[key]}
     end
 
+    def merge!(hash)
+      hash.each_pair do |key, val|
+        self[key] = val
+      end
+
+      return self
+    end
+
+    ######################################################################
+    ### Conversions
+
+    def path(key)
+      self[key].must.coerced(Pathname, String=>proc{|i| Pathname(i)})
+    end
+
     ######################################################################
     ### Utils
 

data/lib/typed/version.rb

@@ -1,3 +1,3 @@
 module Typed
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/default_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe Typed::Default do
+  describe "#merge" do
+    it "should merge to hash" do
+      data = Typed::Hash.new
+      data.default.merge!(:a=>1, :b=>2)
+      data.keys.sort.should == ["a", "b"]
+      data["a"].should == 1
+      data["b"].should == 2
+    end
+
+    it "should merge to hash only when the key is not set" do
+      data = Typed::Hash.new
+      data[:a] = 10
+
+      data.default.merge!(:a=>1, :b=>2)
+      data.keys.sort.should == ["a", "b"]
+      data["a"].should == 10
+      data["b"].should == 2
+    end
+  end
+end
+

data/spec/merge_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+
+describe Typed::Hash do
+  describe "#merge!" do
+    context "(empty)" do
+      it "should merge given hash as same as Hash" do
+        data = Typed::Hash.new
+        data.merge!("a" => 1, :b => "x")
+        data.keys.sort.should == ["a", "b"]
+        data["a"].should == 1
+        data["b"].should == "x"
+      end
+    end
+
+    context "(elements exist)" do
+      it "should merge given hash as same as Hash" do
+        data = Typed::Hash.new
+        data["a"] = 1
+
+        data.merge!("a" => 2, :b => "x", :c => [])
+        data.keys.sort.should == ["a", "b", "c"]
+        data["a"].should == 2
+        data["b"].should == "x"
+        data["c"].should == []
+      end
+    end
+  end
+end

data/spec/path_spec.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+
+describe Typed::Hash do
+  describe "#path" do
+    it "should return a Pathname when it is a String" do
+      data = Typed::Hash.new
+      data["dir"] = "tmp/foo"
+
+      data.path("dir").should == Pathname("tmp/foo")
+    end
+
+    it "should return itself when it is a Pathname" do
+      data = Typed::Hash.new
+      data["dir"] = Pathname("tmp/foo")
+
+      data.path("dir").should == Pathname("tmp/foo")
+    end
+
+    it "should raise Must::Invalid if not pathname-able" do
+      data = Typed::Hash.new
+      data["dir"] = 10
+
+      lambda {
+        data.path("dir")
+      }.should raise_error(Must::Invalid)
+    end
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typed
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - maiha
@@ -84,8 +84,11 @@ files:
 - lib/typed/schema.rb
 - lib/typed/version.rb
 - spec/changes_spec.rb
+- spec/default_spec.rb
 - spec/events_spec.rb
 - spec/hash_spec.rb
+- spec/merge_spec.rb
+- spec/path_spec.rb
 - spec/schema_spec.rb
 - spec/spec_helper.rb
 - typed.gemspec