anyway_config 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c45d9358cf8fa2ab03b6e1bdb7c2062c5f3b2c0f5dddea0fe59095862b53261
-  data.tar.gz: d59c1d2a5ae0ffa7412ac2d8ef34ec19fb79625b1f5b341d7f6c890f8cf5d034
+  metadata.gz: a97f6978750cef7720cc23ca182e8a6456655cb8ece18d1becdcd5e58262b7b9
+  data.tar.gz: 5be2a8fc609273c759cef30b3eaf3c6d470716dc722ebd2a75a32b4209fe42a9
 SHA512:
-  metadata.gz: 84fed0dcb693a6f27cc097550518fa7d068cde633f4d777e9dd03a75f29eaab9355c1925d8d6a3d9fb3d6a99131b1ae34c4aedc788615e9bb0f663560bebab1d
-  data.tar.gz: ec7af93399492b880064f6ca831bbf279c9636d0b864efce4c192bf4f42847b79af0bc4683a31c8730f8628c8634e8d3dd45c8241d82c2766a2f693099691000
+  metadata.gz: 4e7c52fde9b0db72b7429748d0950286facbd82731e98375494dbd4dedec4efd448cc83bc30df8802a98e25c8bd230587ee2d8e09475aab8541410df1208672e
+  data.tar.gz: 932f662e306d85328a9a9131dcb8daab211bb87ee2f1177b68cce1c3b8c315ab2bd4ac4cd2e148c992e02f3ac4bfa4a0c32600b345957f61178cdd9aaa3c3d79

data/.travis.yml

@@ -8,7 +8,8 @@ notifications:
   email: false
 
 before_install:
-  - gem install bundler -v 1.17.3
+  - gem update --system
+  - gem install bundler -v '< 2'
 
 matrix:
   include:
@@ -16,12 +17,14 @@ matrix:
       gemfile: gemfiles/railsmaster.gemfile
     - rvm: jruby-9.2.5.0
       gemfile: gemfiles/jruby.gemfile
-    - rvm: 2.5.0
+    - rvm: jruby-9.1.15.0
+      gemfile: gemfiles/jruby.gemfile
+    - rvm: 2.5.1
       gemfile: gemfiles/rails5.gemfile
-    - rvm: 2.3.2
+    - rvm: 2.5.1
       gemfile: gemfiles/rails42.gemfile
+    - rvm: 2.3.2
+      gemfile: gemfiles/rails5.gemfile
   allow_failures:
     - rvm: ruby-head
       gemfile: gemfiles/railsmaster.gemfile
-    - rvm: jruby-9.2.5.0
-      gemfile: gemfiles/jruby.gemfile

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 1.4.3 (2019-02-04)
+
+- Add a temporary fix for JRuby regression [#5550](https://github.com/jruby/jruby/issues/5550). ([@palkan][])
+
 ## 1.4.2 (2018-01-05)
 
 - Fix: detect Rails by presence of `Rails::VERSION` (instead of just `Rails`). ([@palkan][])

data/anyway_config.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 2.3'
 
-  s.add_development_dependency "bundler", "~> 1.15"
+  s.add_development_dependency "bundler", ">= 1.15"
   s.add_development_dependency "rspec", "~> 3.5"
   s.add_development_dependency "rubocop", "~> 0.60.0"
   s.add_development_dependency "simplecov", ">= 0.3.8"

data/gemfiles/railsmaster.gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 
 gem 'arel', github: 'rails/arel'
 gem 'rails', github: 'rails/rails'
+gem 'rubocop', github: 'rubocop-hq/rubocop'
 
 gemspec path: '..'

data/lib/anyway/config.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'anyway/ext/jruby' if defined? JRUBY_VERSION
 require 'anyway/ext/deep_dup'
 require 'anyway/ext/deep_freeze'
 require 'anyway/ext/hash'
@@ -7,9 +8,13 @@ require 'anyway/ext/string_serialize'
 require 'anyway/option_parser_builder'
 
 module Anyway # :nodoc:
-  using Anyway::Ext::DeepDup
-  using Anyway::Ext::DeepFreeze
-  using Anyway::Ext::Hash
+  if defined? JRUBY_VERSION
+    using Anyway::Ext::JRuby
+  else
+    using Anyway::Ext::DeepDup
+    using Anyway::Ext::DeepFreeze
+    using Anyway::Ext::Hash
+  end
   using Anyway::Ext::StringSerialize
 
   # Base config class

data/lib/anyway/ext/jruby.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module Anyway
+  module Ext
+    # JRuby 9.2.5.0. has a regression which breaks multiple refinements for the same
+    # class, so we put them in one God-refinement
+    # See https://github.com/jruby/jruby/issues/5550
+    #
+    # Should be fixed in 9.2.6.0
+    module JRuby
+      refine ::Hash do
+        # Based on ActiveSupport http://api.rubyonrails.org/classes/Hash.html#method-i-deep_dup
+        def deep_dup
+          each_with_object(dup) do |(key, value), hash|
+            hash[key] = if value.is_a?(::Hash) || value.is_a?(::Array)
+                          value.deep_dup
+                        else
+                          value
+                        end
+          end
+        end
+
+        def deep_freeze
+          freeze
+          each_value do |value|
+            value.deep_freeze if value.is_a?(::Hash) || value.is_a?(::Array)
+          end
+        end
+
+        # From ActiveSupport http://api.rubyonrails.org/classes/Hash.html#method-i-deep_merge
+        def deep_merge!(other_hash)
+          other_hash.each_pair do |current_key, other_value|
+            this_value = self[current_key]
+
+            if this_value.is_a?(::Hash) && other_value.is_a?(::Hash)
+              this_value.deep_merge!(other_value)
+              this_value
+            else
+              self[current_key] = other_value
+            end
+          end
+
+          self
+        end
+
+        def stringify_keys!
+          keys.each do |key|
+            value = delete(key)
+            value.stringify_keys! if value.is_a?(::Hash)
+            self[key.to_s] = value
+          end
+
+          self
+        end
+      end
+
+      refine ::Array do
+        # From ActiveSupport http://api.rubyonrails.org/classes/Array.html#method-i-deep_dup
+        def deep_dup
+          map do |value|
+            if value.is_a?(::Hash) || value.is_a?(::Array)
+              value.deep_dup
+            else
+              value
+            end
+          end
+        end
+
+        def deep_freeze
+          freeze
+          each do |value|
+            value.deep_freeze if value.is_a?(::Hash) || value.is_a?(::Array)
+          end
+        end
+      end
+
+      if defined?(::ActiveSupport::HashWithIndifferentAccess)
+        refine ::ActiveSupport::HashWithIndifferentAccess do
+          def deep_freeze
+            freeze
+            each_value do |value|
+              value.deep_freeze if value.is_a?(::Hash) || value.is_a?(::Array)
+            end
+          end
+        end
+      end
+
+      using self
+    end
+  end
+end

data/lib/anyway/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Anyway # :nodoc:
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: anyway_config
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-06 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
@@ -96,6 +96,7 @@ files:
 - lib/anyway/ext/deep_dup.rb
 - lib/anyway/ext/deep_freeze.rb
 - lib/anyway/ext/hash.rb
+- lib/anyway/ext/jruby.rb
 - lib/anyway/ext/string_serialize.rb
 - lib/anyway/option_parser_builder.rb
 - lib/anyway/rails/config.rb