fusionary-easel_helpers 0.2.2 → 0.2.4

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'echoe'
 
-Echoe.new("easel_helpers", "0.2.2") do |p|
+Echoe.new("easel_helpers", "0.2.4") do |p|
   p.description = "Fusionary Rails View Helpers"
   p.url = "http://github.com/fusionary/easel_helpers"
   p.author = "Joshua Clayton"

data/easel_helpers.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easel_helpers}
-  s.version = "0.2.2"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Clayton"]
-  s.date = %q{2009-05-15}
+  s.date = %q{2009-05-20}
   s.description = %q{Fusionary Rails View Helpers}
   s.email = %q{joshua.clayton@gmail.com}
   s.extra_rdoc_files = ["lib/easel_helpers/helpers/date_helper.rb", "lib/easel_helpers/helpers/flash_helper.rb", "lib/easel_helpers/helpers/form_helper.rb", "lib/easel_helpers/helpers/grid_helper.rb", "lib/easel_helpers/helpers/link_helper.rb", "lib/easel_helpers/helpers/structure_helper.rb", "lib/easel_helpers/helpers/table_helper.rb", "lib/easel_helpers/helpers.rb", "lib/easel_helpers/rails_partial_caching.rb", "lib/easel_helpers.rb", "README.textile", "tasks/easel_helpers_tasks.rake"]

data/lib/easel_helpers/helpers/form_helper.rb

@@ -16,7 +16,7 @@ module EaselHelpers
         
         css_classes = clean_css_classes(css_classes, {"last" => last_column})
         
-        html = clean_column css_classes do
+        html = clean_column(css_classes) do
           content_tag(:div, capture(&block), options.merge(:class => css_classes))
         end
         
@@ -38,7 +38,7 @@ module EaselHelpers
         
         css_classes = clean_css_classes(css_classes, {"last" => last_column})
         
-        html = clean_column css_classes do
+        html = clean_column(css_classes) do
           content_tag(:fieldset, legend + capture(&block), options.merge(:class => css_classes))
         end
         

data/lib/easel_helpers/helpers/grid_helper.rb

@@ -111,7 +111,7 @@ module EaselHelpers
         size = :full if size.blank?
         
         increase_depth(size)
-        output_tag = generate_output_tag(size, args, &block)
+        output_tag = generate_output_tag(size, *args, &block)
         
         if block_given? && block_is_within_action_view?(block)
           concat(output_tag)

data/lib/easel_helpers/helpers/structure_helper.rb

@@ -6,7 +6,7 @@ module EaselHelpers
         options = args.extract_options!
         author = options.delete(:author)
         
-        bq =  content_tag(:blockquote, 
+        bq =  content_tag(:blockquote,
                 (option_quote = textilize(options.delete(:quote))).blank? ? capture(&block) : option_quote
               )
         
@@ -30,7 +30,7 @@ module EaselHelpers
         if block_given?
           block = lambda { yield }
           html = content_tag(:body, capture(&block), @_page_body_attributes)
-          return concat(html)
+          concat(html)
         end
       end
       

data/lib/easel_helpers/helpers/table_helper.rb

@@ -19,16 +19,14 @@ module EaselHelpers
           head = [header].flatten
           opts = head.extract_options!
           
-          css_classes = [] << case index
+          css_classes = [] << opts.delete(:class) << case index
             when 0 then "first"
             when (options[:headers].size - 1) then "last"
           end
           
-          css_classes << opts.delete(:class)
-          
           headers << if head.first =~ /^\<th/
             th = Hpricot(head.first)
-            th.at("th")["class"] = clean_css_classes([th.at("th")['class'].to_s, css_classes])
+            th.at("th")["class"] = clean_css_classes([th.at("th")["class"].to_s, css_classes])
             th.to_html
           else
             content_tag(:th, head.first, opts.merge(:class => clean_css_classes(css_classes)))
@@ -38,9 +36,9 @@ module EaselHelpers
         table_css_classes = ["recordset"] << options[:table].delete(:class) << args
         
         css_classes = clean_css_classes(table_css_classes, {"last" => last_column})
-        html =  clean_column css_classes do
-          content_tag(:table, 
-            content_tag(:thead, content_tag(:tr, headers.to_s)) + capture(&block), 
+        html =  clean_column(css_classes) do
+          content_tag(:table,
+            content_tag(:thead, content_tag(:tr, headers.to_s)) + capture(&block),
               options[:table].merge(:class => css_classes, :cellspacing => 0))
         end
         

data/test/grid_helper_test.rb

@@ -5,7 +5,7 @@ class GridHelperTest < EaselHelpers::ViewTestCase
     template = %(
       <% container do %>
         <% column do %>
-          <% column :half do %>
+          <% column :half, :id => "primary" do %>
             <% column :one_third do %>
               one third of one half of 24 is 4
             <% end %>
@@ -15,7 +15,7 @@ class GridHelperTest < EaselHelpers::ViewTestCase
             <hr/>
             more text
           <% end %>
-          <% column :half, :last do %>
+          <% column :half, :last, :id => "secondary" do %>
             second column
           <% end %>
           <hr/>
@@ -28,6 +28,8 @@ class GridHelperTest < EaselHelpers::ViewTestCase
       assert_select ".container", 1
       assert_select ".col-24", 1
       assert_select ".col-12", 2
+      assert_select ".col-12#primary", 1
+      assert_select ".col-12#secondary", 1
       assert_select ".col-4", 2
       assert_select ".prepend-4", 1
       assert_select ".col-24.col-last", 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fusionary-easel_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors: 
 - Joshua Clayton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-15 00:00:00 -07:00
+date: 2009-05-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency