table_helpers 0.1 → 0.2

data/lib/table_data.rb

@@ -0,0 +1,50 @@
+class TableData < ActionView::Base
+  @label_size = nil
+  @set_label_size = false
+  
+  def initialize(label_size)
+    @label_size = label_size
+  end
+  
+  def row(label, data, colspan=false)
+    unless @set_label_size && @label_size
+      unless colspan
+        result = content_tag :tr do
+          content_tag(:td, label, :class => "label", :width => @label_size) <<
+          content_tag(:td, data)
+        end
+      else
+        result = content_tag :tr do
+          content_tag(:td, content_tag(:span, label, :class => "label") << data, :colspan => 2, :width => @label_size)
+        end
+      end
+      
+      @set_label_size = true
+    else
+      unless colspan
+        result = content_tag :tr do
+          content_tag(:td, label, :class => "label") <<
+          content_tag(:td, data)
+        end
+      else
+        result = content_tag :tr do
+          content_tag(:td, content_tag(:span, label, :class => "label") << data, :colspan => 2, :width => @label_size)
+        end
+      end
+    end
+    
+    return result
+  end
+  
+  def section(name=nil)
+    unless name.nil?
+      content_tag :tr do
+        content_tag :td, content_tag(:div, name, :class => "section"), :colspan => 2
+      end
+    else
+      content_tag :tr do
+        content_tag :td, tag(:hr, :class => "section"), :colspan => 2
+      end
+    end
+  end
+end

data/lib/table_helpers.rb

@@ -1 +1,75 @@
-# TableHelpers
+module TableHelpers
+  def get_table_headers(columns=[], widths={})
+    headers = []
+
+    i = 1
+
+    for column_name in columns
+      if widths.has_key?(i)
+        headers.push(content_tag(:th, column_name, :width => widths[i]))
+      else
+        headers.push(content_tag(:th, column_name))
+      end
+      i += 1
+    end
+
+    return headers
+  end
+
+  def get_sortable_table_headers(columns=[], widths={})
+    headers = []
+
+    p = params
+    i = 1
+
+    for j in 0 .. columns.length - 1
+      column_name = columns[j][0]
+      sort_columns = columns[j][1..columns[j].length-1]
+
+      if params[:order_by] == sort_columns.join(', ')
+        link = link_to(column_name, p.merge('order_by' => "#{sort_columns.join(' DESC, ') + ' DESC'}"), :class=> "sortdown")
+      elsif params[:order_by] == sort_columns.join(' DESC, ') + ' DESC'
+        link = link_to(column_name, p.merge('order_by' => sort_columns.join(', ')), :class=> "sortup")
+      else
+        link = link_to(column_name, p.merge('order_by' => sort_columns.join(', ')), :class=> "sort-none")
+      end
+
+      if widths.has_key?(i)
+        headers.push("<th width=\"%s\">%s</th>" % [widths[i],link])
+      else
+        headers.push("<th>%s</th>" % [link])
+      end
+
+      i += 1
+      j += 1
+    end
+
+    return headers
+  end
+
+  def table_list(html_options = {}, &block)
+    raise "need a block" unless block_given?
+    
+    t = TableList.new self
+    
+    result = capture do
+      content_tag :table, html_options do
+        block.call(t)
+      end
+    end
+
+    concat(result)
+  end
+
+  def table_data(options = {}, &block)
+    options[:label_size] ||= nil
+
+    t = TableData.new(options[:label_size])
+
+    result = content_tag(:table, :class => 'info') do
+      block.call(t)
+    end
+
+    concat(result)
+  end
+end

data/lib/table_list.rb

@@ -0,0 +1,27 @@
+class TableList 
+  def initialize(instance)
+    @instance = instance
+  end
+  
+  def sortable_headers(columns=[], widths={})
+    @instance.content_tag :tr do
+      @instance.get_sortable_table_headers(columns, widths)
+    end
+  end
+  
+  def headers(columns=[], widths={})
+    @instance.content_tag :tr do
+      @instance.get_table_headers(columns, widths)
+    end
+  end
+  
+  def td(data)
+    @instance.content_tag :td, data
+  end
+
+  def tr(&block)
+    raise "need a block" unless block_given?
+
+    @instance.content_tag(:tr, block.call(self))
+  end
+end

data/rails/init.rb

@@ -1,5 +1,3 @@
-require 'app/helpers/table_data_helper'
-require 'app/helpers/table_list_helper'
+require 'table_helpers'
 
-ActionView::Base.send :include, TableDataHelper
-ActionView::Base.send :include, TableListHelper
+ActionView::Base.send :include, TableHelpers

data/test/table_helpers_test.rb

@@ -2,12 +2,12 @@ require 'test_helper'
 require 'action_view'
 require 'action_controller'
 require 'action_view/test_case'
-require File.dirname(__FILE__) + '/../lib/app/helpers/table_data_helper.rb'
-require File.dirname(__FILE__) + '/../lib/app/helpers/table_list_helper.rb'
+require File.dirname(__FILE__) + '/../lib/table_data.rb'
+require File.dirname(__FILE__) + '/../lib/table_list.rb'
+require File.dirname(__FILE__) + '/../lib/table_helpers.rb'
 
 class TableHelpersTest < ActionView::TestCase
-  include TableDataHelper
-  include TableListHelper
+  include TableHelpers
 
   test "table_list_helper_with_headers" do
     result = capture do

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: table_helpers
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
+  hash: 15
+  prerelease: false
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - "Damian Ba\xC4\x87kowski"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 +01:00
+date: 2011-02-03 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -30,11 +30,11 @@ files:
 - Rakefile
 - lib/tasks/table_helpers.rake
 - lib/table_helpers.rb
-- lib/app/helpers/table_data_helper.rb
-- lib/app/helpers/table_list_helper.rb
+- lib/table_list.rb
+- lib/table_data.rb
 - rails/init.rb
-- test/test_helper.rb
 - test/table_helpers_test.rb
+- test/test_helper.rb
 - README
 has_rdoc: true
 homepage: https://github.com/paki-paki/table_helpers
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Table helpers for Rails

data/lib/app/helpers/table_data_helper.rb

@@ -1,64 +0,0 @@
-module TableDataHelper
-  def table_data(options = {}, &block)
-    options[:label_size] ||= nil
-
-    t = TableData.new(options[:label_size])
-
-    result = content_tag(:table, :class => 'info') do
-      block.call(t)
-    end
-
-    concat(result)
-  end
-
-  class TableData < ActionView::Base
-    @label_size = nil
-    @set_label_size = false
-
-    def initialize(label_size)
-      @label_size = label_size
-    end
-
-    def row(label, data, colspan=false)
-      unless @set_label_size && @label_size
-        unless colspan
-          result = content_tag :tr do
-            content_tag(:td, label, :class => "label", :width => @label_size) <<
-              content_tag(:td, data)
-          end
-        else
-          result = content_tag :tr do
-            content_tag(:td, content_tag(:span, label, :class => "label") << data, :colspan => 2, :width => @label_size)
-          end
-        end
-
-        @set_label_size = true
-      else
-        unless colspan
-          result = content_tag :tr do
-            content_tag(:td, label, :class => "label") <<
-              content_tag(:td, data)
-          end
-        else
-          result = content_tag :tr do
-            content_tag(:td, content_tag(:span, label, :class => "label") << data, :colspan => 2, :width => @label_size)
-          end
-        end
-      end
-
-      return result
-    end
-
-    def section(name=nil)
-      unless name.nil?
-        content_tag :tr do
-          content_tag :td, content_tag(:div, name, :class => "section"), :colspan => 2
-        end
-      else
-        content_tag :tr do
-          content_tag :td, tag(:hr, :class => "section"), :colspan => 2
-        end
-      end
-    end
-  end
-end

data/lib/app/helpers/table_list_helper.rb

@@ -1,83 +0,0 @@
-module TableListHelper
-  def get_table_headers(columns=[], widths={})
-    headers = []
-
-    i = 1
-
-    for column_name in columns
-      if widths.has_key?(i)
-        headers.push(content_tag(:th, column_name, :width => widths[i]))
-      else
-        headers.push(content_tag(:th, column_name))
-      end
-      i += 1
-    end
-
-    return headers
-  end
-
-  def get_sortable_table_headers(columns=[], widths={})
-    headers = []
-
-    p = params
-    i = 1
-
-    for j in 0 .. columns.length - 1
-      column_name = columns[j][0]
-      sort_columns = columns[j][1..columns[j].length-1]
-
-      if params[:order_by] == sort_columns.join(', ')
-        link = link_to(column_name, p.merge('order_by' => "#{sort_columns.join(' DESC, ') + ' DESC'}"), :class=> "sortdown")
-      elsif params[:order_by] == sort_columns.join(' DESC, ') + ' DESC'
-        link = link_to(column_name, p.merge('order_by' => sort_columns.join(', ')), :class=> "sortup")
-      else
-        link = link_to(column_name, p.merge('order_by' => sort_columns.join(', ')), :class=> "sort-none")
-      end
-
-      if widths.has_key?(i)
-        headers.push("<th width=\"%s\">%s</th>" % [widths[i],link])
-      else
-        headers.push("<th>%s</th>" % [link])
-      end
-
-      i += 1
-      j += 1
-    end
-
-    return headers
-  end
-
-  def table_list(html_options = {}, &block)
-    raise "need a block" unless block_given?
-
-    result = capture do
-      content_tag :table, html_options do
-        block.call(self)
-      end
-    end
-
-    concat(result)
-  end
-
-  def sortable_headers(columns=[], widths={})
-    content_tag :tr do
-      get_sortable_table_headers(columns, widths)
-    end
-  end
-  
-  def headers(columns=[], widths={})
-    content_tag :tr do
-      get_table_headers(columns, widths)
-    end
-  end
-  
-  def td(data)
-    content_tag :td, data
-  end
-
-  def tr(&block)
-    raise "need a block" unless block_given?
-
-    content_tag(:tr, block.call(self))
-  end
-end