padrino-helpers 0.7.0 → 0.7.1

data/README.rdoc

@@ -130,6 +130,9 @@ The list of defined helpers in the 'asset helpers' category:
 * <tt>link_to(*args, &block)</tt>
   * Creates a link element with given name, url and options
   * <tt>link_to 'click me', '/dashboard', :class => 'linky'</tt>
+  * <tt>link_to 'click me', '/dashboard', :class => 'linky', :if => @foo.present?</tt>
+  * <tt>link_to 'click me', '/dashboard', :class => 'linky', :unless => @foo.blank?</tt>
+  * <tt>link_to 'click me', '/dashboard', :class => 'linky', :unless => :current</tt>
   * <tt>link_to('/dashboard', :class => 'blocky') { ...content... }</tt>
 * <tt>mail_to(email, caption=nil, mail_options={})</tt>
   * Creates a mailto link tag to the specified email_address
@@ -179,7 +182,7 @@ The list of defined helpers in the 'form helpers' category:
   * <tt>field_set_tag("Office", :class => 'office-set') { }</tt>
 * <tt>error_messages_for(:record, options={})</tt>
   * Constructs list html for the errors for a given object
-  * <tt>error_messages_for @user</tt>
+  * <tt>error_messages_for :user</tt>
 * <tt>label_tag(name, options={}, &block)</tt>
   * Constructs a label tag from the given options
   * <tt>label_tag :username, :class => 'long-label'</tt>

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -2,8 +2,12 @@ module Padrino
   module Helpers
     module AssetTagHelpers
 
+      ##
       # Creates a div to display the flash of given type if it exists
-      # flash_tag(:notice, :class => 'flash', :id => 'flash-notice')
+      # 
+      # Examples:
+      # 
+      #   flash_tag(:notice, :class => 'flash', :id => 'flash-notice')
       def flash_tag(kind, options={})
         flash_text = flash[kind]
         return '' if flash_text.blank?
@@ -11,30 +15,46 @@ module Padrino
         content_tag(:div, flash_text, options)
       end
 
+      ##
       # Creates a link element with given name, url and options
-      # link_to 'click me', '/dashboard', :class => 'linky'
-      # link_to('/dashboard', :class => 'blocky') do ... end
-      # parameters: name, url='javascript:void(0)', options={}, &block
+      # 
+      # Examples:
+      # 
+      #   link_to 'click me', '/dashboard', :class => 'linky'
+      #   link_to 'click me', '/dashboard', :if => @foo.present?
+      #   link_to 'click me', '/dashboard', :unless => @foo.empty?
+      #   link_to 'click me', '/dashboard', :unless => :current
+      #   link_to('/dashboard', :class => 'blocky') do ... end
+      # 
+      # Note that you can pass :+if+ or :+unless+ conditions, but if you provide :current as
+      # condition padrino return true/false if the request.path_info match the given url
+      # 
       def link_to(*args, &block)
-        options = args.extract_options!
+        options    = args.extract_options!
         anchor  = options[:anchor] ? "##{CGI.escape options.delete(:anchor).to_s}" : ""
         options["data-remote"] = "true" if options.delete(:remote)
         if block_given?
           url = args[0] || 'javascript:void(0);'
           options.reverse_merge!(:href => url + anchor)
           link_content = capture_html(&block)
+          return name unless parse_conditions(url, options)
           result_link = content_tag(:a, link_content, options)
           block_is_template?(block) ? concat_content(result_link) : result_link
         else
           name, url = args[0], (args[1] || 'javascript:void(0);')
+          return name unless parse_conditions(url, options)
           options.reverse_merge!(:href => url + anchor)
           content_tag(:a, name, options)
         end
       end
 
+      ##
       # Creates a mail link element with given name and caption
-      # mail_to "me@demo.com"             => <a href="mailto:me@demo.com">me@demo.com</a>
-      # mail_to "me@demo.com", "My Email" => <a href="mailto:me@demo.com">My Email</a>
+      # 
+      # Examples:
+      #   mail_to "me@demo.com"             => <a href="mailto:me@demo.com">me@demo.com</a>
+      #   mail_to "me@demo.com", "My Email" => <a href="mailto:me@demo.com">My Email</a>
+      # 
       def mail_to(email, caption=nil, mail_options={})
         html_options = mail_options.slice!(:cc, :bcc, :subject, :body)
         mail_query = Rack::Utils.build_query(mail_options).gsub(/\+/, '%20').gsub('%40', '@')
@@ -42,35 +62,67 @@ module Padrino
         link_to (caption || email), mail_href, html_options
       end
 
+      ##
       # Creates a meta element with the content and given options
-      # meta_tag "weblog,news", :name => "keywords"                         => <meta name="keywords" content="weblog,news">
-      # meta_tag "text/html; charset=UTF-8", :http-equiv => "Content-Type"  => <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+      # 
+      # Examples:
+      # 
+      #   meta_tag "weblog,news", :name => "keywords"                         => <meta name="keywords" content="weblog,news">
+      #   meta_tag "text/html; charset=UTF-8", :http-equiv => "Content-Type"  => <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+      # 
       def meta_tag(content, options={})
         options.reverse_merge!("content" => content)
         tag(:meta, options)
       end
 
+      ##
       # Creates an image element with given url and options
-      # image_tag('icons/avatar.png')
+      # 
+      # Example:
+      # 
+      #   image_tag('icons/avatar.png')
+      # 
       def image_tag(url, options={})
         options.reverse_merge!(:src => image_path(url))
         tag(:img, options)
       end
 
-      # Returns a stylesheet link tag for the sources specified as arguments
-      # stylesheet_link_tag 'style', 'application', 'layout'
+      ##
+      # Returns an html script tag for each of the sources provided. 
+      # You can pass in the filename without extension or a symbol and we search it in your +appname.public+ 
+      # like app/public/stylesheets for inclusion. You can provide also a full path.
+      # 
+      # Example:
+      # 
+      #   stylesheet_link_tag 'style', 'application', 'layout'
+      # 
       def stylesheet_link_tag(*sources)
         options = sources.extract_options!.symbolize_keys
         sources.collect { |sheet| stylesheet_tag(sheet, options) }.join("\n")
       end
 
-      # javascript_include_tag 'application', 'special'
+      ##
+      # Returns an html script tag for each of the sources provided. 
+      # You can pass in the filename without extension or a symbol and we search it in your +appname.public+ 
+      # like app/public/javascript for inclusion. You can provide also a full path.
+      # 
+      # Example:
+      # 
+      #   javascript_include_tag 'application', :extjs
+      # 
       def javascript_include_tag(*sources)
         options = sources.extract_options!.symbolize_keys
         sources.collect { |script| javascript_tag(script, options) }.join("\n")
       end
 
-      # Returns the path to the image, either relative or absolute
+      ##
+      # Returns the path to the image, either relative or absolute. We search it in your +appname.public+ 
+      # like app/public/images for inclusion. You can provide also a full path.
+      # 
+      # Example:
+      # 
+      #   image_path("foo.jpg") => "yourapp/public/images/foo.jpg" 
+      # 
       def image_path(src)
         src.gsub!(/\s/, '')
         src =~ %r{^\s*(/|http)} ? src : uri_root_path('images', src)
@@ -96,31 +148,42 @@ module Padrino
           source_name   = source; source_name << ".js" unless source =~ /\.js/
           result_path   = source_name if source =~ %r{^/} # absolute path
           result_path ||= uri_root_path("javascripts", source_name)
-          if result_path =~ /\?/
-            result_path
-          else
-            stamp = File.exist?(result_path) ? File.mtime(result_path) : Time.now.to_i
-            "#{result_path}?#{stamp}"
-          end
+          return result_path if result_path =~ /\?/
+          public_path = Padrino.root("public", result_path)
+          stamp = File.exist?(public_path) ? File.mtime(public_path).to_i : Time.now.to_i
+          "#{result_path}?#{stamp}"
         end
 
         # Returns the stylesheet_path appending the default stylesheets path if necessary
         def stylesheet_path(source)
           return source if source =~ /^http/
-          source = source.to_s.gsub(/\.css$/, '')
-          source_name = source; source_name << ".css" unless source =~ /\.css/
-          result_path = source_name if source =~ %r{^/} # absolute path
+          source        = source.to_s.gsub(/\.css$/, '')
+          source_name   = source; source_name << ".css" unless source =~ /\.css/
+          result_path   = source_name if source =~ %r{^/} # absolute path
           result_path ||= uri_root_path("stylesheets", source_name)
-          stamp = File.exist?(result_path) ? File.mtime(result_path) : Time.now.to_i
+          return result_path if result_path =~ /\?/
+          public_path   = Padrino.root("public", result_path)
+          stamp         = File.exist?(public_path) ? File.mtime(public_path).to_i : Time.now.to_i
           "#{result_path}?#{stamp}"
         end
 
         # Returns the uri root of the application, defaulting to '/'
-        # @example uri_root('javascripts')
         def uri_root_path(*paths)
           root_uri = self.class.uri_root if self.class.respond_to?(:uri_root)
           File.join(root_uri || '/', *paths)
         end
+
+        # Parse link_to options for give correct conditions
+        def parse_conditions(url, options)
+          if options.has_key?(:if)
+            condition = options.delete(:if)
+            condition == :current ? url == request.path_info : condition
+          elsif condition = options.delete(:unless)
+            condition == :current ? url != request.path_info : !condition
+          else
+            true
+          end
+        end
     end
   end
 end

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

@@ -13,7 +13,7 @@ module Padrino
 
         # f.error_messages
         def error_messages(*params)
-          params.unshift object_name.to_sym
+          params.unshift object
           @template.error_messages_for(*params)
         end
 
@@ -137,7 +137,7 @@ module Padrino
           # explicit_object is either a symbol or a record
           # Returns a new record of the type specified in the object
           def build_object(object_or_symbol)
-            object_or_symbol.is_a?(Symbol) ? object_class(object_or_symbol).new : object_or_symbol
+            object_or_symbol.is_a?(Symbol) ? @template.instance_variable_get("@#{object_or_symbol}") || object_class(object_or_symbol).new : object_or_symbol
           end
 
           # Returns the class type for the given object

data/lib/padrino-helpers/form_helpers.rb

@@ -216,7 +216,7 @@ module Padrino
         # If explicitly defined, returns that, otherwise returns defaults
         # configured_form_builder_class(nil) => StandardFormBuilder
         def configured_form_builder_class(explicit_builder=nil)
-          default_builder = self.respond_to?(:options) && self.options.default_builder
+          default_builder    = self.respond_to?(:options) && self.options.default_builder
           configured_builder = explicit_builder || default_builder || 'StandardFormBuilder'
           configured_builder = "Padrino::Helpers::FormBuilder::#{configured_builder}".constantize if configured_builder.is_a?(String)
           configured_builder

data/padrino-helpers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-helpers}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   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-01-31}
+  s.date = %q{2010-02-03}
   s.description = %q{Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [
@@ -80,7 +80,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.7.0"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.7.1"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
@@ -88,7 +88,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_dependency(%q<padrino-core>, ["= 0.7.0"])
+      s.add_dependency(%q<padrino-core>, ["= 0.7.1"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -97,7 +97,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-    s.add_dependency(%q<padrino-core>, ["= 0.7.0"])
+    s.add_dependency(%q<padrino-core>, ["= 0.7.1"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-31 00:00:00 +01:00
+date: 2010-02-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.0
+        version: 0.7.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml