fusionary-easel_helpers 0.1.5 → 0.1.6

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'echoe'
 
-Echoe.new("easel_helpers", "0.1.5") do |p|
+Echoe.new("easel_helpers", "0.1.6") do |p|
   p.description = "Fusionary Rails View Helpers"
   p.url = "http://github.com/fusionary/easel_helpers"
   p.author = "Joshua Clayton"
@@ -12,9 +12,6 @@ Echoe.new("easel_helpers", "0.1.5") do |p|
   p.development_dependencies = ["actionview >= 2.1.0", "activesupport >= 2.1.0", "hpricot >= 0.8.1"]
 end
 
-desc 'Default: run unit tests.'
-task :default => :test
-
 desc 'Test the easel_helpers plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'

data/easel_helpers.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easel_helpers}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   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-05}
+  s.date = %q{2009-05-07}
   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/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"]
-  s.files = ["lib/easel_helpers/helpers/date_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", "Manifest", "MIT-LICENSE", "rails/init.rb", "Rakefile", "README.textile", "tasks/easel_helpers_tasks.rake", "easel_helpers.gemspec", "test/date_helper_test.rb", "test/form_helper_test.rb", "test/grid_helper_test.rb", "test/link_helper_test.rb", "test/structure_helper_test.rb", "test/table_helper_test.rb", "test/test_helper.rb"]
+  s.files = ["easel_helpers.gemspec", "lib/easel_helpers/helpers/date_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", "Manifest", "MIT-LICENSE", "rails/init.rb", "Rakefile", "README.textile", "tasks/easel_helpers_tasks.rake", "test/date_helper_test.rb", "test/form_helper_test.rb", "test/grid_helper_test.rb", "test/link_helper_test.rb", "test/structure_helper_test.rb", "test/table_helper_test.rb", "test/test_helper.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/fusionary/easel_helpers}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Easel_helpers", "--main", "README.textile"]

data/lib/easel_helpers/helpers/form_helper.rb

@@ -11,9 +11,14 @@ module EaselHelpers
       def set(*args, &block)
         options = args.extract_options!
         css_classes = [] << options.delete(:class) << args
-        css_classes << "text" unless other_than_grid?(args - ["last", last_column])
+        css_classes << "text" unless other_than_grid?(args.map(&:to_s) - ["last", last_column.to_s])
+        
+        css_classes = clean_css_classes(css_classes, {"last" => last_column})
+        
+        html = clean_column css_classes do
+          content_tag(:div, capture(&block), options.merge(:class => css_classes))
+        end
         
-        html = content_tag(:div, capture(&block), options.merge(:class => clean_css_classes(css_classes, {"last" => last_column})))
         concat(html)
       end
       
@@ -30,7 +35,12 @@ module EaselHelpers
             {:class => clean_css_classes([options[:legend].delete(:class)] << "legend")}.merge(options[:legend]))
         end
         
-        html = content_tag(:fieldset, legend + capture(&block), options.merge(:class => clean_css_classes(css_classes, {"last" => last_column})))
+        css_classes = clean_css_classes(css_classes, {"last" => last_column})
+        
+        html = clean_column css_classes do
+          content_tag(:fieldset, legend + capture(&block), options.merge(:class => css_classes))
+        end
+        
         concat(html)
       end
       

data/lib/easel_helpers/helpers/grid_helper.rb

@@ -44,6 +44,31 @@ module EaselHelpers
         column(size, *args, &block)
       end
       
+      def clean_column(classes, &block)
+        size = classes.scan(/col-(\d+)/).flatten.last
+        
+        if size.nil?
+          html = capture(&block)
+          if block_given? && block_is_within_action_view?(block)
+            concat(html)
+          else
+            html
+          end
+        else
+          size = size.to_i
+          increase_depth(size)
+          html = capture(&block)
+          
+          if block_given? && block_is_within_action_view?(block)
+            concat(html)
+            decrease_depth(size)
+          else
+            decrease_depth(size)
+            html
+          end
+        end
+      end
+      
       def method_missing_with_easel_widths(call, *args)
         # filter out any initial helper calls
         found = false
@@ -72,13 +97,14 @@ module EaselHelpers
       def application_width; 24; end
       
       def increase_depth(size)
-        @_easel_current_width = @_easel_column_count.to_s
+        @_easel_current_width ||= []
+        @_easel_current_width.push @_easel_column_count.to_s
         @_easel_column_count = size.to_s =~ /^\d+$/ ? size.to_s.to_i : (@_easel_column_count*MULTIPLES[size]).to_i
       end
       
       def decrease_depth(size)
-        @_easel_column_count = size.is_a?(Integer) ? @_easel_current_width.to_i : (@_easel_column_count/MULTIPLES[size]).to_i
-        @_easel_current_width = nil
+        @_easel_column_count = size.is_a?(Integer) ? @_easel_current_width.last.to_i : (@_easel_column_count/MULTIPLES[size]).to_i
+        @_easel_current_width.pop
       end
       
       def col(size=nil, *args, &block)

data/lib/easel_helpers/helpers/table_helper.rb

@@ -37,9 +37,12 @@ module EaselHelpers
         
         table_css_classes = ["recordset"] << options[:table].delete(:class) << args
         
-        html =  content_tag(:table, 
-                  content_tag(:thead, content_tag(:tr, headers.to_s)) + capture(&block), 
-                    options[:table].merge(:class => clean_css_classes(table_css_classes)))
+        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), 
+              options[:table].merge(:class => css_classes))
+        end
         
         reset_cycle
         concat(html)

data/test/form_helper_test.rb

@@ -56,6 +56,12 @@ class FormHelperTest < EaselHelpers::ViewTestCase
       end
     end
     
+    should "assign default class if last class is passed as the only class" do
+      show_view "<% set :half, :last do %>words<% end %>" do
+        assert_select "div.col-12.text.col-last", "words"
+      end
+    end
+    
   end
   
   context "fieldset" do

data/test/grid_helper_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class GridHelperTest < EaselHelpers::ViewTestCase
-  test "a basic structure can be generated" do
+  should "properly assign classes for a simple column layout" do
     template = %(
       <% container do %>
         <% column do %>
@@ -36,4 +36,67 @@ class GridHelperTest < EaselHelpers::ViewTestCase
       assert_select "hr", 2
     end
   end
+  
+  should "properly assign classes for generic helpers" do
+    template = %(
+      <% column do %>
+        <% fieldset :hform, :half do %>
+          <% set :one_third do %>text<% end %>
+          <% set :two_thirds, :last do %>more text<% end %>
+        <% end %>
+        <% recordset :half, :last do %>table<% end %>
+      <% end %>
+    )
+    
+    show_view template do
+      assert_select "div.col-24" do
+        assert_select "fieldset.hform.col-12" do
+          assert_select "div.col-4", "text"
+          assert_select "div.col-8.col-last", "more text"
+        end
+        assert_select "table.col-12.col-last", "table"
+      end
+    end
+  end
+  
+  should "properly assign classes for a deeply-nested view" do
+    template = %(
+      <% container do %>
+        <% column :half do %>
+          <% fieldset :hform, :half do %>
+            <% set :one_third do %>text<% end %>
+            <% set :two_thirds, :last do %>more text<% end %>
+          <% end %>
+          <% recordset :half, :last do %>table<% end %>
+        <% end %>
+        <% column :one_third do %>one third!<% end %>
+        <% column :one_sixth, :last do %>
+          <% fieldset :vform, :full, :last  do %>
+            <% set do %>text<% end %>
+          <% end %>
+        <% end %>
+      <% end %>
+    )
+    
+    show_view template do
+      assert_select "div.container" do
+        assert_select "div.col-12" do
+          assert_select "fieldset.hform.col-6" do
+            assert_select "div.col-2", "text"
+            assert_select "div.col-4.col-last", "more text"
+          end
+          assert_select "table.col-6.col-last", "table"
+        end
+        
+        assert_select "div.col-8", "one third!"
+        
+        assert_select "div.col-4.col-last" do
+          assert_select "fieldset.vform.col-4.col-last" do
+            assert_select "div", "text"
+          end
+        end
+        
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fusionary-easel_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Joshua Clayton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-05 00:00:00 -07:00
+date: 2009-05-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,6 +70,7 @@ extra_rdoc_files:
 - README.textile
 - tasks/easel_helpers_tasks.rake
 files: 
+- easel_helpers.gemspec
 - lib/easel_helpers/helpers/date_helper.rb
 - lib/easel_helpers/helpers/form_helper.rb
 - lib/easel_helpers/helpers/grid_helper.rb
@@ -85,7 +86,6 @@ files:
 - Rakefile
 - README.textile
 - tasks/easel_helpers_tasks.rake
-- easel_helpers.gemspec
 - test/date_helper_test.rb
 - test/form_helper_test.rb
 - test/grid_helper_test.rb