presenting 2.0.1 → 2.0.2

data/lib/presentation/base.rb

@@ -9,7 +9,7 @@ module Presentation
     attr_accessor :presentable
 
     attr_accessor :controller
-    delegate :request, :form_authenticity_token, :url_for, :params, :to => 'controller'
+    delegate :request, :form_authenticity_token, :url_for, :params, :_prefixes, :to => 'controller'
 
     protected
 

data/lib/presentation/form.rb

@@ -122,10 +122,13 @@ module Presentation
       attr_writer :value
       
       def value_from(obj) #:nodoc:
-        v = case value
-          when Symbol: obj.send(value)
-          when String: value
-          when Proc:   value.call(obj)
+        case value
+        when Symbol
+          obj.send(value)
+        when String
+          value
+        when Proc
+          value.call(obj)
         end
       end
       

data/lib/presentation/grid.rb

@@ -59,9 +59,9 @@ module Presentation
       #   Field.new(:sortable => false)
       def sortable=(val)
         @sort_name = case val
-          when TrueClass, FalseClass, NilClass
+        when TrueClass, FalseClass, NilClass
           val
-          else
+        else
           val.to_s
         end
       end

data/lib/presenting/attribute.rb

@@ -32,9 +32,12 @@ module Presenting
     
     def value_from(obj) #:nodoc:
       case value
-        when Symbol: obj.is_a?(Hash) ? obj[value] : obj.send(value)
-        when String: value
-        when Proc:   value.call(obj)
+      when Symbol
+        obj.is_a?(Hash) ? obj[value] : obj.send(value)
+      when String
+        value
+      when Proc
+        value.call(obj)
       end
     end
     

data/lib/presenting/helpers.rb

@@ -84,14 +84,14 @@ module Presenting
     
     def present_by_class(object, options = {})
       case object
-        when Array
+      when Array
         content_tag "ol" do
           object.collect do |i|
             content_tag "li", present(i, options)
           end.join.html_safe
         end
         
-        when Hash
+      when Hash
         # sort by keys
         content_tag "dl" do
           object.keys.sort.collect do |k|
@@ -100,13 +100,13 @@ module Presenting
           end.join.html_safe
         end
         
-        when TrueClass, FalseClass
+      when TrueClass, FalseClass
         object ? "True" : "False"
         
-        when Date, Time, DateTime
+      when Date, Time, DateTime
         l(object, :format => :default)
         
-        else
+      else
         options[:raw] ? object.to_s.html_safe : object.to_s
       end 
     end

data/lib/presenting/sanitize.rb

@@ -5,13 +5,13 @@ module Presenting::Sanitize
     # escape but preserve Arrays and Hashes
     def h(val)
       case val
-        when Array
+      when Array
         val.map{|i| h(i)}
         
-        when Hash
+      when Hash
         val.clone.each{|k, v| val[h(k)] = h(v)}
         
-        else
+      else
         html_escape(val)
       end
     end

data/lib/presenting/search.rb

@@ -19,10 +19,10 @@ module Presenting
     #   })
     def fields=(obj)
       case obj
-        when Array
+      when Array
         obj.each do |name| fields << name end
         
-        when Hash
+      when Hash
         obj.each do |k, v|
           fields << {k => v}
         end 
@@ -166,17 +166,17 @@ module Presenting
       
       def typecast(val)
         case type
-          when :date
+        when :date
           val.is_a?(String) ?
             (Time.zone ? Time.zone.parse(val) : Time.parse(val)).to_date :
             val
           
-          when :time, :datetime
+        when :time, :datetime
           val.is_a?(String) ?
             (Time.zone ? Time.zone.parse(val) : Time.parse(val)) :
             val
 
-          else
+        else
           val.to_s.strip
         end
       end

data/lib/presenting/sorting.rb

@@ -12,10 +12,10 @@ module Presenting
     #   })
     def fields=(obj)
       case obj
-        when Array
+      when Array
         obj.each do |name| fields << name end
         
-        when Hash
+      when Hash
         obj.each do |k, v|
           fields << {k => v}
         end 

data/lib/presenting.rb

@@ -20,7 +20,7 @@ module Presenting
     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')
+      target_dir = File.join(Rails.application.paths["public/#{asset_type}"].first, 'presenting')
       FileUtils.mkdir_p(target_dir)
 
       Dir[File.join(source_dir, '*')].each do |asset|

data/test/form_test.rb

@@ -165,12 +165,13 @@ class FormRenderingTest < Presentation::RenderTest
   end
   
   def test_rendering_a_password_field
-    @presentation.presentable = User.new(:name => 'bob smith')
+    @presentation.presentable = User.new(:name => 'secret')
     @presentation.fields = [{:name => :password}]
-    
+
     assert_select 'form div.field' do
       assert_select 'label', 'Name'
-      assert_select "input[type=password][name='user[name]'][value='bob smith']"
+      assert_select "input[type=password][name='user[name]']", true
+      assert_select "input[type=password][name='user[name]'][value='secret']", false
     end
   end
   
@@ -300,17 +301,8 @@ class FormRenderingTest < Presentation::RenderTest
     ##
 
     extend ActiveModel::Naming
-
-    # i actually want this model's name to not include the FormRenderingTest namespace
-    # so i'm stubbing out the ActiveModel::Name with my own structure
     def self.model_name
-      @_model_name ||= Name.new(:plural => 'users', :singular => 'user')
-    end
-    class Name
-      attr_accessor :plural, :singular
-      def initialize(hash)
-        hash.each { |k, v| self.instance_variable_set("@#{k}", v) }
-      end
+      @_model_name ||= ActiveModel::Name.new(self, FormRenderingTest)
     end
   end
 end

data/test/grid_test.rb

@@ -239,7 +239,7 @@ class GridRenderTest < Presentation::RenderTest
     @presentation.controller.request.env['QUERY_STRING'] = 'sort[name]=desc'
 
     assert_select "#users thead" do
-      assert_select "th a.sortable[href='?sort[name]=asc']", "Name"
+      assert_select "th a.sortable[href='?sort%5Bname%5D=asc']", "Name"
     end
   end
 end

data/test/helpers_test.rb

@@ -33,11 +33,11 @@ class Presenting::HelpersTest < ActionView::TestCase
   end
   
   def test_presenting_a_time
-    assert_equal 'Fri, 13 Feb 2009 02:31:00 +0000', present(Time.parse('02/13/2009 02:31 AM UTC').to_time)
+    assert_equal 'Fri, 13 Feb 2009 02:31:00 +0000', present(Time.zone.parse('2009-02-13 02:31 AM UTC'))
   end
   
   def test_presenting_a_date
-    assert_equal '2009-02-13', present(Time.parse('02/13/2009 02:31 AM').to_date)
+    assert_equal '2009-02-13', present(Time.zone.parse('2009-02-13 02:31 AM UTC').to_date)
   end
   
   def test_presenting_a_string

data/test/r3/Gemfile

@@ -1,7 +1,11 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.10'
+gem 'rails', '3.2.5'
 gem 'sqlite3'
 
 gem 'presenting', :path => File.dirname(__FILE__) + '/../../'
 gem 'will_paginate', '~>3.0.0'
+
+group :test do
+  gem 'mocha', :require => nil
+end

data/test/r3/Gemfile.lock

@@ -6,81 +6,94 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.10)
-      actionpack (= 3.0.10)
-      mail (~> 2.2.19)
-    actionpack (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-    activesupport (3.0.10)
-    arel (2.0.10)
-    builder (2.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    json (1.6.1)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    actionmailer (3.2.5)
+      actionpack (= 3.2.5)
+      mail (~> 2.4.4)
+    actionpack (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.5)
+      activesupport (= 3.2.5)
+      builder (~> 3.0.0)
+    activerecord (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+    activesupport (3.2.5)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.3)
+    json (1.7.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
+    metaclass (0.0.1)
+    mime-types (1.18)
+    mocha (0.11.3)
+      metaclass (~> 0.0.1)
+    multi_json (1.3.6)
     polyglot (0.3.3)
-    rack (1.2.4)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.10)
-      actionmailer (= 3.0.10)
-      actionpack (= 3.0.10)
-      activerecord (= 3.0.10)
-      activeresource (= 3.0.10)
-      activesupport (= 3.0.10)
+    rails (3.2.5)
+      actionmailer (= 3.2.5)
+      actionpack (= 3.2.5)
+      activerecord (= 3.2.5)
+      activeresource (= 3.2.5)
+      activesupport (= 3.2.5)
       bundler (~> 1.0)
-      railties (= 3.0.10)
-    railties (3.0.10)
-      actionpack (= 3.0.10)
-      activesupport (= 3.0.10)
+      railties (= 3.2.5)
+    railties (3.2.5)
+      actionpack (= 3.2.5)
+      activesupport (= 3.2.5)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
-    sqlite3 (1.3.3)
-    thor (0.14.6)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
+    thor (0.15.2)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    will_paginate (3.0.0)
+    tzinfo (0.3.33)
+    will_paginate (3.0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  mocha
   presenting!
-  rails (= 3.0.10)
+  rails (= 3.2.5)
   sqlite3
   will_paginate (~> 3.0.0)

data/test/r3/log/development.log

@@ -0,0 +1,2 @@
+DEPRECATION WARNING: ActionDispatch::ShowExceptions.rescue_responses is deprecated. Please configure your exceptions using a railtie or in your application config instead. (called from /Users/cainlevy/Code/presenting/test/r3/config/environment.rb:5)
+Connecting to database specified by database.yml