aduki 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d05eacb8c1fcf4375cf8ccdd1214f2327f36956c
-  data.tar.gz: 234193b89c439e6300a85c6b50f23f1c8d57a0c2
+  metadata.gz: b85c60d97a71915e789b12de6530f1bbabb45eb7
+  data.tar.gz: 77743c74d0d3fc6182941742c22b98ea06a6d906
 SHA512:
-  metadata.gz: 61ebf8352dbf342a2fcd4b1032d9508813ea502016788ae931040e9fd36b34565df12db112d729ea04265c30979c8dd12a9ccbfa0c898dce6e1a8459bd9c5cfa
-  data.tar.gz: 74692ea9100157125497e39a85c5e00b093c2f927d5139a11aa05b9cb21ae5521c998577038e560587342a70dc3efff478c96c7e43ab2508b05d8612a9298c2d
+  metadata.gz: 55e9eff182433b8a42591f97ef97f108ddef3f824a5d7b969b26cd2db7ee83288e833aa35b0acc23c9473d841883125c8cb01f6d2b17eae49077d58dca0aacbc
+  data.tar.gz: f7a1bab6b2cae7502d5e649fce9810d4f8ccff24d8e5cf77c0d9bfebf4c245a209b13b6cfd21a64d6555ba39ca14fb9132ac0a8194e53eb6ff324418cf4e3a3a

data/aduki.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/conanite/aduki"
 
 
-  gem.add_development_dependency 'rspec', '~> 2.9'
+  gem.add_development_dependency 'rspec', '~> 3.1'
   gem.add_development_dependency 'rspec_numbering_formatter'
 
   gem.files         = `git ls-files`.split($/)

data/lib/aduki.rb

@@ -5,6 +5,11 @@ require "aduki/recursive_hash"
 require "aduki/attr_finder"
 
 module Aduki
+  def self.install_monkey_patches
+    require 'core_ext/array'
+    require 'core_ext/hash'
+  end
+
   def self.to_aduki obj, collector={ }, key="", join=""
     case obj
     when Hash
@@ -40,7 +45,7 @@ module Aduki
     return value.map { |v| to_value klass, setter, v} if value.is_a? Array
 
     type = klass.aduki_type_for_attribute_name setter
-    if type && (value.class <= type)
+    if type && type.is_a?(Class) && (value.class <= type)
       value
     elsif type.is_a? Hash
       to_typed_hash type.values.first, value
@@ -82,7 +87,7 @@ module Aduki
         setters[first] ||= { }
         setters[first][rest] = value
       else
-        setters[setter] = value
+        setters[setter.to_s] = value
       end
     end
     setters
@@ -182,10 +187,11 @@ module Aduki
   module Initializer
     def initialize attrs={ }
       self.class.get_aduki_initializers.each { |initializer| send initializer }
-      Aduki.apply_attributes self, attrs
+      aduki_apply_attributes attrs
       aduki_after_initialize
     end
 
+    def aduki_apply_attributes attrs ; Aduki.apply_attributes self, attrs ; end
     def aduki_after_initialize ; end
 
     def self.included(base)

data/lib/aduki/version.rb

@@ -1,3 +1,3 @@
 module Aduki
-  VERSION = "0.2.4"
+  VERSION = "0.2.6"
 end

data/lib/core_ext/array.rb

@@ -0,0 +1,32 @@
+class Array
+  def recursively_delete_keys! *keys
+    self.each { |v| v.recursively_delete_keys!(*keys) if v.is_a?(Hash) || v.is_a?(Array) } ; self
+  end
+
+  def recursively_replace_keys! &block
+    self.each { |v| v.recursively_replace_keys!(&block) if v.is_a?(Hash) || v.is_a?(Array) } ; self
+  end
+
+  def recursively_replace_values &block
+    result = []
+    each_with_index { |v, i|
+      result << ((v.is_a?(Hash) || v.is_a?(Array)) ? v.recursively_replace_values(&block) : yield(i, v))
+    }
+    result
+  end
+
+  def recursively_remove_by_value! &block
+    self.delete_if { |v|
+      if v.is_a? Hash
+        v.recursively_remove_by_value! &block
+        v.empty?
+      elsif v.is_a? Array
+        v.recursively_remove_by_value! &block
+        v.empty?
+      else
+        yield v
+      end
+    }
+  end
+
+end

data/lib/core_ext/hash.rb

@@ -0,0 +1,43 @@
+class Hash
+  def recursively_delete_keys! *keys_to_delete
+    keys_to_delete.each { |k| delete k }
+    values.each { |v| v.recursively_delete_keys!(*keys_to_delete) if v.is_a?(Hash) || v.is_a?(Array) }
+    self
+  end
+
+  def recursively_replace_keys! &block
+    keys.each do |k|
+      v = self[k]
+      mk = yield k
+      if k != mk
+        self[mk] = delete k
+      end
+      v.recursively_replace_keys!(&block) if v.is_a?(Hash) || v.is_a?(Array)
+    end
+    self
+  end
+
+  def recursively_stringify_keys!
+    recursively_replace_keys! { |k| k.to_s }
+  end
+
+  def recursively_remove_by_value! &block
+    self.delete_if { |k, v|
+      if v.is_a? Hash
+        v.recursively_remove_by_value! &block
+        v.empty?
+      elsif v.is_a? Array
+        v.recursively_remove_by_value! &block
+        v.empty?
+      else
+        yield v
+      end
+    }
+  end
+
+  def recursively_replace_values &block
+    each_with_object({ }) { |(k, v), result|
+      result[k] = (v.is_a?(Hash) || v.is_a?(Array)) ? v.recursively_replace_values!(&block) : yield(k, v)
+    }
+  end
+end

data/spec/hash_recursively_replace_keys_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe Hash do
+  before { Aduki.install_monkey_patches }
+
+  describe 'recursively_replace_keys!' do
+    it "destructively replaces keys with upcase symbol equivalents" do
+      h0 = { "x/y/z" => [1,2,3], "p-q-r" => 123 }
+      a = [h0, h0, 10, 11, 12]
+      hsh = {
+        "Foo_BAR" => 1,
+        HEYHO: 2,
+        "Tweedlé Dum" => 3,
+        "4" => 4,
+        "  20 something?" => true,
+        "** more fun 2 !! **" => true,
+        "ça và" => true,
+        "((a b c))" => true,
+        :nana => {
+          "a b c" => 1,
+          "surprise! :)" => a
+        }
+      }
+      expected = {
+        :FOO_BAR               => 1,
+        :HEYHO                 => 2,
+        :"TWEEDLé DUM"         => 3,
+        :"4"                   => 4,
+        :"20 SOMETHING?"       => true,
+        :"** MORE FUN 2 !! **" => true,
+        :"çA Và"               => true,
+        :"((A B C))"           => true,
+        :NANA                  => {
+          :"A B C"             => 1,
+          :"SURPRISE! :)"      =>
+          [
+           {
+             :"X/Y/Z"          => [1,2,3],
+             :"P-Q-R"          => 123
+           },
+           {
+             :"X/Y/Z"          => [1,2,3],
+             :"P-Q-R"          => 123
+           },
+           10,
+           11,
+           12
+          ]
+        }
+      }
+
+      hsh.recursively_replace_keys! { |k| k.to_s.strip.upcase.to_sym }
+      expect(hsh).to eq expected
+    end
+  end
+end

data/spec/hash_remove_by_value_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe Hash do
+  before { Aduki.install_monkey_patches }
+
+  describe 'recursively_remove_by_value!' do
+    class Unwanted < Struct.new(:name)
+      def to_s; name; end
+    end
+
+    let(:h) {
+      {
+        :foo   =>  "bar",
+        willy: Unwanted.new("wonka"),
+        "titi" => [1,2,3, String, "yellow", Unwanted.new(999), 3.1415, {
+                     a: :b,
+                     c: :d,
+                     2  => Unwanted.new(Hash),
+                     3  => Unwanted.new(Array),
+                     4  => Numeric,
+                     6  => {
+                       7     => "me",
+                       8     => "you",
+                       :foo  =>  Unwanted.new("enough!")}} ],
+        thats: :it
+      }
+    }
+
+    it "removes unwanted items" do
+      h.recursively_remove_by_value! do |v|
+        v.is_a? Unwanted
+      end
+
+      expected = {
+        foo: "bar",
+        thats: :it,
+        "titi" => [1, 2, 3, String, "yellow", 3.1415, {:a=>:b, :c=>:d, 4=>Numeric, 6=>{7=>"me", 8=>"you"}}]
+      }
+
+      expect(h).to eq(expected)
+    end
+
+    it "removes more unwanted items" do
+      h.recursively_remove_by_value! do |v|
+        k = v.class
+        true unless k <= String || k <= Symbol || k <= Hash || k <= Array || k <= Numeric
+      end
+
+      expected = {
+        foo: "bar",
+        thats: :it,
+        "titi" => [1, 2, 3, "yellow", 3.1415, {:a=>:b, :c=>:d, 6=>{7=>"me", 8=>"you"}}]
+      }
+
+      expect(h).to eq(expected)
+    end
+  end
+end

data/spec/hash_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe Hash do
+  before { Aduki.install_monkey_patches }
+
+  describe 'recursively_delete_keys!' do
+    it "should delete the specified keys from itself and all nested hashes, even sub-nested in arrays" do
+      h = {
+        site_id: "foo",
+        "site_id" => :bar,
+        things: {
+          site_id: "toto",
+          "site_id" => :titi,
+          2 => [ { a: 12, b: 53, site_id: 99 },
+                 { a: 13, b: 54, site_id: 98 },
+                 { a: 14, b: 55, site_id: 97 },
+                 { a: 14, b: 56, site_id: 96 } ],
+          toto: :titi
+        },
+        others: [ { name: "Walter", site_id: 95 } ]
+      }
+
+      h.recursively_delete_keys! :site_id, "site_id"
+
+      h.should == {
+        things: {
+          2 => [ { a: 12, b: 53 },
+                 { a: 13, b: 54 },
+                 { a: 14, b: 55 },
+                 { a: 14, b: 56 } ],
+          toto: :titi
+        },
+        others: [ { name: "Walter" } ]
+      }
+    end
+  end
+
+  describe 'recursively_stringify_keys!' do
+    it "should change all keys to strings" do
+      h = {
+        foo: "bar",
+        12 => 13,
+        Date.parse("2013-04-05") => "yes",
+        nil => "gotcha",
+        [:foo] => "arrrrr"
+      }
+
+      expected = {
+        "foo" => "bar",
+        "12" => 13,
+        "2013-04-05" => "yes",
+        "" => "gotcha",
+        "[:foo]" => "arrrrr"
+      }
+
+      h.recursively_stringify_keys!
+
+      expect(h).to eq expected
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aduki
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2018-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec_numbering_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -56,10 +56,15 @@ files:
 - lib/aduki/attr_finder.rb
 - lib/aduki/recursive_hash.rb
 - lib/aduki/version.rb
+- lib/core_ext/array.rb
+- lib/core_ext/hash.rb
 - spec/array_attribute_spec.rb
 - spec/attr_finder_spec.rb
 - spec/custom_builder_spec.rb
 - spec/finder_spec.rb
+- spec/hash_recursively_replace_keys_spec.rb
+- spec/hash_remove_by_value_spec.rb
+- spec/hash_spec.rb
 - spec/initialize_with_object_spec.rb
 - spec/initializer_spec.rb
 - spec/merge_attributes_spec.rb
@@ -98,6 +103,9 @@ test_files:
 - spec/attr_finder_spec.rb
 - spec/custom_builder_spec.rb
 - spec/finder_spec.rb
+- spec/hash_recursively_replace_keys_spec.rb
+- spec/hash_remove_by_value_spec.rb
+- spec/hash_spec.rb
 - spec/initialize_with_object_spec.rb
 - spec/initializer_spec.rb
 - spec/merge_attributes_spec.rb