hashie 3.5.7 → 3.6.0

data/spec/hashie/mash_spec.rb

@@ -184,7 +184,8 @@ describe Hashie::Mash do
         details: {
           email: 'michael@asf.com',
           address: 'Nowhere road'
-        })
+        }
+      )
     end
 
     describe '#deep_update' do
@@ -284,7 +285,7 @@ describe Hashie::Mash do
       end
 
       it 'leaves only specified keys' do
-        expect(subject.keys.sort).to eq %w(details middle_name)
+        expect(subject.keys.sort).to eq %w[details middle_name]
         expect(subject.first_name?).to be_falsy
         expect(subject).not_to respond_to(:first_name)
         expect(subject.last_name?).to be_falsy
@@ -386,28 +387,28 @@ describe Hashie::Mash do
     end
 
     it 'responds to a set key with a suffix' do
-      %w(= ? ! _).each do |suffix|
+      %w[= ? ! _].each do |suffix|
         expect(subject).to be_respond_to(:"abc#{suffix}")
       end
     end
 
     it 'is able to access the suffixed key as a method' do
-      %w(= ? ! _).each do |suffix|
+      %w[= ? ! _].each do |suffix|
         expect(subject.method(:"abc#{suffix}")).to_not be_nil
       end
     end
 
     it 'responds to an unknown key with a suffix' do
-      %w(= ? ! _).each do |suffix|
+      %w[= ? ! _].each do |suffix|
         expect(subject).to be_respond_to(:"xyz#{suffix}")
       end
     end
 
     it 'is able to access an unknown suffixed key as a method' do
       # See https://github.com/intridea/hashie/pull/285 for more information
-      pending_for(engine: 'ruby', versions: %w(2.2.0 2.2.1 2.2.2))
+      pending_for(engine: 'ruby', versions: %w[2.2.0 2.2.1 2.2.2])
 
-      %w(= ? ! _).each do |suffix|
+      %w[= ? ! _].each do |suffix|
         expect(subject.method(:"xyz#{suffix}")).to_not be_nil
       end
     end
@@ -457,6 +458,13 @@ describe Hashie::Mash do
       expect(initial.test?).to be_truthy
     end
 
+    it 'allows propagation of a default block' do
+      h = Hashie::Mash.new { |mash, key| mash[key] = mash.class.new(&mash.default_proc) }
+      expect { h[:x][:y][:z] = :xyz }.not_to raise_error
+      expect(h.x.y.z).to eq(:xyz)
+      expect(h[:x][:y][:z]).to eq(:xyz)
+    end
+
     it 'allows assignment of an empty array in a default block' do
       initial = Hashie::Mash.new { |h, k| h[k] = [] }
       initial.hello << 100
@@ -553,7 +561,7 @@ describe Hashie::Mash do
     end
 
     it 'includes all keys' do
-      expect(mash.to_hash.keys).to eql(%w(outer testing))
+      expect(mash.to_hash.keys).to eql(%w[outer testing])
     end
 
     it 'converts keys to symbols when symbolize_keys option is true' do

data/spec/hashie/parsers/yaml_erb_parser_spec.rb

@@ -4,12 +4,12 @@ describe Hashie::Extensions::Parsers::YamlErbParser do
   describe '.perform' do
     context 'a file' do
       let(:config) do
-        <<-EOF
+        <<-CONFIG
 ---
 foo: verbatim
 bar: <%= "erb" %>
 baz: "<%= __FILE__ %>"
-        EOF
+        CONFIG
       end
       let(:path) { 'template.yml' }
 
@@ -36,7 +36,7 @@ baz: "<%= __FILE__ %>"
         file
       end
 
-      subject { described_class.new(Pathname tempfile.path) }
+      subject { described_class.new(Pathname(tempfile.path)) }
 
       it '"#perform" can be done in case of path is a Pathname object.' do
         expect(subject.perform).to eq 'foo' => 'hello'

data/spec/hashie/rash_spec.rb

@@ -10,7 +10,7 @@ describe Hashie::Rash do
       1       => 'awesome',
       1..1000 => 'rangey',
       /(bcd)/ => proc { |m| m[1] }
-    # /.+/ => "EVERYTHING"
+      # /.+/ => "EVERYTHING"
     )
   end
 
@@ -18,7 +18,7 @@ describe Hashie::Rash do
     expect(subject['other']).to eq 'whee'
     expect(subject['well hello there']).to eq 'hello'
     expect(subject['the world is round']).to eq 'world'
-    expect(subject.all('hello world').sort).to eq %w(hello world)
+    expect(subject.all('hello world').sort).to eq %w[hello world]
   end
 
   it 'finds regexps' do

data/spec/hashie/trash_spec.rb

@@ -153,7 +153,7 @@ describe Hashie::Trash do
     end
 
     it 'maintains translations hash mapping from the original to the translated name' do
-      expect(SomeDataModel.translations).to eq(config: [:value_a, :value_b])
+      expect(SomeDataModel.translations).to eq(config: %i[value_a value_b])
     end
   end
 
@@ -265,4 +265,64 @@ describe Hashie::Trash do
       expect(subject.first_name).to eq('Frodo')
     end
   end
+
+  context 'when copying properties from other properties' do
+    it 'retains the original and also sets the copy' do
+      simple = Class.new(Hashie::Trash) do
+        property :id
+        property :copy_of_id, from: :id
+      end
+
+      subject = simple.new(id: 1)
+
+      expect(subject.id).to eq(1)
+      expect(subject.copy_of_id).to eq(1)
+    end
+
+    it 'grabs the default for the original if it is not set' do
+      with_default = Class.new(Hashie::Trash) do
+        property :id, default: 0
+        property :copy_of_id, from: :id
+      end
+
+      subject = with_default.new
+
+      expect(subject.id).to eq(0)
+      expect(subject.copy_of_id).to eq(0)
+    end
+
+    it 'can be a required value' do
+      with_required = Class.new(Hashie::Trash) do
+        property :id
+        property :copy_of_id, from: :id, required: true, message: 'must be set'
+      end
+
+      expect { with_required.new }.to raise_error(ArgumentError, "The property 'copy_of_id' must be set")
+    end
+
+    it 'does not set properties that do not exist' do
+      from_non_property = Class.new(Hashie::Trash) do
+        property :copy_of_value, from: :value
+      end
+
+      subject = from_non_property.new(value: 0)
+
+      expect(subject).not_to respond_to(:value)
+      expect { subject[:value] }.to raise_error(NoMethodError, "The property 'value' is not defined for .")
+      expect(subject.to_h[:value]).to eq(nil)
+      expect(subject.copy_of_value).to eq(0)
+    end
+
+    it 'is not order-dependent in definition' do
+      simple = Class.new(Hashie::Trash) do
+        property :copy_of_id, from: :id
+        property :id
+      end
+
+      subject = simple.new(id: 1)
+
+      expect(subject.id).to eq(1)
+      expect(subject.copy_of_id).to eq(1)
+    end
+  end
 end

data/spec/integration/elasticsearch/integration_spec.rb

@@ -0,0 +1,40 @@
+require 'elasticsearch/model'
+require 'hashie'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expect|
+    expect.syntax = :expect
+  end
+end
+
+class MyModel < Hashie::Mash
+  include Elasticsearch::Model
+
+  disable_warnings
+
+  index_name 'model'
+  document_type 'model'
+end
+
+RSpec.describe 'elaasticsearch-model' do
+  # See https://github.com/intridea/hashie/issues/354#issuecomment-363306114
+  # for the reason why this doesn't work as you would expect
+  it 'raises an error when the model does has an id' do
+    object = MyModel.new
+    stub_elasticsearch_client
+
+    expect { object.__elasticsearch__.index_document }.to raise_error(NoMethodError)
+  end
+
+  it 'does not raise an error when the model has an id' do
+    object = MyModel.new(id: 123)
+    stub_elasticsearch_client
+
+    expect { object.__elasticsearch__.index_document }.not_to raise_error
+  end
+
+  def stub_elasticsearch_client
+    response = double('Response', body: '{}')
+    allow_any_instance_of(Elasticsearch::Transport::Client).to receive(:perform_request) { response }
+  end
+end

data/spec/integration/omniauth-oauth2/app.rb

@@ -19,7 +19,7 @@ module RailsApp
   end
 end
 
-LAYOUT = <<-HTML
+LAYOUT = <<-HTML.freeze
 <!DOCTYPE html>
 <html>
 <head>
@@ -32,7 +32,7 @@ LAYOUT = <<-HTML
 </html>
 HTML
 
-INDEX = '<h1>Hello, world!</h1>'
+INDEX = '<h1>Hello, world!</h1>'.freeze
 
 class ApplicationController < ActionController::Base
   include Rails.application.routes.url_helpers
@@ -44,8 +44,7 @@ class ApplicationController < ActionController::Base
     'application/index.html.erb'   => INDEX
   )]
 
-  def index
-  end
+  def index; end
 end
 
 Bundler.require(:default, Rails.env)

data/spec/integration/omniauth-oauth2/some_site.rb

@@ -19,8 +19,8 @@ module OmniAuth
 
       info do
         {
-          :name => raw_info['name'],
-          :email => raw_info['email']
+          name: raw_info['name'],
+          email: raw_info['email']
         }
       end
 

data/spec/integration/rails/app.rb

@@ -14,7 +14,7 @@ module RailsApp
   end
 end
 
-LAYOUT = <<-HTML
+LAYOUT = <<-HTML.freeze
 <!DOCTYPE html>
 <html>
 <head>
@@ -27,7 +27,7 @@ LAYOUT = <<-HTML
 </html>
 HTML
 
-INDEX = '<h1>Hello, world!</h1>'
+INDEX = '<h1>Hello, world!</h1>'.freeze
 
 class ApplicationController < ActionController::Base
   include Rails.application.routes.url_helpers
@@ -39,8 +39,7 @@ class ApplicationController < ActionController::Base
     'application/index.html.erb'   => INDEX
   )]
 
-  def index
-  end
+  def index; end
 end
 
 Bundler.require(:default, Rails.env)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashie
 version: !ruby/object:Gem::Version
-  version: 3.5.7
+  version: 3.6.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,6 +136,7 @@ files:
 - spec/hashie/utils_spec.rb
 - spec/hashie/version_spec.rb
 - spec/hashie_spec.rb
+- spec/integration/elasticsearch/integration_spec.rb
 - spec/integration/omniauth-oauth2/app.rb
 - spec/integration/omniauth-oauth2/integration_spec.rb
 - spec/integration/omniauth-oauth2/some_site.rb
@@ -169,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Your friendly neighborhood hash library.
@@ -211,6 +212,7 @@ test_files:
 - spec/integration/omniauth-oauth2/some_site.rb
 - spec/integration/omniauth/integration_spec.rb
 - spec/integration/omniauth/app.rb
+- spec/integration/elasticsearch/integration_spec.rb
 - spec/integration/rails/integration_spec.rb
 - spec/integration/rails/app.rb
 - spec/support/module_context.rb