hashie 2.1.1 → 2.1.2

data/.rspec

@@ -1,2 +1,2 @@
 --colour
---format=nested
+--format=documentation

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.1.2 (5/12/2014)
+
+* [#169](https://github.com/intridea/hashie/pull/169): Hash#to_hash will also convert nested objects that implement `to_hash` - [@gregory](https://github.com/gregory).
+
 ## 2.1.1 (4/12/2014)
 
 * [#144](https://github.com/intridea/hashie/issues/144): Fixed regression invoking `to_hash` with no parameters - [@mbleigh](https://github.com/mbleigh).
@@ -7,7 +11,7 @@
 * [#134](https://github.com/intridea/hashie/pull/134): Add deep_fetch extension for nested access - [@tylerdooling](https://github.com/tylerdooling).
 * Removed support for Ruby 1.8.7 - [@dblock](https://github.com/dblock).
 * Ruby style now enforced with Rubocop - [@dblock](https://github.com/dblock).
-* [#138](https://github.com/intridea/hashie/pull/138): Added Hashie#Rash, a hash whose keys can be regular expressions or ranges - [@epitron](https://github.com/epitron).
+* [#138](https://github.com/intridea/hashie/pull/138): Added Hashie::Rash, a hash whose keys can be regular expressions or ranges - [@epitron](https://github.com/epitron).
 * [#131](https://github.com/intridea/hashie/pull/131): Added IgnoreUndeclared, an extension to silently ignore undeclared properties at intialization - [@righi](https://github.com/righi).
 * [#136](https://github.com/intridea/hashie/issues/136): Removed Hashie::Extensions::Structure - [@markiz](https://github.com/markiz).
 * [#107](https://github.com/intridea/hashie/pull/107): Fixed excessive value conversions, poor performance of deep merge in Hashie::Mash - [@davemitchell](https://github.com/dblock), [@dblock](https://github.com/dblock).

data/lib/hashie/hash.rb

@@ -19,7 +19,7 @@ module Hashie
             out[assignment_key] << (Hash === array_object ? flexibly_convert_to_hash(array_object, options) : array_object)
           end
         else
-          out[assignment_key] = Hash === self[k] ? flexibly_convert_to_hash(self[k], options) : self[k]
+          out[assignment_key] = (Hash === self[k] || self[k].respond_to?(:to_hash)) ? flexibly_convert_to_hash(self[k], options) : self[k]
         end
       end
       out

data/lib/hashie/version.rb

@@ -1,3 +1,3 @@
 module Hashie
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

data/spec/hashie/dash_spec.rb

@@ -220,17 +220,17 @@ describe DashTest do
     end
 
     it 'checks if a property exists' do
-      expect(described_class.property?('first_name')).to be_true
-      expect(described_class.property?(:first_name)).to be_true
+      expect(described_class.property?('first_name')).to be true
+      expect(described_class.property?(:first_name)).to be true
     end
 
     it 'checks if a property is required' do
-      expect(described_class.required?('first_name')).to be_true
-      expect(described_class.required?(:first_name)).to be_true
+      expect(described_class.required?('first_name')).to be true
+      expect(described_class.required?(:first_name)).to be true
     end
 
     it 'doesnt include property from subclass' do
-      expect(described_class.property?(:last_name)).to be_false
+      expect(described_class.property?(:last_name)).to be false
     end
 
     it 'lists declared defaults' do
@@ -238,7 +238,7 @@ describe DashTest do
     end
 
     it 'allows properties that end in bang' do
-      expect(PropertyBangTest.property?(:important!)).to be_true
+      expect(PropertyBangTest.property?(:important!)).to be true
     end
   end
 
@@ -329,10 +329,10 @@ describe Subclassed do
   it { should respond_to(:last_name=) }
 
   it 'has one additional property' do
-    expect(described_class.property?(:last_name)).to be_true
+    expect(described_class.property?(:last_name)).to be true
   end
 
   it "didn't override superclass inheritance logic" do
-    expect(described_class.instance_variable_get('@inheritance_test')).to be_true
+    expect(described_class.instance_variable_get('@inheritance_test')).to be true
   end
 end

data/spec/hashie/extensions/indifferent_access_spec.rb

@@ -103,12 +103,12 @@ describe Hashie::Extensions::IndifferentAccess do
       it 'removes old keys' do
         [:foo, 'foo'].each do |k|
           expect(h[k]).to be_nil
-          expect(h.key?(k)).to be_false
+          expect(h.key?(k)).to be false
         end
       end
 
       it 'creates new keys with indifferent access' do
-        [:bar, 'bar', :hi, 'hi'].each { |k| expect(h.key?(k)).to be_true }
+        [:bar, 'bar', :hi, 'hi'].each { |k| expect(h.key?(k)).to be true }
         expect(h[:bar]).to eq 'baz'
         expect(h['bar']).to eq 'baz'
         expect(h[:hi]).to eq 'bye'

data/spec/hashie/hash_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Hash do
   it 'is convertible to a Hashie::Mash' do
     mash = Hashie::Hash[some: 'hash'].to_mash
-    expect(mash.is_a?(Hashie::Mash)).to be_true
+    expect(mash.is_a?(Hashie::Mash)).to be true
     expect(mash.some).to eq 'hash'
   end
 
@@ -43,4 +43,24 @@ describe Hash do
     h[:key] = BareCustomMash.new
     expect { h.to_hash }.not_to raise_error
   end
+
+  describe 'when the value is an object that respond_to to_hash' do
+    class ClassRespondsToHash
+      def to_hash(options = {})
+        Hashie::Hash['a' => 'hey', b: 'bar', 123 => 'bob', 'array' => [1, 2, 3]].to_hash(options)
+      end
+    end
+
+    it '#to_hash with stringify_keys set to true returns a hash with stringified_keys' do
+      hash = Hashie::Hash['a' => 'hey', 123 => 'bob', 'array' => [1, 2, 3], subhash: ClassRespondsToHash.new]
+      symbolized_hash = hash.to_hash(stringify_keys: true)
+      expect(symbolized_hash).to eq('a' => 'hey', '123' => 'bob', 'array' => [1, 2, 3], 'subhash' => { 'a' => 'hey', 'b' => 'bar', '123' => 'bob', 'array' => [1, 2, 3] })
+    end
+
+    it '#to_hash with symbolize_keys set to true returns a hash with symbolized keys' do
+      hash = Hashie::Hash['a' => 'hey', 123 => 'bob', 'array' => [1, 2, 3], subhash: ClassRespondsToHash.new]
+      symbolized_hash = hash.to_hash(symbolize_keys: true)
+      expect(symbolized_hash).to eq(:a => 'hey', :"123" => 'bob', :array => [1, 2, 3], subhash: { :a => 'hey', :b => 'bar', :'123' => 'bob', :array => [1, 2, 3] })
+    end
+  end
 end

data/spec/hashie/mash_spec.rb

@@ -5,7 +5,7 @@ describe Hashie::Mash do
   subject { Hashie::Mash.new }
 
   it 'inherits from Hash' do
-    expect(subject.is_a?(Hash)).to be_true
+    expect(subject.is_a?(Hash)).to be true
   end
 
   it 'sets hash values through method= calls' do
@@ -33,9 +33,9 @@ describe Hashie::Mash do
   end
 
   it 'tests for already set values when passed a ? method' do
-    expect(subject.test?).to be_false
+    expect(subject.test?).to be false
     subject.test = 'abc'
-    expect(subject.test?).to be_true
+    expect(subject.test?).to be true
   end
 
   it 'returns false on a ? method if a value has been set to nil or false' do
@@ -47,7 +47,7 @@ describe Hashie::Mash do
 
   it 'makes all [] and []= into strings for consistency' do
     subject['abc'] = 123
-    expect(subject.key?('abc')).to be_true
+    expect(subject.key?('abc')).to be true
     expect(subject['abc']).to eq 123
   end
 
@@ -72,7 +72,7 @@ describe Hashie::Mash do
   end
 
   it 'returns a Hashie::Mash when passed a bang method to a non-existenct key' do
-    expect(subject.abc!.is_a?(Hashie::Mash)).to be_true
+    expect(subject.abc!.is_a?(Hashie::Mash)).to be true
   end
 
   it 'returns the existing value when passed a bang method for an existing key' do
@@ -81,7 +81,7 @@ describe Hashie::Mash do
   end
 
   it 'returns a Hashie::Mash when passed an under bang method to a non-existenct key' do
-    expect(subject.abc_.is_a?(Hashie::Mash)).to be_true
+    expect(subject.abc_.is_a?(Hashie::Mash)).to be true
   end
 
   it 'returns the existing value when passed an under bang method for an existing key' do
@@ -90,7 +90,7 @@ describe Hashie::Mash do
   end
 
   it '#initializing_reader returns a Hashie::Mash when passed a non-existent key' do
-    expect(subject.initializing_reader(:abc).is_a?(Hashie::Mash)).to be_true
+    expect(subject.initializing_reader(:abc).is_a?(Hashie::Mash)).to be true
   end
 
   it 'allows for multi-level assignment through bang methods' do
@@ -218,18 +218,18 @@ describe Hashie::Mash do
       end
 
       it 'sets all specified keys to their corresponding values' do
-        expect(subject.middle_name?).to be_true
-        expect(subject.details?).to be_true
+        expect(subject.middle_name?).to be true
+        expect(subject.details?).to be true
         expect(subject.middle_name).to eq 'Cain'
-        expect(subject.details.city?).to be_true
+        expect(subject.details.city?).to be true
         expect(subject.details.city).to eq 'Imagination'
       end
 
       it 'leaves only specified keys' do
         expect(subject.keys.sort).to eq %w(details middle_name)
-        expect(subject.first_name?).to be_false
+        expect(subject.first_name?).to be false
         expect(subject).not_to respond_to(:first_name)
-        expect(subject.last_name?).to be_false
+        expect(subject.last_name?).to be false
         expect(subject).not_to respond_to(:last_name)
       end
     end
@@ -352,7 +352,7 @@ describe Hashie::Mash do
 
     it 'converts hashes recursively into Hashie::Mashes' do
       converted = Hashie::Mash.new(a: { b: 1, c: { d: 23 } })
-      expect(converted.a.is_a?(Hashie::Mash)).to be_true
+      expect(converted.a.is_a?(Hashie::Mash)).to be true
       expect(converted.a.b).to eq 1
       expect(converted.a.c.d).to eq 23
     end
@@ -379,15 +379,15 @@ describe Hashie::Mash do
       expect(initial.default_proc).not_to be_nil
       expect(initial.default).to be_nil
       expect(initial.test).to eq []
-      expect(initial.test?).to be_true
+      expect(initial.test?).to be true
     end
 
     it 'converts Hashie::Mashes within Arrays back to Hashes' do
       initial_hash = { 'a' => [{ 'b' => 12, 'c' => ['d' => 50, 'e' => 51] }, 23] }
       converted = Hashie::Mash.new(initial_hash)
-      expect(converted.to_hash['a'].first.is_a?(Hashie::Mash)).to be_false
-      expect(converted.to_hash['a'].first.is_a?(Hash)).to be_true
-      expect(converted.to_hash['a'].first['c'].first.is_a?(Hashie::Mash)).to be_false
+      expect(converted.to_hash['a'].first.is_a?(Hashie::Mash)).to be false
+      expect(converted.to_hash['a'].first.is_a?(Hash)).to be true
+      expect(converted.to_hash['a'].first['c'].first.is_a?(Hashie::Mash)).to be false
     end
   end
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: hashie
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
+  prerelease: 
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,34 +10,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Hashie is a collection of classes and mixins that make hashes more powerful.
@@ -97,26 +102,33 @@ files:
 homepage: https://github.com/intridea/hashie
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 775336832915500848
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 775336832915500848
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Your friendly neighborhood hash library.
 test_files:
 - spec/hashie/clash_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 669a459e63fb50152c48b98abf0bce58e5e138e5
-  data.tar.gz: 49b29974978742dab0b2c228dd2c473df1d89732
-SHA512:
-  metadata.gz: 513d09bc3690cfa9a3913354c80bb9bb34321013ba46a710c8a4649ff3967218f4ed04a45bb79451623fadc2d340bb174b260ab8f9b424733c2d16f334f1d9d6
-  data.tar.gz: aea99e5db0b7c58499b45b6ca806fe99bb94a4e8e5c74df22af74a56844104778ba8a328d8e024a7f090daceaf092ed0eb25ae1d302dc901f4b05268ec851756