spectabular 2.0.1 → 2.1

data/lib/spectabular/helper.rb

@@ -1,12 +1,12 @@
 module Spectabular
   module Helper
-    
+
     def table_for(collection,*columns)
       columns = columns.first if columns.size <= 1
       columns ||= default_columns_for(collection)
-      @table = Spectabular::Table.new(  :collection => instance_variable_get("@#{collection}"), 
-                                        :collection_name => collection.to_s.humanize, 
-                                        :columns => columns, 
+      @table = Spectabular::Table.new(  :collection => instance_variable_get("@#{collection}"),
+                                        :collection_name => collection.to_s.humanize,
+                                        :columns => columns,
                                         :context => self
                                         )
       output = []
@@ -19,8 +19,8 @@ module Spectabular
       join_formatted output
     end
 
-    protected
-    
+    private
+
     def join_formatted(array,join_string="\n")
       join_string.html_safe + safe_join(array, join_string.html_safe ) + join_string.html_safe
     end
@@ -28,34 +28,34 @@ module Spectabular
     def spectabular_header
       content_tag(:thead, header_row).html_safe
     end
-    
+
     def header_row
       content_tag(:tr, join_formatted(mapped_headers)).html_safe
     end
-    
+
     def mapped_headers
-      @table.headers.map do |header| 
-          content_tag(:th, header)
+      @table.headers.map do |header|
+        content_tag(:th, header)
       end
     end
 
     def spectabular_body
       content_tag(:tbody, join_formatted(mapped_body)).html_safe
     end
-    
+
     def mapped_body
-      @table.rows.map do |record,row| 
+      @table.rows.map do |record,row|
         @column_number = 0
         content_tag(:tr, join_formatted(mapped_row(row)), :id => dom_id(record), :class => row_class_for(record) )
       end
     end
 
     def mapped_row(row)
-      row.map do |name,cell| 
+      row.map do |name,cell|
         content_tag :td, cell.to_s.html_safe, :class => cell_class_for(name,@column_number+=1)
       end
     end
-    
+
     def row_class_for(record)
       token = [cycle('odd','even')]
       is_active = [:active?, :is_active?, :published?].find {|m| record.respond_to? m }
@@ -64,16 +64,30 @@ module Spectabular
       end
       token.join(" ")
     end
-    
+
     def cell_class_for(name,column_number)
       column_number == 1 ? "tbl-#{name} lead" : name
     end
 
     def spectabular_pagination
-      return "" unless @table.will_paginate?
-      content_tag(:p, will_paginate(@table.collection), :class => 'pagination').html_safe
+      return "" if pagination_method.nil?
+      content_tag(:p, self.send(pagination_method, @table.collection), :class => 'pagination').html_safe
     end
-    
+
+    # Currently supports:
+    #   - will_paginate
+    #   - kaminari
+    def pagination_method
+      case
+      when self.respond_to?(:will_paginate)
+        :will_paginate
+      when self.respond_to?(:paginate)
+        :paginate
+      else
+        nil
+      end
+    end
+
     def default_columns_for(collection)
       {}.tap do |columns_hash|
         collection.to_s.classify.constantize.content_columns.map do |c|
@@ -81,7 +95,7 @@ module Spectabular
         end
       end
     end
-    
+
     def default_formatting_for(record,name,column_type)
       attribute = record.send(name)
       case column_type
@@ -95,4 +109,4 @@ module Spectabular
     end
 
   end
-end
+end

data/lib/spectabular/table.rb

@@ -1,7 +1,7 @@
 module Spectabular
 
   class Table
-    attr_accessor :columns, :skip_sorting_row, :collection, :collection_name, :context, :will_paginate
+    attr_accessor :columns, :skip_sorting_row, :collection, :collection_name, :context
     attr_writer :default_empty
 
     def initialize(options={})
@@ -15,7 +15,7 @@ module Spectabular
        when Array
           @columns.flatten
         when Hash
-          sorted_hash_for(@columns).map {|g| {:header => g[0].to_s.gsub(/^\d+\s?-\s?/,''), :helper => g[1]}}
+          sorted_hash_for(@columns).map {|g| {:header => header_for(g[0]), :helper => g[1]}}
       else
         [@columns]
       end
@@ -59,14 +59,6 @@ module Spectabular
       end
     end
 
-    def will_paginate?
-      if will_paginate.nil?
-        collection_supports_pagination?
-      else
-        will_paginate
-      end
-    end
-
     def headers
       @headers ||= columns.map do |column|
         if column.respond_to? :to_sym
@@ -98,9 +90,13 @@ module Spectabular
         items
       end
     end
-
-    def collection_supports_pagination?
-      collection.respond_to? :total_pages
+    
+    def header_for(name)
+      if name.respond_to?(:sub)
+        name.sub(/^\d+\s?-\s?/,'')
+      else
+        name.to_s.titlecase
+      end
     end
 
   end

data/lib/spectabular/version.rb

@@ -1,3 +1,3 @@
 module Spectabular
-  VERSION = "2.0.1"
+  VERSION = "2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectabular
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: '2.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70294672902480 !ruby/object:Gem::Requirement
+  requirement: &70205170674100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc2
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70294672902480
+  version_requirements: *70205170674100
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70294672916840 !ruby/object:Gem::Requirement
+  requirement: &70205170669800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294672916840
+  version_requirements: *70205170669800
 description: Spectabular provides a helper method which turns ActiveModel resources
   into tabular displays. It provides some minimal customization options.
 email:
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1773474990839441423
+      hash: -1739884906625239554
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1773474990839441423
+      hash: -1739884906625239554
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11