active_decorator 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31bd13919bc3d2af2331782394cad408aa5119c30a4bf6ccbed87dcb0399bd42
-  data.tar.gz: bdcd4d4574bfcc06686deb960f4b91862ac805cf83d388c6485520d364143377
+  metadata.gz: 9a04b73afb4a350371ae29bcc036317ff6a4896fce57c701904e24e4344f0e58
+  data.tar.gz: af8d033bd3b0020126e130ff96c8d423679c1a098edf81b092c5be1ed531f79b
 SHA512:
-  metadata.gz: 1c83e1c9d5d7d3477d1200032f6dada8afa10c37013891b7d574d5e9cba8c8845df1790f922615771f34ffe77c6e0d61853a12d18b5603b3342b5904d0004f2e
-  data.tar.gz: b112eec94bd7634e9d41b4d2ef5e05e7c9479d727b010205a6f4dd2454be11734afdc03af1eacefa62b124ea418e272c22170336cb2f8d02b7b81a2cfb43b710
+  metadata.gz: c21ed89001953686a59cacae36ed644008fc0c0715135fa3810ce19e99d96863334ca8ca25d5236a5b1ec16a26adf0b5c993dc70f71357a80f002ce894899364
+  data.tar.gz: e82b20c35e83766a571edd74df0d0773ca962701bfcfb8dacf2b9faf7094e55336ce226446a33265b293b1e9841370760d6ccc67c2089243ef329718b03e5273

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.6.1
+
+* Fixed a regression in 1.6.0 where decorating an object whose namespace forwards `const_missing` elsewhere (e.g. `URI::Generic`) raised NameError [#131, reported by @fanglang]
+
+
 ## 1.6.0
 
 * Don't swallow NameError raised from inside a decorator module while loading it. Previously such an error was silently rescued and the decorator just disappeared

data/lib/active_decorator/decorator.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'singleton'
-require 'active_support/core_ext/name_error'
 require 'active_decorator/helpers'
 require 'active_decorator/decorated'
 
@@ -62,23 +61,22 @@ module ActiveDecorator
       return @decorators[model_class] if @decorators.key? model_class
 
       decorator_name = "#{model_class.name}#{ActiveDecorator.config.decorator_suffix}"
-      d = decorator_name.constantize
-      unless Class === d
-        d.send :include, ActiveDecorator::Helpers
-        @decorators[model_class] = d
-      else
+      # safe_constantize returns nil when the decorator constant is missing, but re-raises
+      # NameErrors that were raised from inside the decorator module while loading it
+      d = decorator_name.safe_constantize
+      if d.nil?
+        if model_class.respond_to?(:base_class) && (model_class.base_class != model_class)
+          @decorators[model_class] = decorator_for model_class.base_class
+        else
+          # Cache nil results
+          @decorators[model_class] = nil
+        end
+      elsif Class === d
         # Cache nil results
         @decorators[model_class] = nil
-      end
-    rescue NameError => e
-      # Re-raise NameErrors that were raised from inside the decorator module while loading it
-      raise unless e.missing_name?(decorator_name)
-
-      if model_class.respond_to?(:base_class) && (model_class.base_class != model_class)
-        @decorators[model_class] = decorator_for model_class.base_class
       else
-        # Cache nil results
-        @decorators[model_class] = nil
+        d.send :include, ActiveDecorator::Helpers
+        @decorators[model_class] = d
       end
     end
 

data/lib/active_decorator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveDecorator
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
   - Akira Matsuda