fusionary-easel_helpers 0.2.4 → 0.2.5

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'echoe'
 
-Echoe.new("easel_helpers", "0.2.4") do |p|
+Echoe.new("easel_helpers", "0.2.5") 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.4"
+  s.version = "0.2.5"
 
   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-20}
+  s.date = %q{2009-05-22}
   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/flash_helper.rb

@@ -2,8 +2,21 @@ module EaselHelpers
   module Helpers
     module FlashHelper
       
-      def render_flash(flash)
-        flash.keys.map do |key|
+      def render_flash(flash, options = {})
+        except_keys = [options[:except]].flatten.compact
+        only_keys = [options[:only]].flatten.compact
+        
+        raise ArgumentError, ":only and :except options conflict; use one or the other" if except_keys.any? && only_keys.any?
+        
+        keys = if except_keys.any?
+          flash.keys - except_keys
+        elsif only_keys.any?
+          flash.keys & only_keys
+        else
+          flash.keys
+        end
+        
+        keys.map do |key|
           content_tag :p, flash[key], :class => [key, "box", "single-line"].join(" ") unless flash[key].blank?
         end.join
       end

data/lib/easel_helpers/helpers/grid_helper.rb

@@ -34,9 +34,9 @@ module EaselHelpers
         "col-last"
       end
       
-      def column(size=nil, *args, &block)
+      def column(*args, &block)
         @_easel_column_count ||= application_width
-        col(size, *args, &block)
+        col(*args, &block)
       end
       
       def container(size=nil, *args, &block)
@@ -107,8 +107,8 @@ module EaselHelpers
         @_easel_current_width.pop
       end
       
-      def col(size=nil, *args, &block)
-        size = :full if size.blank?
+      def col(*args, &block)
+        size = (MULTIPLE_FRACTIONS.include?(args.first.to_s) || args.first.is_a?(Integer)) ? args.shift : :full
         
         increase_depth(size)
         output_tag = generate_output_tag(size, *args, &block)

data/test/flash_helper_test.rb

@@ -12,18 +12,39 @@ class FlashHelperTest < EaselHelpers::ViewTestCase
     
     should "display all flash messages present" do
       show_view %(<%= render_flash(:structure => "Flash message", :error => "Warning message") %>) do
-        assert_select "p.structure.box.single-line", "Flash message"
-        assert_select "p.error.box.single-line", "Warning message"
+        assert_select "p.structure", "Flash message"
+        assert_select "p.error", "Warning message"
       end
     end
     
     should "not display a flash if it is blank" do
       show_view %(<%= render_flash(:structure => "", :error => nil) %>) do
-        assert_select "p.structure.box.single-line", false
-        assert_select "p.error.box.single-line", false
+        assert_select "p.structure", false
+        assert_select "p.error", false
       end
     end
     
+    should "filter by the :only option" do
+      show_view %(<%= render_flash({:structure => "Flash message", :error => "Warning message", :notice => "Notice!"}, {:only => [:structure, :error]}) %>) do
+        assert_select "p.structure", "Flash message"
+        assert_select "p.error", "Warning message"
+        assert_select "p.notice", false
+      end
+    end
+    
+    should "filter by the :except option" do
+      show_view %(<%= render_flash({:structure => "Flash message", :error => "Warning message", :notice => "Notice!"}, {:except => [:structure, :error]}) %>) do
+        assert_select "p.structure", false
+        assert_select "p.error", false
+        assert_select "p.notice", "Notice!"
+      end
+    end
+    
+    should "raise an error of :only and :except are both passed" do
+      assert_raise ArgumentError, /conflict/ do
+        show_view %(<%= render_flash({:structure => "Flash message"}, {:except => [:structure, :error], :only => :structure}) %>)
+      end
+    end
   end
   
 end

data/test/grid_helper_test.rb

@@ -1,148 +1,179 @@
 require 'test_helper'
 
 class GridHelperTest < EaselHelpers::ViewTestCase
-  should "properly assign classes for a simple column layout" do
-    template = %(
-      <% container do %>
-        <% column do %>
-          <% column :half, :id => "primary" do %>
-            <% column :one_third do %>
-              one third of one half of 24 is 4
+  
+  context "advanced grid structures" do
+    
+    should "properly assign classes for a simple column layout" 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 :one_third, :last, prepend_one_third do %>
-              one third of one half of 24 is 4 (but prepended 4 as well)
+            <% column :half, :last, :id => "secondary" do %>
+              second column
             <% end %>
             <hr/>
-            more text
-          <% end %>
-          <% column :half, :last, :id => "secondary" do %>
-            second column
+            text
           <% end %>
-          <hr/>
-          text
         <% end %>
-      <% end %>
-    )
+      )
+      
+      show_view template do
+        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
+        assert_select ".col-12.col-last", 1
+        assert_select ".col-4.col-last", 1
+        assert_select "hr", 2
+      end
+    end
     
-    show_view template do
-      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
-      assert_select ".col-12.col-last", 1
-      assert_select ".col-4.col-last", 1
-      assert_select "hr", 2
+    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
-  end
-  
-  should "properly assign classes for generic helpers" do
-    template = %(
-      <% column do %>
+    
+    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 %>
-        <% recordset :half, :last do %>table<% end %>
-      <% end %>
-    )
-    
-    show_view template do
-      assert_select "div.col-24" do
+        <% 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 "table.col-12.col-last", "table"
+        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
-  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 %>
+    
+    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 do %>
+              <% set do %>text<% end %>
+            <% 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"
+      )
+      
+      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
-      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 %>
-        <% 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 do %>
-            <% set do %>text<% end %>
-          <% end %>
-        <% end %>
-      <% end %>
-    )
+  context "column" do
     
-    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
+    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 %>
+          <% column :id => "main" do %>main sidebar<% end %>
+          <% column :half do %>three<% end %>
+          <% column :one_third do %>two<% end %>
+          <% column 1, :last do %>one<% end %>
+        <% end %>
+      ) do
+        assert_select "div.col-6.sidebar" do
+          assert_select "div.col-6.col-last#main", "main sidebar"
+          assert_select "div.col-3", "three"
+          assert_select "div.col-2", "two"
+          assert_select "div.col-1.col-last", "one"
         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.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Joshua Clayton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-20 00:00:00 -07:00
+date: 2009-05-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency