active_decorator 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8ec56959877091a50db872942aaeb8352cdb9269
-  data.tar.gz: 5a64a878439cc739235815ad6b9345d243cd191b
+SHA256:
+  metadata.gz: 298a6372406ac3480e7baaeee85eeea4b3dcb393ed37e6ccf4ab0fe120b5d7ed
+  data.tar.gz: 9576044dd3bf36591e9a56190b37f88062f58bc6f325c4e6a7b0446b5d8d05f5
 SHA512:
-  metadata.gz: 7935a3abad55b5a751acfe09fab8cf4dcd7f1b4e5c66b09d2a00fbc0cccbf9562ea84ee76767cc77313160174f427fbcb38ec17f767a2f503c01329e8d377472
-  data.tar.gz: f84157d3533f18cfd9aafed0e5b23f48f210e3dd8a351e8c0bb2df95afec646c634ca650f833e388fb11c1134527ea58c7b7c5f7f4fe7933b98a8221a6672a25
+  metadata.gz: ac2c57c9ace629b66a38fa039d622dd4c6f345334ec7bfee10e8e64dbe6efd43f78adc378fd2aff5e9ba52ecd73e963a21ec9817f776718035db250f13365567
+  data.tar.gz: acaf0a2612909a35e9d095ec6ad8e80b9cc5240df40accec3fc8e337e192714c8fda649d02f98b6ed92a41ac9c0a33702f2d8bc64b2e61071a7f71762d9e2988

data/.travis.yml

@@ -1,49 +1,82 @@
 language: ruby
 
-before_install: gem update bundler --no-document
+sudo: false
+
 script: bundle exec rake test
 
+addons:
+  chrome: stable
+
+before_install:
+  - sudo apt update -qq
+  - sudo apt install -y chromium-chromedriver
+  - sudo ln -s /usr/lib/chromium-browser/chromedriver /usr/bin/
+  - gem update bundler --no-document
+
 rvm:
-  - 2.0.0
+  - 2.5.3
+  - 2.4.5
+  - 2.3.7
+  - 2.2.10
   - 2.1.10
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-  - ruby-head
+  - 2.0.0
 gemfile:
-  - gemfiles/Gemfile-rails.3.2.x
-  - gemfiles/Gemfile-rails.4.0.x
-  - gemfiles/Gemfile-rails.4.1.x
-  - gemfiles/Gemfile-rails.4.2.x
-  - gemfiles/Gemfile-rails.5.0.x
+  - gemfiles/Gemfile-rails.5.2.x
   - gemfiles/Gemfile-rails.5.1.x
-
-sudo: false
+  - gemfiles/Gemfile-rails.5.0.x
+  - gemfiles/Gemfile-rails.4.2.x
+  - gemfiles/Gemfile-rails.4.1.x
+  - gemfiles/Gemfile-rails.4.0.x
+  - gemfiles/Gemfile-rails.3.2.x
 
 matrix:
   exclude:
-    - rvm: ruby-head
-      gemfile: gemfiles/Gemfile-rails.3.2.x
-    - rvm: ruby-head
-      gemfile: gemfiles/Gemfile-rails.4.0.x
-    - rvm: ruby-head
-      gemfile: gemfiles/Gemfile-rails.4.1.x
-    - rvm: 2.4.1
-      gemfile: gemfiles/Gemfile-rails.3.2.x
-    - rvm: 2.4.1
-      gemfile: gemfiles/Gemfile-rails.4.0.x
-    - rvm: 2.4.1
-      gemfile: gemfiles/Gemfile-rails.4.1.x
-    - rvm: 2.4.1
-      gemfile: gemfiles/Gemfile-rails.4.2.x
+    - rvm: 2.1.10
+      gemfile: gemfiles/Gemfile-rails.5.2.x
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile-rails.5.2.x
+    - rvm: 2.4.5
+      gemfile: gemfiles/Gemfile-rails.5.1.x
+    - rvm: 2.3.7
+      gemfile: gemfiles/Gemfile-rails.5.1.x
+    - rvm: 2.1.10
+      gemfile: gemfiles/Gemfile-rails.5.1.x
     - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile-rails.5.1.x
+    - rvm: 2.4.5
+      gemfile: gemfiles/Gemfile-rails.5.0.x
+    - rvm: 2.3.7
       gemfile: gemfiles/Gemfile-rails.5.0.x
     - rvm: 2.1.10
       gemfile: gemfiles/Gemfile-rails.5.0.x
     - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile-rails.5.1.x
+      gemfile: gemfiles/Gemfile-rails.5.0.x
+    - rvm: 2.5.3
+      gemfile: gemfiles/Gemfile-rails.4.2.x
+    - rvm: 2.4.5
+      gemfile: gemfiles/Gemfile-rails.4.2.x
+    - rvm: 2.5.3
+      gemfile: gemfiles/Gemfile-rails.4.1.x
+    - rvm: 2.4.5
+      gemfile: gemfiles/Gemfile-rails.4.1.x
+    - rvm: 2.2.10
+      gemfile: gemfiles/Gemfile-rails.4.1.x
     - rvm: 2.1.10
-      gemfile: gemfiles/Gemfile-rails.5.1.x
+      gemfile: gemfiles/Gemfile-rails.4.1.x
+    - rvm: 2.5.3
+      gemfile: gemfiles/Gemfile-rails.4.0.x
+    - rvm: 2.4.5
+      gemfile: gemfiles/Gemfile-rails.4.0.x
+    - rvm: 2.2.10
+      gemfile: gemfiles/Gemfile-rails.4.0.x
+    - rvm: 2.1.10
+      gemfile: gemfiles/Gemfile-rails.4.0.x
+    - rvm: 2.5.3
+      gemfile: gemfiles/Gemfile-rails.3.2.x
+    - rvm: 2.4.5
+      gemfile: gemfiles/Gemfile-rails.3.2.x
+  include:
+    - rvm: ruby-head
+      gemfile: gemfiles/Gemfile-rails.edge
   allow_failures:
     - rvm: ruby-head
-    - gemfile: gemfiles/Gemfile-rails.5.1.x

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+## 1.1.0
+
+* ActionController::API support [@frodsan]
+
+* `ActiveDecorator::Decorator.instance.decorate` now returns the decorated object when the receiver was already a decorated object (it used to return `nil`) [@velonica1997]
+
+* Update decorator_spec.rb syntax to respect RSpec 3 style [@memoht]
+
+* Fixed namespace for TestUnit generator with some refactorings [@yhirano55]

data/Gemfile

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
-
-gem 'rails'
-gem 'test-unit-rails'
-gem 'capybara'
-gem 'sqlite3'
-gem 'jbuilder'

data/README.md

@@ -6,9 +6,9 @@ A simple and Rubyish view helper for Rails 3, Rails 4 and Rails 5. Keep your hel
 ## Features ##
 
 1. automatically mixes decorator module into corresponding model only when:
-  1. passing a model or collection of models or an instance of ActiveRecord::Relation from controllers to views
-  2. rendering partials with models (using `:collection` or `:object` or `:locals` explicitly or implicitly)
-  3. fetching already decorated Active Record model object's association
+   1. passing a model or collection of models or an instance of ActiveRecord::Relation from controllers to views
+   2. rendering partials with models (using `:collection` or `:object` or `:locals` explicitly or implicitly)
+   3. fetching already decorated Active Record model object's association
 2. the decorator module runs in the model's context. So, you can directly call any attributes or methods in the decorator module
 3. since decorators are considered as sort of helpers, you can also call any ActionView's helper methods such as `content_tag` or `link_to`
 
@@ -114,9 +114,9 @@ end
 
 ### Using ActiveDecorator outside of Action View ###
 
-Sometimes your may want to use decorators outside of Action View, for example,
+Sometimes you may want to use decorators outside of Action View, for example,
 for background tasks for ActiveJob.
-For such use case, ActiveDecorator module provides `with_view_context` method
+For such use case, ActiveDecorator module provides `run_with` method
 that takes some kind of Action View and a block.
 
 ```ruby

data/active_decorator.gemspec

@@ -1,5 +1,5 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
+
 $:.push File.expand_path("../lib", __FILE__)
 require "active_decorator/version"
 
@@ -9,6 +9,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Akira Matsuda"]
   s.email       = ["ronnie@dio.jp"]
   s.homepage    = 'https://github.com/amatsuda/active_decorator'
+  s.license     = 'MIT'
   s.summary     = %q{A simple and Rubyish view helper for Rails}
   s.description = %q{A simple and Rubyish view helper for Rails}
 
@@ -16,4 +17,12 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.add_development_dependency 'test-unit-rails'
+  s.add_development_dependency 'selenium-webdriver'
+  s.add_development_dependency 'puma'
+  s.add_development_dependency 'capybara'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'jbuilder'
 end

data/gemfiles/Gemfile-rails.3.2.x

@@ -1,11 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'active_decorator', path: '..'
+gemspec path: '..'
 
 gem 'rails', '~> 3.2.0'
 gem 'test-unit-rails', '1.0.2'
 gem 'capybara', '~> 2.0.0'
-gem 'sqlite3'
 gem 'nokogiri', '~> 1.5.0'
-gem 'jbuilder'
-gem 'test-unit'

data/gemfiles/Gemfile-rails.4.0.x

@@ -1,10 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'active_decorator', path: '..'
+gemspec path: '..'
 
 gem 'rails', '~> 4.0.0'
-gem 'test-unit-rails'
-gem 'capybara'
-gem 'sqlite3'
 gem 'nokogiri', '~> 1.6.0'
-gem 'jbuilder'

data/gemfiles/Gemfile-rails.4.1.x

@@ -1,10 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'active_decorator', path: '..'
+gemspec path: '..'
 
 gem 'rails', '~> 4.1.0'
-gem 'test-unit-rails'
-gem 'capybara'
-gem 'sqlite3'
 gem 'nokogiri', '~> 1.6.0'
-gem 'jbuilder'

data/gemfiles/Gemfile-rails.4.2.x

@@ -1,10 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'active_decorator', path: '..'
+gemspec path: '..'
 
 gem 'rails', '~> 4.2.0'
-gem 'test-unit-rails'
-gem 'capybara'
-gem 'sqlite3'
 gem 'nokogiri', '~> 1.6.0'
-gem 'jbuilder'

data/gemfiles/Gemfile-rails.5.0.x

@@ -1,9 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'active_decorator', path: '..'
+gemspec path: '..'
 
 gem 'rails', '~> 5.0.0'
-gem 'test-unit-rails'
-gem 'capybara'
-gem 'sqlite3'
-gem 'jbuilder'

data/gemfiles/Gemfile-rails.5.1.x

@@ -1,9 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'active_decorator', path: '..'
+gemspec path: '..'
 
-gem 'rails', '5.1.0'
-gem 'test-unit-rails'
-gem 'capybara'
-gem 'sqlite3'
-gem 'jbuilder'
+gem 'rails', '~> 5.1.0'

data/gemfiles/Gemfile-rails.5.2.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'rails', '~> 5.2.0'

data/gemfiles/Gemfile-rails.edge

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+github 'rails/rails' do
+  gem 'rails'
+end

data/lib/active_decorator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_decorator/version'
 require 'active_decorator/decorator'
 require 'active_decorator/railtie'

data/lib/active_decorator/config.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActiveDecorator
   include ActiveSupport::Configurable
 

data/lib/active_decorator/decorated.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A no-op module to mark an AR model instance as a "decorated" object.
 module ActiveDecorator::Decorated
 end

data/lib/active_decorator/decorator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'singleton'
 require 'active_decorator/helpers'
 require 'active_decorator/decorated'
@@ -45,8 +46,9 @@ module ActiveDecorator
         d = decorator_for obj.class
         return obj unless d
         obj.extend d unless obj.is_a? d
-        obj
       end
+
+      obj
     end
 
     # Decorates AR model object's association only when the object was decorated.

data/lib/active_decorator/helpers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # On the fly delegation from the decorator to the decorated object and the helpers.
 module ActiveDecorator
   module Helpers

data/lib/active_decorator/monkey/abstract_controller/rendering.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A monkey-patch for Rails controllers/mailers that auto-decorates ivars
 # that are passed to views.
 module ActiveDecorator

data/lib/active_decorator/monkey/action_controller/base/rescue_from.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A monkey-patch for Action Controller to pass the controller view_context over
 # to `render` invocation in `rescue_from` block.
 module ActiveDecorator

data/lib/active_decorator/monkey/action_view/partial_renderer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A monkey-patch for Action View `render :partial` that auto-decorates `locals` values.
 module ActiveDecorator
   module Monkey
@@ -9,10 +10,10 @@ module ActiveDecorator
         def setup(*)
           super
 
-          @locals.values.each do |v|
+          @locals.each_value do |v|
             ActiveDecorator::Decorator.instance.decorate v
           end if @locals
-          ActiveDecorator::Decorator.instance.decorate @object if @object && (@object != nil)
+          ActiveDecorator::Decorator.instance.decorate @object if @object
           ActiveDecorator::Decorator.instance.decorate @collection unless @collection.blank?
 
           self

data/lib/active_decorator/monkey/active_record/associations.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A monkey-patch for Active Record that enables association auto-decoration.
 module ActiveDecorator
   module Monkey

data/lib/active_decorator/railtie.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_decorator/view_context'
 require 'rails'
 
@@ -20,6 +21,18 @@ module ActiveDecorator
         ActionController::Base.send :include, ActiveDecorator::ViewContext::Filter
       end
 
+      if Rails::VERSION::MAJOR >= 5
+        ActiveSupport.on_load :action_controller_api do
+          require 'active_decorator/monkey/abstract_controller/rendering'
+          ::ActionController::API.send :prepend, ActiveDecorator::Monkey::AbstractController::Rendering
+
+          require 'active_decorator/monkey/action_controller/base/rescue_from'
+          ::ActionController::API.send :prepend, ActiveDecorator::Monkey::ActionController::Base
+
+          ::ActionController::API.send :include, ActiveDecorator::ViewContext::Filter
+        end
+      end
+
       ActiveSupport.on_load :action_mailer do
         require 'active_decorator/monkey/abstract_controller/rendering'
         ActionMailer::Base.send :prepend, ActiveDecorator::Monkey::AbstractController::Rendering

data/lib/active_decorator/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActiveDecorator
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/active_decorator/view_context.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A module that carries the controllers' view_context to decorators.
 module ActiveDecorator
   module ViewContext

data/lib/generators/rails/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Stubs out a decorator module in app/decorators directory.
+
+Examples:
+    `rails g decorator book`
+
+    This creates:
+        app/decorators/book_decorator.rb

data/lib/generators/rails/decorator_generator.rb

@@ -1,19 +1,10 @@
 # frozen_string_literal: true
+
 module Rails
   module Generators
-    class DecoratorGenerator < Rails::Generators::NamedBase
-      source_root File.expand_path('../templates', __FILE__)
-
-      desc <<DESC
-Description:
-    Stubs out a decorator module in app/decorators directory.
-
-Examples:
-    `rails g decorator book`
-
-    This creates:
-        app/decorators/book_decorator.rb
-DESC
+    class DecoratorGenerator < NamedBase
+      source_root File.expand_path("templates", __dir__)
+      check_class_collision suffix: "Decorator"
 
       def create_decorator_file
         template 'decorator.rb', File.join('app/decorators', class_path, "#{file_name}_decorator.rb")

data/lib/generators/rspec/decorator_generator.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
+
 module Rspec
-  class DecoratorGenerator < ::Rails::Generators::NamedBase
-    source_root File.expand_path('../templates', __FILE__)
+  module Generators
+    class DecoratorGenerator < ::Rails::Generators::NamedBase
+      source_root File.expand_path("templates", __dir__)
 
-    def create_spec_file
-      template 'decorator_spec.rb', File.join('spec/decorators', class_path, "#{file_name}_decorator_spec.rb")
+      def create_spec_file
+        template 'decorator_spec.rb', File.join('spec/decorators', class_path, "#{file_name}_decorator_spec.rb")
+      end
     end
   end
 end

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

@@ -1,6 +1,6 @@
 require '<%= File.exists?('spec/rails_helper.rb') ? 'rails_helper' : 'spec_helper' %>'
 
-describe <%= class_name %>Decorator do
+RSpec.describe <%= class_name %>Decorator do
   let(:<%= singular_name %>) { <%= class_name %>.new.extend <%= class_name %>Decorator }
   subject { <%= singular_name %> }
   it { should be_a <%= class_name %> }

data/lib/generators/test_unit/decorator_generator.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
+
 module TestUnit
-  class DecoratorGenerator < ::Rails::Generators::NamedBase
-    source_root File.expand_path('../templates', __FILE__)
+  module Generators
+    class DecoratorGenerator < ::Rails::Generators::NamedBase
+      source_root File.expand_path("templates", __dir__)
+      check_class_collision suffix: "DecoratorTest"
 
-    def create_test_file
-      template 'decorator_test.rb', File.join('test/decorators', class_path, "#{file_name}_decorator_test.rb")
+      def create_test_file
+        template 'decorator_test.rb', File.join('test/decorators', class_path, "#{file_name}_decorator_test.rb")
+      end
     end
   end
 end

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

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class <%= singular_name.camelize %>DecoratorTest < ActiveSupport::TestCase
+class <%= class_name %>DecoratorTest < ActiveSupport::TestCase
   def setup
     @<%= singular_name %> = <%= class_name %>.new.extend <%= class_name %>Decorator
   end

data/test/configuration_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 Comic = Struct.new(:title, :price)

data/test/controllers/fake_detection_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class MoviesControllerTest < ActionController::TestCase

data/test/decorator_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class DecoratorTest < Test::Unit::TestCase
@@ -12,4 +13,22 @@ class DecoratorTest < Test::Unit::TestCase
     book = Book.new title: 'Boek'
     assert_equal book, ActiveDecorator::Decorator.instance.decorate(ActiveDecorator::Decorator.instance.decorate(book))
   end
+
+  test 'it returns the object of ActiveRecord::Relation on decorate' do
+    3.times do |index|
+      Book.create title: "ve#{index}"
+    end
+
+    books = Book.all
+    assert_equal books, ActiveDecorator::Decorator.instance.decorate(books)
+  end
+
+  test 'it returns the object of ActiveRecord::Relation when it already is decorated on decorate' do
+    3.times do |index|
+      Book.create title: "ve#{index}"
+    end
+
+    books = Book.all
+    assert_equal books, ActiveDecorator::Decorator.instance.decorate(ActiveDecorator::Decorator.instance.decorate(books))
+  end
 end

data/test/fake_app/app/views/api/bookstores/show.json.jbuilder

@@ -0,0 +1,2 @@
+# frozen_string_literal: true
+json.name  @bookstore.name

data/test/fake_app/fake_app.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_record'
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
@@ -42,6 +43,12 @@ ActiveDecoratorTestApp::Application.routes.draw do
     end
   end
   resources :movies, only: :show
+
+  if Rails::VERSION::MAJOR >= 5
+    namespace :api do
+      resources :bookstores, only: :show
+    end
+  end
 end
 
 # models
@@ -81,6 +88,8 @@ end
 class Company < ActiveRecord::Base
   has_many :authors
 end
+class Bookstore < ActiveRecord::Base
+end
 
 # helpers
 module ApplicationHelper; end
@@ -230,6 +239,15 @@ class MoviesController < ApplicationController
     @movie = Movie.find params[:id]
   end
 end
+if Rails::VERSION::MAJOR >= 5
+  module Api
+    class BookstoresController < ActionController::API
+      def show
+        @bookstore = Bookstore.find params[:id]
+      end
+    end
+  end
+end
 
 # mailers
 class BookMailer < ActionMailer::Base
@@ -251,6 +269,7 @@ class CreateAllTables < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migrat
     create_table(:magazines) {|t| t.string :title}
     create_table(:authors_magazines) {|t| t.references :author; t.references :magazine}
     create_table(:companies) {|t| t.string :name}
+    create_table(:bookstores) {|t| t.string :name}
   end
 end
 

data/test/features/action_controller_api_test.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+if Rails::VERSION::MAJOR >= 5
+
+class ActionControllerAPITest < ActionDispatch::IntegrationTest
+  setup do
+    Bookstore.create! name: 'junkudo'
+  end
+
+  test 'decorating objects in api only controllers' do
+    get "/api/bookstores/#{Bookstore.last.id}.json"
+
+    assert_equal({"name" => "junkudo"}, response.parsed_body)
+  end
+end
+
+end

data/test/features/action_view_helpers_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class ActionViewHelpersTest < ActionDispatch::IntegrationTest

data/test/features/association_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class AssociationTest < ActionDispatch::IntegrationTest

data/test/features/controller_ivar_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class ControllerIvarTest < ActionDispatch::IntegrationTest

data/test/features/jbuilder_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class JbuilderTest < ActionDispatch::IntegrationTest

data/test/features/name_error_handling_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class NameErrorHandlingTest < ActionDispatch::IntegrationTest

data/test/features/partial_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class PartialTest < ActionDispatch::IntegrationTest

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 # load Rails first
@@ -7,13 +8,29 @@ require 'rails'
 # load the plugin
 require 'active_decorator'
 
+Bundler.require
+require 'capybara'
+require 'selenium/webdriver'
+
 # needs to load the app next
 require 'fake_app/fake_app'
 
 require 'test/unit/rails/test_help'
 
-class ActionDispatch::IntegrationTest
-  include Capybara::DSL
+begin
+  require 'action_dispatch/system_test_case'
+rescue LoadError
+  Capybara.register_driver :chrome do |app|
+    options = Selenium::WebDriver::Chrome::Options.new(args: %w[no-sandbox headless disable-gpu])
+    Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
+  end
+  Capybara.javascript_driver = :chrome
+
+  class ActionDispatch::IntegrationTest
+    include Capybara::DSL
+  end
+else
+  ActionDispatch::SystemTestCase.driven_by(:selenium, using: :headless_chrome)
 end
 
 module DatabaseDeleter

metadata

@@ -1,15 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
-dependencies: []
+date: 2018-11-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: test-unit-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jbuilder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple and Rubyish view helper for Rails
 email:
 - ronnie@dio.jp
@@ -17,8 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -30,6 +129,8 @@ files:
 - gemfiles/Gemfile-rails.4.2.x
 - gemfiles/Gemfile-rails.5.0.x
 - gemfiles/Gemfile-rails.5.1.x
+- gemfiles/Gemfile-rails.5.2.x
+- gemfiles/Gemfile-rails.edge
 - lib/active_decorator.rb
 - lib/active_decorator/config.rb
 - lib/active_decorator/decorated.rb
@@ -42,6 +143,7 @@ files:
 - lib/active_decorator/railtie.rb
 - lib/active_decorator/version.rb
 - lib/active_decorator/view_context.rb
+- lib/generators/rails/USAGE
 - lib/generators/rails/decorator_generator.rb
 - lib/generators/rails/templates/decorator.rb
 - lib/generators/rspec/decorator_generator.rb
@@ -51,6 +153,7 @@ files:
 - test/configuration_test.rb
 - test/controllers/fake_detection_test.rb
 - test/decorator_test.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
 - test/fake_app/app/views/authors/show.json.jbuilder
@@ -66,6 +169,7 @@ files:
 - test/fake_app/app/views/books/show.html.erb
 - test/fake_app/app/views/movies/show.html.erb
 - test/fake_app/fake_app.rb
+- test/features/action_controller_api_test.rb
 - test/features/action_view_helpers_test.rb
 - test/features/association_test.rb
 - test/features/controller_ivar_test.rb
@@ -74,7 +178,8 @@ files:
 - test/features/partial_test.rb
 - test/test_helper.rb
 homepage: https://github.com/amatsuda/active_decorator
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -82,17 +187,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A simple and Rubyish view helper for Rails
@@ -100,6 +205,7 @@ test_files:
 - test/configuration_test.rb
 - test/controllers/fake_detection_test.rb
 - test/decorator_test.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
 - test/fake_app/app/views/authors/show.json.jbuilder
@@ -115,6 +221,7 @@ test_files:
 - test/fake_app/app/views/books/show.html.erb
 - test/fake_app/app/views/movies/show.html.erb
 - test/fake_app/fake_app.rb
+- test/features/action_controller_api_test.rb
 - test/features/action_view_helpers_test.rb
 - test/features/association_test.rb
 - test/features/controller_ivar_test.rb