gridion 0.0.1 → 0.0.2

data/lib/gridion/grid_helper.rb

@@ -20,6 +20,11 @@ module Gridion
         @footer=block if block_given?
         @footer
       end
+      
+      def paginator(&block)
+        @paginator=block if block_given?
+        @paginator
+      end
 
 
     end
@@ -27,12 +32,39 @@ module Gridion
     def grid(collection, options={}, &block)
       grid_binding=GridBinding.new
 
+      initialize_grid_binding(grid_binding)
+
+      content=with_output_buffer {block.call(grid_binding) } if block_given?
+
+      # we need to initialize the procs in the helper context otherwise other helpers inside the proc object (e.g. link_to) wont work
+
+
+
+      unless collection.blank?
+        grid_binding.header.call(collection.first.class, collection, options)
+
+        collection.each {|object| grid_binding.row.call(object.class, object, options) }
+        
+        grid_binding.paginator.call(collection.first.class, collection, options) if collection.respond_to?(:current_page) && defined?(Kaminari) # we assume only Kaminari is supported
+          
+        
+        grid_binding.footer.call(collection.first.class, collection, options)
+
+      end
+
+      return nil
+
+    end
+    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|
-            safe_concat("<th>#{klass.human_attribute_name(col)}</th>")
+            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>")
           end
           safe_concat("<th>Actions</th>")
           safe_concat("</tr>")
@@ -51,33 +83,26 @@ module Gridion
 
         end
 
+        grid_binding.paginator do |klass, collection, options|
+          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 << paginate(collection)
+          result << "</td>"
+          result << "</tr>"
+          safe_concat(result)
+        end
+
         grid_binding.footer do |klass, collection, options={}|
           safe_concat("</table>")
         end
+        
 
       end
-
-      content=with_output_buffer {block.call(grid_binding) } if block_given?
-
-      # we need to initialize the procs in the helper context otherwise other helpers inside the proc object (e.g. link_to) wont work
-
-
-
-      unless collection.blank?
-        grid_binding.header.call(collection.first.class, collection, options)
-
-        collection.each {|object| grid_binding.row.call(object.class, object, options) }
-
-        grid_binding.footer.call(collection.first.class, collection, options)
-
-      end
-
-      return nil
-
     end
 
 
 
-
   end
 end

data/lib/gridion/version.rb

@@ -1,3 +1,3 @@
 module Gridion
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gridion
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-18 00:00:00.000000000Z
+date: 2011-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152627000 !ruby/object:Gem::Requirement
+  requirement: &70140114563720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152627000
+  version_requirements: *70140114563720
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: &70140114563280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70140114563280
 description: Simple grid helper for rails
 email:
 - william@tofugear.com
@@ -79,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3113714939252299406
+      hash: 1779692905437522479
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -88,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3113714939252299406
+      hash: 1779692905437522479
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10