active_decorator 0.3.4 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b4ff2ae758a8f2c1a18ff85c02a06cfe4227815d
+  data.tar.gz: 5e8fe96b2279ba2ef44a62d342056e4b6aa6b9fd
+SHA512:
+  metadata.gz: b1d64f92890474e35d2e3efcc231f1dd1299c5fd1cee9c6f4e526d8cc1d8c1900d1ce35715f8061129248e8baace4d6034bd50b805ca25b2cd6019117b0acdf1
+  data.tar.gz: 7f885ea5e6e225b08edef2c2962affac26d450d0ea7e41af18150f1affdd624f8dabc4018504dfd4c66ad141751421f40cd7d0b828ba561da4f7e93e9e787eda

data/.gitignore

@@ -1,7 +1,6 @@
 *.gem
 .bundle
 Gemfile.lock
-gemfiles/Gemfile-rails.3.0.x.lock
-gemfiles/Gemfile-rails.3.1.x.lock
+gemfiles/*.lock
 pkg/*
 log

data/.travis.yml

@@ -1,21 +1,35 @@
 language: ruby
+
 script: bundle exec rake spec
+
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1
+  - 2.2
   - ruby-head
 gemfile:
-  - gemfiles/Gemfile-rails.3.0.x
-  - gemfiles/Gemfile-rails.3.1.x
-  - 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
+
+sudo: false
+
 matrix:
-  exclude:
-    - rvm: 2.0.0
+  include:
+    - rvm: 1.8.7
       gemfile: gemfiles/Gemfile-rails.3.0.x
-    - rvm: 2.0.0
+    - rvm: 1.8.7
       gemfile: gemfiles/Gemfile-rails.3.1.x
-    - rvm: ruby-head
+    - rvm: 1.8.7
+      gemfile: gemfiles/Gemfile-rails.3.2.x
+    - rvm: 1.9.3
       gemfile: gemfiles/Gemfile-rails.3.0.x
-    - rvm: ruby-head
+    - rvm: 1.9.3
       gemfile: gemfiles/Gemfile-rails.3.1.x
+  exclude:
+    - rvm: ruby-head
+      gemfile: gemfiles/Gemfile-rails.3.2.x
+  allow_failures:
+    - rvm: ruby-head

data/Gemfile

@@ -2,7 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails', '~> 3.2.0'
+gem 'rails', '~> 4.0.0'
 gem 'rspec-rails'
 gem 'capybara', '>= 2'
 gem 'sqlite3'
+gem 'jbuilder'

data/README.md

@@ -1,6 +1,6 @@
 # ActiveDecorator
 
-A simple and Rubyish view helper for Rails 3. Keep your helpers and views Object-Oriented!
+A simple and Rubyish view helper for Rails 3 and Rails 4. Keep your helpers and views Object-Oriented!
 
 
 ## Features ##
@@ -14,7 +14,7 @@ A simple and Rubyish view helper for Rails 3. Keep your helpers and views Object
 
 ## Supported versions ##
 
-Rails 3.0.x, 3.1.x, 3.2.x, and 4.0 (edge)
+Rails 3.0.x, 3.1.x, 3.2.x, 4.0.x, and 4.1 (edge)
 
 
 ## Supported ORMs ##
@@ -32,34 +32,36 @@ You can use the generator for doing this ( `% rails g decorator user` )
 
 ## Examples ##
 
-    # app/models/user.rb
-    class User < ActiveRecord::Base
-      # first_name:string last_name:string website:string
-    end
-    
-    # app/decorators/user_decorator.rb
-    module UserDecorator
-      def full_name
-        "#{first_name} #{last_name}"
-      end
-    
-      def link
-        link_to full_name, website
-      end
-    end
-    
-    # app/controllers/users_controller.rb
-    class UsersController < ApplicationController
-      def index
-        @users = User.all
-      end
-    end
-    
-    # app/views/users/index.html.erb
-    <% @users.each do |user| %>
-      <%= user.link %><br>
-    <% end %>
-
+```ruby
+# app/models/user.rb
+class User < ActiveRecord::Base
+  # first_name:string last_name:string website:string
+end
+
+# app/decorators/user_decorator.rb
+module UserDecorator
+  def full_name
+    "#{first_name} #{last_name}"
+  end
+
+  def link
+    link_to full_name, website
+  end
+end
+
+# app/controllers/users_controller.rb
+class UsersController < ApplicationController
+  def index
+    @users = User.all
+  end
+end
+```
+```erb
+# app/views/users/index.html.erb
+<% @users.each do |user| %>
+  <%= user.link %><br>
+<% end %>
+```
 
 ## Contributing to ActiveDecorator ##
 

data/gemfiles/Gemfile-rails.3.0.x

@@ -1,8 +1,16 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'active_decorator', :path => '..'
 
 gem 'rails', '~> 3.0.0'
-gem 'rspec-rails'
-gem 'capybara'
+gem 'rspec-rails', '~> 2.14.0'
+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

data/gemfiles/Gemfile-rails.3.1.x

@@ -1,8 +1,19 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'active_decorator', :path => '..'
 
 gem 'rails', '~> 3.1.0'
-gem 'rspec-rails'
-gem 'capybara'
+gem 'rspec-rails', '~> 2.14.0'
+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

data/gemfiles/Gemfile-rails.3.2.x

@@ -0,0 +1,20 @@
+source 'https://rubygems.org'
+
+gem 'active_decorator', :path => '..'
+
+gem 'rails', '~> 3.2.0'
+gem 'rspec-rails', '~> 2.14.0'
+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 'test-unit'

data/gemfiles/Gemfile-rails.4.0.x

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'active_decorator', :path => '..'
+
+gem 'rails', '~> 4.0.0'
+gem 'rspec-rails'
+gem 'capybara'
+gem 'sqlite3'
+gem 'jbuilder'
+gem 'test-unit'

data/gemfiles/Gemfile-rails.4.1.x

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'active_decorator', :path => '..'
+
+gem 'rails', '~> 4.1.0'
+gem 'rspec-rails'
+gem 'capybara'
+gem 'sqlite3'
+gem 'jbuilder'

data/gemfiles/Gemfile-rails.4.2.x

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'active_decorator', :path => '..'
+
+gem 'rails', '~> 4.2.0'
+gem 'rspec-rails'
+gem 'capybara'
+gem 'sqlite3'
+gem 'jbuilder'

data/lib/active_decorator/decorator.rb

@@ -10,9 +10,10 @@ module ActiveDecorator
     end
 
     def decorate(obj)
+      return if defined?(Jbuilder) && Jbuilder === obj
       return if obj.nil?
 
-      if Array === obj
+      if obj.is_a?(Array)
         obj.each do |r|
           decorate r
         end
@@ -38,8 +39,12 @@ module ActiveDecorator
 
       decorator_name = "#{model_class.name}Decorator"
       d = decorator_name.constantize
-      d.send :include, ActiveDecorator::Helpers
-      @@decorators[model_class] = d
+      unless Class === d
+        d.send :include, ActiveDecorator::Helpers
+        @@decorators[model_class] = d
+      else
+        @@decorators[model_class] = nil
+      end
     rescue NameError
       @@decorators[model_class] = nil
     end

data/lib/active_decorator/railtie.rb

@@ -13,6 +13,7 @@ module ActiveDecorator
       end
       ActiveSupport.on_load(:action_mailer) do
         require 'active_decorator/monkey/abstract_controller/rendering'
+        ActionMailer::Base.send :include, ActiveDecorator::ViewContext::Filter
       end
     end
   end

data/lib/active_decorator/version.rb

@@ -1,3 +1,3 @@
 module ActiveDecorator
-  VERSION = '0.3.4'
+  VERSION = '0.4.0'
 end

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

@@ -1,5 +1,5 @@
 # coding: utf-8
-require 'spec_helper'
+require '<%= File.exists?('spec/rails_helper.rb') ? 'rails_helper' : 'spec_helper' %>'
 
 describe <%= singular_name.camelize %>Decorator do
   let(:<%= singular_name %>) { <%= class_name %>.new.extend <%= singular_name.camelize %>Decorator }

data/spec/controllers/fake_detection_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe MoviesController, :type => :controller do
+  let(:movie){ Movie.create }
+
+  it 'reveals fakes' do
+    expect{ get :show, :id => movie.id }.not_to raise_error
+  end
+end

data/spec/fake_app/authors/show.json.jbuilder

@@ -0,0 +1,2 @@
+json.name  @author.name
+json.books @author.books, :partial => 'books/book', :as => :book

data/spec/fake_app/books/_book.json.jbuilder

@@ -0,0 +1,2 @@
+json.title          book.title
+json.reverse_title  book.reverse_title

data/spec/fake_app/books/index.html.erb

@@ -0,0 +1,4 @@
+<% @books.each do |book| %>
+  <%= book.title %>
+  <%= book.reverse_title %>
+<% end %>

data/spec/fake_app/fake_app.rb

@@ -1,6 +1,7 @@
 require 'active_record'
 require 'action_controller/railtie'
 require 'action_view/railtie'
+require 'jbuilder'
 
 # config
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
@@ -10,6 +11,8 @@ module ActiveDecoratorTestApp
     config.secret_token = '"confusion" will be my epitaph.'
     config.session_store :cookie_store, :key => '_myapp_session'
     config.active_support.deprecation = :log
+    config.eager_load = false
+    config.action_dispatch.show_exceptions = false
   end
 end
 ActiveDecoratorTestApp::Application.initialize!
@@ -17,8 +20,9 @@ ActiveDecoratorTestApp::Application.initialize!
 # routes
 ActiveDecoratorTestApp::Application.routes.draw do
   resources :authors, :only => [:index, :show] do
-    resources :books, :only => :show
+    resources :books, :only => [:index, :show]
   end
+  resources :movies, :only => :show
 end
 
 # models
@@ -28,6 +32,8 @@ end
 class Book < ActiveRecord::Base
   belongs_to :author
 end
+class Movie < ActiveRecord::Base
+end
 
 # helpers
 module ApplicationHelper; end
@@ -60,16 +66,29 @@ module BookDecorator
   end
 end
 
+# decorator fake
+class MovieDecorator; end
+
 # controllers
 class ApplicationController < ActionController::Base
   self.append_view_path File.dirname(__FILE__)
 end
 class AuthorsController < ApplicationController
   def index
-    if params[:variable_type] == 'array'
-      @authors = Author.all
+    if Author.respond_to?(:scoped)
+      # ActiveRecord 3.x
+      if params[:variable_type] == 'array'
+        @authors = Author.all
+      else
+        @authors = Author.scoped
+      end
     else
-      @authors = Author.scoped
+      # ActiveRecord 4.x
+      if params[:variable_type] == 'array'
+        @authors = Author.all.to_a
+      else
+        @authors = Author.all
+      end
     end
   end
 
@@ -78,15 +97,26 @@ class AuthorsController < ApplicationController
   end
 end
 class BooksController < ApplicationController
+  def index
+    @author = Author.find params[:author_id]
+    @books  = @author.books
+  end
+
   def show
     @book = Author.find(params[:author_id]).books.find(params[:id])
   end
 end
+class MoviesController < ApplicationController
+  def show
+    @movie = Movie.find params[:id]
+  end
+end
 
 # migrations
 class CreateAllTables < ActiveRecord::Migration
   def self.up
     create_table(:authors) {|t| t.string :name}
     create_table(:books) {|t| t.string :title; t.references :author}
+    create_table(:movies) {|t| t.string :name}
   end
 end

data/spec/fake_app/movies/show.html.erb

@@ -0,0 +1 @@
+<%= @movie.name %>

data/spec/features/controller_ivar_spec.rb

@@ -3,10 +3,13 @@ require 'spec_helper'
 feature 'decorating controller ivar' do
   background do
     @matz = Author.create! :name => 'matz'
+    @matz.books.create! :title => 'the world of code'
     Author.create! :name => 'takahashim'
   end
+
   after do
     Author.delete_all
+    Book.delete_all
   end
 
   scenario 'decorating a model object in ivar' do
@@ -26,4 +29,10 @@ feature 'decorating controller ivar' do
     page.should have_content 'takahashim'
     page.should have_content 'takahashim'.reverse
   end
+
+  scenario 'decorating model association proxy in ivar' do
+    visit "/authors/#{@matz.id}/books"
+    page.should have_content 'the world of code'
+    page.should have_content 'the world of code'.reverse
+  end
 end

data/spec/features/jbuilder_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+feature 'decorating partial object in Jbuilder' do
+  background do
+    Author.create! :name => 'aamine'
+    nari = Author.create! :name => 'nari'
+    nari.books.create! :title => 'the gc book'
+  end
+  after do
+    Book.delete_all
+    Author.delete_all
+  end
+
+  scenario 'decorating objects in Jbuilder partials' do
+    visit "/authors/#{Author.last.id}.json"
+    page.source.should eq '{"name":"nari","books":[{"title":"the gc book","reverse_title":"koob cg eht"}]}'
+  end
+end

data/spec/spec_helper.rb

@@ -11,11 +11,16 @@ require 'rspec/rails'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+
   config.before :all do
     CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'authors'
   end
   config.before :each do
     Book.delete_all
     Author.delete_all
+    Movie.delete_all
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 0.3.4
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies: []
 description: A simple and Rubyish view helper for Rails 3
 email:
@@ -18,9 +17,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -28,6 +27,10 @@ files:
 - active_decorator.gemspec
 - gemfiles/Gemfile-rails.3.0.x
 - gemfiles/Gemfile-rails.3.1.x
+- gemfiles/Gemfile-rails.3.2.x
+- gemfiles/Gemfile-rails.4.0.x
+- gemfiles/Gemfile-rails.4.1.x
+- gemfiles/Gemfile-rails.4.2.x
 - lib/active_decorator.rb
 - lib/active_decorator/decorator.rb
 - lib/active_decorator/helpers.rb
@@ -42,48 +45,59 @@ files:
 - lib/generators/rspec/templates/decorator_spec.rb
 - lib/generators/test_unit/decorator_generator.rb
 - lib/generators/test_unit/templates/decorator_test.rb
+- spec/controllers/fake_detection_spec.rb
 - spec/fake_app/authors/index.html.erb
 - spec/fake_app/authors/show.html.erb
+- spec/fake_app/authors/show.json.jbuilder
 - spec/fake_app/books/_book.html.erb
+- spec/fake_app/books/_book.json.jbuilder
 - spec/fake_app/books/_book_locals.html.erb
+- spec/fake_app/books/index.html.erb
 - spec/fake_app/books/show.html.erb
 - spec/fake_app/fake_app.rb
+- spec/fake_app/movies/show.html.erb
 - spec/features/action_view_helpers_spec.rb
 - spec/features/controller_ivar_spec.rb
+- spec/features/jbuilder_spec.rb
 - spec/features/partial_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/amatsuda/active_decorator
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: active_decorator
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple and Rubyish view helper for Rails 3
 test_files:
+- spec/controllers/fake_detection_spec.rb
 - spec/fake_app/authors/index.html.erb
 - spec/fake_app/authors/show.html.erb
+- spec/fake_app/authors/show.json.jbuilder
 - spec/fake_app/books/_book.html.erb
+- spec/fake_app/books/_book.json.jbuilder
 - spec/fake_app/books/_book_locals.html.erb
+- spec/fake_app/books/index.html.erb
 - spec/fake_app/books/show.html.erb
 - spec/fake_app/fake_app.rb
+- spec/fake_app/movies/show.html.erb
 - spec/features/action_view_helpers_spec.rb
 - spec/features/controller_ivar_spec.rb
+- spec/features/jbuilder_spec.rb
 - spec/features/partial_spec.rb
 - spec/spec_helper.rb