ar_to_html_table 0.1.3 → 0.1.4

data/README.textile

@@ -109,15 +109,14 @@ bc.   class Product < ActiveRecord::Base
      column_format :name,      :order => 1
      column_format :orders,    :total => :sum
      column_format :revenue,   :total => :sum, :order => 5, :class => 'right'
-     column_format :age, 	   :total => :avg, :order => 20, :class => 'right', :formatter => :number_with_delimiter
+     column_format :age,       :total => :avg, :order => 20, :class => 'right', :formatter => :number_with_delimiter
    end
  
-   # p = Product.first
+bc.    p = Product.first
    => #<Product id: 55986, age: 4346, .........
-   # p.age
+   p.age
    => 4346
-
-   # p.format_column(:age)
+   p.format_column(:age)
    => "4,346"
 
 h1. License

data/ar_to_html_table.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency  'builder'
-  s.add_dependency  'activerecord', '~> 2.3.5'
-  s.add_dependency  'actionpack', '~> 2.3.5'
+  #s.add_dependency  'builder'
+  #s.add_dependency  'activerecord', '~> 2.3.5'
+  #s.add_dependency  'actionpack', '~> 2.3.5'
 end

data/lib/ar_to_html_table/column_formats.rb

@@ -38,6 +38,8 @@ module ArToHtmlTable
     end
   
     module ClassMethods
+      include ArToHtmlTable::ColumnFormatter
+      include ::ActionView::Helpers::NumberHelper
       # Define a column format.
       #
       # ====Options
@@ -60,10 +62,11 @@ module ArToHtmlTable
       #     column_format :age, 	    :total => :avg, :order => 20, :class => 'right', :formatter => :number_with_delimiter
       #   end
       def column_format(method, options)
+        options[:formatter] = procify(options[:formatter]) if options[:formatter] && options[:formatter].is_a?(Symbol)
         @attr_formats = (@attr_formats || default_formats).deep_merge({method.to_s => options})
       end
       alias :table_format :column_format
-
+      
       # Retrieve a column format.
       #
       # ====Examples
@@ -111,7 +114,11 @@ module ArToHtmlTable
       end
       alias :format_attribute :format_column
     
-    private
+    private    
+      def procify(symbol)
+        proc { |*args| send(symbol, *args) }
+      end
+
       # Default column formats used in to_table for active_record
       # result arrays
       #
@@ -130,7 +137,7 @@ module ArToHtmlTable
           when :text, :string
             { :formatter => lambda {|*args| args[0]} }
           when :date, :datetime
-            { :formatter => lambda {|*args| args[0].to_s(:db)} }
+            { :formatter => lambda {|*args| (args[0].is_a?(Date) || args[0].is_a?(DateTime)) ? args[0].to_s(:db) : args[0].to_s} }
           else
             { :formatter => lambda {|*args| args[0].to_s} }
           end

data/lib/ar_to_html_table/column_formatter.rb

@@ -39,7 +39,7 @@ module ArToHtmlTable
       if options[:cell_type] == :th
         val
       else
-        val.blank? ? I18n.t(options[:not_set_key]) : val
+        val.blank? ? I18n.t(options[:not_set_key] || 'tables.not_set') : val
       end
     end
 
@@ -63,7 +63,7 @@ module ArToHtmlTable
       if options[:cell_type] == :th
         val
       else    
-        val.blank? ? I18n.t(options[:unknown_key]) : val
+        val.blank? ? I18n.t(options[:unknown_key] || 'tables.unknown') : val
       end
     end
 
@@ -73,7 +73,7 @@ module ArToHtmlTable
     # ====Examples
     #
     #   # Given a value of 3600, the formatter will output
-    #   00:05:00
+    #   => 00:05:00
     #
     #   val: the value to be formatted
     #   options: formatter options
@@ -92,21 +92,113 @@ module ArToHtmlTable
     # ====Examples
     #
     #   # Given a value of 11, the formatter will output
-    #   11:00
+    #   => 11:00
     #
     #   val: the value to be formatted
     #   options: formatter options
     def hours_to_time(val, options)
       "#{"%02d" % val}:00"
     end
+    
+    # Ordinalize a number (ie 1st, 2nd, 3rd, ....).  Localization is
+    # handled externally to this method
+    #
+    # ====Examples
+    #
+    #   # Given a value of 14, the formatter will output
+    #   => 14th
+    #
+    #   val: the value to be formatted
+    #   options: formatter options
+    def ordinalize(val, options)
+      val ? val.to_i.ordinalize : val
+    end
+    
+    # Display as a short date (localized)
+    #
+    # ====Examples
+    #
+    #   # Given a value of 2010/10/1, the formatter will output
+    #   => 1 Oct
+    #
+    #   val: the value to be formatted
+    #   options: formatter options
+    def short_date(val, options)
+      val ? val.to_date.to_s(:short) : val
+    end
 
+    # Display as a long date (localized)
+    #
+    # ====Examples
+    #
+    #   # Given a value of 2010/10/1, the formatter will output
+    #   => October 1, 2010
+    #
+    #   val: the value to be formatted
+    #   options: formatter options
+    def long_date(val, options)
+      val ? val.to_date.to_s(:long) : val
+    end
+    
+    # Display as a long month name (localized)
+    #
+    # ====Examples
+    #
+    #   # Given a value of 9, the formatter will output
+    #   => 'September'
+    #
+    #   val: the value to be formatted
+    #   options: formatter options
+    def long_month_name(val, options)
+      val ? I18n.t('date.month_names')[val.to_i] : val
+    end
+    
+    # Display as a short month name (localized)
+    #
+    # ====Examples
+    #
+    #   # Given a value of 9, the formatter will output
+    #   => 'Sep'
+    #
+    #   val: the value to be formatted
+    #   options: formatter options
+    def short_month_name(val, options)
+      val ? I18n.t('date.abbr_month_names')[val.to_i] : val
+    end    
+
+    # Display as a long day name (localized)
+    #
+    # ====Examples
+    #
+    #   # Given a value of 1, the formatter will output
+    #   => 'Monday'
+    #
+    #   val: the value to be formatted
+    #   options: formatter options
+    def long_day_name(val, options)
+      val ? I18n.t('date.day_names')[val.to_i] : val
+    end
+    
+    # Display as a short day name (localized)
+    #
+    # ====Examples
+    #
+    #   # Given a value of 1, the formatter will output
+    #   => 'Mon'
+    #
+    #   val: the value to be formatted
+    #   options: formatter options
+    def short_day_name(val, options)
+      val ? I18n.t('date.abbr_day_names')[val.to_i] : val
+    end
+    
     # Interprets an integer as a percentage with a single
     # digit of precision. Shim for <tt>#number_to_percentage</tt>
     #
     # ====Examples
     #
     #   # Given a value of 48, the formatter will output
-    #   48.00%
+    #   => 48.00%
     #
     #   val: the value to be formatted
     #   options: formatter options

data/lib/ar_to_html_table/table_formatter.rb

@@ -1,8 +1,5 @@
 module ArToHtmlTable
   class TableFormatter
-    include                 ArToHtmlTable::ColumnFormatter
-    include                 ::ActionView::Helpers::NumberHelper
-    
     attr_accessor           :html, :table_columns, :klass, :merged_options, :rows, :totals
     attr_accessor           :column_cache
 
@@ -142,24 +139,23 @@ module ArToHtmlTable
   
     # Outputs one cells value after invoking its formatter
     def output_cell_value(cell_type, value, column, options = {})
+      # raise ArgumentError, "Column has no formatter: #{column[:name]}." unless column[:formatter]
       column_name = column[:name].to_sym
       column_cache[column_name] = {} unless column_cache.has_key?(column_name)
 
       if column_cache[column_name].has_key?(value)
         result = column_cache[column_name][value]
+      elsif column[:formatter]
+        result = column[:formatter].call(value, options.reverse_merge({:cell_type => cell_type, :column => column})) || ''
+        column_cache[column_name][value] = result
       else
-        result = column[:formatter].call(value, options.reverse_merge({:cell_type => cell_type, :column => column}))
-        result ||= ''
+        result = value.to_s || ''
         column_cache[column_name][value] = result
       end
       html.__send__(cell_type, (column[:class] ? {:class => column[:class]} : {})) do
         html << result
       end
     end
-    
-    def self.procify(symbol)
-      proc { |*args| send(symbol, *args) }
-    end
 
   private
     # Craft a CSS id
@@ -167,15 +163,6 @@ module ArToHtmlTable
       "#{klass.name.underscore}_#{row[klass.primary_key]}"
     end
   
-    def default_formatter(data, options)
-      case data
-      when Fixnum
-        integer_with_delimiter(data, options)
-      else
-        data.to_s
-      end
-    end
-  
     def table_has_totals?
       !totals.empty?
     end
@@ -218,47 +205,20 @@ module ArToHtmlTable
   
     def column_definition(column)
       @column_order += 1
-      @default_formatter ||= procify(:default_formatter)
-    
-      css_class, formatter = get_column_formatter(column.to_s)
-      column_order = klass.format_of(column)[:order] || @column_order
-      totals = klass.format_of(column)[:total]
+      format_options = klass.format_of(column)
       return {
         :name       => column,
         :label      => klass.human_attribute_name(column),
-        :formatter  => formatter || @default_formatter,
-        :class      => css_class,
-        :order      => column_order,
-        :total      => totals
+        :formatter  => format_options[:formatter],
+        :class      => format_options[:class],
+        :order      => format_options[:order] || @column_order,
+        :total      => format_options[:total]
       }
     end
   
     def columns_from_row(row)
       row.attributes.inject([]) {|columns, (k, v)| columns << k.to_s }
     end
-  
-    def get_column_formatter(column)
-      format = klass.format_of(column)
-      case format
-      when Symbol
-        formatter = procify(format)
-      when Proc
-        formatter = format  
-      when Hash
-        css_class = format[:class] if format[:class]
-        formatter = format[:formatter] if format[:formatter]
-        formatter = procify(formatter) if formatter && formatter.is_a?(Symbol)
-      end
-      return css_class, formatter
-    end
-  
-    # A data formatter can be a symbol or a proc
-    # If its a symbol then we 'procify' it so that
-    # we have on calling interface in the output_cell method
-    # - partially for clarity and partially for performance
-    def procify(sym)
-      self.procify(sym)
-    end
 
     # Decide if the given column is to be displayed in the table
     def include_column?(column, options)

data/lib/ar_to_html_table/version.rb

@@ -1,3 +1,3 @@
 module ArToHtmlTable
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar_to_html_table
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Kip Cole
@@ -15,55 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 +08:00
+date: 2010-10-21 00:00:00 +08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: builder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: actionpack
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
-  type: :runtime
-  version_requirements: *id003
+dependencies: []
+
 description: "    Defines Array#to_table that will render an ActiveRecord result set\n    as an HTML table.\n"
 email: 
 - kipcole9@gmail.com