storefront 0.3.1 → 0.3.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
   s.name              = "storefront"
   s.authors           = ["Lance Pollard"]
-  s.version           = "0.3.1"
+  s.version           = "0.3.2"
   s.description       = "Semantic HTML5 for Rails"
   s.summary           = "A simple and semantic FormBuilder, TableBuilder, Locale Interpolator, and Widget API for Rails 3"
   s.homepage          = "http://github.com/viatropos/storefront"

data/lib/storefront/helpers/definition_list_helper.rb

@@ -8,7 +8,7 @@ module Storefront
           @separator = options.has_key?(:separator) ? options[:separator] : storefront_config.term_separator
           header = header_widget(options)
           haml_concat header.gsub(/\n$/, "") if header.present?
-
+          
           haml_tag options[:tag], options[:content_html], &block
           
           if options[:footer_html].present?
@@ -32,12 +32,15 @@ module Storefront
       options
     end
     
-    def definition(key, value, options = {})
+    def definition(*args, &block)
+      options        = args.extract_options!
+      key            = args.shift
+      value          = args.shift || block
       locale_options = options.delete(:locale_options) || {}
-      label       = t?(key, locale_options.reverse_merge(:scope => :"terms.labels"))
+      label          = t?(key, locale_options.reverse_merge(:scope => :"terms.labels"))
       
-      key_html   = options.delete(:key_html) || {}
-      value_html = options.delete(:value_html) || {}
+      key_html       = options.delete(:key_html) || {}
+      value_html     = options.delete(:value_html) || {}
       
       key_html.reverse_merge! clone_attributes(options)
       value_html.reverse_merge! clone_attributes(options)
@@ -45,12 +48,12 @@ module Storefront
       merge_class! key_html, storefront_config.term_key_class
       merge_class! value_html, storefront_config.term_value_class
       
-      id_base    = label.underscore.strip.gsub(/[\s|_]+/, storefront_config.separator).squeeze(storefront_config.separator)
+      id_base        = label.underscore.strip.gsub(/[\s|_]+/, storefront_config.separator).squeeze(storefront_config.separator)
       
       key_html[:id] ||= "#{id_base}-key"
       value_html[:id] ||= "#{id_base}-value"
       
-      separator = options[:separator] || @separator
+      separator      = options[:separator] || @separator
       
       label.gsub!(/#{separator}?$/, separator) if separator.present?
       
@@ -68,11 +71,13 @@ module Storefront
     end
     alias term definition
     
-    def definition_list(&block)
+    def definition_list(options = {}, &block)
+      @separator = options.has_key?(:separator) ? options[:separator] : storefront_config.term_separator
       capture_haml do
         haml_tag storefront_config.terms_tag do
           yield
         end
+        @separator = nil
       end
     end
     alias terms definition_list
@@ -81,7 +86,11 @@ module Storefront
     def _definiton_list_term(label, value, key_html, value_html)      
       capture_haml do
         haml_tag :dt, label, key_html
-        haml_tag :dd, value, value_html
+        if value.is_a?(::Proc)
+          haml_tag :dd, value_html, &value
+        else
+          haml_tag :dd, value, value_html
+        end
       end
     end
     
@@ -89,7 +98,11 @@ module Storefront
       capture_haml do
         haml_tag :tr, :class => storefront_config.term_class do
           haml_tag :td, label, key_html
-          haml_tag :td, value, value_html
+          if value.is_a?(::Proc)
+            haml_tag :td, value_html, &value
+          else
+            haml_tag :td, value, value_html
+          end
         end
       end
     end

metadata

@@ -2,7 +2,7 @@
 name: storefront
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Lance Pollard
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 Z
+date: 2011-07-10 00:00:00 Z
 dependencies: []
 
 description: Semantic HTML5 for Rails