hashie 3.5.2 → 3.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee11cc424479d1ff5f737d9279f60e182adb0553
-  data.tar.gz: 7bae504b1c65b8cf79909c3180cf5084771efb5e
+  metadata.gz: f4946d0568ab6be36877e25d748fdb8f04f50ed5
+  data.tar.gz: f9cdd8a276939236ceb84633d88d5325486d5d86
 SHA512:
-  metadata.gz: 6af54aa6435ee5df457614baf9a60a0d3660e7066229e90a74109ff38999afda2444a02e965ec9f5422e4ddd85e6a493d3cb52ff735712d8dfd8d02c84f504f8
-  data.tar.gz: a2ed6b577219d2a7e6ebaca2ca5589b29af9b89a1201580707ab39d4895c0cbee63f4dd4e92a5c3ccda1409f226fc0ccbce41e0b7f8e6a694f6d85df7e598d60
+  metadata.gz: 7c4748d9c7c2d79fa5a362fe10497994ea1f7fc27e75dc476b17422cd32fb9d32d9923c42662a7bfb64c19413b1391124cf91cfd463b0c4adcdc7b463d611981
+  data.tar.gz: ded15b7bd812ffe4792cf7e56f894e040d9041af56e1816f2c3d82ef62ee7bd5193fcf2cdac4086b11372dc6689fc0ee0a1b150f84cb17462e93bc4a5f860878

data/CHANGELOG.md

@@ -6,6 +6,16 @@ scheme are considered to be bugs.
 
 [semver]: http://semver.org/spec/v2.0.0.html
 
+## [3.5.3] - 2017-02-11
+
+[3.5.3]: https://github.com/intridea/hashie/compare/v3.5.2...v3.5.3
+
+### Fixed
+
+* [#402](https://github.com/intridea/hashie/pull/402): Use a Railtie to set Hashie.logger on rails boot - [@matthewrudy](https://github.com/matthewrudy).
+* [#406](https://github.com/intridea/hashie/pull/406): Ensure that subclasses that disable warnings propagate that setting to grandchild classes - [@michaelherold](https://github.com/michaelherold).
+* Your contribution here.
+
 ## [3.5.2] - 2017-02-10
 
 [3.5.2]: https://github.com/intridea/hashie/compare/v3.5.1...v3.5.2

data/README.md

@@ -20,7 +20,7 @@ $ gem install hashie
 
 ## Upgrading
 
-You're reading the documentation for the stable release of Hashie, 3.5.2. Please read [UPGRADING](UPGRADING.md) when upgrading from a previous version.
+You're reading the documentation for the stable release of Hashie, 3.5.3. Please read [UPGRADING](UPGRADING.md) when upgrading from a previous version.
 
 ## Hash Extensions
 

data/lib/hashie.rb

@@ -56,4 +56,6 @@ module Hashie
     include Hashie::Extensions::StringifyKeys::ClassMethods
     include Hashie::Extensions::SymbolizeKeys::ClassMethods
   end
+
+  require 'hashie/railtie' if defined?(::Rails)
 end

data/lib/hashie/logger.rb

@@ -5,12 +5,7 @@ module Hashie
   #
   # @return [Logger]
   def self.logger
-    @logger ||=
-      if defined?(::Rails)
-        Rails.logger
-      else
-        Logger.new(STDOUT)
-      end
+    @logger ||= Logger.new(STDOUT)
   end
 
   # Sets the logger that Hashie uses for reporting errors.

data/lib/hashie/mash.rb

@@ -86,6 +86,15 @@ module Hashie
       !!@disable_warnings
     end
 
+    # Inheritance hook that sets class configuration when inherited.
+    #
+    # @api semipublic
+    # @return [void]
+    def self.inherited(subclass)
+      super
+      subclass.disable_warnings if disable_warnings?
+    end
+
     def self.load(path, options = {})
       @_mashes ||= new
 

data/lib/hashie/railtie.rb

@@ -0,0 +1,10 @@
+require 'rails/railtie'
+
+module Hashie
+  class Railtie < Rails::Railtie
+    # Set the Hashie.logger to use Rails.logger when used with rails.
+    initializer 'hashie.configure_logger', after: 'initialize_logger' do
+      Hashie.logger = Rails.logger
+    end
+  end
+end

data/lib/hashie/version.rb

@@ -1,3 +1,3 @@
 module Hashie
-  VERSION = '3.5.2'
+  VERSION = '3.5.3'
 end

data/spec/hashie/mash_spec.rb

@@ -155,6 +155,17 @@ describe Hashie::Mash do
     it 'cannot disable logging on the base Mash' do
       expect { Hashie::Mash.disable_warnings }.to raise_error(Hashie::Mash::CannotDisableMashWarnings)
     end
+
+    it 'carries over the disable for warnings on grandchild classes' do
+      child_class = Class.new(Hashie::Mash) do
+        disable_warnings
+      end
+      grandchild_class = Class.new(child_class)
+
+      grandchild_class.new('trust' => { 'two' => 2 })
+
+      expect(logger_output).to be_blank
+    end
   end
 
   context 'updating' do

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

@@ -0,0 +1,53 @@
+require 'action_controller/railtie'
+require 'action_view/railtie'
+require 'action_view/testing/resolvers'
+require 'rails/test_unit/railtie'
+require_relative 'some_site'
+
+module RailsApp
+  class Application < ::Rails::Application
+    config.eager_load      = false
+    config.secret_key_base = 'hashieintegrationtest'
+
+    config.middleware.use OmniAuth::Builder do
+      provider :some_site
+    end
+
+    routes.append do
+      get '/' => 'application#index'
+    end
+  end
+end
+
+LAYOUT = <<-HTML
+<!DOCTYPE html>
+<html>
+<head>
+  <title>TestApp</title>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+<%= yield %>
+</body>
+</html>
+HTML
+
+INDEX = '<h1>Hello, world!</h1>'
+
+class ApplicationController < ActionController::Base
+  include Rails.application.routes.url_helpers
+
+  layout 'application'
+
+  self.view_paths = [ActionView::FixtureResolver.new(
+    'layouts/application.html.erb' => LAYOUT,
+    'application/index.html.erb'   => INDEX
+  )]
+
+  def index
+  end
+end
+
+Bundler.require(:default, Rails.env)
+
+RailsApp::Application.initialize!

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

@@ -0,0 +1,26 @@
+ENV['RAILS_ENV'] = 'test'
+
+require 'rspec/core'
+
+RSpec.describe 'omniauth-oauth2 inside of rails', type: :request do
+  let(:stdout) { StringIO.new }
+
+  around(:each) do |example|
+    original_stdout = $stdout
+    $stdout = stdout
+    require_relative 'app'
+    require 'rspec/rails'
+    example.run
+    $stdout = original_stdout
+  end
+
+  it 'does not log anything to STDOUT when initializing a Rails app and is set to Rails logger' do
+    expect(stdout.string).to eq('')
+    expect(Hashie.logger).to eq(Rails.logger)
+  end
+
+  it 'works' do
+    get '/'
+    assert_select 'h1', 'Hello, world!'
+  end
+end

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

@@ -0,0 +1,38 @@
+require 'omniauth-oauth2'
+
+module OmniAuth
+  module Strategies
+    class SomeSite < OmniAuth::Strategies::OAuth2
+      # Give your strategy a name.
+      option :name, 'some_site'
+
+      # This is where you pass the options you would pass when
+      # initializing your consumer from the OAuth gem.
+      option :client_options, site: 'https://api.somesite.com'
+
+      # These are called after authentication has succeeded. If
+      # possible, you should try to set the UID without making
+      # additional calls (if the user id is returned with the token
+      # or as a URI parameter). This may not be possible with all
+      # providers.
+      uid { raw_info['id'] }
+
+      info do
+        {
+          :name => raw_info['name'],
+          :email => raw_info['email']
+        }
+      end
+
+      extra do
+        {
+          'raw_info' => raw_info
+        }
+      end
+
+      def raw_info
+        @raw_info ||= access_token.get('/me').parsed
+      end
+    end
+  end
+end

data/spec/integration/omniauth/app.rb

@@ -0,0 +1,11 @@
+require 'sinatra'
+require 'omniauth'
+
+class MyApplication < Sinatra::Base
+  use Rack::Session::Cookie, secret: 'hashie integration tests'
+  use OmniAuth::Strategies::Developer
+
+  get '/' do
+    'Hello World'
+  end
+end

data/spec/integration/omniauth/integration_spec.rb

@@ -2,33 +2,34 @@ ENV['RACK_ENV'] = 'test'
 
 require 'rspec/core'
 require 'rack/test'
-require 'sinatra'
-require 'omniauth'
 
-class MyApplication < Sinatra::Base
-  use Rack::Session::Cookie, secret: 'hashie integration tests'
-  use OmniAuth::Strategies::Developer
-
-  get '/' do
-    'Hello World'
+RSpec.configure do |config|
+  config.expect_with :rspec do |expect|
+    expect.syntax = :expect
   end
 end
 
-module RSpecMixin
+RSpec.describe 'omniauth' do
   include Rack::Test::Methods
+
   def app
     MyApplication
   end
-end
 
-RSpec.configure do |config|
-  config.include RSpecMixin
-  config.expect_with :rspec do |expect|
-    expect.syntax = :expect
+  let(:stdout) { StringIO.new }
+
+  around(:each) do |example|
+    original_stdout = $stdout
+    $stdout = stdout
+    require_relative 'app'
+    example.run
+    $stdout = original_stdout
+  end
+
+  it 'does not log anything to STDOUT when initializing' do
+    expect(stdout.string).to eq('')
   end
-end
 
-describe 'omniauth' do
   it 'works' do
     get '/'
     expect(last_response).to be_ok

data/spec/integration/rails/app.rb

@@ -0,0 +1,48 @@
+require 'action_controller/railtie'
+require 'action_view/railtie'
+require 'action_view/testing/resolvers'
+require 'rails/test_unit/railtie'
+
+module RailsApp
+  class Application < ::Rails::Application
+    config.eager_load      = false
+    config.secret_key_base = 'hashieintegrationtest'
+
+    routes.append do
+      get '/' => 'application#index'
+    end
+  end
+end
+
+LAYOUT = <<-HTML
+<!DOCTYPE html>
+<html>
+<head>
+  <title>TestApp</title>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+<%= yield %>
+</body>
+</html>
+HTML
+
+INDEX = '<h1>Hello, world!</h1>'
+
+class ApplicationController < ActionController::Base
+  include Rails.application.routes.url_helpers
+
+  layout 'application'
+
+  self.view_paths = [ActionView::FixtureResolver.new(
+    'layouts/application.html.erb' => LAYOUT,
+    'application/index.html.erb'   => INDEX
+  )]
+
+  def index
+  end
+end
+
+Bundler.require(:default, Rails.env)
+
+RailsApp::Application.initialize!

data/spec/integration/rails/integration_spec.rb

@@ -1,66 +1,26 @@
-ENV['RACK_ENV'] = 'test'
+ENV['RAILS_ENV'] = 'test'
 
 require 'rspec/core'
-require 'rails'
-require 'rails/all'
-require 'action_view/testing/resolvers'
 
-module RailsApp
-  class Application < ::Rails::Application
-    config.action_dispatch.show_exceptions            = false
-    config.active_support.deprecation                 = :stderr
-    config.eager_load                                 = false
-    config.root                                       = __dir__
-    config.secret_key_base                            = 'hashieintegrationtest'
+RSpec.describe 'rails', type: :request do
+  let(:stdout) { StringIO.new }
 
-    routes.append do
-      get '/' => 'application#index'
-    end
-
-    config.assets.paths << File.join(__dir__, 'assets/javascripts')
-    config.assets.debug = true
+  around(:each) do |example|
+    original_stdout = $stdout
+    $stdout = stdout
+    require_relative 'app'
+    require 'rspec/rails'
+    example.run
+    $stdout = original_stdout
   end
-end
-
-LAYOUT = <<-HTML
-<!DOCTYPE html>
-<html>
-<head>
-  <title>TestApp</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
-  <%= javascript_include_tag "application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-<%= yield %>
-</body>
-</html>
-HTML
-
-INDEX = <<-HTML
-<h1>Hello, world!</h1>
-HTML
-
-class ApplicationController < ActionController::Base
-  include Rails.application.routes.url_helpers
-
-  layout 'application'
 
-  self.view_paths = [ActionView::FixtureResolver.new(
-    'layouts/application.html.erb'         => LAYOUT,
-    'application/index.html.erb'           => INDEX
-  )]
-
-  def index
+  it 'does not log anything to STDOUT when initializing and sets the Hashie logger to the Rails logger' do
+    expect(stdout.string).to eq('')
+    expect(Hashie.logger).to eq(Rails.logger)
   end
-end
 
-RailsApp::Application.initialize!
-
-require 'hashie'
-
-RSpec.describe 'the Hashie logger' do
-  it 'is set to the Rails logger' do
-    expect(Hashie.logger).to eq(Rails.logger)
+  it 'works' do
+    get '/'
+    assert_select 'h1', 'Hello, world!'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashie
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.5.3
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -98,6 +98,7 @@ files:
 - lib/hashie/hash.rb
 - lib/hashie/logger.rb
 - lib/hashie/mash.rb
+- lib/hashie/railtie.rb
 - lib/hashie/rash.rb
 - lib/hashie/trash.rb
 - lib/hashie/utils.rb
@@ -131,7 +132,12 @@ files:
 - spec/hashie/utils_spec.rb
 - spec/hashie/version_spec.rb
 - spec/hashie_spec.rb
+- spec/integration/omniauth-oauth2/app.rb
+- spec/integration/omniauth-oauth2/integration_spec.rb
+- spec/integration/omniauth-oauth2/some_site.rb
+- spec/integration/omniauth/app.rb
 - spec/integration/omniauth/integration_spec.rb
+- spec/integration/rails/app.rb
 - spec/integration/rails/integration_spec.rb
 - spec/spec_helper.rb
 - spec/support/integration_specs.rb
@@ -192,7 +198,12 @@ test_files:
 - spec/hashie/utils_spec.rb
 - spec/hashie/version_spec.rb
 - spec/hashie_spec.rb
+- spec/integration/omniauth/app.rb
 - spec/integration/omniauth/integration_spec.rb
+- spec/integration/omniauth-oauth2/app.rb
+- spec/integration/omniauth-oauth2/integration_spec.rb
+- spec/integration/omniauth-oauth2/some_site.rb
+- spec/integration/rails/app.rb
 - spec/integration/rails/integration_spec.rb
 - spec/spec_helper.rb
 - spec/support/integration_specs.rb