hashery 2.0.0 → 2.0.1

data/.ruby

@@ -58,11 +58,10 @@ load_path:
 - lib
 - alt
 revision: 0
+name: hashery
+title: Hashery
 created: '2010-04-21'
 summary: Facets-bread collection of Hash-like classes.
-title: Hashery
-version: 2.0.0
-name: hashery
 description: ! 'The Hashery is a tight collection of Hash-like classes. Included among
   its many
 
@@ -73,4 +72,5 @@ description: ! 'The Hashery is a tight collection of Hash-like classes. Included
   of the CRUDHash which defines a CRUD model on top of Ruby''s standard Hash
 
   making it a snap to subclass and augment to fit any specific use case.'
-date: '2012-06-18'
+version: 2.0.1
+date: '2012-07-06'

data/HISTORY.rdoc

@@ -1,5 +1,15 @@
 = RELEASE HISTORY
 
+== 2.0.1 / 2012-07-06
+
+This minor release fixes an issue with OpenCascade (#13).
+The key_proc procedure wasn't being passed along to sub-cascades. 
+
+Changes:
+
+* OpenCascade passes along key_proc to childern.
+
+
 == 2.0.0 / 2012-05-11
 
 This is a big release for Hashery which both culls some of it's

data/lib/hashery.yml

@@ -58,11 +58,10 @@ load_path:
 - lib
 - alt
 revision: 0
+name: hashery
+title: Hashery
 created: '2010-04-21'
 summary: Facets-bread collection of Hash-like classes.
-title: Hashery
-version: 2.0.0
-name: hashery
 description: ! 'The Hashery is a tight collection of Hash-like classes. Included among
   its many
 
@@ -73,4 +72,5 @@ description: ! 'The Hashery is a tight collection of Hash-like classes. Included
   of the CRUDHash which defines a CRUD model on top of Ruby''s standard Hash
 
   making it a snap to subclass and augment to fit any specific use case.'
-date: '2012-06-18'
+version: 2.0.1
+date: '2012-07-06'

data/lib/hashery/open_cascade.rb

@@ -72,7 +72,7 @@ module Hashery
     #
     # Read value given a +key+.
     #
-    # key - Index keey to lookup.
+    # key - Index key to lookup.
     #
     # Returns value.
     #
@@ -124,7 +124,10 @@ module Hashery
     def cast_value(entry)
       case entry
       when Hash
-        OpenCascade[entry] #self.class.new(val)
+        e = OpenCascade.new
+        e.key_proc = key_proc if key_proc
+        e.merge!(entry)
+        e
       when Array
         entry.map{ |e| cast_value(e) }
       else
@@ -136,6 +139,7 @@ module Hashery
 
 end
 
+
 #--
 # Last, when an entry is not found, 'null' is returned rather then 'nil'.
 # This allows for run-on entries withuot error. Eg.

data/test/case_casting_hash.rb

@@ -0,0 +1,71 @@
+require 'helper'
+
+test_case CastingHash do
+
+  class_method :[] do
+    test do
+      h = CastingHash[:a=>1, :b=>2]
+    end
+  end
+
+  class_method :new do
+    test do
+      h = CastingHash.new
+    end
+
+    test 'with default' do
+      h = CastingHash.new(0)
+      h['a'].assert == 0
+    end
+
+    test 'with casting procedure' do
+      h = CastingHash.new{ |k,v| [k.to_sym, v] }
+      h['a'] = 1
+      h.assert == {:a=>1}
+    end
+
+    test 'with default and casting procedure' do
+      h = CastingHash.new(0){ |k,v| [k.to_sym, v] }
+      h['a'].assert == 0
+      h['b'] = 2
+      h.assert == {:b=>2}
+    end
+  end
+
+  method :recast! do
+    test do
+      h = CastingHash[:a=>1, :b=>2]
+      h.cast_proc{ |k,v| [k.to_s, v] }
+      h.recast!
+      h.assert == {'a'=>1, 'b'=>2}
+    end
+  end
+
+  method :cast_proc= do
+    test do
+      h = CastingHash[:a=>1, :b=>2]
+      h.cast_proc = Proc.new{ |k,v| [k.to_s, v] }
+      h.recast!
+      h.assert == {'a'=>1, 'b'=>2}
+    end
+  end
+
+  method :to_hash do
+    test do
+      h = CastingHash[:a=>1, :b=>2]
+      h.to_hash
+      ::Hash.assert === h
+      h.assert == {:a=>1, :b=>2}
+    end
+  end
+
+  method :to_h do
+    test do
+      h = CastingHash[:a=>1, :b=>2]
+      h.to_h
+      ::Hash.assert === h
+      h.assert == {:a=>1, :b=>2}
+    end
+  end
+
+end

data/test/case_core_ext.rb

@@ -0,0 +1,79 @@
+require 'helper'
+
+test_case Hash do
+
+  method :rekey do
+
+    test "default" do
+      foo = { "a"=>1, "b"=>2 }
+      foo.rekey.assert == { :a=>1, :b=>2 }
+      foo.assert == { "a"=>1, "b"=>2 }
+    end
+
+    test "specific key" do
+      bar = { :a=>1, :b=>2 }
+      foo = bar.rekey(:a=>:c)
+      foo[:c].assert == 1
+      foo[:b].assert == 2
+      foo[:a].assert == nil
+    end
+
+    test "with block" do
+      bar = { :a=>1, :b=>2 }
+      foo = bar.rekey{ |k| k.to_s }
+      foo['a'].assert == 1
+      foo['b'].assert == 2
+      foo[:a].assert  == nil
+      foo[:b].assert  == nil
+      foo.assert == { 'a'=>1, 'b'=>2 }
+    end
+
+    test "symbol proc" do
+      foo = { :a=>1, :b=>2 }
+      foo.rekey(&:to_s).assert == { "a"=>1, "b"=>2 }
+      foo.assert == { :a =>1, :b=>2 }
+    end
+
+  end
+
+  method :rekey! do
+
+    test "default" do
+      foo = { "a"=>1, "b"=>2 }
+      foo.rekey!.assert == { :a=>1, :b=>2 }
+      foo.assert == { :a=>1, :b=>2 }
+    end
+
+    test "specific key" do
+      foo = { :a=>1, :b=>2 }
+      foo.rekey!(:a=>:c)
+      foo[:c].assert == 1
+      foo[:b].assert == 2
+      foo[:a].assert == nil
+    end
+
+    test "with block" do
+      foo = { :a=>1, :b=>2 }
+      foo.rekey!{ |k| k.to_s }
+      foo['a'].assert == 1
+      foo['b'].assert == 2
+      foo[:a].assert == nil
+      foo[:b].assert == nil
+      foo.assert == { 'a'=>1, 'b'=>2 }
+    end
+
+    test "symbol proc" do
+      foo = { :a=>1, :b=>2 }
+      foo.rekey!(&:to_s).assert == { "a"=>1, "b"=>2 }
+      foo.assert == { "a"=>1, "b"=>2 }
+    end
+
+    test "no conflict between keys" do
+      r = {1 => :a, 2 => :b}.rekey!{ |k| k + 1 }
+      r.refute = {3 => :a}
+      r.assert = {2 => :a, 3 => :b}  
+    end
+
+  end
+
+end

data/test/case_crud_hash.rb

@@ -0,0 +1,29 @@
+require 'helper'
+
+test_case CRUDHash do
+
+  class_method :create do
+    test do
+      h = CRUDHash.create(:a=>1,:b=>2)
+      h.assert == {:a=>1,:b=>2}
+    end
+  end
+
+  class_method :auto do
+    test 'without a block' do
+      h = CRUDHash.auto
+      h[:a].assert == {}
+    end
+
+    test 'with a block' do
+      h = CRUDHash.auto{ [] }
+      h[:a].assert == []
+    end
+  end
+
+end
+
+
+#
+# OT: Why not make `:a=>1` a Pair object?
+#

data/test/case_ini_hash.rb

@@ -0,0 +1,56 @@
+require 'helper'
+
+test_case IniHash do
+
+  class_method :new do
+    test do
+      h = IniHash.new('foo.ini', false)
+    end
+  end
+
+  method :[]= do
+    test do
+      h = IniHash.new('foo.ini', false)
+      h['a'] = '1'
+      h['a'].assert = '1'
+    end
+  end
+
+  method :[] do
+    test do
+      h = IniHash.new('foo.ini', false)
+      h['a'] = '1'
+      h['a'].assert = '1'
+    end
+  end
+
+  method :to_h do
+    test do
+      h = IniHash.new('foo.ini', false)
+      h['a'] = '1'
+      h.to_h.assert = {'a'=>'1'}
+    end
+  end
+
+  method :to_s do
+    test do
+      h = IniHash.new('foo.ini', false)
+      h['a'] = '1'
+      h.to_s.assert == "a=1\n"
+    end
+
+    test do
+      h = IniHash.new('foo.ini', false)
+      h['a'] = '1'
+      h['b'] = {'c'=>3}
+      h.to_s.assert == "a=1\n[b]\nc=3\n"
+    end
+  end
+
+  class_method :load do
+    h = IniHash.load('test/fixture/example.ini')
+    h['a'].assert == '1'
+  end
+
+end
+

data/test/case_linked_list.rb

@@ -0,0 +1,167 @@
+require 'helper'
+
+test_case LinkedList do
+
+  class_method :new do
+    ll = LinkedList.new
+    LinkedList.assert === ll
+  end
+
+  method :to_a do
+    test 'empty' do
+      ll = LinkedList.new
+      ll.to_a.assert == []
+    end
+    test 'not empty' do
+      ll = LinkedList.new
+      ll.push :a
+      ll.to_a.assert == [:a]
+    end
+  end
+
+  method :empty? do
+    test do
+      ll = LinkedList.new
+      ll.assert.empty?
+    end
+  end
+
+  method :delete do
+    test do
+      ll = LinkedList.new
+      ll.push :a
+      ll.to_a.assert == [:a]
+      ll.delete(:a)
+      ll.to_a.assert == []
+    end
+
+    test do
+      ll = LinkedList.new
+      ll.push :a
+      ll.push :b
+      ll.push :c
+      ll.to_a.assert == [:a, :b, :c]
+      ll.delete(:b)
+      ll.to_a.assert == [:a, :c]
+    end
+  end
+
+  method :each do
+    test do
+       a = []
+      ll = LinkedList.new
+      ll.push :a
+      ll.each do |e|
+        a << e
+      end
+      a.assert == [:a]
+    end
+  end
+
+  method :length do
+    test do
+      ll = LinkedList.new
+      ll.push :a
+      ll.length.assert == 1
+    end
+  end
+
+  method :push do
+    test do
+      ll = LinkedList.new
+      ll.push :a
+      ll.to_a.assert == [:a]
+    end
+  end
+
+  method :unshift do
+    test do
+      ll = LinkedList.new
+      ll.unshift :a
+      ll.to_a.assert == [:a]
+    end
+    test do
+      ll = LinkedList.new
+      ll.push :a
+      ll.unshift :b
+      ll.to_a.assert == [:b, :a]
+    end
+  end
+
+  method :pop do
+    test do
+      ll = LinkedList.new
+      ll.push :a
+      ll.push :b
+      ll.to_a.assert == [:a, :b]
+      ll.pop
+      ll.to_a.assert == [:a]
+    end
+  end
+
+  method :shift do
+    test do
+      ll = LinkedList.new
+      ll.push :a
+      ll.push :b
+      ll.to_a.assert == [:a, :b]
+      ll.shift
+      ll.to_a.assert == [:b]
+    end
+  end
+
+  method :first do
+    test do
+      ll = LinkedList.new
+      ll.push :a
+      ll.push :b
+      ll.to_a.assert == [:a, :b]
+      ll.first.assert == :a
+    end
+  end
+
+  method :last do
+    test do
+      ll = LinkedList.new
+      ll.push :a
+      ll.push :b
+      ll.to_a.assert == [:a, :b]
+      ll.last.assert == :b
+    end
+  end
+
+  method :queue do
+    test do
+      ll = LinkedList.new
+      ll.push :a
+      ll.push :b
+      ll.queue.assert == [:a, :b]
+    end
+  end
+
+  method :[]= do
+    test do
+      ll = LinkedList.new
+      ll[:a] = :b
+      ll.to_a.assert == [:b]
+      ll[:a].assert == :b
+    end
+  end
+
+  method :[] do
+    test do
+      ll = LinkedList.new
+      ll.push :a 
+      ll[:a].assert == :a
+    end
+
+    test do
+      ll = LinkedList.new
+      ll.push :a
+      ll.push :b  
+      ll[:a].assert == :a
+      ll[:b].assert == :b
+    end
+  end
+
+end

data/test/case_property_hash.rb

@@ -0,0 +1,21 @@
+require 'helper'
+
+test_case PropertyHash do
+
+  class_method :new do
+    test do
+      PropertyHash.new
+    end
+  end
+
+  method :update do
+    test do
+      h = PropertyHash.new
+      h.property :a
+      h.property :b
+      h.update(:a=>1, :b=>2)
+      h.assert == {:a=>1, :b=>2}
+    end
+  end
+
+end

data/test/fixture/example.ini

@@ -0,0 +1,8 @@
+# top comment
+
+a = 1
+
+[section]
+x = 2
+y = 3
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashery
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -15,11 +15,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: detroit
-  requirement: &19204020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -27,10 +27,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19204020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: qed
-  requirement: &19203280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +43,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19203280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: lemon
-  requirement: &19222540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -49,7 +59,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19222540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'The Hashery is a tight collection of Hash-like classes. Included among
   its many
 
@@ -65,8 +80,8 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- LICENSE.txt
 - NOTICE.txt
+- LICENSE.txt
 - HISTORY.rdoc
 - DEMO.rdoc
 - README.rdoc
@@ -94,19 +109,26 @@ files:
 - lib/hashery.rb
 - lib/hashery.yml
 - test/case_association.rb
+- test/case_casting_hash.rb
+- test/case_core_ext.rb
+- test/case_crud_hash.rb
 - test/case_dictionary.rb
+- test/case_ini_hash.rb
 - test/case_key_hash.rb
+- test/case_linked_list.rb
 - test/case_lru_hash.rb
 - test/case_open_cascade.rb
 - test/case_open_hash.rb
+- test/case_property_hash.rb
 - test/case_query_hash.rb
+- test/fixture/example.ini
 - test/helper.rb
 - HISTORY.rdoc
 - DEMO.rdoc
-- LICENSE.txt
-- README.rdoc
 - NOTICE.txt
 - Config.rb
+- README.rdoc
+- LICENSE.txt
 homepage: http://rubyworks.github.com/hashery
 licenses:
 - BSD-2-Clause
@@ -129,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Facets-bread collection of Hash-like classes.