active_decorator 1.3.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abd22d415613228c6c98fe9a0bf7255496dabaada709c34ba2cbe032a2fcc9b6
-  data.tar.gz: af38045be9a3de1832be692fa8f349010e7f79c7144d8d1f9f248aa3c311abb3
+  metadata.gz: f803e15d40a85700faf6ceb443bea2fabc225c2d3503e32c99dcb4e54e7f75e3
+  data.tar.gz: 1c15042cec49c02013f05ff50c91335d00d6acff63b6ae51ccee2ea77c27ec88
 SHA512:
-  metadata.gz: 39f6198f7583dbc4df7bb3071161f234ce858cda7d17a27c07caab910bc3a1c652468cd42dfd7bf094cb53ceedc9da8c9a35d031a0e258398dc41f15b44d2925
-  data.tar.gz: 3b342f062765a460b03b3adbe2562cf01579a4b54427713dd3abe88694e371acee44ded648a218e9a2fd2872285635a08016cf11a0b68ecae0631243c6909c2f
+  metadata.gz: b48a0acdcdce16cd8f3fda7b56c95209af5e833502ea2ea5f9244e9e78bcf4255c376c21f50310631852a928279283d070bed45f618578867eb1edd45f6ddcaa
+  data.tar.gz: 8b959e33b9c70791a47ee759a6e9c3c877672cda9bb3ba5dc1de0ea4587be5d16bbccd0d0e980fc9ecfaae47adad0f616b35dda7f3c902b05cba064fda21fcc5

data/.travis.yml

@@ -11,9 +11,9 @@ before_install:
 cache: bundler
 
 # rvm:
-#   - 2.6.6
-#   - 2.5.8
-#   - 2.4.6
+#   - 2.6.7
+#   - 2.5.9
+#   - 2.4.10
 #   - 2.3.8
 #   - 2.2.10
 #   - 2.1.10
@@ -26,47 +26,53 @@ cache: bundler
 
 matrix:
   include:
-    - rvm: 2.7.1
+    - rvm: 3.0.1
       gemfile: gemfiles/Gemfile-rails.6.1.x
-    - rvm: 2.7.1
+    - rvm: 3.0.1
       gemfile: gemfiles/Gemfile-rails.6.1.x
       env: API=1
-    - rvm: 2.7.1
+
+    - rvm: 2.7.3
+      gemfile: gemfiles/Gemfile-rails.6.1.x
+    - rvm: 2.7.3
+      gemfile: gemfiles/Gemfile-rails.6.1.x
+      env: API=1
+    - rvm: 2.7.3
       gemfile: gemfiles/Gemfile-rails.6.0.x
-    - rvm: 2.7.1
+    - rvm: 2.7.3
       gemfile: gemfiles/Gemfile-rails.6.0.x
       env: API=1
 
-    - rvm: 2.6.6
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.6.1.x
-    - rvm: 2.6.6
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.6.1.x
       env: API=1
-    - rvm: 2.6.6
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.6.0.x
-    - rvm: 2.6.6
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.6.0.x
       env: API=1
-    - rvm: 2.6.6
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.5.2.x
-    - rvm: 2.6.6
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.5.2.x
       env: API=1
-    - rvm: 2.6.6
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.5.1.x
-    - rvm: 2.6.6
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.5.1.x
       env: API=1
-    - rvm: 2.6.6
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.5.0.x
-    - rvm: 2.6.6
+    - rvm: 2.6.7
       gemfile: gemfiles/Gemfile-rails.5.0.x
       env: API=1
 
-    - rvm: 2.5.8
+    - rvm: 2.5.9
       gemfile: gemfiles/Gemfile-rails.5.2.x
 
-    - rvm: 2.4.6
+    - rvm: 2.4.10
       gemfile: gemfiles/Gemfile-rails.5.2.x
 
     - rvm: 2.3.8
@@ -85,7 +91,6 @@ matrix:
 
     - rvm: ruby-head
       gemfile: gemfiles/Gemfile-rails.edge
-
     - rvm: ruby-head
       gemfile: gemfiles/Gemfile-rails.edge
       env: API=1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.4.0
+
+* Decorate non-nil objects where `nil?` returns true, namely, ActionText::RichText body [@jamesbrooks]
+
 ## 1.3.4
 
 * Support Rails 6.1 [@y-yagi]

data/README.md

@@ -15,9 +15,9 @@ A simple and Rubyish view helper for Rails 4, Rails 5, and Rails 6. Keep your he
 
 ## Supported versions ##
 
-* Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.x, 2.5.x, 2.6.x, and 2.7 (trunk)
+* Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.x, 2.5.x, 2.6.x, 2.7.x, 3.0.x, and 3.1 (trunk)
 
-* Rails 4.2.x, 5.0, 5.1, 5.2, 6.0, and 6.1 (edge)
+* Rails 4.2.x, 5.0, 5.1, 5.2, 6.0, 6.1, and 7.0 (edge)
 
 
 ## Supported ORMs ##

data/gemfiles/Gemfile-rails.6.1.x

@@ -4,4 +4,5 @@ gemspec path: '..'
 
 gem 'rails', '~> 6.1.0'
 gem 'webdrivers'
+gem 'rexml'
 gem 'jbuilder' unless ENV['API']

data/lib/active_decorator/decorator.rb

@@ -23,34 +23,38 @@ module ActiveDecorator
     #
     # This method can be publicly called from anywhere by `ActiveDecorator::Decorator.instance.decorate(obj)`.
     def decorate(obj)
-      return if defined?(Jbuilder) && (Jbuilder === obj)
-      return if obj.nil?
+      return obj if defined?(Jbuilder) && (Jbuilder === obj)
 
-      if obj.is_a?(Array)
+      case obj
+      when Array
         obj.each do |r|
           decorate r
         end
-      elsif obj.is_a?(Hash)
+      when Hash
         obj.each_value do |v|
           decorate v
         end
-      elsif defined?(ActiveRecord) && obj.is_a?(ActiveRecord::Relation)
-        # don't call each nor to_a immediately
-        if obj.respond_to?(:records)
-          # Rails 5.0
-          obj.extend ActiveDecorator::RelationDecorator unless obj.is_a? ActiveDecorator::RelationDecorator
-        else
-          # Rails 3.x and 4.x
-          obj.extend ActiveDecorator::RelationDecoratorLegacy unless obj.is_a? ActiveDecorator::RelationDecoratorLegacy
-        end
+      when nil, true, false
+        obj
       else
-        if defined?(ActiveRecord) && obj.is_a?(ActiveRecord::Base) && !obj.is_a?(ActiveDecorator::Decorated)
-          obj.extend ActiveDecorator::Decorated
-        end
+        if defined?(ActiveRecord) && obj.is_a?(ActiveRecord::Relation)
+          # don't call each nor to_a immediately
+          if obj.respond_to?(:records)
+            # Rails 5.0
+            obj.extend ActiveDecorator::RelationDecorator unless obj.is_a? ActiveDecorator::RelationDecorator
+          else
+            # Rails 3.x and 4.x
+            obj.extend ActiveDecorator::RelationDecoratorLegacy unless obj.is_a? ActiveDecorator::RelationDecoratorLegacy
+          end
+        else
+          if defined?(ActiveRecord) && obj.is_a?(ActiveRecord::Base) && !obj.is_a?(ActiveDecorator::Decorated)
+            obj.extend ActiveDecorator::Decorated
+          end
 
-        d = decorator_for obj.class
-        return obj unless d
-        obj.extend d unless obj.is_a? d
+          d = decorator_for obj.class
+          return obj unless d
+          obj.extend d unless obj.is_a? d
+        end
       end
 
       obj

data/lib/active_decorator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-21 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: A simple and Rubyish view helper for Rails