table_cloth 0.1.1 → 0.1.2

data/README.md

@@ -1,6 +1,9 @@
 # Table Cloth
 
 Table Cloth gives you an easy to use DSL for creating and rendering tables in rails.
+It's new, so if you want a feature or have an improvement? Make an issue!
+
+Follow me! [@robertoross](http://twitter.com/robertoross)
 
 [![Build Status](https://travis-ci.org/bobbytables/table_cloth.png)](https://travis-ci.org/bobbytables/table_cloth)
 
@@ -142,4 +145,4 @@ config.td.valign = 'top'
 3. CREATE A SPEC.
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)
-6. Create new Pull Request
+6. Create new Pull Request

data/lib/table_cloth/base.rb

@@ -8,17 +8,14 @@ module TableCloth
     end
 
     def column_names
-      columns.inject([]) do |names, (column_name, column)|
-        names << column.human_name; names
+      @column_names ||= columns.each_with_object([]) do |(column_name, column), names|
+        names << column.human_name
       end
     end
 
     def columns
-      self.class.columns.inject({}) do |columns, (column_name, column)|
-        if column.available?(self)
-          columns[column_name] = column
-        end
-        columns
+      @columns ||=self.class.columns.each_with_object({}) do |(column_name, column), columns|
+        columns[column_name] = column if column.available?(self)
       end
     end
 
@@ -27,6 +24,10 @@ module TableCloth
     end
 
     class << self
+      def config
+        @config ||= Class.new { include ConfigurableElements }
+      end
+
       def presenter(klass=nil)
         if klass
           @presenter = klass

data/lib/table_cloth/column.rb

@@ -9,7 +9,7 @@ module TableCloth
 
     def value(object, view, table=nil)
       if options[:proc] && options[:proc].respond_to?(:call)
-        view.capture(object, options, view, &options[:proc])
+        view.capture(object, view, &options[:proc])
       else
         object.send(name)
       end

data/lib/table_cloth/configurable_elements.rb

@@ -0,0 +1,21 @@
+module TableCloth
+  module ConfigurableElements
+    extend ActiveSupport::Concern
+
+    included do
+      cattr_accessor :table
+      cattr_accessor :thead
+      cattr_accessor :th
+      cattr_accessor :tbody
+      cattr_accessor :tr
+      cattr_accessor :td
+
+      self.table = ActiveSupport::OrderedOptions.new
+      self.thead = ActiveSupport::OrderedOptions.new
+      self.th    = ActiveSupport::OrderedOptions.new
+      self.tbody = ActiveSupport::OrderedOptions.new
+      self.tr    = ActiveSupport::OrderedOptions.new
+      self.td    = ActiveSupport::OrderedOptions.new
+    end
+  end
+end

data/lib/table_cloth/configuration.rb

@@ -1,18 +1,6 @@
 module TableCloth
   class Configuration
-    cattr_accessor :table
-    cattr_accessor :thead
-    cattr_accessor :th
-    cattr_accessor :tbody
-    cattr_accessor :tr
-    cattr_accessor :td
-
-    self.table = ActiveSupport::OrderedOptions.new
-    self.thead = ActiveSupport::OrderedOptions.new
-    self.th    = ActiveSupport::OrderedOptions.new
-    self.tbody = ActiveSupport::OrderedOptions.new
-    self.tr    = ActiveSupport::OrderedOptions.new
-    self.td    = ActiveSupport::OrderedOptions.new
+    include ConfigurableElements
 
     class << self
       def configure(&block)

data/lib/table_cloth/presenter.rb

@@ -32,22 +32,27 @@ module TableCloth
     end
 
     def row_values(object)
-      column_values = table.columns.inject([]) do |values, (key, column)|
-        values << column.value(object, view_context, table); values
+      table.columns.each_with_object([]) do |(key, column), values|
+        values << column.value(object, view_context, table)
       end
     end
 
     def rows
-      objects.inject([]) do |row, object|
-        row << row_values(object); row
+      objects.each_with_object([]) do |object, row|
+        row << row_values(object)
       end
     end
 
-    def wrapper_tag(type, value=nil, &block)
+    def wrapper_tag(type, value=nil, options={}, &block)
+      table_config = table.class.config.send(type).to_hash
+      tag_options = TableCloth.config_for(type)
+      tag_options.merge!(table_config)
+      tag_options.merge!(options)
+
       content = if block_given?
-        v.content_tag(type, TableCloth.config_for(type), &block)
+        v.content_tag(type, tag_options, &block)
       else
-        v.content_tag(type, value, TableCloth.config_for(type))
+        v.content_tag(type, value, tag_options)
       end
     end
   end

data/lib/table_cloth/presenters/default.rb

@@ -9,32 +9,25 @@ module TableCloth
 
       def render_rows
         wrapper_tag :tbody do
-          body = rows.inject('') do |r, values|
-            r + render_row(values)
-          end
-
-          v.raw(body)
+          v.raw objects.inject('') {|r, object| r + render_row(object) }
         end
       end
 
-      def render_row(values)
+      def render_row(object)
         wrapper_tag :tr do
-          row = values.inject('') do |tds, value|
-            tds + wrapper_tag(:td, value)
-          end
-
-          v.raw(row)
+          v.raw table.columns.inject('') {|tds, (key, column)| tds + render_td(column, object) }
         end
       end
 
+      def render_td(column, object)
+        td_options = column.options.delete(:td_options) || {}
+        wrapper_tag(:td, column.value(object, view_context, table), td_options)
+      end
+
       def render_header
         wrapper_tag :thead do
-          wrapper_tag(:tr) do
-            names = column_names.inject('') do |tags, name|
-              tags + wrapper_tag(:th, name)
-            end
-
-            v.raw(names)
+          wrapper_tag :tr do
+            v.raw column_names.inject('') {|tags, name| tags + wrapper_tag(:th, name) }
           end
         end
       end

data/lib/table_cloth/version.rb

@@ -1,3 +1,3 @@
 module TableCloth
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/table_cloth.rb

@@ -1,5 +1,6 @@
 require 'action_view'
 require 'table_cloth/version'
+require 'table_cloth/configurable_elements'
 require 'table_cloth/base'
 
 module TableCloth

data/spec/lib/column_spec.rb

@@ -17,7 +17,7 @@ describe TableCloth::Column do
     end
 
     let(:email_column) do
-      proc = lambda {|object, options, view|
+      proc = lambda {|object, view|
         object.email
       }
 

data/spec/lib/presenters/default_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe TableCloth::Presenters::Default do
-  let(:dummy_table) { DummyTable }
+  let(:dummy_table) { Class.new(DummyTable) }
   let(:dummy_model) do
     DummyModel.new.tap do |d|
       d.id    = 1
@@ -113,5 +113,59 @@ describe TableCloth::Presenters::Default do
     it 'td has a class attached' do
       doc.at_xpath('//td')[:class].should include 'td'
     end
+
+  end
+
+  context 'specific configuration' do
+    let(:doc) { Nokogiri::HTML(subject.render_table) }
+    let(:dummy_table) do
+      Class.new(TableCloth::Base) do
+        column :email, td_options: { class: 'email_column' }
+      end
+    end
+
+    it 'td has a class set' do
+      doc.at_xpath('//td')[:class].should include 'email_column'
+    end
+  end
+
+  context 'table configuration' do
+    let(:doc) { Nokogiri::HTML(subject.render_table) }
+    let(:dummy_table) do
+      Class.new(TableCloth::Base) do
+        column :email
+
+        config.table.class = 'table2'
+        config.thead.class = 'thead2'
+        config.th.class    = 'th2'
+        config.tbody.class = 'tbody2'
+        config.tr.class    = 'tr2'
+        config.td.class    = 'td2'
+      end
+    end
+
+    it 'tables have a class attached' do
+      doc.at_xpath('//table')[:class].should include 'table2'
+    end
+
+    it 'thead has a class attached' do
+      doc.at_xpath('//thead')[:class].should include 'thead2'
+    end
+
+    it 'th has a class attached' do
+      doc.at_xpath('//th')[:class].should include 'th2'
+    end
+
+    it 'tbody has a class attached' do
+      doc.at_xpath('//tbody')[:class].should include 'tbody2'
+    end
+
+    it 'tr has a class attached' do
+      doc.at_xpath('//tr')[:class].should include 'tr2'
+    end
+
+    it 'td has a class attached' do
+      doc.at_xpath('//td')[:class].should include 'td2'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_cloth
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -147,6 +147,7 @@ files:
 - lib/table_cloth/builder.rb
 - lib/table_cloth/column.rb
 - lib/table_cloth/columns/action.rb
+- lib/table_cloth/configurable_elements.rb
 - lib/table_cloth/configuration.rb
 - lib/table_cloth/presenter.rb
 - lib/table_cloth/presenters/default.rb