hashie 2.1.2 → 3.0.0

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_truthy
     expect(mash.some).to eq 'hash'
   end
 
@@ -13,6 +13,12 @@ describe Hash do
     expect(hash).to eq Hashie::Hash['a' => 'hey', '123' => 'bob']
   end
 
+  it '#stringify_keys! turns all keys into strings non-recursively' do
+    hash = Hashie::Hash[:a => 'hey', 123 => { 345 => 'hey' }]
+    hash.stringify_keys!
+    expect(hash).to eq Hashie::Hash['a' => 'hey', '123' => { 345 => 'hey' }]
+  end
+
   it '#stringify_keys returns a hash with stringified keys' do
     hash = Hashie::Hash[:a => 'hey', 123 => 'bob']
     stringified_hash = hash.stringify_keys
@@ -20,10 +26,16 @@ describe Hash do
     expect(stringified_hash).to eq Hashie::Hash['a' => 'hey', '123' => 'bob']
   end
 
-  it '#to_hash returns a hash with stringified keys' do
+  it '#to_hash returns a hash with same keys' do
     hash = Hashie::Hash['a' => 'hey', 123 => 'bob', 'array' => [1, 2, 3]]
     stringified_hash = hash.to_hash
-    expect(stringified_hash).to eq('a' => 'hey', '123' => 'bob', 'array' => [1, 2, 3])
+    expect(stringified_hash).to eq('a' => 'hey', 123 => 'bob', 'array' => [1, 2, 3])
+  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]]
+    symbolized_hash = hash.to_hash(stringify_keys: true)
+    expect(symbolized_hash).to eq('a' => 'hey', '123' => 'bob', 'array' => [1, 2, 3])
   end
 
   it '#to_hash with symbolize_keys set to true returns a hash with symbolized keys' do
@@ -43,24 +55,4 @@ 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_truthy
   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_falsy
     subject.test = 'abc'
-    expect(subject.test?).to be true
+    expect(subject.test?).to be_truthy
   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_truthy
     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_truthy
   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_truthy
   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_truthy
   end
 
   it 'allows for multi-level assignment through bang methods' do
@@ -176,7 +176,7 @@ describe Hashie::Mash do
 
       # http://www.ruby-doc.org/core-1.9.3/Hash.html#method-i-update
       it 'accepts a block' do
-        duped = subject.merge(details: { address: 'Pasadena CA' }) { |key, oldv, newv| [oldv, newv].join(', ') }
+        duped = subject.merge(details: { address: 'Pasadena CA' }) { |_, oldv, newv| [oldv, newv].join(', ') }
         expect(duped.details.address).to eq 'Nowhere road, Pasadena CA'
       end
     end
@@ -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_truthy
+        expect(subject.details?).to be_truthy
         expect(subject.middle_name).to eq 'Cain'
-        expect(subject.details.city?).to be true
+        expect(subject.details.city?).to be_truthy
         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_falsy
         expect(subject).not_to respond_to(:first_name)
-        expect(subject.last_name?).to be false
+        expect(subject.last_name?).to be_falsy
         expect(subject).not_to respond_to(:last_name)
       end
     end
@@ -314,32 +314,36 @@ describe Hashie::Mash do
   end
 
   describe '#respond_to?' do
+    subject do
+      Hashie::Mash.new(abc: 'def')
+    end
+
     it 'responds to a normal method' do
-      expect(Hashie::Mash.new).to be_respond_to(:key?)
+      expect(subject).to be_respond_to(:key?)
     end
 
     it 'responds to a set key' do
-      expect(Hashie::Mash.new(abc: 'def')).to be_respond_to(:abc)
+      expect(subject).to be_respond_to(:abc)
+      expect(subject.method(:abc)).to_not be_nil
     end
 
     it 'responds to a set key with a suffix' do
       %w(= ? ! _).each do |suffix|
-        expect(Hashie::Mash.new(abc: 'def')).to be_respond_to(:"abc#{suffix}")
+        expect(subject).to be_respond_to(:"abc#{suffix}")
+        expect(subject.method(:"abc#{suffix}")).to_not be_nil
       end
     end
 
-    it 'does not respond to an unknown key with a suffix' do
+    it 'responds to an unknown key with a suffix' do
       %w(= ? ! _).each do |suffix|
-        expect(Hashie::Mash.new(abc: 'def')).not_to be_respond_to(:"xyz#{suffix}")
+        expect(subject).to be_respond_to(:"xyz#{suffix}")
+        expect(subject.method(:"xyz#{suffix}")).to_not be_nil
       end
     end
 
     it 'does not respond to an unknown key without a suffix' do
-      expect(Hashie::Mash.new(abc: 'def')).not_to be_respond_to(:xyz)
-    end
-
-    it 'does not respond to permitted?' do
-      expect(Hashie::Mash.new).not_to be_respond_to(:permitted?)
+      expect(subject).not_to be_respond_to(:xyz)
+      expect { subject.method(:xyz) }.to raise_error(NameError)
     end
   end
 
@@ -352,7 +356,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_truthy
       expect(converted.a.b).to eq 1
       expect(converted.a.c.d).to eq 23
     end
@@ -379,15 +383,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_truthy
     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_falsy
+      expect(converted.to_hash['a'].first.is_a?(Hash)).to be_truthy
+      expect(converted.to_hash['a'].first['c'].first.is_a?(Hashie::Mash)).to be_falsy
     end
   end
 
@@ -429,7 +433,7 @@ describe Hashie::Mash do
 
       context 'with block given' do
         it 'returns default value' do
-          expect(mash.fetch(:two) do |key|
+          expect(mash.fetch(:two) do
             'block default value'
           end).to eql('block default value')
         end
@@ -464,4 +468,12 @@ describe Hashie::Mash do
       expect(mash.to_hash(symbolize_keys: true)[:outer].keys).not_to include('inner')
     end
   end
+
+  describe '#stringify_keys' do
+    it 'turns all keys into strings recursively' do
+      hash = Hashie::Mash[:a => 'hey', 123 => { 345 => 'hey' }]
+      hash.stringify_keys!
+      expect(hash).to eq Hashie::Hash['a' => 'hey', '123' => { '345' => 'hey' }]
+    end
+  end
 end

data/spec/hashie/trash_spec.rb

@@ -57,11 +57,14 @@ describe Hashie::Trash do
     end
 
     it 'writes to an existing property using []=' do
-      expect { trash['first_name'] = 'Bob' }.not_to raise_error
+      expect { trash[:first_name] = 'Bob' }.not_to raise_error
+      expect(trash.first_name).to eq('Bob')
+      expect { trash['first_name'] = 'John' }.to raise_error(NoMethodError)
     end
 
     it 'writes to a translated property using []=' do
-      expect { trash['firstName'] = 'Bob' }.not_to raise_error
+      expect { trash[:firstName] = 'Bob' }.not_to raise_error
+      expect { trash['firstName'] = 'Bob' }.to raise_error(NoMethodError)
     end
 
     it 'reads/writes to an existing property using a method call' do

data/spec/spec_helper.rb

@@ -5,4 +5,3 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'hashie'
 require 'rspec'
-require 'rspec/autorun'

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashie
 version: !ruby/object:Gem::Version
-  version: 2.1.2
-  prerelease: 
+  version: 3.0.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -10,40 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-03 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'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: Hashie is a collection of classes and mixins that make hashes more powerful.
 email:
 - michael@intridea.com
@@ -64,11 +59,13 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- UPGRADING.md
 - hashie.gemspec
 - lib/hashie.rb
 - lib/hashie/clash.rb
 - lib/hashie/dash.rb
 - lib/hashie/extensions/coercion.rb
+- lib/hashie/extensions/dash/indifferent_access.rb
 - lib/hashie/extensions/deep_fetch.rb
 - lib/hashie/extensions/deep_merge.rb
 - lib/hashie/extensions/ignore_undeclared.rb
@@ -76,8 +73,10 @@ files:
 - lib/hashie/extensions/key_conversion.rb
 - lib/hashie/extensions/merge_initializer.rb
 - lib/hashie/extensions/method_access.rb
+- lib/hashie/extensions/pretty_inspect.rb
+- lib/hashie/extensions/stringify_keys.rb
+- lib/hashie/extensions/symbolize_keys.rb
 - lib/hashie/hash.rb
-- lib/hashie/hash_extensions.rb
 - lib/hashie/mash.rb
 - lib/hashie/rash.rb
 - lib/hashie/trash.rb
@@ -85,6 +84,7 @@ files:
 - spec/hashie/clash_spec.rb
 - spec/hashie/dash_spec.rb
 - spec/hashie/extensions/coercion_spec.rb
+- spec/hashie/extensions/dash/indifferent_access_spec.rb
 - spec/hashie/extensions/deep_fetch_spec.rb
 - spec/hashie/extensions/deep_merge_spec.rb
 - spec/hashie/extensions/ignore_undeclared_spec.rb
@@ -97,43 +97,36 @@ files:
 - spec/hashie/rash_spec.rb
 - spec/hashie/trash_spec.rb
 - spec/hashie/version_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 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: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Your friendly neighborhood hash library.
 test_files:
 - spec/hashie/clash_spec.rb
 - spec/hashie/dash_spec.rb
 - spec/hashie/extensions/coercion_spec.rb
+- spec/hashie/extensions/dash/indifferent_access_spec.rb
 - spec/hashie/extensions/deep_fetch_spec.rb
 - spec/hashie/extensions/deep_merge_spec.rb
 - spec/hashie/extensions/ignore_undeclared_spec.rb
@@ -146,5 +139,4 @@ test_files:
 - spec/hashie/rash_spec.rb
 - spec/hashie/trash_spec.rb
 - spec/hashie/version_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb

data/lib/hashie/hash_extensions.rb

@@ -1,47 +0,0 @@
-module Hashie
-  module HashExtensions
-    def self.included(base)
-      # Don't tread on existing extensions of Hash by
-      # adding methods that are likely to exist.
-      %w(stringify_keys stringify_keys!).each do |hashie_method|
-        base.send :alias_method, hashie_method, "hashie_#{hashie_method}" unless base.instance_methods.include?(hashie_method)
-      end
-    end
-
-    # Destructively convert all of the keys of a Hash
-    # to their string representations.
-    def hashie_stringify_keys!
-      keys.each do |k|
-        self[k.to_s] = delete(k) unless String === k
-      end
-      self
-    end
-
-    # Convert all of the keys of a Hash
-    # to their string representations.
-    def hashie_stringify_keys
-      dup.stringify_keys!
-    end
-
-    # Convert this hash into a Mash
-    def to_mash
-      ::Hashie::Mash.new(self)
-    end
-  end
-
-  module PrettyInspect
-    def self.included(base)
-      base.send :alias_method, :hash_inspect, :inspect
-      base.send :alias_method, :inspect, :hashie_inspect
-    end
-
-    def hashie_inspect
-      ret = "#<#{self.class}"
-      stringify_keys.keys.sort.each do |key|
-        ret << " #{key}=#{self[key].inspect}"
-      end
-      ret << '>'
-      ret
-    end
-  end
-end