hashery 1.1.0 → 1.2.0

data/HISTORY

@@ -1,5 +1,26 @@
 = RELEASE HISTORY
 
+== 1.2.0 // 2010-06-04
+
+This release makes two signifficant changes to the Hashery.
+First, we have a new shiny library called FuzzyHash by
+Joshua Hull. It's a cool idea that allows hash keys to be
+regular expressions. Secondly, OpenCascade is now a subclass
+of OpenHash rather than OpenObject (to go along with the
+changes of the last release), and it now support cascading
+within Arrays.
+
+Changes:
+
+* 1 New Library
+
+  * FuzzyHash by Joshua Hull
+
+* 1 Major Enhancement
+
+  * OpenCascade subclasses OpenHash and handles Array cascading.
+
+
 == 1.1.0 // 2010-04-28
 
 A follow-up release of Hashery that adds two new libraries:
@@ -34,3 +55,4 @@ diverge to target slightly different use cases.
 Changes:
 
 * Happy Birthday!
+

data/README.rdoc

@@ -1,19 +1,21 @@
-= Facets Hashery
+= Hashery
 
 * home: http://rubyworks.github.com/hashery
 * work: http://github.com/rubyworks/hashery
 
+
 == DESCRIPTION
 
 Among Ruby Facets most common additions were an assortment
-of Hash-like classes. To better support this collection of
+of Hash-like classes. To better support this collection
 of libraries it was deemed prudent to create a side project
-specifically for them. Hence the Facets Hashery.
+specifically for them. Hence the "Facets" Hashery.
 
-Included in this collect are the widely used OrderedHash, 
+Included in this collection are the widely used OrderedHash, 
 the related but more featured Dictionary class, a number
-of _open_ classes, similiar to the standard OpenStruct, 
-and variations of the standard Hash.
+of _open_ classes, similar to the standard OpenStruct, 
+plus a few variations of the standard Hash and a few
+other yummy morsels.
 
 
 == RELEASE NOTES
@@ -34,14 +36,27 @@ To install with RubyGems simply open a console and type:
   $ sudo gem install hashery
 
 Tarball packages are available for manual site installations
-via <a href="http://proutils.github.com/setup">Setup.rb</a>.
+via {Ruby Setup}[http://proutils.github.com/setup].
 
 
 == LICENSE
 
-Copyright (c) 2005,2010 Thomas Sawyer
+Copyright (c) 2005, 2010 Thomas Sawyer
 
-This program is ditributed unser the terms of the MIT license.
+This library is distributed under the terms of the MIT license.
 
 See LICENSE file for details.
 
+Some libraries included in the Hashery have special copyrights
+attributing specific authors. Please see each file for details.
+
+Contributing authors include:
+
+* Kirk Haines
+* Joshua Hull
+* Robert Klemme
+* Jan Molic
+* George Moschovitis
+* Jeena Paradies
+* Erik Veenstra
+

data/lib/hashery/dictionary.rb

@@ -1,24 +1,3 @@
-# = Dictionary.rb
-#
-# Copyright (c) 2005, 2009 Jan Molic, Thomas Sawyer
-#
-# Ruby License
-#
-# This module is free software. You may use, modify, and/or redistribute this
-# software under the same terms as Ruby.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-# == Acknowledgments
-#
-# * Andrew Johnson (merge, to_a, inspect, shift and Hash[])
-# * Jeff Sharpe    (reverse and reverse!)
-# * Thomas Leitner (has_key? and key?)
-#
-# Ported from OrderHash 2.0, Copyright (c) 2005 Jan Molic
-
 # = Dictionary
 #
 # The Dictionary class is a Hash that preserves order.
@@ -62,6 +41,18 @@
 # * Use ::auto which creates Dictionay sub-entries as needed.
 # * And ::alpha which creates a new Dictionary sorted by key.
 #
+# == Acknowledgments
+#
+# Dictionary is a ported of OrderHash 2.0 Copyright (c) 2005 Jan Molic.
+#
+# People who have contributed to this class since then include:
+#
+# * Andrew Johnson (merge, to_a, inspect, shift and Hash[])
+# * Jeff Sharpe    (reverse and reverse!)
+# * Thomas Leitner (has_key? and key?)
+#
+# Copyright (c) 2005, 2009 Jan Molic, Thomas Sawyer
+
 class Dictionary
 
   include Enumerable

data/lib/hashery/lruhash.rb

@@ -1,12 +1,11 @@
-# LRU based Hash
-
 require 'enumerator'
 
 # Hash with LRU expiry policy.  There are at most max_size elements in a
 # LRUHash.  When adding more elements old elements are removed according
 # to LRU policy.
 #
-# by Robert Klemme
+# http://github.com/rklemme/muppet-laboratories/blob/master/lib/lruhash.rb
+# Copyright (c) 2010 Robert Klemme
 
 class LRUHash
 

data/lib/hashery/opencascade.rb

@@ -1,7 +1,4 @@
-# OpenCascade Copyright (c) 2006 Thomas Sawyer
-
-require 'hashery/openobject'
-#require 'facets/boolean' # bool
+require 'hashery/openhash'
 #require 'facets/nullclass'
 
 # = OpenCascade
@@ -32,6 +29,13 @@ require 'hashery/openobject'
 #
 #   c.a.z?                #=> nil
 #
+# OpenCascade also transforms Hashes within Arrays.
+#
+#  h = { :x=>[ {:a=>1}, {:a=>2} ], :y=>1 }
+#  c = OpenCascade[h]
+#  c.x.first.a.assert == 1
+#  c.x.last.a.assert == 2
+#
 # Finally, you can set a node and get the reciever back using
 # the !-mark.
 #
@@ -54,8 +58,9 @@ require 'hashery/openobject'
 # So be sure to take that into account.
 #++
 
-class OpenCascade < OpenObject
+class OpenCascade < OpenHash
 
+  #
   def method_missing(sym, *args, &blk)
     type = sym.to_s[-1,1]
     name = sym.to_s.gsub(/[=!?]$/, '').to_sym
@@ -63,21 +68,32 @@ class OpenCascade < OpenObject
     when '='
       self[name] = args.first
     when '!'
-      @hash.__send__(key, *args, &blk)
+      #@hash.__send__(name, *args, &blk)
+      __send__(name, *args, &blk)
     when '?'
       self[name]
     else
       if key?(name)
-        val = self[name]
-        if Hash === val
-          self[name] = OpenCascade.new(val) #self.class.new(val)
-        else
-          self[name]
-        end
+        self[name] = transform_entry(self[name])
       else
         self[name] = OpenCascade.new #self.class.new
       end
     end
   end
 
+  private
+
+    #
+    def transform_entry(entry)
+      case entry
+      when Hash
+        OpenCascade.new(entry) #self.class.new(val)
+      when Array
+        entry.map{ |e| transform_entry(e) }
+      else
+        entry
+      end
+    end
+
 end
+

data/lib/hashery/openhash.rb

@@ -15,6 +15,18 @@ class OpenHash < Hash
     merge!(data)
   end
 
+  #
+  def <<(x)
+    case x
+    when Hash
+      update(x)
+    when Array
+      x.each_slice(2) do |(k,v)|
+        self[k] = v
+      end
+    end
+  end
+
   #
   def respond_to?(name)
     key?(name.to_sym) || super(name)

data/lib/hashery/sparsearray.rb

@@ -1,24 +1,3 @@
-#--
-# SparseArray
-#
-# Copyright (c) 2004,2005 Thomas Sawyer
-#
-# Ruby License
-#
-# This module is free software. You may use, modify, and/or redistribute this
-# software under the same terms as Ruby.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-# ==========================================================================
-# Revision History ::
-# --------------------------------------------------------------------------
-#  04.09    Trans    * 99% Compatible with Array
-# ==========================================================================
-#++
-
 # = SparseArray
 #
 # SparseArray is an implemenation of the Array class using only Hashes.
@@ -28,17 +7,29 @@
 # Ruby 1.9 that need to be added, and negative indexes are not quite fully
 # supported yet.
 #
-# SparseArray is slower then the built in Array class, but not as slow
-# as one might expect, since a Hash is generally faster than an Array.
-# It would interesting to see how this would perform if it were 
-# written in C.
+# Benchmarks comparing Ruby 1.6 circa 2004 compared to Ruby 1.8.7 
+# circa 2010, show that Ruby's Array implementation has improved quite
+# a bit. Where as Array was about 2-4 times faster than SparseArray in 2004,
+# it is now over 10x faster, and able to handle large sparse arrays quite
+# easily. Though surely SparseArray could still be improved, <b>SparseArray
+# is little more than an interesting novelty at this point</b>, as opposed
+# to a useful class, but we will keep her nonetheless for simple interests
+# sake.
+# 
+# NOTE: SparseArray is also the first piece of code I used TDD to create.
+#
+# Copyright (c) 2004 Thomas Sawyer
 #
+#--
+# TODO: Add auto-array features if needed (see work/autoarray).
+#++
+
 class SparseArray < Hash
 
   def self.[](*args)
-    nha = new
-    args.each { |a| nha << a } #.set(nha.length,a) }
-    nha
+    s = new
+    args.each{ |e| s << e }
+    s
   end
 
   def self.new_h(hsh)
@@ -267,11 +258,11 @@ class SparseArray < Hash
   end
 
   def each
-    (0...self.length).each { |i| yield(self.fetch(i)) }
+    (0...self.length).each{ |i| yield(get(i)) }
   end
 
   def each_index
-    (0...self.length).each { |i| yield(i) }
+    (0...self.length).each{ |i| yield(i) }
   end
 
   # empty? okay as is

metadata

@@ -4,35 +4,34 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Thomas Sawyer
+- Kirk Haines
+- Robert Klemme
 - Jan Molic
 - George Moschovitis
+- Jeena Paradies
+- Erik Veenstra
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -04:00
+date: 2010-06-04 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: |-
-  The Facets Hashery is collection of Hash-like classes, spun-off
-  from the original Ruby Facets library. Included are the widely
-  used OrderedHash, the related but more featured Dictionary
-  class, a number of _open_ classes, similiar to the standard 
-  OpenStruct and variations on the standard Hash.
-email: 
+description: The Hashery is a collection of Hash-like classes, spun-off from the original Ruby Facets library. Included are the widely used OrderedHash, the related but more featured Dictionary class, a number of open classes, similiar to the standard OpenStruct and a few variations on the standard Hash.
+email: transfire@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
 files: 
 - lib/hashery/association.rb
 - lib/hashery/castinghash.rb
@@ -51,17 +50,6 @@ files:
 - lib/hashery/stash.rb
 - lib/hashery/statichash.rb
 - lib/hashery.rb
-- meta/authors
-- meta/created
-- meta/description
-- meta/homepage
-- meta/license
-- meta/name
-- meta/release
-- meta/repository
-- meta/suite
-- meta/summary
-- meta/version
 - test/case_association.rb
 - test/case_dictionary.rb
 - test/case_opencascade.rb
@@ -80,6 +68,8 @@ post_install_message:
 rdoc_options: 
 - --title
 - Hashery API
+- --main
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/meta/authors

@@ -1,3 +0,0 @@
-Thomas Sawyer
-Jan Molic
-George Moschovitis

data/meta/created

@@ -1 +0,0 @@
-2010-04-21

data/meta/description

@@ -1,5 +0,0 @@
-The Facets Hashery is collection of Hash-like classes, spun-off
-from the original Ruby Facets library. Included are the widely
-used OrderedHash, the related but more featured Dictionary
-class, a number of _open_ classes, similiar to the standard 
-OpenStruct and variations on the standard Hash.

data/meta/homepage

@@ -1 +0,0 @@
-http://rubyworks.github.com/hashery

data/meta/license

@@ -1 +0,0 @@
-MIT

data/meta/name

@@ -1 +0,0 @@
-hashery

data/meta/release

@@ -1 +0,0 @@
-2009-06-26

data/meta/repository

@@ -1 +0,0 @@
-git://github.com/rubyworks/hashery.git

data/meta/suite

@@ -1 +0,0 @@
-rubyworks

data/meta/summary

@@ -1 +0,0 @@
-Facets bread collection of Hash-like classes.

data/meta/version

@@ -1 +0,0 @@
-1.1.0