fusionary-easel_helpers 0.1.7 → 0.1.8

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'echoe'
 
-Echoe.new("easel_helpers", "0.1.7") do |p|
+Echoe.new("easel_helpers", "0.1.8") 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.1.7"
+  s.version = "0.1.8"
 
   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-07}
+  s.date = %q{2009-05-08}
   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"]

data/lib/easel_helpers/helpers/grid_helper.rb

@@ -97,8 +97,8 @@ module EaselHelpers
       def application_width; 24; end
       
       def increase_depth(size)
-        @_easel_current_width ||= []
-        @_easel_current_width.push @_easel_column_count.to_s
+        @_easel_current_width ||= [application_width.to_s]
+        @_easel_current_width.push @_easel_column_count.to_s unless @_easel_column_count.blank?
         @_easel_column_count = size.to_s =~ /^\d+$/ ? size.to_s.to_i : (@_easel_column_count*MULTIPLES[size]).to_i
       end
       

data/lib/easel_helpers/helpers.rb

@@ -17,7 +17,7 @@ module EaselHelpers
     protected
     
     def other_than_grid?(classes)
-      ([classes].flatten.map(&:to_s) - EaselHelpers::Helpers::GridHelper::MULTIPLE_FRACTIONS).any?
+      (standardize_css_classes(classes).map(&:to_s) - EaselHelpers::Helpers::GridHelper::MULTIPLE_FRACTIONS).any?
     end
     
     def clean_css_classes(string_or_array, replace = {})
@@ -36,6 +36,7 @@ module EaselHelpers
         fractions.each do |f|
           css_classes.delete(f)
           css_classes << self.send(f)
+          css_classes << last_column if f == "full" && @_easel_column_count != application_width
         end
       end
       

data/test/grid_helper_test.rb

@@ -59,6 +59,49 @@ class GridHelperTest < EaselHelpers::ViewTestCase
     end
   end
   
+  should "properly assign classes for generic helpers without column wrappers" do
+    template = %(
+      <% fieldset :hform, :half do %>
+        <% set :one_third do %>text<% end %>
+        <% set :two_thirds, :last do %>more text<% end %>
+        <% column do %>
+          <% column :one_third do %>one third<% end %>
+          <% column :two_thirds, :last do %>
+            <% column :half do %>half<% end %>
+            <% column :half, :last do %>last half<% end %>
+          <% end %>
+        <% end %>
+      <% end %>
+      <% column :one_third do %>
+        <% column :one_fourth do %>two wide<% end %>
+        <% column :half do %>four wide<% end %>
+        <% column :one_fourth, :last do %>two more wide<% end %>
+      <% end %>
+      <% recordset :one_sixth, :last do %>table<% end %>
+    )
+    
+    show_view template do
+      assert_select "fieldset.hform.col-12" do
+        assert_select "div.col-4", "text"
+        assert_select "div.col-8.col-last", "more text"
+        
+        assert_select "div.col-12.col-last" do
+          assert_select "div.col-4", "one third"
+          assert_select "div.col-8.col-last" do
+            assert_select "div.col-4", "half"
+            assert_select "div.col-4.col-last", "last half"
+          end
+        end
+      end
+      assert_select "div.col-8" do
+        assert_select "div.col-2", "two wide"
+        assert_select "div.col-4", "four wide"
+        assert_select "div.col-2.col-last", "two more wide"
+      end
+      assert_select "table.col-4.col-last", "table"
+    end
+  end
+  
   should "properly assign classes for a deeply-nested view" do
     template = %(
       <% container do %>
@@ -71,7 +114,7 @@ class GridHelperTest < EaselHelpers::ViewTestCase
         <% end %>
         <% column :one_third do %>one third!<% end %>
         <% column :one_sixth, :last do %>
-          <% fieldset :vform, :full, :last  do %>
+          <% fieldset :vform, :full do %>
             <% set do %>text<% end %>
           <% end %>
         <% end %>
@@ -99,4 +142,5 @@ class GridHelperTest < EaselHelpers::ViewTestCase
       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.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Joshua Clayton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 -07:00
+date: 2009-05-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency