fusionary-easel_helpers 0.2.10 → 0.2.11

data/Manifest

@@ -16,4 +16,14 @@ MIT-LICENSE
 rails/init.rb
 Rakefile
 README.textile
-tasks/easel_helpers_tasks.rake
+tasks/easel_helpers_tasks.rake
+test/date_helper_test.rb
+test/form_helper_test.rb
+test/grid_helper_test.rb
+test/jquery_helper_test.rb
+test/link_helper_test.rb
+test/message_helper_test.rb
+test/rjs_helper_test.rb
+test/structure_helper_test.rb
+test/table_helper_test.rb
+test/test_helper.rb

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'echoe'
 
-Echoe.new("easel_helpers", "0.2.10") do |p|
+Echoe.new("easel_helpers", "0.2.11") 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.10"
+  s.version = "0.2.11"
 
   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-12}
+  s.date = %q{2009-06-23}
   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/date_helper.rb

@@ -1,15 +1,15 @@
 module EaselHelpers
   module Helpers
     module DateHelper
-      
+
       def datetime(dt = nil, default_text = "", format_string = :long)
         dt ? dt.to_time.to_s(format_string) : default_text
       end
-      
+
       def date(dt = nil, default_text = "", format_string = :long)
         dt ? dt.to_date.to_s(format_string) : default_text
       end
-      
+
     end
   end
-end
+end

data/lib/easel_helpers/helpers/form_helper.rb

@@ -1,28 +1,43 @@
 module EaselHelpers
   module Helpers
     module FormHelper
-      
+
       def submit_button(value, *args)
         options = args.extract_options!
         css_classes = ["btn"] << options.delete(:class) << args
-        content_tag(:button, "<span>#{value}</span>", {:value => value, :type => "submit", :class => clean_css_classes(css_classes, {"last" => last_column})}.merge(options))
+        css_classes = clean_css_classes(css_classes, {"last" => last_column})
+
+        content_tag :button, 
+                    "<span>#{value}</span>",
+                    { :value => value,
+                      :type => "submit",
+                      :class => css_classes
+                    }.merge(options)
       end
-      
+
       def set(*args, &block)
         options = args.extract_options!
         css_classes = [] << options.delete(:class) << args
-        css_classes << "text" unless other_than_grid?(args.map(&:to_s) - ["last", last_column.to_s])
-        css_classes << "text" if standardize_css_classes(css_classes).include?("textarea")
-        
+
+        if !other_than_grid?(args.map(&:to_s) - ["last", last_column.to_s])
+          css_classes << "text"
+        end
+
+        if standardize_css_classes(css_classes).include?("textarea")
+          css_classes << "text" 
+        end
+
         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))
+          content_tag :div,
+                      capture(&block),
+                      options.merge(:class => css_classes)
         end
-        
+
         concat(html)
       end
-      
+
       def fieldset(*args, &block)
         options = args.extract_options!
         css_classes = [] << options.delete(:class) << args
@@ -31,20 +46,23 @@ module EaselHelpers
           ""
         else
           legend_opts = options.delete(:legend) || {}
-          content_tag(:h3, 
-            title, 
-            {:class => clean_css_classes([legend_opts.delete(:class)] << "legend")}.merge(legend_opts))
+          legend_classes = clean_css_classes([legend_opts.delete(:class)] << "legend")
+          content_tag :h3, 
+                      title, 
+                      {:class => legend_classes}.merge(legend_opts)
         end
-        
+
         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))
+          content_tag :fieldset,
+                      legend + capture(&block),
+                      options.merge(:class => css_classes)
         end
-        
+
         concat(html)
       end
-      
+
     end
   end
-end
+end

data/lib/easel_helpers/helpers/grid_helper.rb

@@ -28,25 +28,25 @@ module EaselHelpers
         :twentythree_twentyfourths => (23/24.to_f),
         :full =>                      (1.to_f)
       }.freeze
-      MULTIPLE_FRACTIONS = MULTIPLES.keys.map {|k| k.to_s }.freeze
-      
+      MULTIPLE_FRACTIONS = MULTIPLES.keys.map {|key| key.to_s }.freeze
+
       def last_column
         "col-last"
       end
-      
+
       def column(*args, &block)
         @_easel_column_count ||= application_width
         col(*args, &block)
       end
-      
+
       def container(size=nil, *args, &block)
         args = args.insert(0, :container)
         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)
@@ -58,7 +58,7 @@ module EaselHelpers
           size = size.to_i
           increase_depth(size)
           html = capture(&block)
-          
+
           if block_given? && block_is_within_action_view?(block)
             concat(html)
             decrease_depth(size)
@@ -68,20 +68,21 @@ module EaselHelpers
           end
         end
       end
-      
+
       def method_missing_with_easel_widths(call, *args)
         # filter out any initial helper calls
         found = false
-        MULTIPLE_FRACTIONS.each do |w|
-          found = true and break if call.to_s.include?(w)
+        MULTIPLE_FRACTIONS.each do |fraction|
+          found = true and break if call.to_s.include?(fraction)
         end
+
         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"
         class_width = $3
-        
+
         if MULTIPLES.keys.include?(class_width.to_sym)
           width = @_easel_column_count || application_width
           "#{class_name}-#{(width*MULTIPLES[class_width.to_sym]).to_i}"
@@ -89,30 +90,45 @@ module EaselHelpers
           method_missing_without_easel_widths(call, *args)
         end
       end
-      
+
       alias_method_chain :method_missing, :easel_widths
-      
+
       private
-      
+
       def application_width; 24; end
-      
+
       def increase_depth(size)
         @_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
+
+        unless @_easel_column_count.blank?
+          @_easel_current_width.push(@_easel_column_count.to_s)
+        end
+
+        @_easel_column_count = if size.to_s =~ /^\d+$/
+          size.to_s.to_i
+        else
+          (@_easel_column_count*MULTIPLES[size]).to_i
+        end
       end
-      
+
       def decrease_depth(size)
-        @_easel_column_count = size.is_a?(Integer) ? @_easel_current_width.last.to_i : (@_easel_column_count/MULTIPLES[size]).to_i
+        @_easel_column_count = if size.is_a?(Integer)
+          @_easel_current_width.last.to_i
+        else
+          (@_easel_column_count/MULTIPLES[size]).to_i
+        end
+
         @_easel_current_width.pop
       end
-      
+
       def col(*args, &block)
-        size = (MULTIPLE_FRACTIONS.include?(args.first.to_s) || args.first.is_a?(Integer)) ? args.shift : :full
-        
+        fractional_width = MULTIPLE_FRACTIONS.include?(args.first.to_s)
+        explicit_column_width = args.first.is_a?(Integer)
+        size = (fractional_width || explicit_column_width) ? args.shift : :full
+
         increase_depth(size)
         output_tag = generate_output_tag(size, *args, &block)
-        
+
         if block_given? && block_is_within_action_view?(block)
           concat(output_tag)
           decrease_depth(size)
@@ -121,17 +137,25 @@ module EaselHelpers
           output_tag
         end
       end
-      
+
       def generate_output_tag(size, *args, &block)
         options = args.extract_options!
-        
+
         css_classes = [] << options.delete(:class) << args
-        css_classes << "col-#{@_easel_column_count}" unless options.delete(:suppress_col)
-        css_classes << last_column if size.to_sym == :full && @_easel_column_count != application_width
-        
-        content_tag(:div, capture(&block), {:class => clean_css_classes(css_classes, {"last" => last_column})}.merge(options))
+        unless options.delete(:suppress_col)
+          css_classes << "col-#{@_easel_column_count}"
+        end
+
+        if size.to_sym == :full && @_easel_column_count != application_width
+          css_classes << last_column
+        end
+
+        css_classes = clean_css_classes(css_classes, {"last" => last_column})
+        content_tag(:div,
+                    capture(&block),
+                    {:class => css_classes}.merge(options))
       end
-      
+
     end
   end
-end
+end

data/lib/easel_helpers/helpers/jquery_helper.rb

@@ -1,7 +1,7 @@
 module EaselHelpers
   module Helpers
     module JqueryHelper
-      
+
       def document_ready(&block)
         html = content_tag :script, :type => "text/javascript" do
           %(
@@ -12,10 +12,10 @@ module EaselHelpers
             })(jQuery);
           )
         end
-        
+
         concat(html)
       end
-      
+
     end
   end
-end
+end

data/lib/easel_helpers/helpers/link_helper.rb

@@ -1,21 +1,21 @@
 module EaselHelpers
   module Helpers
     module LinkHelper
-      
+
       def link_button(*args, &block)
         doc = Hpricot(link_to(*args, &block))
         doc.at("a").inner_html = "<span>#{doc.at("a").inner_html}</span>"
         (doc/:a).add_class("btn")
         doc.to_html
       end
-      
+
       def link_to_email(email_address, *args)
         options = args.extract_options!
         link = args.first.is_a?(String) ? h(args.first) : email_address
         return link if email_address.blank?
         link_to link, "mailto:#{email_address}", options
       end
-      
+
     end
   end
-end
+end

data/lib/easel_helpers/helpers/message_helper.rb

@@ -1,13 +1,15 @@
 module EaselHelpers
   module Helpers
     module MessageHelper
-      
+
       def messages(messages, 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?
-        
+        only_keys   = [options[:only]].flatten.compact
+
+        if except_keys.any? && only_keys.any?
+          raise ArgumentError, ":only and :except options conflict; use one"
+        end
+
         keys = if except_keys.any?
           messages.keys - except_keys
         elsif only_keys.any?
@@ -15,12 +17,16 @@ module EaselHelpers
         else
           messages.keys
         end
-        
+
         keys.map do |key|
-          content_tag :p, messages[key], :class => [key, "box", "single-line"].join(" ") unless messages[key].blank?
+          unless messages[key].blank?
+            content_tag :p,
+                        messages[key],
+                        :class => [key, "box", "single-line"].join(" ")
+          end
         end.join
       end
-      
+
     end
   end
-end
+end

data/lib/easel_helpers/helpers/rjs_helper.rb

@@ -1,20 +1,20 @@
 module EaselHelpers
   module Helpers
     module RjsHelper
-      
+
       def inline_flash(page, flash, options = {})
         container_id = options[:container] || "flash-container"
         current_flash = flash
-        
+
         flash.discard unless options[:keep_flash]
-        
+
         if options[:replace]
           page.replace_html container_id, messages(current_flash)
         else
           page.insert_html :top, container_id, messages(current_flash)
         end
       end
-      
+
     end
   end
-end
+end

data/lib/easel_helpers/helpers/structure_helper.rb

@@ -1,39 +1,43 @@
 module EaselHelpers
   module Helpers
     module StructureHelper
-      
+
       def blockquote(*args, &block)
         options = args.extract_options!
         author = options.delete(:author)
-        
-        bq =  content_tag(:blockquote,
-                (option_quote = textilize(options.delete(:quote))).blank? ? capture(&block) : option_quote
-              )
-        
+        option_quote = textilize(options.delete(:quote))
+
+        bq =  content_tag :blockquote,
+                          option_quote.blank? ? capture(&block) : option_quote
+
         html = if author
-          content_tag(:div, bq + content_tag(:cite, author), :class => "quote-cited")
+          content_tag :div,
+                      bq + content_tag(:cite, author),
+                      :class => "quote-cited"
         else
           bq
         end
-        
+
         concat(html)
       end
-      
+
       def body(*args)
         options = args.extract_options!
         @_page_body_attributes ||= {}
-        
+
         css_classes = [] << @_page_body_attributes.delete(:class) << args
+
         @_page_body_attributes = @_page_body_attributes.merge(options)
         @_page_body_attributes[:class] = clean_css_classes(css_classes)
-        
+
         if block_given?
           block = lambda { yield }
+
           html = content_tag(:body, capture(&block), @_page_body_attributes)
           concat(html)
         end
       end
-      
+
     end
   end
-end
+end

data/lib/easel_helpers/helpers/table_helper.rb

@@ -1,51 +1,61 @@
 module EaselHelpers
   module Helpers
     module TableHelper
-      
+
       def zebra_row(options = {}, &block)
         cycle_list = options.delete(:cycle_list) || [nil, "alt"]
         css_classes = [cycle(*cycle_list)] << options.delete(:class)
-        html = content_tag(:tr, capture(&block),
-          options.merge(:class => clean_css_classes(css_classes)))
+        css_classes = clean_css_classes(css_classes)
+
+        html = content_tag :tr,
+                           capture(&block),
+                           options.merge(:class => css_classes)
         concat(html)
       end
-      
+
       def recordset(*args, &block)
         options = args.extract_options!
         options[:table] ||= {}
-        
+
         headers = []
         (options[:headers] || []).each_with_index do |header, index|
           head = [header].flatten
           opts = head.extract_options!
-          
+
           css_classes = [] << opts.delete(:class) << case index
             when 0 then "first"
             when (options[:headers].size - 1) then "last"
           end
-          
+
           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_classes = th.at("th")["class"].to_s
+            th_classes = clean_css_classes([th_classes, css_classes])
+            th.at("th")["class"] = th_classes
             th.to_html
           else
-            content_tag(:th, head.first, opts.merge(:class => clean_css_classes(css_classes)))
+            content_tag :th,
+                        head.first,
+                        opts.merge(:class => clean_css_classes(css_classes))
           end
         end
-        
-        table_css_classes = ["recordset"] << options[:table].delete(:class) << args
-        
-        css_classes = clean_css_classes(table_css_classes, {"last" => last_column})
+
+        table_classes = ["recordset", args] << options[:table].delete(:class)
+        css_classes = clean_css_classes(table_classes, {"last" => last_column})
+
         html =  clean_column(css_classes) do
+          table_options = options[:table]
+          table_options.merge!(:class => css_classes, :cellspacing => 0)
           content_tag(:table,
-            content_tag(:thead, content_tag(:tr, headers.to_s)) + capture(&block),
-              options[:table].merge(:class => css_classes, :cellspacing => 0))
+                      content_tag(:thead, content_tag(:tr, headers.to_s)) + \
+                        capture(&block),
+                      table_options)
         end
-        
+
         reset_cycle
         concat(html)
       end
-      
+
     end
   end
-end
+end

data/lib/easel_helpers/helpers.rb

@@ -19,16 +19,17 @@ module EaselHelpers
     include MessageHelper
     include RjsHelper
     include JqueryHelper
-    
+
     protected
-    
+
     def other_than_grid?(classes)
-      (standardize_css_classes(classes).map {|s| s.to_s } - EaselHelpers::Helpers::GridHelper::MULTIPLE_FRACTIONS).any?
+      (standardize_css_classes(classes).map {|s| s.to_s } -
+       EaselHelpers::Helpers::GridHelper::MULTIPLE_FRACTIONS).any?
     end
-    
+
     def clean_css_classes(string_or_array, replace = {})
       css_classes = [] + standardize_css_classes(string_or_array)
-      
+
       if replace.any?
         replace.keys.each do |k|
           if css_classes.include? k
@@ -37,26 +38,29 @@ module EaselHelpers
           end
         end
       end
-      
-      if css_classes.any? && (fractions = css_classes & EaselHelpers::Helpers::GridHelper::MULTIPLE_FRACTIONS).any?
-        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
+
+      fractions = css_classes & EaselHelpers::Helpers::GridHelper::MULTIPLE_FRACTIONS
+      if css_classes.any? && fractions.any?
+        fractions.each do |fraction|
+          css_classes.delete(fraction)
+          css_classes << self.send(fraction)
+          if fraction == "full" && @_easel_column_count != application_width
+            css_classes << last_column 
+          end
         end
       end
-      
+
       css_classes.map {|s| s.strip }.reject {|s| s.blank? }.uniq.join(" ").strip
     end
-    
+
     private
-    
+
     def standardize_css_classes(string_or_array)
       [string_or_array].flatten.join(" ").split(/ /)
     end
-    
+
     BLOCK_CALLED_FROM_ERB = 'defined? __in_erb_template'
-    
+
     if RUBY_VERSION < '1.9.0'
       # Check whether we're called from an erb template.
       # We'd return a string in any other case, but erb <%= ... %>
@@ -70,6 +74,6 @@ module EaselHelpers
         block && eval(BLOCK_CALLED_FROM_ERB, block.binding)
       end
     end
-    
+
   end
-end
+end

data/lib/easel_helpers/rails_partial_caching.rb

@@ -1,23 +1,25 @@
 module ActionView
   module Partials
     private
-    
+
     def render_partial_with_easel(*args)
       path = args.first[:partial]
       locals = args.last
-      
+
       easel_cached_column_counts = session[:easel_cached_column_counts] ||= {}
-      
+
       if easel_cached_column_counts.keys.include?(path)
         @_easel_column_count = locals[:easel_width] || easel_cached_column_counts[path]
         easel_cached_column_counts[path] = @_easel_column_count
       else
-        easel_cached_column_counts[path] = @_easel_column_count if @_easel_column_count.is_a?(Fixnum) && path !~ /^layout/
+        if @_easel_column_count.is_a?(Fixnum) && path !~ /^layout/
+          easel_cached_column_counts[path] = @_easel_column_count
+        end
       end
-      
+
       render_partial_without_easel(*args)
     end
-    
+
     alias_method_chain :render_partial, :easel
   end
 end
@@ -28,11 +30,11 @@ module EaselHelpers
       base.send :include, EaselHelpers::PartialCaching::InstanceMethods
       base.before_filter :clear_easel_cache
     end
-    
+
     module InstanceMethods
       def clear_easel_cache
         session[:easel_cached_column_counts] = nil unless request.xhr?
       end
     end
   end
-end
+end

data/test/jquery_helper_test.rb

@@ -6,12 +6,13 @@ class JqueryHelperTest < EaselHelpers::ViewTestCase
     
     setup do
       @whitespace = '\s+?'
-      @anything = '(.|\s)+?'
-      @anon_function_start_regex = '\(function\(\$\) \{'
-      @document_ready_start_regex = '\$\(document\)\.ready\(function\(\) \{'
+      @anything =   '(.|\s)+?'
       
-      @document_ready_end_regex = '\}\)\;'
-      @anon_function_end_regex = '\}\)\(jQuery\)\;'
+      @anon_function_start_regex  = Regexp.escape "(function($) {"
+      @document_ready_start_regex = Regexp.escape   "$(document).ready(function() {"
+      
+      @document_ready_end_regex   = Regexp.escape   "});"
+      @anon_function_end_regex    = Regexp.escape "})(jQuery);"
     end
     
     should "properly build the document ready script tag" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fusionary-easel_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors: 
 - Joshua Clayton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-12 00:00:00 -07:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency