padrino-helpers 0.9.6 → 0.9.7

data/lib/padrino-helpers/translation_helpers.rb

@@ -3,7 +3,7 @@ module Padrino
     module TranslationHelpers
       ##
       # Delegates to I18n.translate with no additional functionality.
-      # 
+      #
       def translate(*args)
         I18n.translate(*args)
       end
@@ -11,7 +11,7 @@ module Padrino
 
       ##
       # Delegates to I18n.localize with no additional functionality.
-      # 
+      #
       def localize(*args)
         I18n.localize(*args)
       end

data/padrino-helpers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-helpers}
-  s.version = "0.9.6"
+  s.version = "0.9.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-03-15}
+  s.date = %q{2010-03-22}
   s.description = %q{Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino}
   s.email = %q{padrinorb@gmail.com}
   s.extra_rdoc_files = [
@@ -84,14 +84,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.6"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.7"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
-      s.add_dependency(%q<padrino-core>, ["= 0.9.6"])
+      s.add_dependency(%q<padrino-core>, ["= 0.9.7"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -99,7 +99,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
     end
   else
-    s.add_dependency(%q<padrino-core>, ["= 0.9.6"])
+    s.add_dependency(%q<padrino-core>, ["= 0.9.7"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 2.10.3"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

data/test/fixtures/markup_app/views/capture_concat.erb

@@ -10,5 +10,5 @@
   <span>This is erb</span>
   <span>This is erb</span>
 <% end %>
-  
+
 <% ruby_not_template_block %>

data/test/fixtures/markup_app/views/capture_concat.haml

@@ -8,6 +8,5 @@
 - determine_block_is_template('haml') do
   %span This is haml
   %span This is haml
-  
+
 - ruby_not_template_block
-  

data/test/fixtures/markup_app/views/content_for.erb

@@ -1,11 +1,11 @@
 <% content_for :demo do %>
   <h1>This is content yielded from a content_for</h1>
 <% end %>
-  
+
 <div class='demo'><%= yield_content :demo %></div>
-  
+
 <% content_for :demo2 do |fname, lname| %>
   <h1>This is content yielded with name <%= fname + " " + lname %></h1>
 <% end %>
-  
+
 <div class='demo2'><%= yield_content :demo2, "Johnny", "Smith" %></div>

data/test/fixtures/markup_app/views/content_for.haml

@@ -1,9 +1,9 @@
 - content_for :demo do
   %h1 This is content yielded from a content_for
-  
+
 .demo= yield_content :demo
 
 - content_for :demo2 do |fname, lname|
   %h1 This is content yielded with name #{fname + " " + lname}
-  
+
 .demo2= yield_content :demo2, "Johnny", "Smith"

data/test/fixtures/markup_app/views/content_tag.erb

@@ -5,7 +5,7 @@
 <% content_tag(:p, :class => 'test', :id => 'test3') do %>
   <span>Test 3</span>
 <% end %>
-  
+
 <% content_tag(:p) do %>
   <span>Test 4</span>
 <% end %>

data/test/fixtures/markup_app/views/content_tag.haml

@@ -4,6 +4,6 @@
 
 - content_tag(:p, :class => 'test', :id => 'test3') do
   %span Test 3
-  
+
 - content_tag(:p) do
   %span Test 4

data/test/fixtures/markup_app/views/form_for.erb

@@ -19,7 +19,7 @@
   </p>
   <p>
     <%= f.label :about, :caption => "About Me: " %>
-    <%= f.text_area :about, :class => 'user-about'  %> 
+    <%= f.text_area :about, :class => 'user-about'  %>
   </p>
   <p>
     <%= f.label :gender, :caption => "Your gender: " %>

data/test/fixtures/markup_app/views/form_for.haml

@@ -15,7 +15,7 @@
     = f.file_field :photo, :class => 'user-photo'
   %p
     = f.label :about, :caption => "About Me: "
-    = f.text_area :about, :class => 'user-about'  
+    = f.text_area :about, :class => 'user-about'
   %p
     = f.label :gender, :caption => "Your gender: "
     = f.radio_button :gender, :value => 'male'
@@ -42,6 +42,6 @@
   = f.select_block :state, :options => ['California', 'Texas'], :class => 'selector'
   = f.submit_block "Create", { :class => 'button' }
   = f.image_submit_block "buttons/ok.png", { :class => 'image' }
-  
+
 - form_for :markup_user, '/third_demo', :id => 'demo3', :method => 'get' do |f|
   = f.text_field_block :username

data/test/fixtures/markup_app/views/form_tag.erb

@@ -24,7 +24,7 @@
       <%= text_field_tag :username, :value => params[:username], :id => 'the_username' %>
     </p>
     <p>
-      <%= label_tag :password, :class => 'first' %> 
+      <%= label_tag :password, :class => 'first' %>
       <%= password_field_tag :password, :value => params[:password] %>
     </p>
     <p>

data/test/fixtures/render_app/app.rb

@@ -14,12 +14,12 @@ class RenderDemo < Padrino::Application
   get '/partial/object' do
     partial 'template/user', :object => RenderUser.new('John'), :locals => { :extra => "bar" }
   end
-  
+
   # partial with collection
   get '/partial/collection' do
     partial 'template/user', :collection => [RenderUser.new('John'), RenderUser.new('Billy')], :locals => { :extra => "bar" }
   end
-  
+
   # partial with locals
   get '/partial/locals' do
     partial 'template/user', :locals => { :user => RenderUser.new('John'), :extra => "bar" }

data/test/fixtures/render_app/views/template/_user.haml

@@ -4,4 +4,4 @@
   %p Extra is #{extra}
 
 - if defined?(user_counter)
-  %p My counter is #{user_counter} 
+  %p My counter is #{user_counter}

data/test/helper.rb

@@ -27,10 +27,6 @@ class Test::Unit::TestCase
   include Rack::Test::Methods
   include Webrat::Methods
   include Webrat::Matchers
-  
-  def setup
-    Padrino.stubs(:root).returns("/tmp/sample")
-  end
 
   Webrat.configure do |config|
     config.mode = :rack

data/test/test_asset_tag_helpers.rb

@@ -109,20 +109,27 @@ class TestAssetTagHelpers < Test::Unit::TestCase
 
   context 'for #image_tag method' do
     should "display image tag absolute link with no options" do
-      assert_has_tag('img', :src => "/absolute/pic.gif") { image_tag('/absolute/pic.gif') }
+      time = stop_time_for_test
+      assert_has_tag('img', :src => "/absolute/pic.gif?#{time.to_i}") { image_tag('/absolute/pic.gif') }
     end
     should "display image tag absolute link with specified uri root" do
+      time = stop_time_for_test
       self.class.stubs(:uri_root).returns("/blog")
-      assert_has_tag('img', :src => "/blog/images/relative/pic.gif") { image_tag('relative/pic.gif') }
+      assert_has_tag('img', :src => "/blog/images/relative/pic.gif?#{time.to_i}") { image_tag('relative/pic.gif') }
     end
     should "display image tag relative link with options" do
-      assert_has_tag('img.photo', :src => "/images/relative/pic.gif") { image_tag('relative/pic.gif', :class => 'photo') }
+      time = stop_time_for_test
+      assert_has_tag('img.photo', :src => "/images/relative/pic.gif?#{time.to_i}") { 
+        image_tag('relative/pic.gif', :class => 'photo') }
     end
     should "display image tag uri link with options" do
+      time = stop_time_for_test
       assert_has_tag('img.photo', :src => "http://demo.org/pic.gif") { image_tag('http://demo.org/pic.gif', :class => 'photo') }
     end
     should "display image tag relative link with incorrect spacing" do
-      assert_has_tag('img.photo', :src => "/images/relative/pic.gif") { image_tag(' relative/ pic.gif  ', :class => 'photo') }
+      time = stop_time_for_test
+      assert_has_tag('img.photo', :src => "/images/relative/pic.gif?#{time.to_i}") { 
+        image_tag(' relative/ pic.gif  ', :class => 'photo') }
     end
   end
 
@@ -202,24 +209,34 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       assert_has_tag('script', :src => "http://google.com/lib.js") { actual_html }
     end
   end
-  
+
   context "for #favicon_tag method" do
     should "display favicon" do
       time = stop_time_for_test
       actual_html = favicon_tag('icons/favicon.png')
-      assert_has_tag('link', :rel => 'icon', :type => 'image/png', :href => '/images/icons/favicon.png') { actual_html }
+      assert_has_tag('link', :rel => 'icon', :type => 'image/png', :href => "/images/icons/favicon.png?#{time.to_i}") { actual_html }
     end
     should "match type with file ext" do
       time = stop_time_for_test
       actual_html = favicon_tag('favicon.ico')
-      assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => '/images/favicon.ico') { actual_html }
+      assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => "/images/favicon.ico?#{time.to_i}") { actual_html }
     end
     should "allow option overrides" do
       time = stop_time_for_test
       actual_html = favicon_tag('favicon.png', :type => 'image/ico')
-      assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => '/images/favicon.png') { actual_html }
+      assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => "/images/favicon.png?#{time.to_i}") { actual_html }
+    end
+  end
+
+  context 'for #feed_tag method' do
+    should "generate correctly link tag for rss" do
+      assert_has_tag('link', :type => 'application/rss+xml', :rel => 'alternate', :href => "/blog/post.rss", :title => 'rss') { feed_tag :rss, "/blog/post.rss" }
+    end
+    should "generate correctly link tag for atom" do
+      assert_has_tag('link', :type => 'application/atom+xml', :rel => 'alternate', :href => "/blog/post.atom", :title => 'atom') { feed_tag :atom, "/blog/post.atom" }
+    end
+    should "override options" do
+      assert_has_tag('link', :type => 'my-type', :rel => 'my-rel', :href => "/blog/post.rss", :title => 'my-title') { feed_tag :rss, "/blog/post.rss", :type => "my-type", :rel => "my-rel", :title => "my-title" }
     end
-    
   end
-  
 end

data/test/test_form_builder.rb

@@ -33,7 +33,7 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_has_tag('form input', :type => 'text', :name => 'markup_user[username]') { actual_html }
       assert_has_tag('form input[type=hidden]', :name => '_method', :count => 0) { actual_html } # no method action field
     end
-    
+
     should "display correct form html for namespaced object" do
       actual_html = form_for(Outer::UserAccount.new, '/register', :method => 'post') { |f| f.text_field :username }
       assert_has_tag('form', :action => '/register', :method => 'post') { actual_html }
@@ -445,26 +445,30 @@ class TestFormBuilder < Test::Unit::TestCase
   end
 
   context 'for #image_submit method' do
+    setup do
+      @stamp = stop_time_for_test.to_i
+    end
+
     should "display correct image submit button html with no options" do
       actual_html = standard_builder.image_submit('buttons/ok.png')
-      assert_has_tag('input[type=image]', :src => "/images/buttons/ok.png") { actual_html }
+      assert_has_tag('input[type=image]', :src => "/images/buttons/ok.png?#{@stamp}") { actual_html }
     end
 
     should "display correct image submit button html" do
       actual_html = standard_builder.image_submit('/system/ok.png', :class => 'large')
-      assert_has_tag('input.large[type=image]', :src => "/system/ok.png") { actual_html }
+      assert_has_tag('input.large[type=image]', :src => "/system/ok.png?#{@stamp}") { actual_html }
     end
 
     should "display correct image submit button in haml" do
       visit '/haml/form_for'
-      assert_have_selector '#demo input', :type => 'image', :id => 'image-button', :src => '/images/buttons/post.png'
-      assert_have_selector '#demo2 input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png"
+      assert_have_selector '#demo input', :type => 'image', :id => 'image-button', :src => "/images/buttons/post.png?#{@stamp}"
+      assert_have_selector '#demo2 input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
     end
 
     should "display correct image submit button in erb" do
       visit '/erb/form_for'
-      assert_have_selector '#demo input', :type => 'image', :id => 'image-button', :src => '/images/buttons/post.png'
-      assert_have_selector '#demo2 input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png"
+      assert_have_selector '#demo input', :type => 'image', :id => 'image-button', :src => "/images/buttons/post.png?#{@stamp}"
+      assert_have_selector '#demo2 input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
     end
   end
 
@@ -614,19 +618,23 @@ class TestFormBuilder < Test::Unit::TestCase
   end
 
   context 'for #image_submit_block method' do
+    setup do
+      @stamp = stop_time_for_test.to_i
+    end
+
     should "display correct image submit block html" do
       actual_html = standard_builder.image_submit_block("buttons/ok.png", :class => 'large')
-      assert_has_tag('p input.large[type=image]', :src => '/images/buttons/ok.png') { actual_html }
+      assert_has_tag('p input.large[type=image]', :src => "/images/buttons/ok.png?#{@stamp}") { actual_html }
     end
 
     should "display correct image submit block in haml" do
       visit '/haml/form_for'
-      assert_have_selector '#demo2 p input', :type => 'image', :class => 'image', :src => '/images/buttons/ok.png'
+      assert_have_selector '#demo2 p input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
     end
 
     should "display correct image submit block in erb" do
       visit '/erb/form_for'
-      assert_have_selector '#demo2 p input', :type => 'image', :class => 'image', :src => '/images/buttons/ok.png'
+      assert_have_selector '#demo2 p input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
     end
   end
 end

data/test/test_form_helpers.rb

@@ -390,24 +390,28 @@ class TestFormHelpers < Test::Unit::TestCase
   end
 
   context 'for #image_submit_tag method' do
+    setup do
+      @stamp = stop_time_for_test.to_i
+    end
+
     should "display image submit tag in ruby with relative path" do
       actual_html = image_submit_tag('buttons/ok.png', :class => 'success')
-      assert_has_tag(:input, :type => 'image', :class => "success", :src => '/images/buttons/ok.png') { actual_html }
+      assert_has_tag(:input, :type => 'image', :class => "success", :src => "/images/buttons/ok.png?#{@stamp}") { actual_html }
     end
 
     should "display image submit tag in ruby with absolute path" do
       actual_html = image_submit_tag('/system/ok.png', :class => 'success')
-      assert_has_tag(:input, :type => 'image', :class => "success", :src => '/system/ok.png') { actual_html }
+      assert_has_tag(:input, :type => 'image', :class => "success", :src => "/system/ok.png?#{@stamp}") { actual_html }
     end
 
     should "display image submit tag in erb" do
       visit '/erb/form_tag'
-      assert_have_selector 'form.advanced-form input[type=image]', :count => 1, :src => "/images/buttons/submit.png"
+      assert_have_selector 'form.advanced-form input[type=image]', :count => 1, :src => "/images/buttons/submit.png?#{@stamp}"
     end
 
     should "display image submit tag in haml" do
       visit '/haml/form_tag'
-      assert_have_selector 'form.advanced-form input[type=image]', :count => 1, :src => "/images/buttons/submit.png"
+      assert_have_selector 'form.advanced-form input[type=image]', :count => 1, :src => "/images/buttons/submit.png?#{@stamp}"
     end
   end
 

data/test/test_tag_helpers.rb

@@ -77,5 +77,4 @@ class TestTagHelpers < Test::Unit::TestCase
       assert_has_tag('input[type=checkbox]', :disabled => 'disabled') { actual_html }
     end
   end
-
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -07:00
+date: 2010-03-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 6
-        version: 0.9.6
+        - 7
+        version: 0.9.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency