draper 0.7.4 → 0.8.0

data/.gitignore

@@ -5,4 +5,5 @@ Gemfile.lock
 pkg/*
 coverage.data
 coverage/*
-.yardoc
+.yardoc
+tmp

data/Gemfile

@@ -1,14 +1,13 @@
 source :rubygems
 
 gem 'rake'
-gem 'rspec', '~> 2.0.1'
+gem 'rspec', '~> 2.0'
 gem 'activesupport', '~> 3.0.10'
 gem 'actionpack', "~> 3.0.10", :require => 'action_view'
+gem 'ammeter', '~> 0.1.3', :require => 'ammeter/init'
 gem 'guard'
 gem 'guard-rspec'
 gem 'launchy'  
-gem 'rcov', :platforms => [:mri_18]
-gem 'cover_me', '>= 1.0.0.rc6', :platforms => [:mri_19]  
 gem 'yard'
 
 gemspec

data/Readme.markdown

@@ -1,5 +1,7 @@
 # Draper: View Models for Rails
 
+![TravisCI Build Status](https://secure.travis-ci.org/jcasimir/draper.png)
+
 ## Quick Start
 
 1. Add `gem 'draper'` to your `Gemfile` and `bundle`
@@ -319,7 +321,6 @@ end
   * Add YARD documentation to source
   * Add a section about contributing
 * Generators
-  * Test coverage for generators (help!)
   * Implement hook so generating a controller/scaffold generates a decorator  
   * Add generators for...
     * `draper:model`: Model + Decorator

data/lib/draper.rb

@@ -1,8 +1,8 @@
 require "draper/version"
 require 'draper/system'
-require 'draper/all_helpers'
 require 'draper/base'
 require 'draper/lazy_helpers'
 require 'draper/model_support'
+require 'draper/view_context'
 
 Draper::System.setup

data/lib/draper/base.rb

@@ -101,7 +101,7 @@ module Draper
     #
     # @return [Object] proxy   
     def helpers
-      @helpers ||= ApplicationController::all_helpers
+      Thread.current[:current_view_context]
     end
     alias :h :helpers
 

data/lib/draper/system.rb

@@ -1,7 +1,7 @@
 module Draper
   class System    
     def self.setup
-      ActionController::Base.send(:extend, Draper::AllHelpers) if defined?(ActionController::Base)
+      ActionController::Base.send(:include, Draper::ViewContext) if defined?(ActionController::Base)
     end
   end
 end

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = "0.7.4"
+  VERSION = "0.8.0"
 end

data/lib/draper/view_context.rb

@@ -0,0 +1,11 @@
+module Draper
+  module ViewContext
+    def set_current_view_context
+      Thread.current[:current_view_context] ||= self.view_context
+    end
+    
+    def self.included(source)
+      source.send(:before_filter, :set_current_view_context)
+    end
+  end
+end

data/spec/base_spec.rb

@@ -2,9 +2,16 @@ require 'spec_helper'
 require 'draper'
 
 describe Draper::Base do
+  before(:each){ ApplicationController.new.set_current_view_context }
   subject{ Draper::Base.new(source) }
   let(:source){ Product.new }
 
+  context(".helpers") do
+    it "should have a valid view_context" do
+      subject.helpers.should be
+    end    
+  end
+
   context(".lazy_helpers") do
     it "makes Rails helpers available without using the h. proxy" do
       Draper::Base.lazy_helpers
@@ -43,10 +50,9 @@ describe Draper::Base do
 
   context("selecting methods") do
     it "echos the methods of the wrapped class except default exclusions" do
-      pending "Fine on 1.9 but fails on 1.8 due to differences in implementation of respond_to and method_missing. Help?"
       source.methods.each do |method|
         unless Draper::Base::DEFAULT_DENIED.include?(method)        
-          subject.should respond_to(method)
+          subject.should respond_to(method.to_sym)
         end
       end
     end

data/spec/generators/draper/decorator/decorator_generator_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+# Generators are not automatically loaded by Rails
+require 'generators/draper/decorator/decorator_generator'
+
+describe Draper::DecoratorGenerator do
+  # Tell the generator where to put its output (what it thinks of as Rails.root)
+  destination File.expand_path("../../../../../tmp", __FILE__)
+
+  before { prepare_destination }
+
+  describe 'no arguments' do
+    before { run_generator %w(products)  }
+
+    describe 'app/decorators/application_decorator.rb' do
+      subject { file('app/decorators/application_decorator.rb') }
+      it { should exist }
+      it { should contain "class ApplicationDecorator < Draper::Base" }
+    end
+
+    describe 'app/decorators/products_decorator.rb' do
+      subject { file('app/decorators/products_decorator.rb') }
+      it { should exist }
+      it { should contain "class ProductsDecorator < ApplicationDecorator" }
+    end
+
+  end
+end

data/spec/samples/application_controller.rb

@@ -1,10 +1,32 @@
-class ApplicationController
+module ActionController
+  class Base
+    @@before_filters = []
+    def self.before_filters
+      @@before_filters
+    end
+    def self.before_filter(name)
+      @@before_filters << name
+    end
+  end
+end
+
+class ApplicationController < ActionController::Base
   extend ActionView::Helpers
   extend ActionView::Helpers::TagHelper
   extend ActionView::Helpers::UrlHelper
-  extend ApplicationHelper
-
-  def self.all_helpers
-    self
+  extend ApplicationHelper    
+  
+  def view_context
+    @view_context ||= ApplicationController
   end
-end
+  
+  def view_context=(input)
+    @view_context = input
+  end
+  
+  def self.hello
+    "Hello!"
+  end
+end
+
+Draper::System.setup

data/spec/spec_helper.rb

@@ -1,8 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 Bundler.require
-require 'draper'
 require './spec/samples/application_helper.rb'
 Dir.glob(['./spec/samples/*.rb', './spec/support/*.rb']) do |file| 
   require file
-end
+end

data/spec/view_context_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+require 'draper'
+
+describe Draper::ViewContext do
+  let (:app_controller) do
+    ApplicationController
+  end
+  
+  let (:app_controller_instance) do
+    app_controller.new
+  end
+  
+  it "implements #set_current_view_context" do
+    app_controller_instance.should respond_to(:set_current_view_context)
+  end
+  
+  it "calls #before_filter with #set_current_view_context" do
+    app_controller.before_filters.should include(:set_current_view_context)
+  end
+  
+  it "raises an exception if the view_context is fetched without being set" do
+    Thread.current[:current_view_context] = nil
+    expect {app_controller.current_view_context}.should raise_exception(Exception)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00.000000000Z
+date: 2011-10-08 00:00:00.000000000Z
 dependencies: []
 description: Draper reimagines the role of helpers in the view layer of a Rails application,
   allowing an object-oriented approach rather than procedural.
@@ -49,12 +49,12 @@ files:
 - doc/top-level-namespace.html
 - draper.gemspec
 - lib/draper.rb
-- lib/draper/all_helpers.rb
 - lib/draper/base.rb
 - lib/draper/lazy_helpers.rb
 - lib/draper/model_support.rb
 - lib/draper/system.rb
 - lib/draper/version.rb
+- lib/draper/view_context.rb
 - lib/generators/draper/decorator/USAGE
 - lib/generators/draper/decorator/decorator_generator.rb
 - lib/generators/draper/decorator/templates/application_decorator.rb
@@ -62,6 +62,7 @@ files:
 - lib/generators/rails/decorator_generator.rb
 - spec/base_spec.rb
 - spec/draper/model_support_spec.rb
+- spec/generators/draper/decorator/decorator_generator_spec.rb
 - spec/samples/active_record.rb
 - spec/samples/application_controller.rb
 - spec/samples/application_helper.rb
@@ -71,6 +72,7 @@ files:
 - spec/samples/product.rb
 - spec/samples/product_decorator.rb
 - spec/spec_helper.rb
+- spec/view_context_spec.rb
 homepage: http://github.com/jcasimir/draper
 licenses: []
 post_install_message: 
@@ -98,6 +100,7 @@ summary: Decorator pattern implmentation for Rails.
 test_files:
 - spec/base_spec.rb
 - spec/draper/model_support_spec.rb
+- spec/generators/draper/decorator/decorator_generator_spec.rb
 - spec/samples/active_record.rb
 - spec/samples/application_controller.rb
 - spec/samples/application_helper.rb
@@ -107,3 +110,4 @@ test_files:
 - spec/samples/product.rb
 - spec/samples/product_decorator.rb
 - spec/spec_helper.rb
+- spec/view_context_spec.rb

data/lib/draper/all_helpers.rb

@@ -1,50 +0,0 @@
-module Draper
-  module AllHelpers
-    # Most of the black magic here thanks to Xavier Shay (@xshay)
-    # Provide access to helper methods from outside controllers and views,
-    # such as in Presenter objects. Rails provides ActionController::Base.helpers,
-    # but this does not include any of our application helpers.
-    def all_helpers
-      @all_helpers_proxy ||= begin
-        # Start with just the rails helpers. This is the same method used
-        # by ActionController::Base.helpers
-        # proxy = ActionView::Base.new.extend(_helpers)
-        proxy = ActionController::Base.helpers
-
-        # url_for depends on _routes method being defined
-        proxy.instance_eval do
-          def _routes
-            Rails.application.routes
-          end
-        end
-     
-        # Import all named path methods
-        proxy.extend(Rails.application.routes.named_routes.module)
-
-        # Load all our application helpers to extend
-        modules_for_helpers([:all]).each do |mod|
-          proxy.extend(mod)
-        end
-
-        proxy.instance_eval do
-          def controller
-            #Object.controller
-          end
-        end
-
-        proxy.instance_eval do
-          # A hack since this proxy doesn't pick up default_url_options from anywhere
-          def url_for(*args)
-            if args.last.is_a?(Hash) && !args.last[:only_path]
-              args = args.dup
-              args << args.pop.merge('host' => ActionMailer::Base.default_url_options[:host])
-            end
-            super(*args)
-          end
-        end
-
-        proxy
-      end
-    end
-  end
-end