presenting 1.0.0 → 2.0.0

data/app/controllers/presentation/assets_controller.rb

@@ -26,7 +26,7 @@ class Presentation::AssetsController < ActionController::Base
   # - - required fields
   # TODO: tests for ujs
   def javascript
-    dir = asset_path(:javascript)
+    dir = asset_path(:javascripts)
     script = params[:id].split(',').collect{ |id| File.read("#{dir}/#{id}.js") }.join("\n")
     
     respond_to do |type|

data/app/views/presentations/_details.erb

@@ -5,7 +5,7 @@
   <dl>
     <% @details.fields.each do |field| %>
       <dt><%= field.name %></dt>
-      <dd><%= present(field.value_from(@details.presentable), :h => field.sanitize?) %></dd>
+      <dd><%= present(field.value_from(@details.presentable), :raw => !field.sanitize?) %></dd>
     <% end %>
   </dl>
 </div>

data/app/views/presentations/_field_search.erb

@@ -1,5 +1,5 @@
 <div class="presentation-search">
-  <% form_tag @search.url, :method => :get, :class => ("compact" if @search.compact) do %>
+  <%= form_tag @search.url, :method => :get, :class => ("compact" if @search.compact) do %>
     <% @search.fields.each do |field| %>
       <fieldset>
         <label><%= field.name %></label>

data/app/views/presentations/_form.erb

@@ -1,4 +1,4 @@
-<% form_for @form.presentable, :url => @form.url, :method => @form.method, :html => @form.html do |f| %>
+<%= form_for @form.presentable, :url => @form.url, :method => @form.method, :html => @form.html do |f| %>
   <% @form.groups.each do |group| %>
     <fieldset>
       <% unless group.name.blank? %>

data/app/views/presentations/_grid.erb

@@ -41,7 +41,7 @@
           <tr class="<%= cycle('odd', 'even') %>">
             <% @grid.fields.each do |field| %>
               <td class="<%= [field.id, ('sorted' if field.is_sorted?(request))].compact.join(' ') %>">
-                <%= present(field.value_from(record), :h => field.sanitize?) %>
+                <%= present(field.value_from(record), :raw => !field.sanitize?) %>
               </td>
             <% end %>
             <% unless @grid.record_links.empty? %>

data/app/views/presentations/_search.erb

@@ -1,5 +1,5 @@
 <div class="presentation-search">
-  <% form_tag @search.url, :method => :get do %>
+  <%= form_tag @search.url, :method => :get do %>
     <%= text_field_tag 'search', params[:search] %>
     <input type="submit" value="Search" class="submit" />
     <%= link_to 'reset', @search.url %>

data/config/routes.rb

@@ -1,3 +1,8 @@
-ActionController::Routing::Routes.draw do |map|
-  Presenting.draw_routes(map)
+Rails.application.routes.draw do
+  namespace :presentation do
+    controller 'assets' do
+      match 'stylesheets/:id.:format', :as => 'stylesheet', :action => 'stylesheet', :constraints => {:format => 'css'}
+      match 'javascript/:id.:format', :as => 'javascript', :action => 'javascript', :constraints => {:format => 'js'}
+    end
+  end
 end

data/lib/presentation/base.rb

@@ -1,48 +1,31 @@
 module Presentation
   class Base
     include Presenting::Configurable
-    
+
     def render
       view.render :partial => "presentations/#{self.class.to_s.split('::').last.underscore}"
     end
-    
+
     attr_accessor :presentable
-    
-    ##
-    ## begin ActionView compat
-    ##
-    
-    attr_accessor :controller # not strictly for compat, but it makes the compat easy
-    
-    def request
-      controller.request
-    end
-    
-    def url_for(*args)
-      controller.url_for(*args)
-    end
-    
-    def params
-      request.parameters
-    end
-    
-    ## end ActionView compat
-    
+
+    attr_accessor :controller
+    delegate :request, :form_authenticity_token, :url_for, :params, :to => 'controller'
+
     protected
-    
+
     # what the presentation is called in its templates
     def iname
       :presentation
     end
-    
+
     # a reference to the view
     def view #:nodoc:
       @view ||= Presenting::View.new(ActionController::Base.view_paths, assigns_for_view, self)
     end
-    
+
     def assigns_for_view
       {iname => self, :_request => request}
     end
-    
+
   end
 end

data/lib/presentation/details.rb

@@ -1,3 +1,5 @@
+require 'presentation/grid'
+
 module Presentation
   # TODO: abstract what's common between Record and Grid into a shared module or reusable objects or something
   class Details < Grid

data/lib/presentation/field_search.rb

@@ -1,3 +1,5 @@
+require 'presentation/search'
+
 module Presentation
   class FieldSearch < Search
     # This method supports the configuration-on-initialization paradigm. It makes:

data/lib/presentation/grid.rb

@@ -154,7 +154,7 @@ module Presentation
     end
     
     def paginate?
-      defined? WillPaginate and presentable.is_a?(WillPaginate::Collection)
+      defined? WillPaginate and (presentable.is_a? WillPaginate::Collection or presentable.respond_to?(:total_entries))
     end
   end
 end

data/lib/presenting/engine.rb

@@ -0,0 +1,7 @@
+module Presenting
+  class Engine < Rails::Engine
+    initializer "presenting.precache" do |app|
+      Presenting.precache!
+    end
+  end
+end

data/lib/presenting/form_helpers.rb

@@ -40,7 +40,7 @@ module Presenting::FormHelpers
     field.type_options.collect do |(display, value)|
       label("#{field.name}_#{value}", display) +
       radio_button(field.name, value)
-    end.join
+    end.join.html_safe
   end
   
   private

data/lib/presenting/helpers.rb

@@ -1,11 +1,15 @@
 module Presenting
   module Helpers
     def presentation_stylesheets(*args)
-      stylesheet_link_tag presentation_stylesheet_path(args.sort.join(','))
+      warn "[DEPRECATION] presentation_stylesheets is deprecated. Please use the stylesheets" <<
+           "that are copied to public/stylesheets/presenting/* on boot."
+      stylesheet_link_tag presentation_stylesheet_path(args.sort.join(','), :format => 'css')
     end
     
     def presentation_javascript(*args)
-      javascript_include_tag presentation_javascript_path(args.sort.join(','))
+      warn "[DEPRECATION] presentation_javascript is deprecated. Please use the javascripts" <<
+           "that are copied to public/javascripts/presenting/* on boot."
+      javascript_include_tag presentation_javascript_path(args.sort.join(','), :format => 'js')
     end
     
     def present(*args, &block)
@@ -103,7 +107,7 @@ module Presenting
         l(object, :format => :default)
         
         else
-        options[:h] ? h(object.to_s) : object.to_s
+        options[:raw] ? object.to_s.html_safe : object.to_s
       end 
     end
   end

data/lib/presenting/view.rb

@@ -1,3 +1,3 @@
-class Presenting::View < ActionView::Base
-  delegate :protect_against_forgery?, :form_authenticity_token, :to => :controller
-end
+class Presenting::View < ActionView::Base
+  delegate :protect_against_forgery?, :form_authenticity_token, :url_for, :to => :controller
+end

data/lib/presenting.rb

@@ -1,9 +1,42 @@
+require 'action_view'
+require 'action_controller'
+require 'presenting/engine'
+
 module Presenting
-  # prior to Rails 2.3, you need to call this manually from your config/routes.rb
-  def self.draw_routes(map)
-    map.namespace(:presentation) do |presentation|
-      presentation.stylesheet 'stylesheets/:id.css', :controller => 'assets', :action => 'stylesheet', :format => 'css'
-      presentation.javascript 'javascript/:id.js', :controller => 'assets', :action => 'javascript', :format => 'js'
+  autoload :Attribute, 'presenting/attribute'
+  autoload :Configurable, 'presenting/configurable'
+  autoload :Defaults, 'presenting/defaults'
+  autoload :FieldSet, 'presenting/field_set'
+  autoload :FormHelpers, 'presenting/form_helpers'
+  autoload :Helpers, 'presenting/helpers'
+  autoload :Sanitize, 'presenting/sanitize'
+  autoload :Search, 'presenting/search'
+  autoload :Sorting, 'presenting/sorting'
+  autoload :View, 'presenting/view'
+
+  # copies all assets into the application's public directory
+  # public/stylesheets/presenting and public/javascripts/presenting
+  def self.precache!
+    presenting_dir = __FILE__.sub(/\/lib\/.*/, '') # there must be a better way
+    %w(stylesheets javascripts).each do |asset_type|
+      source_dir = File.join(presenting_dir, 'app', 'assets', asset_type)
+      target_dir = File.join(Rails.application.paths.public.send(asset_type).first, 'presenting')
+      FileUtils.mkdir_p(target_dir)
+
+      Dir[File.join(source_dir, '*')].each do |asset|
+        FileUtils.cp(asset, File.join(target_dir, File.basename(asset)))
+      end
     end
   end
 end
+
+module Presentation
+  autoload :Base, 'presentation/base'
+end
+
+Dir[File.join(File.dirname(__FILE__), 'presentation', '*')].each { |path| require path }
+
+ActionView::Base.class_eval { include Presenting::Helpers }
+ActionController::Base.const_set(:Search, Presenting::Search)
+ActionController::Base.const_set(:Sorting, Presenting::Sorting)
+ActionView::Helpers::FormBuilder.class_eval { include Presenting::FormHelpers }

data/test/assets_test.rb

@@ -1,6 +1,4 @@
 require File.dirname(__FILE__) + '/test_helper'
-require 'action_controller/test_case'
-require 'action_controller/integration'
 
 class Presentation::AssetsControllerTest < ActionController::TestCase
 
@@ -25,14 +23,14 @@ class Presentation::AssetsControllerTest < ActionController::TestCase
   def test_retrieving_a_named_stylesheet
     get :stylesheet, :id => 'grid', :format => 'css'
     assert_response :success
-    assert_equal @response.body, File.read(File.join(PLUGIN_ROOT, 'app', 'assets', 'stylesheets', 'grid.css'))
+    assert_equal @response.body, File.read(File.join('app', 'assets', 'stylesheets', 'grid.css'))
   end
   
   def test_retrieving_multiple_named_stylesheets
     get :stylesheet, :id => 'grid,form', :format => 'css'
     assert_response :success
-    assert @response.body.include?(File.read(File.join(PLUGIN_ROOT, 'app', 'assets', 'stylesheets', 'grid.css')))
-    assert @response.body.include?(File.read(File.join(PLUGIN_ROOT, 'app', 'assets', 'stylesheets', 'form.css')))
+    assert @response.body.include?(File.read(File.join('app', 'assets', 'stylesheets', 'grid.css')))
+    assert @response.body.include?(File.read(File.join('app', 'assets', 'stylesheets', 'form.css')))
   end
   
   # javascript
@@ -52,7 +50,7 @@ class Presentation::AssetsControllerTest < ActionController::TestCase
   def test_retrieving_multiple_named_javascripts
     get :javascript, :id => 'grid,search', :format => 'js'
     assert_response :success
-    assert @response.body.include?(File.read(File.join(PLUGIN_ROOT, 'app', 'assets', 'javascript', 'grid.js')))
-    assert @response.body.include?(File.read(File.join(PLUGIN_ROOT, 'app', 'assets', 'javascript', 'search.js')))
+    assert @response.body.include?(File.read(File.join('app', 'assets', 'javascripts', 'grid.js')))
+    assert @response.body.include?(File.read(File.join('app', 'assets', 'javascripts', 'search.js')))
   end
 end

data/test/details_test.rb

@@ -28,7 +28,7 @@ class DetailsRenderTest < Presentation::RenderTest
   def setup
     @presentation = Presentation::Details.new
     @presentation.presentable = stub('user', :name => 'foo', :email => 'foo@example.com')
-    @presentation.controller = TestController.new
+    @presentation.controller = ActionView::TestCase::TestController.new
   end
   
   def test_rendering_a_title

data/test/field_search_test.rb

@@ -47,7 +47,7 @@ end
 class FieldSearchRenderingTest < Presentation::RenderTest
   def setup
     @presentation = Presentation::FieldSearch.new
-    @presentation.controller = TestController.new
+    @presentation.controller = ActionView::TestCase::TestController.new
     @presentation.controller.request.path = '/users'
   end