active_decorator 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39935554e752b75933ebf759c5173fc67b451c077c6cb3d18c48af54f9b4192c
-  data.tar.gz: 6917e250174825e7ead1ffaa69ad4614ba6aa1070bd53d6e84aa2b2c15faef47
+  metadata.gz: 9312dab89b8f57877eac8447beff11151b7399640c9a457aa51d9251a0779792
+  data.tar.gz: d09cceaf7f064a6536d983fdb577bdbca11aba51046faaee021887ca112b1bed
 SHA512:
-  metadata.gz: 1acb7ae8ea1a3a263d59611d3819036eb6aa303a3dfc3b55b0a6eb9eaef4b26412ed6c74aea6580ef1435aaab4a62360b7464e75130004f3da1d563f49a321c3
-  data.tar.gz: 69b9d07798170f1944cdd98a396b880232ed44278167ae0db3760aebdfc83a86f8f9fcf9846ec8008594bbb28e6285b9537fef3c19805ebbe3d17b47dd3e589d
+  metadata.gz: f1d98fea1b67c618239dc865b913a8f1ccf32097ca19b7e2adc2679bb3668ce57a981ddcc5940aa3b5388d85ac7fe01eb4cd51bd8005944253016112d53e5c1c
+  data.tar.gz: 9314835959902259af91f0909abd3b299dc7b7a30730323b235e51a231d8d9ce644145c457cfeae526b18a600dbf3561dcbf9072219ad17a9d980a1ec3c0595a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.1
+
+* Switched back from Ruby's `const_get` to Active Support `constantize` for fetching decorator modules, due to inability to properly detect namespaced decorator [@sinsoku]
+
 ## 1.3.0
 
 * Switched from Active Support `constantize` to Ruby's `const_get` when fetching decorator modules

data/active_decorator.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency 'activesupport'
+
   s.add_development_dependency 'test-unit-rails'
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'puma'

data/gemfiles/Gemfile-rails.6.0.x

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'rails', '~> 6.0.0.rc1'
+gem 'rails', '~> 6.0.0.rc2'

data/lib/active_decorator/decorator.rb

@@ -69,7 +69,7 @@ module ActiveDecorator
       return @@decorators[model_class] if @@decorators.key? model_class
 
       decorator_name = "#{model_class.name}#{ActiveDecorator.config.decorator_suffix}"
-      d = Object.const_get decorator_name, false
+      d = decorator_name.constantize
       unless Class === d
         d.send :include, ActiveDecorator::Helpers
         @@decorators[model_class] = d

data/lib/active_decorator/version.rb

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

data/lib/generators/rails/templates/decorator.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module <%= class_name %>Decorator
 end

data/lib/generators/rspec/templates/decorator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require '<%= File.exists?('spec/rails_helper.rb') ? 'rails_helper' : 'spec_helper' %>'
 
 RSpec.describe <%= class_name %>Decorator do

data/lib/generators/test_unit/templates/decorator_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class <%= class_name %>DecoratorTest < ActiveSupport::TestCase

data/test/decorator_test.rb

@@ -48,4 +48,11 @@ class DecoratorTest < Test::Unit::TestCase
       assert value.is_a?(BookDecorator)
     end
   end
+
+  test "Don't use the wrong decorator for nested classes" do
+    comic = Foo::Comic.new
+
+    assert_equal comic, ActiveDecorator::Decorator.instance.decorate(comic)
+    assert !comic.is_a?(ComicDecorator)
+  end
 end

data/test/fake_app/app/decorators/comic_decorator.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# decorator to test auto-loading behavior
+# this module is intended not to be loaded.
+module ComicDecorator; end

data/test/fake_app/fake_app.rb

@@ -277,3 +277,7 @@ class RelationProxy < BasicObject
     @ar_relation.public_send(method, *args, &block)
   end
 end
+
+module Foo
+  class Comic; end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-rails
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +179,7 @@ files:
 - test/configuration_test.rb
 - test/controllers/fake_detection_test.rb
 - test/decorator_test.rb
+- test/fake_app/app/decorators/comic_decorator.rb
 - test/fake_app/app/views/api/bookstores/show.json.jbuilder
 - test/fake_app/app/views/authors/index.html.erb
 - test/fake_app/app/views/authors/show.html.erb
@@ -218,6 +233,7 @@ test_files:
 - test/configuration_test.rb
 - test/controllers/fake_detection_test.rb
 - test/decorator_test.rb
+- test/fake_app/app/decorators/comic_decorator.rb
 - test/fake_app/app/views/api/bookstores/show.json.jbuilder
 - test/fake_app/app/views/authors/index.html.erb
 - test/fake_app/app/views/authors/show.html.erb