hashie 3.5.7 → 3.6.0

data/lib/hashie/rash.rb

@@ -64,7 +64,7 @@ module Hashie
     # Raise (or yield) unless something matches the key.
     #
     def fetch(*args)
-      fail ArgumentError, "Expected 1-2 arguments, got #{args.length}" \
+      raise ArgumentError, "Expected 1-2 arguments, got #{args.length}" \
         unless (1..2).cover?(args.length)
 
       key, default = args
@@ -78,7 +78,7 @@ module Hashie
       elsif default
         default
       else
-        fail KeyError, "key not found: #{key.inspect}"
+        raise KeyError, "key not found: #{key.inspect}"
       end
     end
 
@@ -125,11 +125,11 @@ module Hashie
     end
 
     def method_missing(*args, &block)
-      @hash.send(*args, &block)
+      @hash.send(*args, &block) || super
     end
 
-    def respond_to_missing?(*args)
-      @hash.respond_to?(*args)
+    def respond_to_missing?(method_name, _include_private = false)
+      @hash.respond_to?(method_name)
     end
 
     private

data/lib/hashie/version.rb

@@ -1,3 +1,3 @@
 module Hashie
-  VERSION = '3.5.7'
+  VERSION = '3.6.0'.freeze
 end

data/spec/hashie/array_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Array do
   with_minimum_ruby('2.3.0') do
     describe '#dig' do
-      let(:array) { Hashie::Array.new([:a, :b, :c]) }
+      let(:array) { Hashie::Array.new(%i[a b c]) }
 
       it 'works with a string index' do
         expect(array.dig('0')).to eq(:a)

data/spec/hashie/dash_spec.rb

@@ -310,7 +310,7 @@ describe DashTest do
 
   describe 'properties' do
     it 'lists defined properties' do
-      expect(described_class.properties).to eq Set.new([:first_name, :email, :count])
+      expect(described_class.properties).to eq Set.new(%i[first_name email count])
     end
 
     it 'checks if a property exists' do
@@ -348,7 +348,7 @@ describe DashTest do
     end
 
     it 'leaves only specified keys and keys with default values' do
-      expect(subject.keys.sort_by(&:to_s)).to eq [:count, :first_name]
+      expect(subject.keys.sort_by(&:to_s)).to eq %i[count first_name]
       expect(subject.email).to be_nil
       expect(subject.count).to eq 0
     end
@@ -402,6 +402,31 @@ describe DashTest do
         expect(subject.count).to eq subject.class.defaults[:count]
       end
     end
+
+    context 'codependent attributes' do
+      let(:codependent) do
+        Class.new(Hashie::Dash) do
+          property :a, required: -> { b.nil? }, message: 'is required if b is not set.'
+          property :b, required: -> { a.nil? }, message: 'is required if a is not set.'
+        end
+      end
+
+      it 'does not raise an error when only the first property is set' do
+        expect { codependent.new(a: 'ant', b: nil) }.not_to raise_error
+      end
+
+      it 'does not raise an error when only the second property is set' do
+        expect { codependent.new(a: nil, b: 'bat') }.not_to raise_error
+      end
+
+      it 'does not raise an error when both properties are set' do
+        expect { codependent.new(a: 'ant', b: 'bat') }.not_to raise_error
+      end
+
+      it 'raises an error when neither property is set' do
+        expect { codependent.new(a: nil, b: nil) }.to raise_error(ArgumentError)
+      end
+    end
   end
 end
 

data/spec/hashie/extensions/coercion_spec.rb

@@ -154,7 +154,7 @@ describe Hashie::Extensions::Coercion do
     it 'supports coercion for Array' do
       subject.coerce_key :foo, Array[Coercable]
 
-      instance[:foo] = %w('bar', 'bar2')
+      instance[:foo] = %w[bar bar2]
       expect(instance[:foo]).to all(be_coerced)
       expect(instance[:foo]).to be_a(Array)
     end
@@ -162,7 +162,7 @@ describe Hashie::Extensions::Coercion do
     it 'supports coercion for Set' do
       subject.coerce_key :foo, Set[Coercable]
 
-      instance[:foo] = Set.new(%w('bar', 'bar2'))
+      instance[:foo] = Set.new(%w[bar bar2])
       expect(instance[:foo]).to all(be_coerced)
       expect(instance[:foo]).to be_a(Set)
     end
@@ -170,7 +170,7 @@ describe Hashie::Extensions::Coercion do
     it 'supports coercion for Set of primitive' do
       subject.coerce_key :foo, Set[Initializable]
 
-      instance[:foo] = %w('bar', 'bar2')
+      instance[:foo] = %w[bar bar2]
       expect(instance[:foo].map(&:value)).to all(eq 'String')
       expect(instance[:foo]).to be_none(&:coerced?)
       expect(instance[:foo]).to be_a(Set)
@@ -558,18 +558,26 @@ describe Hashie::Extensions::Coercion do
       end
 
       it 'raises a CoercionError when coercion is not possible' do
-        type = if Hashie::Extensions::RubyVersion.new(RUBY_VERSION) >= Hashie::Extensions::RubyVersion.new('2.4.0')
-                 Integer
-               else
-                 Fixnum
-               end
+        type =
+          if Hashie::Extensions::RubyVersion.new(RUBY_VERSION) >= Hashie::Extensions::RubyVersion.new('2.4.0')
+            Integer
+          else
+            Fixnum # rubocop:disable Lint/UnifiedInteger
+          end
 
         subject.coerce_value type, Symbol
         expect { instance[:hi] = 1 }.to raise_error(Hashie::CoercionError, /Cannot coerce property :hi from #{type} to Symbol/)
       end
 
       it 'coerces Integer to String' do
-        subject.coerce_value Integer, String
+        type =
+          if Hashie::Extensions::RubyVersion.new(RUBY_VERSION) >= Hashie::Extensions::RubyVersion.new('2.4.0')
+            Integer
+          else
+            Fixnum # rubocop:disable Lint/UnifiedInteger
+          end
+
+        subject.coerce_value type, String
 
         {
           fixnum: 2,
@@ -579,7 +587,7 @@ describe Hashie::Extensions::Coercion do
           complex: Complex(1)
         }.each do |k, v|
           instance[k] = v
-          if v.is_a? Integer
+          if v.is_a? type
             expect(instance[k]).to be_a(String)
             expect(instance[k]).to eq(v.to_s)
           else
@@ -610,8 +618,8 @@ describe Hashie::Extensions::Coercion do
           return !!(v =~ /^(true|t|yes|y|1)$/i)
         end)
 
-        true_values = %w(true t yes y 1)
-        false_values = %w(false f no n 0)
+        true_values = %w[true t yes y 1]
+        false_values = %w[false f no n 0]
 
         true_values.each do |v|
           instance[:foo] = v

data/spec/hashie/extensions/deep_locate_spec.rb

@@ -78,7 +78,7 @@ describe Hashie::Extensions::DeepLocate do
         [
           lambda do |_key, _value, object|
             object.is_a?(Array) &&
-            !object.extend(described_class).deep_locate(:match).empty?
+              !object.extend(described_class).deep_locate(:match).empty?
           end,
           [
             hash[:query][:bool][:must],

data/spec/hashie/extensions/deep_merge_spec.rb

@@ -28,7 +28,7 @@ describe Hashie::Extensions::DeepMerge do
 
     it 'merges new nested hash entries by value, not by reference' do
       h1.deep_merge!(h2)
-      expect { h1[:e][:e1] = 'changed' }.not_to change { h2[:e][:e1] }
+      expect { h1[:e][:e1] = 'changed' }.not_to(change { h2[:e][:e1] })
     end
   end
 

data/spec/hashie/extensions/indifferent_access_spec.rb

@@ -6,7 +6,7 @@ describe Hashie::Extensions::IndifferentAccess do
     include Hashie::Extensions::IndifferentAccess
 
     class << self
-      alias_method :build, :new
+      alias build new
     end
   end
 
@@ -14,7 +14,7 @@ describe Hashie::Extensions::IndifferentAccess do
     include Hashie::Extensions::IndifferentAccess
 
     class << self
-      alias_method :build, :[]
+      alias build []
     end
   end
 
@@ -22,7 +22,7 @@ describe Hashie::Extensions::IndifferentAccess do
     include Hashie::Extensions::IndifferentAccess
 
     class << self
-      alias_method :build, :try_convert
+      alias build try_convert
     end
   end
 
@@ -44,11 +44,24 @@ describe Hashie::Extensions::IndifferentAccess do
         include Hashie::Extensions::IndifferentAccess
       end.new
 
-      merged_hash = indifferent_hash.merge(:cat => 'meow')
+      merged_hash = indifferent_hash.merge(cat: 'meow')
 
       expect(merged_hash[:cat]).to eq('meow')
       expect(merged_hash['cat']).to eq('meow')
     end
+
+    it 'injects the resulting new Hash with IndifferentAccess' do
+      hash = IndifferentHashWithMergeInitializer.new(
+        :cat => 'meow',
+        'dog' => { name: 'Mango', sound: 'woof' }
+      )
+
+      dog = hash[:dog]
+      merged = dog.merge(foo: 'bar')
+
+      expect(merged[:foo]).to eq('bar')
+      expect(merged['foo']).to eq('bar')
+    end
   end
 
   describe '#merge!' do
@@ -57,7 +70,7 @@ describe Hashie::Extensions::IndifferentAccess do
         include Hashie::Extensions::IndifferentAccess
       end.new
 
-      indifferent_hash.merge!(:cat => 'meow')
+      indifferent_hash[:cat] = 'meow'
 
       expect(indifferent_hash[:cat]).to eq('meow')
       expect(indifferent_hash['cat']).to eq('meow')
@@ -113,7 +126,7 @@ describe Hashie::Extensions::IndifferentAccess do
     describe '#values_at' do
       it 'indifferently finds values' do
         h = subject.build(:foo => 'bar', 'baz' => 'qux')
-        expect(h.values_at('foo', :baz)).to eq %w(bar qux)
+        expect(h.values_at('foo', :baz)).to eq %w[bar qux]
       end
 
       it 'returns the same instance of the hash that was set' do
@@ -195,7 +208,7 @@ describe Hashie::Extensions::IndifferentAccess do
         expect(h).to be_key('foo')
       end
 
-      %w(include? member? has_key?).each do |key_alias|
+      %w[include? member? has_key?].each do |key_alias|
         it "is aliased as #{key_alias}" do
           expect(h.send(key_alias.to_sym, :foo)).to be(true)
           expect(h.send(key_alias.to_sym, 'foo')).to be(true)

data/spec/hashie/extensions/indifferent_access_with_rails_hwia_spec.rb

@@ -11,7 +11,7 @@ describe Hashie::Extensions::IndifferentAccess do
     include Hashie::Extensions::IndifferentAccess
 
     class << self
-      alias_method :build, :new
+      alias build new
     end
   end
 
@@ -19,7 +19,7 @@ describe Hashie::Extensions::IndifferentAccess do
     include Hashie::Extensions::IndifferentAccess
 
     class << self
-      alias_method :build, :[]
+      alias build []
     end
   end
 
@@ -27,7 +27,7 @@ describe Hashie::Extensions::IndifferentAccess do
     include Hashie::Extensions::IndifferentAccess
 
     class << self
-      alias_method :build, :try_convert
+      alias build try_convert
     end
   end
 
@@ -54,7 +54,7 @@ describe Hashie::Extensions::IndifferentAccess do
           :foo => 'bar', 'baz' => 'qux'
         )
         h = subject.build(indifferent_hash)
-        expect(h.values_at('foo', :baz)).to eq %w(bar qux)
+        expect(h.values_at('foo', :baz)).to eq %w[bar qux]
       end
     end
 
@@ -91,7 +91,7 @@ describe Hashie::Extensions::IndifferentAccess do
         expect(h).to be_key('foo')
       end
 
-      %w(include? member? has_key?).each do |key_alias|
+      %w[include? member? has_key?].each do |key_alias|
         it "is aliased as #{key_alias}" do
           expect(h.send(key_alias.to_sym, :foo)).to be(true)
           expect(h.send(key_alias.to_sym, 'foo')).to be(true)

data/spec/hashie/extensions/method_access_spec.rb

@@ -20,7 +20,7 @@ describe Hashie::Extensions::MethodReader do
   end
 
   it 'reads nil and false values out properly' do
-    h = subject.new(nil: nil, false: false)
+    h = subject.new(nil: nil, false: false) # rubocop:disable Lint/BooleanSymbol
     expect(h.nil).to eq nil
     expect(h.false).to eq false
   end
@@ -168,21 +168,59 @@ describe Hashie::Extensions::MethodOverridingWriter do
     end
 
     it 'aliases the method with two leading underscores' do
-      expect(subject.__zip).to eq [[%w(zip a-dee-doo-dah)]]
+      expect(subject.__zip).to eq [[%w[zip a-dee-doo-dah]]]
     end
 
     it 'does not re-alias when overriding an already overridden method' do
       subject.zip = 'test'
       expect(subject.zip).to eq 'test'
-      expect(subject.__zip).to eq [[%w(zip test)]]
+      expect(subject.__zip).to eq [[%w[zip test]]]
     end
   end
 end
 
 describe Hashie::Extensions::MethodAccessWithOverride do
   it 'includes all of the other method mixins' do
+    mod_list = [
+      Hashie::Extensions::MethodReader,
+      Hashie::Extensions::MethodOverridingWriter,
+      Hashie::Extensions::MethodQuery,
+      Hashie::Extensions::MethodOverridingInitializer
+    ]
+
     klass = Class.new(Hash)
     klass.send :include, Hashie::Extensions::MethodAccessWithOverride
-    expect((klass.ancestors & [Hashie::Extensions::MethodReader, Hashie::Extensions::MethodOverridingWriter, Hashie::Extensions::MethodQuery]).size).to eq 3
+
+    expect((klass.ancestors & mod_list).size).to eq 4
+  end
+end
+
+describe Hashie::Extensions::MethodOverridingInitializer do
+  class OverridingHash < Hash
+    include Hashie::Extensions::MethodOverridingInitializer
+  end
+
+  context 'when the key is a string' do
+    subject { OverridingHash.new('zip' => 'a-dee-doo-dah') }
+
+    it 'overrides the original method' do
+      expect(subject.zip).to eq 'a-dee-doo-dah'
+    end
+
+    it 'aliases the method with two leading underscores' do
+      expect(subject.__zip).to eq [[%w[zip a-dee-doo-dah]]]
+    end
+  end
+
+  context 'when the key is a symbol' do
+    subject { OverridingHash.new(zip: 'a-dee-doo-dah') }
+
+    it 'overrides the original method' do
+      expect(subject.zip).to eq 'a-dee-doo-dah'
+    end
+
+    it 'aliases the method with two leading underscores' do
+      expect(subject.__zip).to eq [[%w[zip a-dee-doo-dah]]]
+    end
   end
 end

data/spec/hashie/extensions/stringify_keys_spec.rb

@@ -14,7 +14,7 @@ shared_examples 'stringify_keys!' do
     object[:abc] = 'abc'
     object[123] = '123'
     invoke :stringify_keys!
-    expect((object.keys & %w(abc 123)).size).to eq 2
+    expect((object.keys & %w[abc 123]).size).to eq 2
   end
 
   it 'converts nested instances of the same class' do
@@ -53,7 +53,7 @@ shared_examples 'stringify_keys' do
     object[:abc] = 'def'
     copy = invoke :stringify_keys
     expect(object.keys).to eq [:abc]
-    expect(copy.keys).to eq %w(abc)
+    expect(copy.keys).to eq %w[abc]
   end
 end
 
@@ -71,7 +71,7 @@ describe Hashie::Extensions::StringifyKeys do
 
   context 'class methods' do
     subject { described_class }
-    let(:object) { Hash.new }
+    let(:object) { {} }
 
     describe '.stringify_keys' do
       include_examples 'stringify_keys'
@@ -113,7 +113,7 @@ describe Hashie do
   end
 
   subject { described_class }
-  let(:object) { Hash.new }
+  let(:object) { {} }
 
   describe '.stringify_keys' do
     include_examples 'stringify_keys'

data/spec/hashie/extensions/symbolize_keys_spec.rb

@@ -14,7 +14,7 @@ shared_examples 'symbolize_keys!' do
     object['abc'] = 'abc'
     object['def'] = 'def'
     invoke :symbolize_keys!
-    expect((object.keys & [:abc, :def]).size).to eq 2
+    expect((object.keys & %i[abc def]).size).to eq 2
   end
 
   it 'converts nested instances of the same class' do
@@ -76,7 +76,7 @@ describe Hashie::Extensions::SymbolizeKeys do
 
   context 'class methods' do
     subject { described_class }
-    let(:object) { Hash.new }
+    let(:object) { {} }
 
     describe '.symbolize_keys' do
       include_examples 'symbolize_keys'
@@ -118,7 +118,7 @@ describe Hashie do
   end
 
   subject { described_class }
-  let(:object) { Hash.new }
+  let(:object) { {} }
 
   describe '.symbolize_keys' do
     include_examples 'symbolize_keys'