y_support 2.0.33 → 2.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 053b9bd4ab69ab18a27d4e0cdd2fd1b994a601f0
-  data.tar.gz: 63f43d3edd19d69ea8a7f7c060096c3b75071fb3
+  metadata.gz: b8837638588e1c76d7fea644f117253c4250cb13
+  data.tar.gz: 3ede5fb44abe873b9fc068ecb6b3f059a9264e98
 SHA512:
-  metadata.gz: 31264bdb2e2e5f61d1d3e7a5d94a1cfd1b0a789b5870b9cab68e4e6729eb07a1d877711e33acfc3adbccdf24f659b5b63fe4d1a9913fc49e35797bcd98051502
-  data.tar.gz: 2c66e2e58fa7b494292763d3128fb3522444291ba204cecd8d2d81ce338cc135ffdc07f16e6e87c7a14c935607059ec5266bff04dca2acd025c31582a92ed27b
+  metadata.gz: 16aec56e99572375aaa49450202c4700247b20ba5b6457935fc2aeb6a100e99699436cafb88618d53c6c6895f860e973b5899b2d13fe926d300fb26a054d0fd6
+  data.tar.gz: b10e770494ad0f115b9b2f9f75cdcbb6123a51d6a4ba98dddf2f796062408359ffaa69a4e262a909d7436a2a02cd1cff45d26bc15a427df6f1fae9331c4035a9

data/lib/y_support/core_ext/hash/misc.rb

@@ -3,6 +3,49 @@
 require 'active_support/core_ext/hash/reverse_merge'
 
 class Hash
+  class << self
+    # This kluge method guards against overwriting of the #slice method by
+    # ActiveSupport.
+    # 
+    def method_added( sym )
+      if sym == :slice then
+        puts "Method added activated on :slice"
+        # Unless it is our method, overwrite it.
+        unless instance_method( sym ).source_location.include? 'y_support'
+          puts "Self is #{self}"
+          puts "Self class is #{self.class}"
+          # Let's now make a cache of this very method being called
+          ma = singleton_class.instance_method :method_added
+          # Let's remove the :method_added hook, or otherwise infinite recursion
+          # would ensue.
+          singleton_class.class_exec { remove_method :method_added }
+          # And let's redefine the +:slice+ method now:
+          warn "Attempt to overwrite Hash#slice method has occured, reverting."
+
+          class_exec do
+            # A bit like Array#slice, but only takes 1 argument, which is either
+            # a Range, or an Array, and returns the selection of the hash for
+            # the keys that match the range or are present in the array.
+            # 
+            define_method sym do |matcher|
+              self.class[ case matcher
+                          when Array then
+                            select { |key, _| matcher.include? key }
+                          else
+                            select { |key, _| matcher === key }
+                          end ]
+            end
+          end
+
+          # Finally, let's bind the +:method_added+ method to self again.
+          singleton_class.class_exec do
+            define_method :method_added do |sym| ma.bind( self ).call( sym ) end
+          end
+        end
+      end
+    end
+  end
+
   # reversed merge!: defaults.merge( self! )
   alias :default! :reverse_merge!
 
@@ -63,7 +106,7 @@ class Hash
 
   # Checking mainly against the collision with ActiveSupport's Hash#slice.
   if Hash.instance_methods.include? :slice then
-    fail LoadError, "Collision: Method #slice already defined on Hash! (%s)" %
+    warn "Collision: Method #slice already defined on Hash! (%s)" %
       Hash.instance_method( :slice ).source_location
   end
 
@@ -111,12 +154,4 @@ class Hash
     end.each { |line| puts line }
     return nil
   end
-
-  class << self
-    def method_added( sym )
-      if sym == :slice then
-        fail LoadError, "Attempt to overwrite YSupport's Hash##{sym} method!"
-      end
-    end
-  end
 end

data/lib/y_support/version.rb

@@ -1,3 +1,3 @@
 module YSupport
-  VERSION = "2.0.33"
+  VERSION = "2.0.34"
 end

data/test/misc_test.rb

@@ -169,7 +169,9 @@ describe Hash do
   end
 
   it "should be safeguarded against redefining #slice" do
-    -> { class Hash; def slice; end end }.must_raise LoadError
+    m = Hash.instance_method :slice
+    class Hash; def slice( *args ); fail "This should not happen!" end end
+    {}.slice( :a )
   end
 end
 

data/test/unicode_test.rb

@@ -1,5 +1,5 @@
 #! /usr/bin/ruby
-#encoding: utf-8
+# encoding: utf-8
 
 require 'minitest/autorun'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: y_support
 version: !ruby/object:Gem::Version
-  version: 2.0.33
+  version: 2.0.34
 platform: ruby
 authors:
 - boris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport