lazyhash 0.1.0 → 0.1.1

data/lib/lazyhash.rb

@@ -1,17 +1,12 @@
 module LazyHash
   class << self
-    def add(hash, key, value, pre = nil)
+    def add(hash, key, value)
       skeys = key.split(".")
       f = skeys.shift
       if skeys.empty?
-        if pre.nil?
-          hash.send("[]=", f, value) unless hash.has_key?(f)
-        else
-          pre.send("[]=", f, value) unless pre.has_key?(f)
-        end
+        hash.send("[]=", f, value) unless !hash.is_a?(Hash) || (hash.has_key?(f) && hash[f].is_a?(Hash))
       else
-        pre = pre.nil? ? hash.send("[]", f) : pre.send("[]", f)
-        add(hash, skeys.join("."), value, pre)
+        add(hash[f], skeys.join("."), value)
       end
     end
 
@@ -19,5 +14,9 @@ module LazyHash
       lazy = lambda { |h,k| h[k] = Hash.new(&lazy) }
       Hash.new(&lazy)
     end
+
+    def no_lazy(hash)
+      eval(hash.inspect)
+    end
   end
 end

data/lib/lazyhash/version.rb

@@ -1,3 +1,3 @@
 module Lazyhash
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/lazyhash_spec.rb

@@ -5,17 +5,55 @@ describe LazyHash do
     @hash = LazyHash.build_hash
   end
 
-  it "should assign consecutive values with different deep's" do
-    LazyHash.add(@hash, "es.projects.title", "Main title")
-    LazyHash.add(@hash, "es.ph1", "one paragraph")
+  it "should not be marshable" do
+    lambda { Marshal.dump(@hash) }.should raise_error
+  end
+
+  describe ".add" do
+    it "should assign consecutive values with different deep's" do
+      LazyHash.add(@hash, "es.projects.title", "Main title")
+      LazyHash.add(@hash, "es.ph1", "one paragraph")
+
+      @hash.should == {"es" => {"projects" => {"title" => "Main title"}, "ph1" => "one paragraph"}}
+    end
+
+    it "should overwrite values for the same key" do
+      LazyHash.add(@hash, "es.ph1", "First value")
+      LazyHash.add(@hash, "es.ph1", "Second value")
+
+      @hash.should == {"es" => {"ph1" => "Second value"}}
+    end
 
-    @hash.should == {"es" => {"projects" => {"title" => "Main title"}, "ph1" => "one paragraph"}}
+    it "should not overwrite a node previously defined as a 'folder'" do
+      LazyHash.add(@hash, "es.projects.title", "Main title")
+      LazyHash.add(@hash, "es.projects", "try to convert the projects folder into a value with this string")
+
+      @hash.should == {"es" => {"projects" => {"title" => "Main title"}}}
+    end
+
+    it "should not overwrite a node previously defined as a 'value'" do
+      LazyHash.add(@hash, "es.projects", "Proyectos")
+      LazyHash.add(@hash, "es.projects.title", "try to convert a value into a folder with other values")
+
+      @hash.should == {"es" => {"projects" => "Proyectos"}}
+    end
   end
 
-  it "should not overwrite existing values with keys" do
-    LazyHash.add(@hash, "es.projects.title", "Main title")
-    LazyHash.add(@hash, "es.projects", "title")
+  describe ".no_lazy" do
+    it "should return a copy of the given hash" do
+      LazyHash.add(@hash, "es.projects", "Proyectos")
+      unlazy = LazyHash.no_lazy(@hash)
+      unlazy.should == {"es" => {"projects" => "Proyectos"}}
+    end
+
+    it "should return a copy of the given hash without the proc constructor" do
+      unlazy = LazyHash.no_lazy(@hash)
+      unlazy.default_proc.should be_nil
+    end
 
-    @hash.should == {"es" => {"projects" => {"title" => "Main title"}}}
+    it "should return a marshable hash" do
+      unlazy = LazyHash.no_lazy(@hash)
+      lambda { Marshal.dump(unlazy) }.should_not raise_error
+    end
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: lazyhash
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors: 
 - Roger Campos
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 +01:00
+date: 2011-02-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
         version: "2.5"
   type: :development
   version_requirements: *id001
@@ -65,23 +56,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: lazyhash
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: add values to a hash with an arbitrary deep of keys