shash 0.0.6 → 0.0.7

data/.gitignore

@@ -0,0 +1 @@
+.idea

data/lib/shash.rb

@@ -1,27 +1,18 @@
-class Shash  
-  def initialize(hash={}, &proc)
-    @_hash = hash
-    @_proc = proc
+class Shash
+  def initialize(hash={})
+    @hash = {}
+    init!(hash)
   end
-  
-  def _key key
-    @_proc ? @_proc.call(key) : key.to_s
-  end 
 
   def method_missing(key, *args, &block)
     if key[/=$/]
-      @_hash[_key(key[0...-1])] = args.first
+      self[key[0...-1]] = args.first
     else
-      if value = @_hash[_key(key)]
-        case value
-          when Hash
-            Shash.new(value, &@_proc)
-          else
-            value
-        end
+      if @hash.key?(key)
+        @hash[key]
       else
         begin
-          @_hash.send(key, *args, &block)
+          @hash.send(key, *args, &block)
         rescue NoMethodError
           nil
         end
@@ -29,22 +20,36 @@ class Shash
     end
   end
   
-  def has_key?(key)
-    @_hash.has_key?(key)
-  end
-  alias_method :key?, :has_key?
-  
   def ==(other)
-    other == @_hash
+    other == @hash
   end
   
   def []=(key,value)
-    @_hash[key] = value
+    @hash[key.respond_to?(:to_sym) ? key.to_sym : key] = shashify(value)
+  end
+
+  protected
+
+  def init!(hash)
+    hash.each do |k,v|
+      self[k] = v
+    end
+  end
+
+  def shashify(value)
+    case value
+      when Hash
+        Shash.new(value)
+      when Array
+        value.map{|v| self.shashify(v)}
+      else
+        value
+    end
   end
 end
 
 class Hash
-  def to_shash &proc
-    Shash.new(self, &proc)
+  def to_shash
+    Shash.new(self)
   end
 end

data/lib/version.rb

@@ -1,7 +1,7 @@
 class Shash
   MAJOR = 0
   MINOR = 0
-  BUILD = 6
+  BUILD = 7
 
   VERSION = "#{MAJOR}.#{MINOR}.#{BUILD}"
 end

data/test/test_shash.rb

@@ -26,45 +26,31 @@ describe Shash do
   
   it "#has_key? should check for key existence correctly" do
     h = {"a"=>1, "b"=>{"c"=>2}}.to_shash
-    h.has_key?("z").should == false
-    h.has_key?("b").should == true
-    h.b.has_key?("c").should == true
+    h.has_key?(:z).should == false
+    h.has_key?(:b).should == true
+    h.b.has_key?(:c).should == true
   end
   
   it "#[] should still works as expected" do
     h = {"a"=>1}.to_shash
     h.a.should == 1
-    h["a"].should == 1
+    h[:a].should == 1
   end
   
   it "#[]= should still works as expected" do
     h = Shash.new
-    h["b"] = 2
-    h.b.should == 2
-  end
-  
-  it "#initialize should take a block and call it for each key before set/get" do
-    h = Shash.new(:a=>1){ |k| k.to_sym }
-    h.b = 2
-    h.should == {:a=>1, :b=>2}.to_shash
-    h.has_key?(:b).should == true
+    h[:b] = 2
     h.b.should == 2
   end
-  
-  it "#initialize should propagates the proc to sub-shashes when given" do
-    h = Shash.new{ |k| k.to_sym }
-    h.a = {}
-    h.a.b = 1
-    h.should == {:a=>{:b=>1}}
-  end
-  
-  it "should handles all sort of fancy things" do
-    h = Shash.new{ |k| k.upcase.reverse }
-    h.test = "are you sure?"
-    h.has_key?("test").should == false
-    h.has_key?("TSET").should == true
-    h.test.should == "are you sure?"
-    h.should == {"TSET"=>"are you sure?"}.to_shash
+
+  it "#should handle hashes containing arrays properly" do
+    h = {:a => 1, :b => [{:ba => 1, :bb => 2}, [{:ccc => 3}]]}.to_shash
+    h.a.should == 1
+    h.b.should == [{:ba => 1, :bb => 2}.to_shash, [{:ccc => 3}.to_shash]]
+    h.b[0].should == {:ba => 1, :bb => 2}.to_shash
+    h.b[1][0].should == {:ccc => 3}.to_shash
+    h.b[1][0].ccc.should == 3
+    h.b.last.first.ccc.should == 3
   end
   
 end

metadata

@@ -1,74 +1,53 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shash
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.0.7
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
 platform: ruby
-authors: 
+authors:
 - Christian Blais
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-07 00:00:00 -05:00
-default_executable: 
+date: 2012-01-25 00:00:00.000000000 Z
 dependencies: []
-
 description: Replace hash keys with method calls
-email: 
+email:
 - christ.blais@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- .gitignore
 - LICENSE
 - README.md
 - lib/shash.rb
 - lib/version.rb
 - shash.gemspec
 - test/test_shash.rb
-has_rdoc: true
 homepage: http://github.com/christianblais/shash
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - test
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Replace hash keys with method calls
 test_files: []
-