draper 0.18.0 → 1.0.0.beta1

data/.gitignore

@@ -6,8 +6,11 @@ pkg/*
 coverage.data
 coverage/*
 .yardoc
+doc/*
 tmp
 vendor/bundle
 *.swp
 *.swo
 *.DS_Store
+spec/dummy/log/*
+spec/dummy/db/*.sqlite3

data/.travis.yml

@@ -1,4 +1,9 @@
+language: ruby
 rvm:
   - 1.9.3
   - rbx-19mode
   - jruby-19mode
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/CHANGELOG.markdown

@@ -1,5 +1,13 @@
 # Draper Changelog
 
+## 0.18.0
+
+* [Adds the ability to decorate an enumerable proxy](https://github.com/drapergem/draper/commit/67c7125192740a7586a3a635acd735ae01b97837)
+
+* Many bug fixes.
+
+* Last version of Draper in the 0.x series.
+
 ## 0.17.0
 
 * [Fix earlier fix of `view_context` priming](https://github.com/jcasimir/draper/commit/5da44336)

data/Gemfile

@@ -1,3 +1,7 @@
 source :rubygems
 
 gemspec
+
+gem "sqlite3", :platforms => :ruby
+
+gem "activerecord-jdbcsqlite3-adapter",   :platforms => :jruby

data/Rakefile

@@ -1,47 +1,66 @@
-require 'bundler/gem_tasks'
 require 'rake'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-RCOV = RUBY_VERSION.to_f == 1.8
+def run_in_dummy_app(command)
+  success = system("cd spec/dummy && #{command}")
+  raise "#{command} failed" unless success
+end
+
+task "default" => "ci"
+
+desc "Run all tests for CI"
+task "ci" => "spec"
 
-namespace :spec do
+desc "Run all specs"
+task "spec" => "spec:all"
 
-  RSpec::Core::RakeTask.new(:coverage) do |t|
-    t.pattern = 'spec/**/*_spec.rb'
+namespace "spec" do
+  task "all" => ["draper", "generators", "minitest-rails", "integration"]
 
-    if RCOV
-      t.rcov = true
-      t.rcov_opts = '--exclude osx\/objc,spec,gems\/'
+  def spec_task(name)
+    desc "Run #{name} specs"
+    RSpec::Core::RakeTask.new(name) do |t|
+      t.pattern = "spec/#{name}/**/*_spec.rb"
     end
   end
 
-  RSpec::Core::RakeTask.new(:normal) do |t|
-    t.pattern ='spec/**/*_spec.rb'
-    t.rcov = false
-  end
+  spec_task "draper"
+  spec_task "generators"
+  spec_task "minitest-rails"
 
-  namespace :coverage do
-    desc "Cleanup coverage data"
-    task :cleanup do
-      rm_rf 'coverage.data'
-      rm_rf 'coverage'
-    end
+  desc "Run integration specs"
+  task "integration" => ["db:setup", "integration:all"]
 
-    desc "Browse the code coverage report."
-    task :report => ["spec:coverage:cleanup", "spec:coverage"] do
-      if RCOV
-        require "launchy"
-        Launchy.open("coverage/index.html")
-      else
-        require 'cover_me'
-        CoverMe.complete!
+  namespace "integration" do
+    task "all" => ["development", "production", "test"]
+
+    ["development", "production"].each do |environment|
+      task environment do
+        Rake::Task["spec:integration:run"].execute environment
       end
     end
-  end
 
-end
+    task "run" do |t, environment|
+      puts "Running integration specs in #{environment}"
+
+      ENV["RAILS_ENV"] = environment
+      success = system("rspec spec/integration")
 
-desc "RSpec tests"
-task "spec" => "spec:normal"
+      raise "Integration specs failed in #{environment}" unless success
+    end
 
-task "default" => "spec"
+    task "test" do
+      run_in_dummy_app "rake"
+    end
+  end
+end
+
+namespace "db" do
+  desc "Set up databases for integration testing"
+  task "setup" do
+    run_in_dummy_app "rm -f db/*.sqlite3"
+    run_in_dummy_app "RAILS_ENV=development rake db:schema:load db:seed db:test:prepare"
+    run_in_dummy_app "RAILS_ENV=production rake db:schema:load db:seed"
+  end
+end

data/Readme.markdown

@@ -1,6 +1,7 @@
 # Draper: View Models for Rails
 
-[![TravisCI Build Status](https://secure.travis-ci.org/jcasimir/draper.png)](http://travis-ci.org/jcasimir/draper)
+[![TravisCI Build Status](https://secure.travis-ci.org/drapergem/draper.png?branch=master)](http://travis-ci.org/drapergem/draper)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/drapergem/draper)
 
 ## Quick Start
 
@@ -11,11 +12,9 @@
   1. `h` to proxy to Rails/application helpers like `h.current_user`
   2. the name of your decorated model to access the wrapped object like `article.created_at`
 5. Wrap models in your controller with the decorator using:
-  1. `.find` automatic lookup & wrap
-    ex: `ArticleDecorator.find(1)`
-  2. `.decorate` method with a single object or collection, 
+  1. `.decorate` method with a single object or collection,
     ex: `ArticleDecorator.decorate(Article.all)`
-  3. `.new` method with single object
+  2. `.new` method with single object
     ex: `ArticleDecorator.new(Article.first)`
 6. Call decorator methods from your view templates
   ex: `<%= @article_decorator.created_at %>`
@@ -23,7 +22,7 @@
 If you need common methods in your decorators, create an `app/decorators/application_decorator.rb`:
 
 ``` ruby
-class ApplicationDecorator < Draper::Base
+class ApplicationDecorator < Draper::Decorator
   # your methods go here
 end
 ```
@@ -45,9 +44,7 @@ Why hate normal helpers? In Ruby/Rails we approach everything from an Object-Ori
 A decorator wraps an object with presentation-related accessor methods. For instance, if you had an `Article` object, then the decorator could override `.published_at` to use formatted output like this:
 
 ```ruby
-class ArticleDecorator < Draper::Base
-  decorates :article
-
+class ArticleDecorator < Draper::Decorator
   def published_at
     date = h.content_tag(:span, article.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
     time = h.content_tag(:span, article.published_at.strftime("%l:%M%p"), :class => 'time').delete(" ")
@@ -68,8 +65,6 @@ When you use a decorator you have the power of a Ruby object but it's a part of
 
 ```ruby
 class ArticleDecorator < ApplicationDecorator
-  decorates :article
-  
   ADMIN_VISIBLE_ATTRIBUTES = [:title, :body, :author, :status]
   PUBLIC_VISIBLE_ATTRIBUTES = [:title, :body]
 
@@ -90,7 +85,6 @@ The `denies` method takes a blacklist approach. For instance:
 
 ```ruby
 class ArticleDecorator < ApplicationDecorator
-  decorates :article
   denies :title
 end
 ```
@@ -98,11 +92,19 @@ end
 Then, to test it:
 
 ```irb
- > ad = ArticleDecorator.find(1)
- => #<ArticleDecorator:0x000001020d7728 @model=#<Article id: 1, title: "Hello, World">> 
+ > ad = ArticleDecorator.new(Article.find(1))
+ => #<ArticleDecorator:0x000001020d7728 @model=#<Article id: 1, title: "Hello, World">>
  > ad.title
 NoMethodError: undefined method `title' for #<ArticleDecorator:0x000001020d7728>
-``` 
+```
+
+You may also blacklist all methods by using `denies_all`:
+
+```ruby
+class ArticleDecorate < ApplicationDecorator
+  denies_all
+end
+```
 
 #### Using `allows`
 
@@ -110,14 +112,13 @@ A better approach is to define a whitelist using `allows`:
 
 ```ruby
 class ArticleDecorator < ApplicationDecorator
-  decorates :article
   allows :title, :description
 end
 ```
 
 ```irb
-> ad = ArticleDecorator.find(1)
-=> #<ArticleDecorator:0x000001020d7728 @model=#<Article id: 1, title: "Hello, World">> 
+> ad = ArticleDecorator.new(Article.find(1))
+=> #<ArticleDecorator:0x000001020d7728 @model=#<Article id: 1, title: "Hello, World">>
 > ad.title
 => "Hello, World"
 > ad.created_at
@@ -146,14 +147,12 @@ rails generate decorator article
 
 ### Writing Methods
 
-Open the decorator model (ex: `app/decorators/article_decorator.rb`) and add normal instance methods. To access the wrapped source object, use a method named after the `decorates` argument:
+Open the decorator model (ex: `app/decorators/article_decorator.rb`) and add normal instance methods. To access the wrapped source object, use the `model` method:
 
 ```ruby
-class ArticleDecorator < Draper::Base
-  decorates :article
-  
+class ArticleDecorator < Draper::Decorator
   def author_name
-    article.author.first_name + " " + article.author.last_name
+    model.author.first_name + " " + model.author.last_name
   end
 end
 ```
@@ -163,9 +162,7 @@ end
 You probably want to make use of Rails helpers and those defined in your application. Use the `helpers` or `h` method proxy:
 
 ```ruby
-class ArticleDecorator < Draper::Base
-  decorates :article
-  
+class ArticleDecorator < Draper::Decorator
   def published_at
     date = h.content_tag(:span, article.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
     time = h.content_tag(:span, article.published_at.strftime("%l:%M%p"), :class => 'time').delete(" ")
@@ -179,10 +176,9 @@ end
 Hate seeing that `h.` proxy all over? Willing to mix a bazillion methods into your decorator? Then try lazy helpers:
 
 ```ruby
-class ArticleDecorator < Draper::Base
-  decorates :article
+class ArticleDecorator < Draper::Decorator
   include Draper::LazyHelpers
-  
+
   def published_at
     date = content_tag(:span, article.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
     time = content_tag(:span, article.published_at.strftime("%l:%M%p"), :class => 'time').delete(" ")
@@ -207,12 +203,6 @@ ArticleDecorator.new(Article.find(params[:id]))
 ArticleDecorator.decorate(Article.first) # Returns one instance of ArticleDecorator
 ArticleDecorator.decorate(Article.all)   # Returns an enumeration proxy of ArticleDecorator instances
 ```
-  
-* Call `.find` to automatically do a lookup on the `decorates` class:
-
-```ruby
-ArticleDecorator.find(1)
-```
 
 ### In Your Views
 
@@ -224,11 +214,11 @@ Use the new methods in your views like any other model method (ex: `@article.pub
 
 ### Integration with RSpec
 
-Using the provided generator, Draper will place specs for your new decorator in `spec/decorators/`. 
+Using the provided generator, Draper will place specs for your new decorator in `spec/decorators/`.
 
 By default, specs in `spec/decorators` will be tagged as `type => :decorator`. Any spec tagged as `decorator` will make helpers available to the decorator.
 
-If your decorator specs live somewhere else, which they shouldn't, make sure to tag them with `type => :decorator`. If you don't tag them, Draper's helpers won't be available to your decorator while testing. 
+If your decorator specs live somewhere else, which they shouldn't, make sure to tag them with `type => :decorator`. If you don't tag them, Draper's helpers won't be available to your decorator while testing.
 
 Note: If you're using Spork, you need to `require 'draper/test/rspec_integration'` in your Spork.prefork block.
 
@@ -284,7 +274,7 @@ Then you need to perform the wrapping in your controller. Here's the simplest me
 ```ruby
 class ArticlesController < ApplicationController
   def show
-    @article = ArticleDecorator.find params[:id]
+    @article = ArticleDecorator.new(Article.find(params[:id]))
   end
 end
 ```
@@ -298,9 +288,7 @@ Then within your views you can utilize both the normal data methods and your new
 Ta-da! Object-oriented data formatting for your view layer. Below is the complete decorator with extra comments removed:
 
 ```ruby
-class ArticleDecorator < Draper::Base
-  decorates :article
-  
+class ArticleDecorator < Draper::Decorator
   def published_at
     date = h.content_tag(:span, article.published_at.strftime("%A, %B %e").squeeze(" "), :class => 'date')
     time = h.content_tag(:span, article.published_at.strftime("%l:%M%p"), :class => 'time').delete(" ")
@@ -314,14 +302,11 @@ end
 Add a `decorates_association :association_name` to gain access to a decorated version of your target association.
 
 ```ruby
-class ArticleDecorator < Draper::Base
-  decorates :article
-  decorates_association :author # belongs_to :author association  
+class ArticleDecorator < Draper::Decorator
+  decorates_association :author # belongs_to :author association
 end
 
-class AuthorDecorator < Draper::Base
-  decorates :author
-  
+class AuthorDecorator < Draper::Decorator
   def fancy_name
     "#{model.title}. #{model.first_name} #{model.middle_name[0]}. #{model.last_name}"
   end
@@ -346,7 +331,6 @@ end
 
 # app/decorators/user_decorator.rb
 class UserDecorator < ApplicationDecorator
-  decorates :user
 end
 ```
 
@@ -366,6 +350,16 @@ For automatic decoration, check out [decorates_before_rendering](https://github.
 4. Push to the branch (`git push origin my_awesome_branch`)
 5. Send pull request
 
+## Running tests
+
+If it's the first time you want to run the tests, start by creating the dummy database:
+
+```
+$ rake db:migrate
+```
+
+You can then run tests by executing `rake`.
+
 ## Contributors
 
 Draper was conceived by Jeff Casimir and heavily refined by Steve Klabnik and a great community of open source contributors.

data/draper.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Draper::VERSION
   s.authors     = ["Jeff Casimir", "Steve Klabnik"]
   s.email       = ["jeff@casimircreative.com", "steve@steveklabnik.com"]
-  s.homepage    = "http://github.com/jcasimir/draper"
+  s.homepage    = "http://github.com/drapergem/draper"
   s.summary     = "Decorator pattern implementation for Rails."
   s.description = "Draper implements a decorator or presenter pattern for Rails applications."
   s.rubyforge_project = "draper"
@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard'
   s.add_development_dependency 'minitest-rails', '~> 0.2'
   s.add_development_dependency 'minitest', '~> 3.0' if RUBY_PLATFORM == "java"
+  s.add_development_dependency 'capybara'
 end

data/lib/draper.rb

@@ -1,16 +1,51 @@
 require 'action_view'
 
 require 'draper/version'
-require 'draper/system'
-require 'draper/active_model_support'
-require 'draper/base'
+require 'draper/view_helpers'
+require 'draper/finders'
+require 'draper/decorator'
+require 'draper/helper_proxy'
 require 'draper/lazy_helpers'
-require 'draper/model_support'
+require 'draper/decoratable'
+require 'draper/decorated_association'
+require 'draper/security'
 require 'draper/helper_support'
 require 'draper/view_context'
-require 'draper/decorated_enumerable_proxy'
+require 'draper/collection_decorator'
 require 'draper/railtie' if defined?(Rails)
 
 # Test Support
-require 'draper/test/rspec_integration'    if defined?(RSpec) and RSpec.respond_to?(:configure)
-require 'draper/test/minitest_integration' if defined?(MiniTest::Rails)
+require 'draper/test/rspec_integration'     if defined?(RSpec) and RSpec.respond_to?(:configure)
+require 'draper/test/minitest_integration'  if defined?(MiniTest::Rails)
+require 'draper/test/test_unit_integration'
+
+module Draper
+  def self.setup_action_controller(base)
+    base.class_eval do
+      include Draper::ViewContext
+      extend  Draper::HelperSupport
+      before_filter ->(controller) {
+        Draper::ViewContext.current = nil
+        Draper::ViewContext.current_controller = controller
+      }
+    end
+  end
+
+  def self.setup_action_mailer(base)
+    base.class_eval do
+      include Draper::ViewContext
+    end
+  end
+
+  def self.setup_active_record(base)
+    base.class_eval do
+      include Draper::Decoratable
+    end
+  end
+
+  class UninferrableDecoratorError < NameError
+    def initialize(klass)
+      super("Could not infer a decorator for #{klass}.")
+    end
+  end
+end

data/lib/draper/collection_decorator.rb

@@ -0,0 +1,88 @@
+module Draper
+  class CollectionDecorator
+    include Enumerable
+    include ViewHelpers
+
+    attr_accessor :source, :options, :decorator_class
+    alias_method :to_source, :source
+
+    delegate :as_json, *(Array.instance_methods - Object.instance_methods), to: :decorated_collection
+
+    # @param source collection to decorate
+    # @param options [Hash] passed to each item's decorator (except
+    #   for the keys listed below)
+    # @option options [Class,Symbol] :with the class used to decorate
+    #   items, or `:infer` to call each item's `decorate` method instead
+    def initialize(source, options = {})
+      @source = source
+      @decorator_class = options.delete(:with) || self.class.inferred_decorator_class
+      @options = options
+    end
+
+    class << self
+      alias_method :decorate, :new
+    end
+
+    def decorated_collection
+      @decorated_collection ||= source.collect {|item| decorate_item(item) }
+    end
+
+    def find(*args, &block)
+      if block_given?
+        decorated_collection.find(*args, &block)
+      else
+        decorator_class.find(*args)
+      end
+    end
+
+    def method_missing(method, *args, &block)
+      source.send(method, *args, &block)
+    end
+
+    def respond_to?(method, include_private = false)
+      super || source.respond_to?(method, include_private)
+    end
+
+    def kind_of?(klass)
+      super || source.kind_of?(klass)
+    end
+    alias_method :is_a?, :kind_of?
+
+    def ==(other)
+      source == (other.respond_to?(:source) ? other.source : other)
+    end
+
+    def to_s
+      "#<CollectionDecorator of #{decorator_class} for #{source.inspect}>"
+    end
+
+    def options=(options)
+      each {|item| item.options = options }
+      @options = options
+    end
+
+    protected
+
+    def decorate_item(item)
+      if decorator_class == :infer
+        item.decorate(options)
+      else
+        decorator_class.decorate(item, options)
+      end
+    end
+
+    def self.inferred_decorator_class
+      decorator_name = "#{name.chomp("Decorator").singularize}Decorator"
+      decorator_uninferrable if decorator_name == name
+
+      decorator_name.constantize
+
+    rescue NameError
+      decorator_uninferrable
+    end
+
+    def self.decorator_uninferrable
+      raise Draper::UninferrableDecoratorError.new(self)
+    end
+  end
+end