active_decorator 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32cc540a94d0c4151aa9ccc05f8ecdd075643b1d
-  data.tar.gz: ae85f4549a24440613e4dca88f9f770e8e6b2f1f
+  metadata.gz: 14f002118bfbc2127bf674fc7488990d80a5152c
+  data.tar.gz: 6e40b90bb6ffc7ba584147a93041025456216f52
 SHA512:
-  metadata.gz: c035b1cb9156d73057f019fdc1a6c1f0ded63563570333f212a7d47719cc40d827f099eda3759fe5656fdcfc19ba1739b8f8f1f329bfe79a51a159ed2d5263c2
-  data.tar.gz: bffdaf8dd9ffb4fe61944266f735292a6dec5e8d008e7d6825acec4d2c5033bae2eecdf70db51da3e7ec209db7ddbe2a8dc987df6af59092039290dbdb04d526
+  metadata.gz: 5bd8f1c1bdc0cfe4734755e9a56fd1d20cbea6205319ac20c308360b95b5c74303d3f16cda0002458c2b33795ad6690e2eb8401ed99d35db4c3068f5630e6936
+  data.tar.gz: cf5c094dedd2637ea7f23bdd3b0f131b2a33f0cc98e9ff2148433960e8305c2b1732d7cf6005bd82247d9cc8b8a71897c61e5bcd5f9d044a641d970f53c7fa58

data/.travis.yml

@@ -5,15 +5,15 @@ script: bundle exec rake test
 rvm:
   - 2.0.0
   - 2.1.10
-  - 2.2.4
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
   - ruby-head
 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.0.rc1
+  - gemfiles/Gemfile-rails.5.0.x
 
 sudo: false
 
@@ -21,9 +21,13 @@ 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.0.0
-      gemfile: gemfiles/Gemfile-rails.5.0.0.rc1
+      gemfile: gemfiles/Gemfile-rails.5.0.x
     - rvm: 2.1.10
-      gemfile: gemfiles/Gemfile-rails.5.0.0.rc1
+      gemfile: gemfiles/Gemfile-rails.5.0.x
   allow_failures:
     - rvm: ruby-head

data/Gemfile

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails', '~> 4.0.0'
-gem 'capybara', '>= 2'
+gem 'rails'
+gem 'test-unit-rails'
+gem 'capybara'
 gem 'sqlite3'
 gem 'jbuilder'

data/README.md

@@ -1,6 +1,6 @@
 # ActiveDecorator [![Build Status](https://travis-ci.org/amatsuda/active_decorator.svg?branch=master)](https://travis-ci.org/amatsuda/active_decorator) [![Code Climate](https://codeclimate.com/github/amatsuda/active_decorator/badges/gpa.svg)](https://codeclimate.com/github/amatsuda/active_decorator)
 
-A simple and Rubyish view helper for Rails 3 and Rails 4. Keep your helpers and views Object-Oriented!
+A simple and Rubyish view helper for Rails 3, Rails 4 and Rails 5. Keep your helpers and views Object-Oriented!
 
 
 ## Features ##
@@ -16,7 +16,7 @@ A simple and Rubyish view helper for Rails 3 and Rails 4. Keep your helpers and
 
 * Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.x, and 2.4 (trunk)
 
-* Rails 3.2.x, 4.0.x, 4.1.x, 4.2.x, and 5.0 (edge)
+* Rails 3.2.x, 4.0.x, 4.1.x, 4.2.x, 5.0, and 5.1 (edge)
 
 
 ## Supported ORMs ##

data/Rakefile

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require 'bundler'
 Bundler::GemHelper.install_tasks

data/active_decorator.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 $:.push File.expand_path("../lib", __FILE__)
 require "active_decorator/version"
 

data/gemfiles/Gemfile-rails.3.2.x

@@ -4,17 +4,8 @@ gem 'active_decorator', path: '..'
 
 gem 'rails', '~> 3.2.0'
 gem 'test-unit-rails', '1.0.2'
-if RUBY_VERSION <= '1.8.7'
-  gem 'i18n', '~> 0.6.11'
-end
 gem 'capybara', '~> 2.0.0'
-# rubyzip >=1 doesn't support ruby 1.8
-gem 'rubyzip', '< 1.0.0'
 gem 'sqlite3'
 gem 'nokogiri', '~> 1.5.0'
-if RUBY_VERSION <= '1.8.7'
-  gem 'jbuilder', '< 2'
-else
-  gem 'jbuilder'
-end
+gem 'jbuilder'
 gem 'test-unit'

data/gemfiles/{Gemfile-rails.5.0.0.rc1 → Gemfile-rails.5.0.x}

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'active_decorator', path: '..'
 
-gem 'rails', '~> 5.0.0.beta4'
+gem 'rails', '~> 5.0.0'
 gem 'test-unit-rails'
 gem 'capybara'
 gem 'sqlite3'

data/lib/active_decorator.rb

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

data/lib/active_decorator/config.rb

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

data/lib/active_decorator/decorator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'singleton'
 require 'active_decorator/helpers'
 
@@ -17,14 +18,14 @@ module ActiveDecorator
         obj.each do |r|
           decorate r
         end
-      elsif defined?(ActiveRecord) && obj.is_a?(ActiveRecord::Relation) && !obj.is_a?(ActiveDecorator::RelationDecorator)
+      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
+          obj.extend ActiveDecorator::RelationDecorator unless obj.is_a? ActiveDecorator::RelationDecorator
         else
           # Rails 3.x and 4.x
-          obj.extend ActiveDecorator::RelationDecoratorLegacy
+          obj.extend ActiveDecorator::RelationDecoratorLegacy unless obj.is_a? ActiveDecorator::RelationDecoratorLegacy
         end
       else
         d = decorator_for obj.class
@@ -35,7 +36,7 @@ module ActiveDecorator
 
     private
     def decorator_for(model_class)
-      return @@decorators[model_class] if @@decorators.has_key? model_class
+      return @@decorators[model_class] if @@decorators.key? model_class
 
       decorator_name = "#{model_class.name}#{ActiveDecorator.config.decorator_suffix}"
       d = decorator_name.constantize

data/lib/active_decorator/helpers.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
 module ActiveDecorator
   module Helpers
     def method_missing(method, *args, &block)
       super
-    #TODO need to make sure who raised the error?
-    rescue NoMethodError, NameError => original_error
+    rescue NoMethodError, NameError
       begin
-        ActiveDecorator::ViewContext.current.send method, *args, &block
-      rescue NoMethodError, NameError
-        raise original_error
+        (view_context = ActiveDecorator::ViewContext.current).send method, *args, &block
+      rescue NoMethodError
+        raise NoMethodError, "undefined method `#{method}` for either #{self} or #{view_context}"
+      rescue NameError
+        raise NameError, "undefined local variable `#{method}` for either #{self} or #{view_context}"
       end
     end
   end

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

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module ActiveDecorator
   module Monkey
     module AbstractController
       module Rendering
         def view_assigns
           hash = super
-          hash.values.each do |v|
+          hash.each_value do |v|
             ActiveDecorator::Decorator.instance.decorate v
           end
           hash

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveDecorator
   module Monkey
     module ActionController

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveDecorator
   module Monkey
     module ActionView
@@ -9,8 +10,8 @@ module ActiveDecorator
 
           @locals.values.each do |v|
             ActiveDecorator::Decorator.instance.decorate v
-          end unless @locals.blank?
-          ActiveDecorator::Decorator.instance.decorate @object unless @object.blank?
+          end if @locals
+          ActiveDecorator::Decorator.instance.decorate @object if @object && (@object != nil)
           ActiveDecorator::Decorator.instance.decorate @collection unless @collection.blank?
 
           self

data/lib/active_decorator/railtie.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_decorator/view_context'
 require 'rails'
 

data/lib/active_decorator/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveDecorator
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

data/lib/active_decorator/view_context.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveDecorator
   module ViewContext
     class << self

data/lib/generators/rails/decorator_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rails
   module Generators
     class DecoratorGenerator < Rails::Generators::NamedBase

data/lib/generators/rspec/decorator_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rspec
   class DecoratorGenerator < ::Rails::Generators::NamedBase
     source_root File.expand_path('../templates', __FILE__)

data/lib/generators/test_unit/decorator_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module TestUnit
   class DecoratorGenerator < ::Rails::Generators::NamedBase
     source_root File.expand_path('../templates', __FILE__)

data/test/configuration_test.rb

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

data/test/controllers/fake_detection_test.rb

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

data/test/fake_app/app/views/authors/show.json.jbuilder

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 json.name  @author.name
 json.books @author.books, partial: 'books/book', as: :book

data/test/fake_app/app/views/books/_book.json.jbuilder

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 json.title          book.title
 json.reverse_title  book.reverse_title

data/test/fake_app/app/views/books/errata.html.erb

@@ -0,0 +1 @@
+<%= @book.errata %>

data/test/fake_app/fake_app.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_record'
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
@@ -27,6 +28,7 @@ ActiveDecoratorTestApp::Application.routes.draw do
   resources :authors, only: [:index, :show] do
     resources :books, only: [:index, :show] do
       member do
+        get :errata
         get :error
         post :purchase
       end
@@ -83,6 +85,10 @@ module BookDecorator
     image_tag 'cover.png'
   end
 
+  def errata
+    poof!
+  end
+
   def error
     "ERROR"
   end
@@ -126,7 +132,7 @@ class BooksController < ApplicationController
   class CustomError < StandardError; end
 
   rescue_from CustomError do
-    render "error"
+    render :error
   end
 
   def index
@@ -138,6 +144,10 @@ class BooksController < ApplicationController
     @book = Author.find(params[:author_id]).books.find(params[:id])
   end
 
+  def errata
+    @book = Author.find(params[:author_id]).books.find(params[:id])
+  end
+
   def error
     @book = Author.find(params[:author_id]).books.find(params[:id])
     raise CustomError, "error"

data/test/features/action_view_helpers_test.rb

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

data/test/features/controller_ivar_test.rb

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

data/test/features/jbuilder_test.rb

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

data/test/features/name_error_handling_test.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+require 'test_helper'
+
+class NameErrorHandlingTest < ActionDispatch::IntegrationTest
+  setup do
+    aamine = Author.create! name: 'aamine'
+    @rhg = aamine.books.create! title: 'RHG'
+  end
+
+  test 'raising NameError in a decorator' do
+    err = assert_raises ActionView::Template::Error do
+      visit "/authors/#{@rhg.author.id}/books/#{@rhg.id}/errata"
+    end
+
+    assert_match(/undefined method `poof!` for/, err.message)
+  end
+end

data/test/features/partial_test.rb

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

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 # load Rails first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-07 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies: []
 description: A simple and Rubyish view helper for Rails
 email:
@@ -28,7 +28,7 @@ files:
 - gemfiles/Gemfile-rails.4.0.x
 - gemfiles/Gemfile-rails.4.1.x
 - gemfiles/Gemfile-rails.4.2.x
-- gemfiles/Gemfile-rails.5.0.0.rc1
+- gemfiles/Gemfile-rails.5.0.x
 - lib/active_decorator.rb
 - lib/active_decorator/config.rb
 - lib/active_decorator/decorator.rb
@@ -54,6 +54,7 @@ files:
 - test/fake_app/app/views/books/_book.html.erb
 - test/fake_app/app/views/books/_book.json.jbuilder
 - test/fake_app/app/views/books/_book_locals.html.erb
+- test/fake_app/app/views/books/errata.html.erb
 - test/fake_app/app/views/books/error.html.erb
 - test/fake_app/app/views/books/index.html.erb
 - test/fake_app/app/views/books/purchase.html.erb
@@ -63,6 +64,7 @@ files:
 - test/features/action_view_helpers_test.rb
 - test/features/controller_ivar_test.rb
 - test/features/jbuilder_test.rb
+- test/features/name_error_handling_test.rb
 - test/features/partial_test.rb
 - test/test_helper.rb
 homepage: https://github.com/amatsuda/active_decorator
@@ -84,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A simple and Rubyish view helper for Rails
@@ -98,6 +100,7 @@ test_files:
 - test/fake_app/app/views/books/_book.html.erb
 - test/fake_app/app/views/books/_book.json.jbuilder
 - test/fake_app/app/views/books/_book_locals.html.erb
+- test/fake_app/app/views/books/errata.html.erb
 - test/fake_app/app/views/books/error.html.erb
 - test/fake_app/app/views/books/index.html.erb
 - test/fake_app/app/views/books/purchase.html.erb
@@ -107,6 +110,6 @@ test_files:
 - test/features/action_view_helpers_test.rb
 - test/features/controller_ivar_test.rb
 - test/features/jbuilder_test.rb
+- test/features/name_error_handling_test.rb
 - test/features/partial_test.rb
 - test/test_helper.rb
-has_rdoc: