insensitive_hash 0.2.2 → 0.2.3

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+### 0.2.3 / 2012/02/18
+* Key-clash detection made optional with `Insensitive#safe=`
+* Ruby 1.8 compatibility
+
 ### 0.2.2 / 2012/02/13
 * :underscore option added
 * `Insensitive::KeyClashError` added for safer operations

data/lib/insensitive_hash/insensitive_hash.rb

@@ -11,6 +11,7 @@ class InsensitiveHash < Hash
 
     @key_map    = {}
     @underscore = false
+    @safe       = false
   end
 
   # Sets whether to replace spaces in String keys to underscores
@@ -35,6 +36,19 @@ class InsensitiveHash < Hash
   def underscore?
     @underscore
   end
+
+  # Sets whether to detect key clashes
+  # @param [Boolean] 
+  # @return [Boolean]
+  def safe= s
+    raise ArgumentError.new("Not true or false") unless [true, false].include?(s)
+    @safe = s
+  end
+
+  # @return [Boolean] Key-clash detection enabled?
+  def safe?
+    @safe
+  end
   
   # Returns a normal, sensitive Hash
   # @return [Hash]
@@ -95,19 +109,18 @@ class InsensitiveHash < Hash
   end
 
   def replace other
+    super other
+
     # TODO
     # What is the correct behavior of replace when the other hash is not an InsensitiveHash?
     # underscore property precedence: other => self (FIXME)
-    us = other.respond_to?(:underscore?) ? other.underscore? : self.underscore?
-    detect_clash other, us
+    self.underscore = other.respond_to?(:underscore?) ? other.underscore? : self.underscore?
+    self.safe       = other.safe? if other.respond_to?(:safe?)
 
-    self.default      = other.default
-    self.default_proc = other.default_proc if other.default_proc
-    self.underscore   = us
-
-    clear
-    other.each do |k, v|
-      self[k] = v
+    @key_map.clear
+    self.each do |k, v|
+      ekey = encode k, @underscore
+      @key_map[ekey] = k
     end
   end
 
@@ -166,7 +179,7 @@ private
   def detect_clash hash, us
     hash.keys.map { |k| encode k, us }.tap { |ekeys|
       raise KeyClashError.new("Key clash detected") if ekeys != ekeys.uniq
-    }
+    } if @safe
   end
 end
 

data/lib/insensitive_hash/version.rb

@@ -1,3 +1,3 @@
 class InsensitiveHash < Hash
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/test/test_insensitive_hash.rb

@@ -6,6 +6,20 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'insensitive_hash/minimal'
 
 class TestInsensitiveHash < Test::Unit::TestCase
+  def eight?
+    RUBY_VERSION =~ /^1\.8\./
+  end
+
+  def assert_keys set1, set2
+    if eight?
+      assert_equal set1.sort { |a, b| a.to_s <=> b.to_s },
+        set2.sort { |a, b| a.to_s <=> b.to_s }
+    else
+      assert_equal set1, set2
+    end
+
+  end
+
   def test_has_key_set
     ih = InsensitiveHash.new
     ih['a'] = 1
@@ -19,12 +33,11 @@ class TestInsensitiveHash < Test::Unit::TestCase
       assert_equal 2, ih[a]
     end
 
-    assert_equal ['A'], ih.keys
+    assert_keys  ['A'], ih.keys
     assert_equal [2], ih.values
 
     ih[:A] = 4
-    assert_equal ih.keys, [:A]
-    assert_equal [:A], ih.keys
+    assert_keys  [:A], ih.keys
     assert_equal [4], ih.values
 
     ih[:b] = { :c => 5 }
@@ -91,14 +104,16 @@ class TestInsensitiveHash < Test::Unit::TestCase
     end
 
     # Preserving default_proc
-    hash2 = {}
-    hash2.replace hash
-    hash2.default_proc = proc { |h, k| h[k] = :default }
-
-    ihash2 = hash2.insensitive.insensitive.insensitive
-    assert !ihash2.has_key?(:anything)
-    assert_equal :default, ihash2[:anything]
-    assert ihash2.has_key?(:anything)
+    unless eight?
+      hash2 = {}
+      hash2.replace hash
+      hash2.default_proc = proc { |h, k| h[k] = :default }
+
+      ihash2 = hash2.insensitive.insensitive.insensitive
+      assert !ihash2.has_key?(:anything)
+      assert_equal :default, ihash2[:anything]
+      assert ihash2.has_key?(:anything)
+    end
 
     # FIXME: test insensitive call with encoder
     h = InsensitiveHash[{'Key with spaces' => 1}]
@@ -145,8 +160,8 @@ class TestInsensitiveHash < Test::Unit::TestCase
       ih = InsensitiveHash[:a => 1, 'hello world' => 2]
       ih2 = ih.send(method, :b => 2)
 
-      assert_equal [:a, 'hello world'], ih.keys
-      assert_equal [:a, 'hello world', :b], ih2.keys
+      assert_keys [:a, 'hello world'], ih.keys
+      assert_keys [:a, 'hello world', :b], ih2.keys
       assert ih2.has_key?('B'), 'correctly merged another hash'
 
       assert_nil ih[:hello_world]
@@ -166,11 +181,13 @@ class TestInsensitiveHash < Test::Unit::TestCase
       ih.default = nil
       assert_nil ih.send(method, :b => 2)[:anything]
 
-      ih.default_proc = proc { |h, k| h[k] = :default }
-      mh = ih.send(method, :b => 2)
-      assert       !mh.has_key?(:anything)
-      assert_equal :default, mh[:anything]
-      assert        mh.has_key?(:anything)
+      unless eight?
+        ih.default_proc = proc { |h, k| h[k] = :default }
+        mh = ih.send(method, :b => 2)
+        assert       !mh.has_key?(:anything)
+        assert_equal :default, mh[:anything]
+        assert        mh.has_key?(:anything)
+      end
 
       ih2.delete 'b'
       assert ih2.has_key?('B') == false
@@ -182,8 +199,8 @@ class TestInsensitiveHash < Test::Unit::TestCase
       ih = InsensitiveHash[:a => 1]
       ih2 = ih.send(method, :b => 2)
 
-      assert_equal [:a, :b], ih.keys
-      assert_equal [:a, :b], ih2.keys
+      assert_keys [:a, :b], ih.keys
+      assert_keys [:a, :b], ih2.keys
       assert ih2.has_key?('B'), 'correctly merged another hash'
 
       ih2.delete 'b'
@@ -191,13 +208,46 @@ class TestInsensitiveHash < Test::Unit::TestCase
     end
   end
 
+  def test_merge_clash_overwritten
+    ih = InsensitiveHash.new
+
+    ih = ih.merge(:a => 1, :A =>2)
+    # No guarantee in order in 1.8
+    unless eight?
+      assert_equal 2, ih.values.first
+      assert_equal 2, ih['A']
+    end
+    assert_equal 1, ih.length
+
+    ih = InsensitiveHash.new
+    ih.underscore = true
+    ih.merge!(:hello_world => 1, 'hello world' =>2)
+    unless eight?
+      assert_equal 2, ih.values.first
+      assert_equal 2, ih[:Hello_World]
+    end
+    assert_equal 1, ih.length
+  end
+
   def test_merge_clash
     ih = InsensitiveHash.new
     ih2 = InsensitiveHash.new
     ih2.underscore = true
 
+    sih = InsensitiveHash.new
+    sih.safe = true
+    sih2 = InsensitiveHash.new
+    sih2.safe = true
+    sih2.underscore = true
+
     [:merge, :merge!, :update, :update!].each do |method|
+      # No problem
       [ih, ih2].each do |h|
+        h.send(method, { :a => 1, :A => 1, 'A' => 1})
+        h.send(method, { 'a' => 1, 'A' => 1 })
+      end
+
+      [sih, sih2].each do |h|
         assert_raise(InsensitiveHash::KeyClashError) {
           h.send(method, { :a => 1, :A => 1, 'A' => 1})
         }
@@ -206,18 +256,22 @@ class TestInsensitiveHash < Test::Unit::TestCase
         }
       end
 
-      ih.send(method, { :hello_world => 1, 'hello world' => 2})
+      sih.send(method, { :hello_world => 1, 'hello world' => 2})
       assert_raise(InsensitiveHash::KeyClashError) {
-        ih2.send(method, { :hello_world => 1, 'hello world' => 2})
+        sih2.send(method, { :hello_world => 1, 'hello world' => 2})
       }
+      ih2.send(method, { :hello_world => 1, 'hello world' => 2})
     end
 
+    ih.merge({ :a => 1, :A => 1, 'A' => 1})
     assert_raise(InsensitiveHash::KeyClashError) {
-      ih.merge({ :a => 1, :A => 1, 'A' => 1})
+      sih.merge({ :a => 1, :A => 1, 'A' => 1})
     }
   end
 
   def test_assoc
+    pend "1.8" if eight?
+
     h = InsensitiveHash[{
       "colors"  => ["red", "blue", "green"],
       :Letters => ["a", "b", "c" ]
@@ -308,7 +362,7 @@ class TestInsensitiveHash < Test::Unit::TestCase
     # FIXME: Test passes, but key_map not updated
     h = InsensitiveHash[ :a => 100, :tmp_a => 200, :c => 300 ]
     h.delete_if.each { |k, v| k == :tmp_a }
-    assert_equal [:a, :c], h.keys
+    assert_keys [:a, :c], h.keys
   end
 
   def test_has_key_after_delete
@@ -316,7 +370,7 @@ class TestInsensitiveHash < Test::Unit::TestCase
     h = InsensitiveHash[ :a => 1, :b => 2 ]
     
     set.each { |s| assert h.has_key?(s) }
-    h.delete_if { |e| true }
+    h.delete_if { |k, v| true }
     set.each { |s| assert !h.has_key?(s) }
   end
 
@@ -368,11 +422,6 @@ class TestInsensitiveHash < Test::Unit::TestCase
     assert h.underscore?
     assert_equal 1, h[:hello_world]
 
-    h = InsensitiveHash.new
-    assert_raise(InsensitiveHash::KeyClashError) {
-      h.replace({ 'a' => 1, :A => 2 })
-    }
-
     # TODO: FIXME
     # underscore property of other
     h = InsensitiveHash.new
@@ -389,6 +438,8 @@ class TestInsensitiveHash < Test::Unit::TestCase
   end
 
   def test_rassoc
+    pend "1.8" if eight?
+
     a = InsensitiveHash[{1=> "one", 2 => "two", 3 => "three", "ii" => "two"}]
     assert_equal [2, "two"], a.rassoc("two")
     assert_nil a.rassoc("four")
@@ -414,7 +465,7 @@ class TestInsensitiveHash < Test::Unit::TestCase
     end
     assert_equal 3, h.fetch(:c, 3)
     assert_equal 3, h.fetch(:c) { 3 }
-    assert_raise(KeyError) { h.fetch('D') }
+    assert_raise(eight? ? IndexError : KeyError) { h.fetch('D') }
   end
 
   def test_underscore
@@ -506,6 +557,8 @@ class TestInsensitiveHash < Test::Unit::TestCase
 
   def test_underscore_clash
     h = InsensitiveHash.new
+    h.safe = true
+
     h['hello world'] = 1
     h['HELLO_world'] = 2
     assert_equal 1, h['HELLO WORLD']
@@ -528,7 +581,7 @@ class TestInsensitiveHash < Test::Unit::TestCase
     h.underscore = false
     h['hello world'] = 2
 
-    assert_equal [:hello_world, 'hello world'], h.keys
+    assert_keys  [:hello_world, 'hello world'], h.keys
     assert_equal 2, h['Hello World']
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: insensitive_hash
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000 Z
+date: 2012-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2152875840 !ruby/object:Gem::Requirement
+  requirement: &2160341260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2152875840
+  version_requirements: *2160341260
 description: Hash with case-insensitive, Symbol/String-indifferent key access
 email:
 - junegunn.c@gmail.com