fusionary-easel_helpers 0.2.11 → 0.2.12

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'echoe'
 
-Echoe.new("easel_helpers", "0.2.11") do |p|
+Echoe.new("easel_helpers", "0.2.12") 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.11"
+  s.version = "0.2.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Clayton"]
-  s.date = %q{2009-06-23}
+  s.date = %q{2009-06-28}
   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/jquery_helper.rb", "lib/easel_helpers/helpers/link_helper.rb", "lib/easel_helpers/helpers/message_helper.rb", "lib/easel_helpers/helpers/rjs_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

@@ -30,8 +30,20 @@ module EaselHelpers
       }.freeze
       MULTIPLE_FRACTIONS = MULTIPLES.keys.map {|key| key.to_s }.freeze
 
+      def self.easel_grid!
+        @@last_column = "col-last"
+        @@column_prefix = "col"
+      end
+
+      def self.blueprint_grid!
+        @@last_column = "last"
+        @@column_prefix = "span"
+      end
+
+      easel_grid!
+
       def last_column
-        "col-last"
+        @@last_column
       end
 
       def column(*args, &block)
@@ -45,7 +57,7 @@ module EaselHelpers
       end
 
       def clean_column(classes, &block)
-        size = classes.scan(/col-(\d+)/).flatten.last
+        size = classes.scan(/#{column_prefix}-(\d+)/).flatten.last
 
         if size.nil?
           html = capture(&block)
@@ -79,8 +91,8 @@ module EaselHelpers
         method_missing_without_easel_widths(call, *args) and return unless found
 
         # one of the widths is somewhere in the helper call; let's find it
-        call.to_s =~ /^((append|prepend|col)_)?(.+)$/
-        class_name = $2 || "col"
+        call.to_s =~ /^((append|prepend|#{column_prefix})_)?(.+)$/
+        class_name = $2 || column_prefix
         class_width = $3
 
         if MULTIPLES.keys.include?(class_width.to_sym)
@@ -143,7 +155,7 @@ module EaselHelpers
 
         css_classes = [] << options.delete(:class) << args
         unless options.delete(:suppress_col)
-          css_classes << "col-#{@_easel_column_count}"
+          css_classes << "#{column_prefix}-#{@_easel_column_count}"
         end
 
         if size.to_sym == :full && @_easel_column_count != application_width
@@ -151,11 +163,14 @@ module EaselHelpers
         end
 
         css_classes = clean_css_classes(css_classes, {"last" => last_column})
-        content_tag(:div,
+        content_tag(options[:tag] || :div,
                     capture(&block),
                     {:class => css_classes}.merge(options))
       end
 
+      def column_prefix
+        @@column_prefix
+      end
     end
   end
 end

data/test/grid_helper_test.rb

@@ -1,9 +1,9 @@
 require 'test_helper'
 
 class GridHelperTest < EaselHelpers::ViewTestCase
-  
+
   context "advanced grid structures" do
-    
+
     should "properly assign classes for a simple column layout" do
       template = %(
         <% container do %>
@@ -26,7 +26,7 @@ class GridHelperTest < EaselHelpers::ViewTestCase
           <% end %>
         <% end %>
       )
-      
+
       show_view template do
         assert_select ".container", 1
         assert_select ".col-24", 1
@@ -41,7 +41,7 @@ class GridHelperTest < EaselHelpers::ViewTestCase
         assert_select "hr", 2
       end
     end
-    
+
     should "properly assign classes for generic helpers" do
       template = %(
         <% column do %>
@@ -52,7 +52,7 @@ class GridHelperTest < EaselHelpers::ViewTestCase
           <% recordset :half, :last do %>table<% end %>
         <% end %>
       )
-      
+
       show_view template do
         assert_select "div.col-24" do
           assert_select "fieldset.hform.col-12" do
@@ -63,7 +63,7 @@ class GridHelperTest < EaselHelpers::ViewTestCase
         end
       end
     end
-    
+
     should "properly assign classes for generic helpers without column wrappers" do
       template = %(
         <% fieldset :hform, :half do %>
@@ -84,12 +84,12 @@ class GridHelperTest < EaselHelpers::ViewTestCase
         <% 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
@@ -106,7 +106,7 @@ class GridHelperTest < EaselHelpers::ViewTestCase
         assert_select "table.col-4.col-last", "table"
       end
     end
-    
+
     should "properly assign classes for a deeply-nested view" do
       template = %(
         <% container do %>
@@ -125,7 +125,7 @@ class GridHelperTest < EaselHelpers::ViewTestCase
           <% end %>
         <% end %>
       )
-      
+
       show_view template do
         assert_select "div.container" do
           assert_select "div.col-12" do
@@ -135,9 +135,9 @@ class GridHelperTest < EaselHelpers::ViewTestCase
             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"
@@ -146,17 +146,55 @@ class GridHelperTest < EaselHelpers::ViewTestCase
         end
       end
     end
-    
+
+    should "properly assign classes when using Blueprint grid" do
+      template = %(
+        <% container do %>
+          <% column do %>
+            <% column :half, :id => "primary" do %>
+              <% column :one_third do %>
+                one third of one half of 24 is 4
+              <% end %>
+              <% column :one_third, :last, prepend_one_third do %>
+                one third of one half of 24 is 4 (but prepended 4 as well)
+              <% end %>
+              <hr/>
+              more text
+            <% end %>
+            <% column :half, :last, :id => "secondary" do %>
+              second column
+            <% end %>
+            <hr/>
+            text
+          <% end %>
+        <% end %>
+      )
+      EaselHelpers::Helpers::GridHelper.blueprint_grid!
+      show_view template do
+        assert_select ".container", 1
+        assert_select ".span-24", 1
+        assert_select ".span-12", 2
+        assert_select ".span-12#primary", 1
+        assert_select ".span-12#secondary", 1
+        assert_select ".span-4", 2
+        assert_select ".prepend-4", 1
+        assert_select ".span-24.last", 0
+        assert_select ".span-12.last", 1
+        assert_select ".span-4.last", 1
+        assert_select "hr", 2
+      end
+      EaselHelpers::Helpers::GridHelper.easel_grid!
+    end
   end
-  
+
   context "column" do
-    
+
     should "allow assigning options hash without having to define a width" do
       show_view %(<% column :id => "my-custom-id", :class => "content" do %>words<% end %>) do
         assert_select "div.col-24.content#my-custom-id", "words"
       end
     end
-    
+
     should "allow explicit column assignment" do
       show_view %(
         <% column 6, :sidebar do %>
@@ -174,6 +212,11 @@ class GridHelperTest < EaselHelpers::ViewTestCase
         end
       end
     end
-    
+
+    should "allow tag overriding" do
+      show_view %(<% column :tag => :section do %>content<% end %>) do
+        assert_select "section.col-24", "content"
+      end
+    end
   end
-end
+end

data/test/structure_helper_test.rb

@@ -1,15 +1,15 @@
 require 'test_helper'
 
 class StructureHelperTest < EaselHelpers::ViewTestCase
-  
+
   context "blockquote" do
-    
+
     should "default with the correct structure" do
       show_view "<% blockquote do %>My quoted text<% end %>" do
         assert_select "blockquote", "My quoted text"
       end
     end
-    
+
     should "default with the correct structure when an author is set" do
       show_view "<% blockquote :author => 'W. Shakespeare' do %>All the world's a stage<% end %>" do
         assert_select "div.quote-cited" do
@@ -18,11 +18,11 @@ class StructureHelperTest < EaselHelpers::ViewTestCase
         end
       end
     end
-    
+
   end
-  
+
   context "body" do
-    
+
     should "allow passing a block structure" do
       show_view %(
         <% body do %>body goes here<% end %>
@@ -30,7 +30,7 @@ class StructureHelperTest < EaselHelpers::ViewTestCase
         assert_select "body", "body goes here"
       end
     end
-    
+
     should "allow passing arguments" do
       show_view %(
         <% body :home, 'home-index', 'logged-in', :id => 'application' do %>body goes here<% end %>
@@ -38,7 +38,7 @@ class StructureHelperTest < EaselHelpers::ViewTestCase
         assert_select "body#application.home.home-index.logged-in", "body goes here"
       end
     end
-    
+
     should "allow multiple body definitions that set attributes" do
       show_view %(
         <% body :home, 'logged-in' %>
@@ -48,7 +48,7 @@ class StructureHelperTest < EaselHelpers::ViewTestCase
         assert_select "body#application-override.home.home-index.logged-in", "body goes here"
       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.2.11
+  version: 0.2.12
 platform: ruby
 authors: 
 - Joshua Clayton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-23 00:00:00 -07:00
+date: 2009-06-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency