gridion 0.0.16 → 0.0.17

data/lib/gridion/grid_helper.rb

@@ -41,7 +41,16 @@ module Gridion
       
       options={:actions=>[:edit, :delete]}.merge(options).with_indifferent_access
       
-
+      if %w(ol ul).include?(options[:table_tag])
+        options[:table_header_tag]||="span"
+        options[:table_row_tag]||="li"
+        options[:table_cell_tag]||="span"
+      end
+      
+      options[:table_tag]||="table"
+      options[:table_header_tag]||="th"
+      options[:table_row_tag]||="tr"
+      options[:table_cell_tag]||="td"
       
       if collection.blank?
         if options[:render_empty_grid]
@@ -53,7 +62,9 @@ module Gridion
 
         collection.each_with_index {|object, i| grid_binding.row.call(object.class, object, options.merge(:row_is_even=>i%2==1)) } #index starts from 0 
         
-        grid_binding.paginator.call(collection.first.class, collection, options) if collection.respond_to?(:current_page) && defined?(Kaminari) # we assume only Kaminari is supported
+        if collection.respond_to?(:current_page) && defined?(Kaminari) # we assume only Kaminari is supported
+          grid_binding.paginator.call(collection.first.class, collection, options) if collection.num_pages > 1
+        end
           
         
         grid_binding.footer.call(collection.first.class, collection, options)
@@ -66,20 +77,29 @@ module Gridion
     def initialize_grid_binding(grid_binding)
       with_output_buffer do
         grid_binding.header do |klass, collection, options={}|
-          safe_concat("<table class=\"#{klass.name.downcase}\">")
-          safe_concat("<tr>")
-          
-          (options[:columns]||klass.column_names).each do |col|
+          table_tag = options[:table_tag]||"table"
+          table_row_tag=options[:table_row_tag]||"tr"
+          table_header_tag=options[:table_header_tag]||"th"
+          safe_concat("<#{table_tag} class=\"#{klass.name.downcase}\">")
+
+          columns=options[:columns]||klass.column_names
+
+          safe_concat("<#{table_row_tag} class=\"header\">")
+          (columns).each do |col|
             col_label=klass.human_attribute_name(col)
             col_label = sort_link(options[:q], col, col_label) if defined?(:sort_link) && options.has_key?(:q)
-            safe_concat("<th>#{col_label}</th>")
+            safe_concat("<#{table_header_tag} class=\"header_cell #{col.to_s.parameterize.underscore}\">#{col_label}</#{table_header_tag}>")
           end
-          safe_concat("<th class=\"children\"></th>") if options.has_key?(:children)
-          safe_concat("<th class=\"actions\">Actions</th>")
-          safe_concat("</tr>")
+          safe_concat("<#{table_header_tag} class=\"actions\">Actions</#{table_header_tag}>")
+          safe_concat("<#{table_header_tag} class=\"children\"></#{table_header_tag}>") if options.has_key?(:children)
+          safe_concat("</#{table_row_tag}>")
         end
 
         grid_binding.row do  |klass, object, options={}|
+          table_tag = options[:table_tag]||"table"
+          table_row_tag=options[:table_row_tag]||"tr"
+          table_cell_tag=options[:table_cell_tag]||"td"
+          
           object_list=
             if options.has_key?(:parent)
               ([options[:parent]] + [object]).flatten 
@@ -93,18 +113,23 @@ module Gridion
           end
             
           result =""
-          result << "<tr id=\"#{klass.name}_#{object.id}\" class=\"#{options[:row_is_even] ? 'even' : 'odd'}\">"
           aux_columns={}
           aux_columns=options[:aux_columns].with_indifferent_access if options.has_key?(:aux_columns)
           
           formats=(options[:formats]||{}).with_indifferent_access
-          (options[:columns]||klass.column_names).each do |col|
+          actions=options[:actions]
+          columns=options[:columns]||klass.column_names
+
+          row_id="#{klass.name}_#{object.id}"
+          
+          result << "<#{table_row_tag} id=\"#{row_id}\" class=\"#{options[:row_is_even] ? 'even' : 'odd'}\">"
+          (columns).each do |col|
             if aux_columns[col].present?
               value=aux_columns[col].call(object, options)
             else
               value=object.send(col)
               if formats.has_key?(col)
-              
+            
                 if formats[col]==:currency
                   value=number_to_currency(value) 
                 elsif formats[col].kind_of?(Hash)
@@ -117,16 +142,30 @@ module Gridion
                   # use hook
                   value=formats[col].call(value)
                 end
-              
-            
               end
             end
-            result << "<td class=\"#{col}\">#{value}</td>"
+            result << "<#{table_cell_tag} class=\"#{col}\">#{value}</#{table_cell_tag}>"
+          end
+            
+
+          if actions.present?
+            result << "<#{table_cell_tag} class=\"actions\">"
+            if actions.kind_of?(Proc)
+              result << actions.call(object, options)
+            elsif actions.kind_of?(Array)
+              result << "#{link_to 'Show', object_list, :class=>%w{action_link show}}" if actions.include?(:show)
+              result << "#{link_to 'Edit', [:edit]+ object_list, :class=>%w{action_link edit}}" if actions.include?(:edit)
+              result << "#{link_to 'Delete', object_list, :class=>%w{action_link delete}, :method=>:delete, :confirm=>'Are you sure?'}"  if actions.include?(:delete)
+            elsif actions.kind_of?(Hash)
+              result << "#{link_to 'Show', object_list, {:class=>%w{action_link show}}.merge(actions[:show]||{})}" if actions.has_key?(:show)
+              result << "#{link_to 'Edit', [:edit]+ object_list, {:class=>%w{action_link edit}}.merge(actions[:edit]||{})}" if actions.include?(:edit)
+              result << "#{link_to 'Delete', object_list, {:class=>%w{action_link delete}, :method=>:delete, :confirm=>'Are you sure?'}.merge(actions[:delete]||{})}"  if actions.include?(:delete)
+            end
+            result << "</#{table_cell_tag}>"
           end
-          actions=options[:actions]
           
           if options.has_key?(:children)
-            result << "<td class=\"children\">"
+            result << "<#{table_cell_tag} class=\"children\">"
             children_hash=
               if options[:children].kind_of?(Array)
                 options[:children].each_with_object({}) {|child, h| h[child]=child.to_s.singularize.classify.constantize.model_name.human.pluralize }
@@ -140,42 +179,36 @@ module Gridion
               result << link_to(label, [namespaces, object, child].flatten, :class=>"child_link #{child.to_s}")
             end
           
-            result << "</td>"
+            result << "</#{table_cell_tag}>"
           end
 
-          if actions.present?
-          result << "<td class=\"actions\">"
-            if actions.kind_of?(Proc)
-              result << actions.call(object, options)
-            elsif actions.kind_of?(Array)
-              result << "#{link_to 'Show', object_list, :class=>%w{action_link show}}" if actions.include?(:show)
-              result << "#{link_to 'Edit', [:edit]+ object_list, :class=>%w{action_link edit}}" if actions.include?(:edit)
-              result << "#{link_to 'Delete', object_list, :class=>%w{action_link delete}, :method=>:delete, :confirm=>'Are you sure?'}"  if actions.include?(:delete)
-            elsif actions.kind_of?(Hash)
-              result << "#{link_to 'Show', object_list, {:class=>%w{action_link show}}.merge(actions[:show]||{})}" if actions.has_key?(:show)
-              result << "#{link_to 'Edit', [:edit]+ object_list, {:class=>%w{action_link edit}}.merge(actions[:edit]||{})}" if actions.include?(:edit)
-              result << "#{link_to 'Delete', object_list, {:class=>%w{action_link delete}, :method=>:delete, :confirm=>'Are you sure?'}.merge(actions[:delete]||{})}"  if actions.include?(:delete)
-            end
-            result << "</td>"
-          end
-          result << "</tr>"
+          
+          result << "</#{table_row_tag}>"
           safe_concat(result)
 
         end
 
         grid_binding.paginator do |klass, collection, options|
+          table_tag = options[:table_tag]
+          table_row_tag=options[:table_row_tag]
+          table_cell_tag=options[:table_cell_tag]
+          
           colspans=(options[:columns]||klass.column_names).count + 2 #TODO: change this to number of action columns
           result = ""
-          result << "<tr class=\"footer\">"
-          result << "<td colspan=\"#{colspans}\">"
+          result << "<#{table_row_tag} class=\"paginator\">"
+          result << "<#{table_cell_tag} colspan=\"#{colspans}\">"
           result << paginate(collection)
-          result << "</td>"
-          result << "</tr>"
+          result << "</#{table_cell_tag}>"
+          result << "</#{table_row_tag}>"
           safe_concat(result)
         end
 
         grid_binding.footer do |klass, collection, options={}|
-          safe_concat("</table>")
+          table_tag = options[:table_tag]
+          table_row_tag=options[:table_row_tag]
+          table_cell_tag=options[:table_cell_tag]
+          
+          safe_concat("</#{table_tag}>")
         end
         
 

data/lib/gridion/version.rb

@@ -1,3 +1,3 @@
 module Gridion
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gridion
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-02 00:00:00.000000000Z
+date: 2011-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70223266421760 !ruby/object:Gem::Requirement
+  requirement: &70341045774500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223266421760
+  version_requirements: *70341045774500
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70223266421260 !ruby/object:Gem::Requirement
+  requirement: &70341045773800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223266421260
+  version_requirements: *70341045773800
 description: Simple grid helper for rails
 email:
 - william@tofugear.com
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2662129059111446417
+      hash: -2132856971133222190
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2662129059111446417
+      hash: -2132856971133222190
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10