rangehash 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.3 2011-04-25
+* 1 major enhancement:
+  * RangeHash is now a full fledged derived class of Hash
+
 === 0.0.2 2010-12-30
 
 * 1 major enhancement:

data/README.rdoc

@@ -30,7 +30,7 @@ one of the hashes that value is returned.
 
 (The MIT License)
 
-Copyright (c) 2010 Mark Simpson
+Copyright (c) 2010-2011 Mark Simpson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -15,7 +15,8 @@ $hoe = Hoe.spec 'rangehash' do
   self.developer 'Mark Simpson', 'verdammelt@gmail.com'
   self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   self.rubyforge_name       = self.name
-  self.test_globs         = ["spec/**/*_spec.rb"] #["test/**/test_*.rb", "spec/**/*_spec.rb"]
+  self.test_globs         = ["spec/**/*_spec.rb"]
+  self.extra_rdoc_files = ["README.rdoc"]
 end
 
 require 'newgem/tasks'

data/lib/rangehash.rb

@@ -2,39 +2,52 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Rangehash
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end
 
-class RangeHash
-  def initialize (key_value_hash, default_value=nil)
-    @key_value_hash = key_value_hash || Hash.new()
-    @default_item = [nil, default_value]
-  end
-  
+class RangeHash < Hash
   def [](key)
-    (@key_value_hash.find{ |kv| kv[0] === key } || @default_item)[1]
+    value = find_value key
+    value == :notfound ? default : value
   end
-  
-  def []=(key, value)
-    @key_value_hash[key] = value
+
+  def fetch(key, default = nil)
+    value = find_value key
+    return value if value != :notfound
+    return default if default != nil
+    yield key if block_given?
+    raise IndexError, "key " + key.to_s + " not found" if not block_given?
   end
-  
-  def to_s
-    @key_value_hash.to_s
+
+  def key?(key)
+    found = find_pair(key)
+    !(found.empty?)
   end
-  
+
+  alias_method :has_key?, :key?
+  alias_method :include?, :key?
+  alias_method :member?, :key?
+
+  def delete(key)
+    super
+  end
+
   def sorted_keys
-    @key_value_hash.keys.sort do |a, b|
+    keys.sort do |a, b|
       sort_key(a) <=> sort_key(b)
     end
   end
   
   private
+  def find_pair(key)
+    each_pair.select {|k, v| (k == key || k === key)}
+  end
   
+  def find_value(key)
+    (find_pair(key).first || [nil, :notfound])[1]
+  end
+
   def sort_key(a)
-    return a.first if Range === a
-    a
+    return Range === a ? a.first : a
   end
 end
-
-

data/spec/rangehash_spec.rb

@@ -1,59 +1,141 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-# Time to add your specs!
-# http://rspec.info/
 describe RangeHash do
-  describe "retrieval by key:" do
-    it "should allow bare fixnum keys" do
-      rh = RangeHash.new({ 1 => :foo })
+  let(:rh) { RangeHash.new }
+  let(:rh_with_default) { RangeHash.new(:default_value) }
+  let(:rh_with_other)
+
+  describe "[]" do
+    it "allows bare fixnum keys" do
+      rh[1] = :foo
       rh[1].should == :foo
     end
   
-    it "should allow ranges as keys" do
-      rh = RangeHash.new({ 1..3 => :foo })
+    it "allows ranges as keys" do
+      rh[1..3] = :foo
       rh[2].should == :foo
     end
-  
-    it "should return default value if key not found" do
-      rh = RangeHash.new({ 1..3 => :foo}, :bar)
-      rh[42].should == :bar
+    
+    it "allows ranges as keys for lookup if equal" do
+      rh[1..3] = :foo
+      rh[1..3].should == :foo
     end
-  end
-  
-  describe "initialization:" do
-    it "should have default value of nil" do
-      rh = RangeHash.new({ 1..3 => :foo})
-      rh[42].should == nil
+
+    it "allows mix of ranges and fixnums" do
+      rh[1] = :foo
+      rh[2..4] = :bar
+      [rh[1], rh[3]].should == [:foo, :bar]
     end
-    
-    it "should allow nil initial value" do
-      rh = RangeHash.new(nil)
-      rh.to_s.should == ""
+  
+    it "returns default value if key not found" do
+      rh_with_default[1..3] = :foo
+      rh_with_default[42].should == :default_value
     end
   end
 
-  describe "adding keys and values: " do
-    it "should allow adding new fixnum keys dynamically" do
+  describe "[]=" do
+    it "allows adding new fixnum keys dynamically" do
       rh = RangeHash.new(nil)
       rh[42] = :answer
       rh[42].should == :answer
     end
   
-    it "should allow adding new range keys dynamically" do
-      rh = RangeHash.new(nil)
+    it "allows adding new range keys dynamically" do
       rh[1..3] = :foo
       rh[2].should == :foo
     end
-    
-    it "should replace existing key-value pair when adding" do
-      rh = RangeHash.new({ 1 => :foo})
-      rh[1] = :bar
-      rh[1].should == :bar
+  end
+  
+  describe ".delete" do
+    it "handles ranges as keys" do
+      rh[2..4] = :foo
+      rh.delete(2..4)
+      rh.has_key?(2..4).should be_false
+    end
+
+    it "does not handle ranges specially" do
+      rh[2..4] = :foo
+      rh.delete(3)
+      rh.key?(2..4).should be_true
     end
   end
 
-  it "should allow retrieval of sorted keys" do
-    rh = RangeHash.new({ 10..20 => :foo, 2 => :bar, 0 => :baz })
-    rh.sorted_keys.should == [0, 2, 10..20]
+  describe ".fetch" do
+    it "handles ranges" do
+      rh[2..4] = :foo
+      rh.fetch(3).should == :foo
+    end
+
+    it "handle ranges as lookup if equal" do
+      rh[2..4] = :foo
+      rh.fetch(2..4).should == :foo
+    end 
+
+
+    it "handles ranges and fires IndexError property" do
+      rh[2..4] = :foo
+      expect { rh.fetch(42) }.to raise_error(IndexError)
+    end
+
+    it "handles ranges and default value" do
+      rh[2..4] = :foo
+      rh.fetch(42, :default).should == :default
+    end
+
+    it "handles ranges and block" do
+      str = "block not called"
+
+      rh[2..4] = :foo
+      rh.fetch(42) { |el| str = "key:" + el.to_s }
+      str.should == "key:42"
+    end
+  end
+
+  describe ".has_key?" do
+    it "handles ranges" do
+      rh[2..4] = :foo
+      rh.has_key?(3).should be_true
+      rh.has_key?(2..4).should be_true
+    end
+  end
+
+  describe ".include?" do
+    it "handles ranges" do
+      rh[2..4] = :foo
+      rh.include?(3).should be_true
+      rh.has_key?(2..4).should be_true
+    end
+  end
+
+  describe ".key?" do
+    it "handles ranges" do
+      rh[2..4] = :foo
+      rh.key?(3).should be_true
+      rh.has_key?(2..4).should be_true
+    end
+  end
+
+  describe ".member?" do
+    it "handles ranges" do
+      rh[2..4] = :foo
+      rh.key?(3).should be_true
+      rh.has_key?(2..4).should be_true
+    end
+  end
+
+  describe ".index" do
+    it "handles ranges" do
+      rh[2..4] = :foo
+      rh.index(:foo).should == (2..4)
+    end
+  end
+
+  describe ".sorted_keys" do
+    it "allows retrieval of sorted keys" do
+      rh[10..20] = :foo
+      rh[2] = :bar
+      rh[0] = :baz
+      rh.sorted_keys.should == [0, 2, 10..20]
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rangehash
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mark Simpson
@@ -36,57 +36,25 @@ cert_chain:
   rPnJW2hNpPLFrA==
   -----END CERTIFICATE-----
 
-date: 2010-12-30 00:00:00 -05:00
+date: 2011-04-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 35
         segments: 
         - 2
-        - 0
+        - 9
         - 4
-        version: 2.0.4
+        version: 2.9.4
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
-        version: 0.6.1
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
-  type: :development
-  version_requirements: *id003
 description: |-
   Simple class which uses Ranges (and Fixnums) as keys in for a hash.
   Then look ups can be done with FixNum and if the FixNum is included in
@@ -101,6 +69,7 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - PostInstall.txt
+- README.rdoc
 files: 
 - .rspec
 - History.txt
@@ -116,6 +85,7 @@ files:
 - spec/spec_helper.rb
 - tasks/rspec.rake
 - todo.org
+- .gemtest
 has_rdoc: true
 homepage: http://github.com/verdammelt/range-hash
 licenses: []
@@ -147,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rangehash
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Simple class which uses Ranges (and Fixnums) as keys in for a hash