padrino-helpers 0.8.5 → 0.9.0

data/README.rdoc

@@ -429,15 +429,15 @@ This plugin also has support for useful additions such as partials (with support
 
 Using render plugin helpers is extremely simple. If you want to render an erb template in your view path:
 
-  erb_template 'path/to/my/template'
+  render :erb, 'path/to/erb/template'
   
 or using haml templates works just as well:
 
-  haml_template 'path/to/haml/template'
+  render :haml, 'path/to/haml/template'
   
 There is also a method which renders the first view matching the path and removes the need to define an engine:
 
-  render_template 'path/to/any/template'
+  render 'path/to/any/template'
   
 It is worth noting these are mostly for convenience. With nested view file paths in Sinatra, this becomes tiresome:
 
@@ -457,16 +457,10 @@ This works as you would expect and also supports the collection counter inside t
   
 The list of defined helpers in the 'render helpers' category:
 
-* <tt>erb_template(template_path, options={})</tt>
-  * Renders a erb template based on the given path
-  * <tt>erb_template 'users/new'</tt>
-* <tt>haml_template(template_path, options={})</tt>
-  * Renders a haml template based on the given path
-  * <tt>haml_template 'users/new'</tt>
-* <tt>render_template(template_path, options={})</tt>
-  * Renders the first detected template based on the given path
-  * <tt>render_template 'users/new'</tt>
-  * <tt>render_template 'users/index', :template_engine => 'haml'</tt>
+* <tt>render(engine, data, options, locals)</tt>
+  * Renders the specified template with the given options
+  * <tt>render ‘user/new’'</tt>
+  * <tt>render :erb, ‘users/new’, :layout => false</tt>
 * <tt>partial(template, *args)</tt>
   * Renders the html related to the partial template for object or collection
   * <tt>partial 'photo/_item', :object => @photo, :locals => { :foo => 'bar' }</tt>

data/VERSION

@@ -1 +1 @@
-0.8.5
+0.9.0

data/lib/padrino-helpers.rb

@@ -37,6 +37,7 @@ module Padrino
       app.helpers Padrino::Helpers::FormatHelpers
       app.helpers Padrino::Helpers::RenderHelpers
       app.helpers Padrino::Helpers::NumberHelpers
+      app.helpers Padrino::Helpers::TranslationHelpers
     end
   end # Helpers
 end # Padrino

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -5,13 +5,13 @@ module Padrino
       # Creates a div to display the flash of given type if it exists
       # 
       # ==== Examples
-      # 
-      #   flash_tag(:notice, :class => 'flash', :id => 'flash-notice')
+      #   # => <div class="notice">flash-notice</div>
+      #   flash_tag(:notice, :id => 'flash-notice')
       # 
       def flash_tag(kind, options={})
         flash_text = flash[kind]
         return '' if flash_text.blank?
-        options.reverse_merge!(:class => 'flash')
+        options.reverse_merge!(:class => kind)
         content_tag(:div, flash_text, options)
       end
 
@@ -37,7 +37,7 @@ module Padrino
           url = args[0] ? args[0] + anchor.to_s : anchor || 'javascript:void(0);'
           options.reverse_merge!(:href => url)
           link_content = capture_html(&block)
-          return name unless parse_conditions(url, options)
+          return '' unless parse_conditions(url, options)
           result_link = content_tag(:a, link_content, options)
           block_is_template?(block) ? concat_content(result_link) : result_link
         else
@@ -48,6 +48,31 @@ module Padrino
         end
       end
 
+      ##
+      # Creates a form containing a single button that submits to the url.
+      # 
+      # ==== Examples
+      # 
+      #   # Generates:
+      #   # <form class="form" action="/admin/accounts/destroy/2" method="post">
+      #   #   <input type="hidden" value="delete" name="_method" />
+      #   #   <input type="submit" value="Delete" />
+      #   # </form>
+      #   button_to 'Delete', url(:accounts_destroy, :id => account), :method => :delete, :class => :form
+      # 
+      def button_to(*args, &block)
+        name, url = args[0], args[1]
+        options   = args.extract_options!
+        desired_method = options[:method]
+        options.delete(:method) if options[:method].to_s !~ /get|post/i
+        options.reverse_merge!(:method => 'post', :action => url)
+        options[:enctype] = "multipart/form-data" if options.delete(:multipart)
+        options["data-remote"] = "true" if options.delete(:remote)
+        inner_form_html  = hidden_form_method_field(desired_method)
+        inner_form_html += block_given? ? capture_html(&block) : submit_tag(name)
+        content_tag('form', inner_form_html, options)
+      end
+
       ##
       # Creates a mail link element with given name and caption
       # 
@@ -180,6 +205,18 @@ module Padrino
         stamp         = File.exist?(public_path) ? File.mtime(public_path).to_i : Time.now.to_i
         "#{result_path}?#{stamp}"
       end
+      
+      ##
+      # Generates a favicon link.
+      # example:
+      # favicon_tag 'images/favicon.png'
+      # or override some options
+      # favicon_tag 'images/favicon.png', :type => 'image/ico'
+      def favicon_tag(source,options={})
+        type = File.extname(source).gsub('.','')
+        options = options.dup.reverse_merge!(:href => source, :rel => 'icon', :type => "image/#{type}")
+        tag(:link, options)
+      end
 
       private
         ##

data/lib/padrino-helpers/form_builder/abstract_form_builder.rb

@@ -17,6 +17,11 @@ module Padrino
           @template.error_messages_for(*params)
         end
 
+        # f.error_message_on(field)
+        def error_message_on(field, options={})
+          @template.error_message_on(object_name, field, options)
+        end
+
         # f.label :username, :caption => "Nickname"
         def label(field, options={})
           options.reverse_merge!(:caption => "#{field_human_name(field)}: ")
@@ -31,26 +36,30 @@ module Padrino
 
         # f.text_field :username, :value => "(blank)", :id => 'username'
         def text_field(field, options={})
-          options.reverse_merge!(:value => field_value(field), :id => field_id(field), :class => field_error(field, options))
+          options.reverse_merge!(:value => field_value(field), :id => field_id(field))
+          options.merge!(:class => field_error(field, options))
           @template.text_field_tag field_name(field), options
         end
 
         # f.text_area :summary, :value => "(enter summary)", :id => 'summary'
         def text_area(field, options={})
-          options.reverse_merge!(:value => field_value(field), :id => field_id(field), :class => field_error(field, options))
+          options.reverse_merge!(:value => field_value(field), :id => field_id(field))
+          options.merge!(:class => field_error(field, options))
           @template.text_area_tag field_name(field), options
         end
 
         # f.password_field :password, :id => 'password'
         def password_field(field, options={})
-          options.reverse_merge!(:value => field_value(field), :id => field_id(field), :class => field_error(field, options))
+          options.reverse_merge!(:value => field_value(field), :id => field_id(field))
+          options.merge!(:class => field_error(field, options))
           @template.password_field_tag field_name(field), options
         end
 
         # f.select :color, :options => ['red', 'green'], :include_blank => true
         # f.select :color, :collection => @colors, :fields => [:name, :id]
         def select(field, options={})
-          options.reverse_merge!(:id => field_id(field), :selected => field_value(field), :class => field_error(field, options))
+          options.reverse_merge!(:id => field_id(field), :selected => field_value(field))
+          options.merge!(:class => field_error(field, options))
           @template.select_tag field_name(field), options
         end
 
@@ -72,7 +81,8 @@ module Padrino
 
         # f.file_field :photo, :class => 'avatar'
         def file_field(field, options={})
-          options.reverse_merge!(:id => field_id(field), :class => field_error(field, options))
+          options.reverse_merge!(:id => field_id(field))
+          options.merge!(:class => field_error(field, options))
           @template.file_field_tag field_name(field), options
         end
 
@@ -110,9 +120,12 @@ module Padrino
             @object && @object.respond_to?(field) ? @object.send(field) : ""
           end
 
+          # Add a :invalid css class to the field if it contain an error
           def field_error(field, options)
-            if @object && @object.respond_to?(:errors) && @object.errors.respond_to?(:on) && @object.errors.on(field)
-              ["x-form-invalid", options[:class]].compact.join(" ")
+            if @object && @object.respond_to?(:errors) && @object.errors.respond_to?(:[]) && @object.errors[field]
+              [options[:class], :invalid].flatten.compact.join(" ")
+            else
+              options[:class]
             end
           end
 

data/lib/padrino-helpers/form_helpers.rb

@@ -38,13 +38,30 @@ module Padrino
       #   form_tag '/register' do ... end
       # 
       def form_tag(url, options={}, &block)
+        desired_method = options[:method]
+        options.delete(:method) if options[:method].to_s !~ /get|post/i
         options.reverse_merge!(:method => 'post', :action => url)
         options[:enctype] = "multipart/form-data" if options.delete(:multipart)
         options["data-remote"] = "true" if options.delete(:remote)
-        inner_form_html = hidden_form_method_field(options[:method]) + capture_html(&block)
+        inner_form_html = hidden_form_method_field(desired_method) + capture_html(&block)
         concat_content content_tag('form', inner_form_html, options)
       end
 
+      ##
+      # Returns the hidden method field for 'put' and 'delete' forms
+      # Only 'get' and 'post' are allowed within browsers;
+      # 'put' and 'delete' are just specified using hidden fields with form action still 'put'.
+      # 
+      # ==== Examples
+      # 
+      #   # Generate: <input name="_method" value="delete" />
+      #   hidden_form_method_field('delete')
+      # 
+      def hidden_form_method_field(desired_method)
+        return '' if desired_method.blank? || desired_method.to_s =~ /get|post/i
+        hidden_field_tag(:_method, :value => desired_method)
+      end
+
       ##
       # Constructs a field_set to group fields with given options
       # 
@@ -124,6 +141,38 @@ module Padrino
         end
       end
 
+      ##
+      # Returns a string containing the error message attached to the +method+ on the +object+ if one exists.
+      #
+      # ==== Options
+      # 
+      # :tag::      The tag that enclose your error. (Default 'div')
+      # :prepend::  Text to add before error.
+      # :append::   Text to add after error.
+      # 
+      # ==== Examples
+      # 
+      #   # => <span class="error">can't be blank</div>
+      #   error_message_on :post, :title
+      # 
+      #   # => <div class="custom" style="border:1px solid red">can't be blank</div>
+      #   error_message_on :post, :title, :tag => :id, :class => :custom, :style => "border:1px solid red"
+      # 
+      #   # => <div class="error">This title can't be blank (or it won't work)</div>
+      #   error_message_on :post, :title, :prepend => "This title", :append => "(or it won't work)"
+      # 
+      def error_message_on(object, field, options={})
+        object = instance_variable_get("@#{object}")
+        if object && object.respond_to?(:errors) && object.errors.respond_to?(:[]) && object.errors[field]
+          options.reverse_merge!(:tag => :span, :class => :error)
+          tag   = options.delete(:tag)
+          error = [options.delete(:prepend), Array(object.errors[field]).first, options.delete(:append)].compact.join(" ")
+          content_tag(tag, error, options)
+        else
+          ''
+        end
+      end
+
       ##
       # Constructs a label tag from the given options
       # 
@@ -303,23 +352,6 @@ module Padrino
         end
       end
 
-      ##
-      # Returns the hidden method field for 'put' and 'delete' forms
-      # Only 'get' and 'post' are allowed within browsers;
-      # 'put' and 'delete' are just specified using hidden fields with form action still 'put'.
-      # 
-      # ==== Examples
-      # 
-      #   # Generate: <input name="_method" value="delete" />
-      #   hidden_form_method_field('delete')
-      # 
-      def hidden_form_method_field(desired_method)
-        return '' if (desired_method.to_s =~ /get|post/)
-        original_method = desired_method.to_s.dup
-        desired_method.to_s.replace('post')
-        hidden_field_tag(:_method, :value => original_method)
-      end
-
       private
         ##
         # Returns the FormBuilder class to use based on all available setting sources

data/lib/padrino-helpers/output_helpers.rb

@@ -49,16 +49,17 @@ module Padrino
       end
 
       ##
-      # Capture a block of content to be rendered at a later time.
+      # Capture a block or text of content to be rendered at a later time.
       # Your blocks can also receive values, which are passed to them by <tt>yield_content</tt>
       # 
       # ==== Examples
       # 
       #   content_for(:name) { ...content... }
       #   content_for(:name) { |name| ...content... }
+      #   content_for(:name, "I'm Jeff")
       # 
-      def content_for(key, &block)
-        content_blocks[key.to_sym] << block
+      def content_for(key, content = nil, &block)
+        content_blocks[key.to_sym] << (block_given? ? block : Proc.new { content })
       end
 
       ##
@@ -70,9 +71,12 @@ module Padrino
       # 
       #   yield_content :include
       #   yield_content :head, "param1", "param2"
+      #   yield_content(:title) || "My page title"
       # 
       def yield_content(key, *args)
-        content_blocks[key.to_sym].map { |content|
+        blocks = content_blocks[key.to_sym]
+        return nil if blocks.empty?
+        blocks.map { |content|
           capture_html(*args, &content)
         }.join
       end

data/lib/padrino-helpers/translation_helpers.rb

@@ -0,0 +1,21 @@
+module Padrino
+  module Helpers
+    module TranslationHelpers
+      ##
+      # Delegates to I18n.translate with no additional functionality.
+      # 
+      def translate(*args)
+        I18n.translate(*args)
+      end
+      alias :t :translate
+
+      ##
+      # Delegates to I18n.localize with no additional functionality.
+      # 
+      def localize(*args)
+        I18n.localize(*args)
+      end
+      alias :l :localize
+    end # TranslationHelpers
+  end # Helpers
+end # Padrino

data/padrino-helpers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-helpers}
-  s.version = "0.8.5"
+  s.version = "0.9.0"
 
   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-02-18}
+  s.date = %q{2010-02-23}
   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 = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "lib/padrino-helpers/output_helpers.rb",
      "lib/padrino-helpers/render_helpers.rb",
      "lib/padrino-helpers/tag_helpers.rb",
+     "lib/padrino-helpers/translation_helpers.rb",
      "padrino-helpers.gemspec",
      "test/fixtures/markup_app/app.rb",
      "test/fixtures/markup_app/views/capture_concat.erb",
@@ -83,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.8.5"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.0"])
       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.8.5"])
+      s.add_dependency(%q<padrino-core>, ["= 0.9.0"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -98,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.8.5"])
+    s.add_dependency(%q<padrino-core>, ["= 0.9.0"])
     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/app.rb

@@ -55,7 +55,7 @@ end
 
 class Errors < Array
   def initialize; self << [:fake, :second, :third]; end
-  def on(fake); true if fake == :email; end
+  def [](fake); true if fake == :email; end
   def full_messages
     ["This is a fake error", "This is a second fake error", "This is a third fake error"]
   end

data/test/test_asset_tag_helpers.rb

@@ -14,7 +14,7 @@ class TestAssetTagHelpers < Test::Unit::TestCase
 
   context 'for #flash_tag method' do
     should "display flash with no given attributes" do
-      assert_has_tag('div.flash', :content => "Demo notice") { flash_tag(:notice) }
+      assert_has_tag('div.notice', :content => "Demo notice") { flash_tag(:notice) }
     end
     should "display flash with given attributes" do
       actual_html = flash_tag(:notice, :class => 'notice', :id => 'notice-area')
@@ -202,4 +202,24 @@ 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('images/favicon.png')
+      assert_has_tag('link', :rel => 'icon', :type => 'image/png', :href => 'images/favicon.png') { actual_html }
+    end
+    should "match type with file ext" do
+      time = stop_time_for_test
+      actual_html = favicon_tag('images/favicon.ico')
+      assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => 'images/favicon.ico') { actual_html }
+    end
+    should "allow option overrides" do
+      time = stop_time_for_test
+      actual_html = favicon_tag('images/favicon.png', :type => 'image/ico')
+      assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => 'images/favicon.png') { actual_html }
+    end
+    
+  end
+  
 end

data/test/test_form_builder.rb

@@ -9,7 +9,7 @@ class TestFormBuilder < Test::Unit::TestCase
   end
 
   def setup
-    error_stub = stub(:full_messages => ["1", "2"], :count => 2)
+    error_stub = stub(:full_messages => ["1", "2"], :count => 2, :[] => [])
     role_types = [stub(:name => 'Admin', :id => 1), stub(:name => 'Moderate', :id => 2),  stub(:name => 'Limited', :id => 3)]
     @user = stub(:errors => error_stub, :class => 'User', :first_name => "Joe", :session_id => 54)
     @user.stubs(:role_types => role_types, :role => "1")
@@ -143,7 +143,7 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo div.field-errors ul li', :content => "This is a fake error"
       assert_have_selector '#demo2 div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "This is a fake error"
-      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'x-form-invalid'
+      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'invalid'
     end
 
     should "display correct form in erb" do
@@ -152,7 +152,7 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo div.field-errors ul li', :content => "This is a fake error"
       assert_have_selector '#demo2 div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "This is a fake error"
-      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'x-form-invalid'
+      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'invalid'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  version: 0.8.5
+  version: 0.9.0
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 +01:00
+date: 2010-02-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.5
+        version: 0.9.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml
@@ -103,6 +103,7 @@ files:
 - lib/padrino-helpers/output_helpers.rb
 - lib/padrino-helpers/render_helpers.rb
 - lib/padrino-helpers/tag_helpers.rb
+- lib/padrino-helpers/translation_helpers.rb
 - padrino-helpers.gemspec
 - test/fixtures/markup_app/app.rb
 - test/fixtures/markup_app/views/capture_concat.erb