tengine_support 0.3.14 → 0.3.15

data/VERSION

@@ -1 +1 @@
-0.3.14
+0.3.15

data/lib/tengine/support/core_ext/array/deep_dup.rb

@@ -0,0 +1,6 @@
+class Array
+  def deep_dup
+    map{|v| v.respond_to?(:deep_dup) ? v.deep_dup : v }
+  end
+
+end

data/lib/tengine/support/core_ext/array.rb

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+
+# このファイルはクラスやモジュールを定義せず、tengine/support/core_ext/*.rbをrequireするだけです
+Dir.chdir(File.expand_path("../../../", File.dirname(__FILE__))) do
+  Dir['tengine/support/core_ext/array'].each do |f|
+    require File.basename(f)
+  end
+end

data/lib/tengine/support/core_ext/hash/deep_dup.rb

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+# activesupport-3.1.0以上では
+# active_support/core_ext/hash/deep_dupでHash#deep_dupを定義していますが、
+# 対象がHashだけなのでArrayをコピーできません。
+# Arrayや他のオブジェクトに対応するためにメソッドを上書きします。
+
+if ActiveSupport::VERSION::STRING >= "3.1.0"
+  require 'active_support/core_ext/hash/deep_dup'
+end
+
+class Hash
+  # Returns a deep copy of hash.
+  def deep_dup
+    duplicate = self.dup
+    duplicate.each_pair do |k,v|
+      tv = duplicate[k]
+      duplicate[k] = tv.respond_to?(:deep_dup) && v.respond_to?(:deep_dup) ? tv.deep_dup : v
+    end
+    duplicate
+  end
+
+end

data/lib/tengine/support/core_ext/hash/keys.rb

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-require 'active_support/core_ext/hash/deep_dup'
-require 'active_support/core_ext/hash/keys'
+require 'tengine/support/core_ext/hash/deep_dup'
 
 class Hash
 
@@ -13,7 +12,11 @@ class Hash
   def deep_stringify_keys!
     stringify_keys! # active_support/core_ext/hash/keysのメソッドをそのまま使う
     values.each do |value|
-      value.deep_stringify_keys! if value.respond_to?(:deep_stringify_keys!)
+      if value.respond_to?(:deep_stringify_keys!)
+        value.deep_stringify_keys!
+      elsif value.respond_to?(:each)
+        value.each{|v| v.deep_stringify_keys! if v.respond_to?(:deep_stringify_keys!)}
+      end
     end
     self
   end
@@ -29,7 +32,11 @@ class Hash
   def deep_symbolize_keys!
     symbolize_keys! # active_support/core_ext/hash/keysのメソッドをそのまま使う
     values.each do |value|
-      value.deep_symbolize_keys! if value.respond_to?(:deep_symbolize_keys!)
+      if value.respond_to?(:deep_symbolize_keys!)
+        value.deep_symbolize_keys!
+      elsif value.respond_to?(:each)
+        value.each{|v| v.deep_symbolize_keys! if v.respond_to?(:deep_symbolize_keys!)}
+      end
     end
     self
   end

data/spec/tengine_support/core_ext/array/deep_dup_spec.rb

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+require 'active_support'
+require "tengine/support/core_ext/array/deep_dup"
+
+describe "tengine/support/core_ext/array/deep_dup" do
+
+  original = [
+    :a,
+    [
+      :b,
+      [:c, :d].freeze,
+      {
+        :e => {
+          :f => [:g, :h].freeze,
+          :i => {:j => :k}.freeze,
+        }.freeze
+      }.freeze
+    ].freeze
+  ].freeze
+
+  context "Hash#deep_dupがある場合" do
+    before do
+      load("tengine/support/core_ext/hash/deep_dup.rb")
+    end
+
+    subject{ original.deep_dup }
+    it { subject.should == original }
+    it { subject.object_id.should_not == original.object_id }
+    it { subject[1].object_id.should_not == original[1].object_id }
+    it { subject[1][1].object_id.should_not == original[1][1].object_id }
+    it { subject[1][2].object_id.should_not == original[1][2].object_id }
+    it { subject[1][2][:e].object_id.should_not  == original[1][2][:e].object_id }
+    it { subject[1][2][:e][:f].object_id.should_not == original[1][2][:e][:f].object_id }
+    it { subject[1][2][:e][:i].object_id.should_not  == original[1][2][:e][:i].object_id }
+  end
+
+  context "Hash#deep_dupがない場合" do
+    before do
+      if Hash.instance_methods.include?(:deep_dup)
+        Hash.class_eval do
+          remove_method(:deep_dup)
+        end
+      end
+    end
+    after do
+      load("tengine/support/core_ext/hash/deep_dup.rb")
+    end
+
+    subject{ original.deep_dup }
+    it { subject.should == original }
+    it { subject.object_id.should_not == original.object_id }
+    it { subject[1].object_id.should_not == original[1].object_id }
+    it { subject[1][1].object_id.should_not == original[1][1].object_id }
+    it { subject[1][2].object_id.should == original[1][2].object_id }
+    it { subject[1][2][:e].object_id.should  == original[1][2][:e].object_id }
+    it { subject[1][2][:e][:f].object_id.should == original[1][2][:e][:f].object_id }
+    it { subject[1][2][:e][:i].object_id.should  == original[1][2][:e][:i].object_id }
+  end
+
+end

data/spec/tengine_support/core_ext/hash/deep_dup_spec.rb

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+require 'active_support'
+require "tengine/support/core_ext/hash/deep_dup"
+
+describe "tengine/support/core_ext/hash/deep_dup" do
+
+  original = {
+    :a => {
+      :b => {
+        :c => :d
+      }.freeze,
+      :e => [
+        :f,
+        {:g => :h}.freeze,
+        [:i, :j].freeze
+      ].freeze
+    }.freeze
+  }.freeze
+
+  context "Array#deep_dupがある場合" do
+    before do
+      load("tengine/support/core_ext/array/deep_dup.rb")
+    end
+
+    subject{ original.deep_dup }
+    it { subject.should == original }
+    it { subject.object_id.should_not == original.object_id }
+    it { subject[:a].object_id.should_not == original[:a].object_id }
+    it { subject[:a][:b].object_id.should_not == original[:a][:b].object_id }
+    it { subject[:a][:e].object_id.should_not == original[:a][:e].object_id }
+    it { subject[:a][:e][1].object_id.should_not == original[:a][:e][1].object_id }
+    it { subject[:a][:e][2].object_id.should_not == original[:a][:e][2].object_id }
+  end
+
+  context "Array#deep_dupがない場合" do
+    before do
+      if Array.instance_methods.include?(:deep_dup)
+        Array.class_eval do
+          remove_method(:deep_dup)
+        end
+      end
+    end
+    after do
+      load("tengine/support/core_ext/array/deep_dup.rb")
+    end
+
+    subject{ original.deep_dup }
+    it { subject.should == original }
+    it { subject.object_id.should_not == original.object_id }
+    it { subject[:a].object_id.should_not == original[:a].object_id }
+    it { subject[:a][:b].object_id.should_not == original[:a][:b].object_id }
+    it { subject[:a][:e].object_id.should     == original[:a][:e].object_id }
+    it { subject[:a][:e][1].object_id.should     == original[:a][:e][1].object_id }
+    it { subject[:a][:e][2].object_id.should     == original[:a][:e][2].object_id }
+  end
+
+end

data/spec/tengine_support/core_ext/hash/keys_spec.rb

@@ -3,76 +3,67 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 require 'active_support'
 
-# この機能は、activesupport-3.1.0から追加された active_support/core_ext/hash/deep_dup を
-# 使っているので、3.1.0以下ではテストせず、pendingのメッセージを出します
-if ActiveSupport::VERSION::STRING < "3.1.0"
-  describe "tengine/support/core_ext/hash/keys" do
-    pending %W[
-      depends on active_support/core_ext/hash/deep_dup,
-      but activesupport version is #{ActiveSupport::VERSION::STRING}.
-      If you need to use Hash#deep_stringify_keys and Hash#deep_symbolize_keys,
-      install tengine_support with activesupport >= 3.1.0.
-      ].join(' ')
-  end
-else
-  require 'active_support/core_ext/hash/deep_dup'
-  require 'tengine/support/core_ext/hash/keys'
+require 'tengine/support/core_ext/array/deep_dup'
+require 'tengine/support/core_ext/hash/keys'
 
-  describe "tengine/support/core_ext/hash/keys" do
+describe "tengine/support/core_ext/hash/keys" do
 
-    test_hashs ={
-      :deep_stringify_keys_result => {
-        'a' => 1,
-        'b' => {
-          'foo' => 2,
-          'bar' => {
-            'hoge' => "3",
-            "wake" => {}.freeze,
-          }.freeze
-        }.freeze,
-        'c' => {
-          'baz' => "4"
+  test_hashs ={
+    :deep_stringify_keys_result => {
+      'a' => 1,
+      'b' => {
+        'foo' => 2,
+        'bar' => {
+          'hoge' => "3",
+          "wake" => {}.freeze,
         }.freeze
       }.freeze,
+      'c' => [
+        { 'baz' => "4" }.freeze,
+        { 'blah' => "5" }.freeze,
+      ]
+    }.freeze,
 
-      :deep_symbolize_keys_result => {
-        :a => 1,
-        :b => {
-          :foo => 2,
-          :bar => {
-            :hoge => "3",
-            :wake => {}.freeze,
-          }.freeze
-        }.freeze,
-        :c => {
-          :baz => "4"
+    :deep_symbolize_keys_result => {
+      :a => 1,
+      :b => {
+        :foo => 2,
+        :bar => {
+          :hoge => "3",
+          :wake => {}.freeze,
         }.freeze
       }.freeze,
+      :c => [
+        { :baz => "4" }.freeze,
+        { :blah => "5" }.freeze,
+      ]
+    }.freeze,
 
-      :mixed_key_hash => {
-        'a' => 1,
-        :b => {
-          :foo => 2,
-          'bar' => {
-            'hoge' => "3",
-            :wake => {}.freeze,
-          }.freeze
-        }.freeze,
-        :c => {
-          'baz' => "4"
+    :mixed_key_hash => {
+      'a' => 1,
+      :b => {
+        :foo => 2,
+        'bar' => {
+          'hoge' => "3",
+          :wake => {}.freeze,
         }.freeze
-      }.freeze
-    }
+      }.freeze,
+      :c => [
+        { 'baz' => "4" }.freeze,
+        { :blah => "5" }.freeze,
+      ]
+    }.freeze
+  }
 
-    [:deep_stringify_keys, :deep_symbolize_keys].each do |method_name|
-      test_hashs.keys.each do |target_name|
-        context target_name do
-          describe ".#{method_name}" do
-            it "should returns #{method_name}_result" do
-              original = test_hashs[target_name]
-              converted = original.send(method_name)
-              converted.object_id.should_not == original.object_id # object_id is changed
-              converted.should == test_hashs[:"#{method_name}_result"]
+  [:deep_stringify_keys, :deep_symbolize_keys].each do |method_name|
+    test_hashs.keys.each do |target_name|
+      context target_name do
+        describe ".#{method_name}" do
+          it "should returns #{method_name}_result" do
+            original = test_hashs[target_name]
+            converted = original.send(method_name)
+            converted.object_id.should_not == original.object_id # object_id is changed
+            converted.should == test_hashs[:"#{method_name}_result"]
               original.should == test_hashs[target_name]
             end
           end
@@ -95,4 +86,3 @@ else
     end
 
   end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_support
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
   prerelease: 
 platform: ruby
 authors:
@@ -24,7 +24,7 @@ date: 2011-11-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2155256840 !ruby/object:Gem::Requirement
+  requirement: &2167471060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2155256840
+  version_requirements: *2167471060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2155256280 !ruby/object:Gem::Requirement
+  requirement: &2167470540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2155256280
+  version_requirements: *2167470540
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2155255800 !ruby/object:Gem::Requirement
+  requirement: &2167469940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2155255800
+  version_requirements: *2167469940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2155255300 !ruby/object:Gem::Requirement
+  requirement: &2167469400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *2155255300
+  version_requirements: *2167469400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2155254800 !ruby/object:Gem::Requirement
+  requirement: &2167468880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2155254800
+  version_requirements: *2167468880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2155254320 !ruby/object:Gem::Requirement
+  requirement: &2167468400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *2155254320
+  version_requirements: *2167468400
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2155253840 !ruby/object:Gem::Requirement
+  requirement: &2167467800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155253840
+  version_requirements: *2167467800
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2155253360 !ruby/object:Gem::Requirement
+  requirement: &2167467300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155253360
+  version_requirements: *2167467300
 description: tengine_support provides utility classes/modules which is not included
   in active_support. It doesn't depend on other tengine gems.
 email: tengine@nautilus-technologies.com
@@ -140,7 +140,10 @@ files:
 - lib/tengine/support/config/logger.rb
 - lib/tengine/support/config/mongoid.rb
 - lib/tengine/support/core_ext.rb
+- lib/tengine/support/core_ext/array.rb
+- lib/tengine/support/core_ext/array/deep_dup.rb
 - lib/tengine/support/core_ext/hash.rb
+- lib/tengine/support/core_ext/hash/deep_dup.rb
 - lib/tengine/support/core_ext/hash/keys.rb
 - lib/tengine/support/null_logger.rb
 - lib/tengine/support/yaml_with_erb.rb
@@ -158,6 +161,8 @@ files:
 - spec/tengine_support/config_spec/load_spec_01.yml.erb
 - spec/tengine_support/config_spec/load_spec_02.yml.erb
 - spec/tengine_support/config_spec/parse_spec.rb
+- spec/tengine_support/core_ext/array/deep_dup_spec.rb
+- spec/tengine_support/core_ext/hash/deep_dup_spec.rb
 - spec/tengine_support/core_ext/hash/keys_spec.rb
 - spec/tengine_support/null_logger_spec.rb
 - spec/tengine_support/yaml_with_erb_spec.rb
@@ -181,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4314659835284975712
+      hash: -839430569768029966
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: