tableasy 0.1.2 → 0.2.0

data/.gitignore

@@ -5,6 +5,9 @@
 *.tmproj
 tmtags
 
+## Netbeans
+nbproject
+
 ## EMACS
 *~
 \#*

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/formatters.rb

@@ -1,17 +1,16 @@
-formatter(:linked) do |subject, column|
-  link_to(subject.send(column), subject)
+formatter(:linked) do |cell|
+  cell.value = link_to(cell.value, cell.subject)
 end
 
-formatter(:linked_to) do |subject, column|
-  object = subject.send(column)
-  object ? link_to(object, object) : ''
+formatter(:linked_to) do |cell|
+  cell.value = cell.value ? link_to(cell.value, cell.value) : ''
 end
 
-formatter(:tail_link, :no_header => true) do |subject, text, *args|
+formatter(:tail_link, :no_header => true, :no_initial => true) do |cell, text, *args|
   html_options = args.extract_options!.clone
-  url = args + [subject]
+  url = args + [cell.subject]
 
-  if html_options.delete(:ajax)
+  cell.value = if html_options.delete(:ajax)
     options = {:method => html_options.delete(:method), :confirm => html_options.delete(:confirm), :url => url}
     link_to_remote text, options, html_options
   else
@@ -19,24 +18,30 @@ formatter(:tail_link, :no_header => true) do |subject, text, *args|
   end
 end
 
-formatter(:edit_link) do |subject, text, options|
+formatter(:edit_link, :no_initial => true, :no_header => true) do |cell, text, options|
   options ||= {}
   options[:method] = 'get' if options[:ajax]
-  tail_link(text, :edit, options).execute(subject)
+  tail_link(text, :edit, options).execute(cell)
 end
 
-formatter(:destroy_link) do |subject, text, options|
+formatter(:destroy_link, :no_initial => true, :no_header => true) do |cell, text, options|
   options ||= {}
   options.reverse_merge!(:confirm => 'Are you sure?', :method => 'delete')
-  tail_link(text, options).execute(subject)
+  tail_link(text, options).execute(cell)
 end
 
-formatter(:with_percent) do |subject, column, total_column|
-  number, total = subject.send(column).to_i, subject.send(total_column).to_i
+formatter(:with_percent) do |cell, total_column|
+  number, total = cell.value.to_i, cell.subject.send(total_column).to_i
   percent = total == 0 ? 0 : number.to_f / total * 100
-  "#{number} (#{helper.number_to_percentage(percent)})"
+  cell.value = "#{number} (#{number_to_percentage(percent)})"
 end
 
-formatter(:random) do |subject, column, range|
-  rand(range.last - range.first) + range.first
+formatter(:random, :no_initial => true) do |cell, header, range|
+  cell.value = rand(range.last - range.first) + range.first
+end
+
+formatter(:header_row, :no_header => true, :no_initial => true) do |cell, text|
+  cell.value = text
+  cell.html[:colspan] = 2
+  cell.header = true
 end

data/lib/tableasy.rb

@@ -1,7 +1,7 @@
 require 'active_support'
 require 'action_view'
 require 'action_controller'
-%w{html_attributes column row total formatter tables_helper}.each {|f| require File.dirname(__FILE__) + "/tableasy/#{f}" }
+%w{html_attributes table/cell table/row total formatter tables_helper table}.each {|f| require File.dirname(__FILE__) + "/tableasy/#{f}" }
 
 module Tableasy
   module FormattersHelper
@@ -10,11 +10,11 @@ module Tableasy
   class FormattersContext
     def self.formatter(name, options = {}, &block)
       Formatter.new(&block).tap do |formatter|
-        formatter.format_header { nil } if options[:no_header]
+        formatter.format_header { nil } if options.delete(:no_header)
 
         FormattersHelper.module_eval do
           define_method(name) do |column, *args|
-            ColumnFormatter.new(self, formatter, column, *args)
+            Formatter::Column.new(self, formatter, column, *args.push(options))
           end
         end
       end

data/lib/tableasy/formatter.rb

@@ -1,21 +1,29 @@
 module Tableasy
-  class ColumnFormatter
-    def initialize(context, formatter, *args)
-      @context = context
-      @formatter = formatter
-      @args = args
-    end
+  class Formatter
+    class Column
+      attr_reader :column
 
-    def execute(record)
-      @context.instance_exec(record, *@args, &@formatter.block)
-    end
+      def initialize(context, formatter, column, *args)
+        options = args.extract_options!
+        @context = context
+        @formatter = formatter
+        @args = args
+        if options[:no_initial]
+          @args.unshift(column)
+        else
+          @column = column
+        end
+      end
 
-    def to_sym
-      @formatter.format_header(@args.first)
+      def execute(record)
+        @context.instance_exec(record, *@args, &@formatter.block)
+      end
+
+      def to_sym
+        @formatter.format_header(@column || @args.first)
+      end
     end
-  end
 
-  class Formatter
     attr_reader :block
 
     def initialize(&block)

data/lib/tableasy/html_attributes.rb

@@ -3,12 +3,5 @@ module Tableasy
     def html
       @html ||= {}
     end
-
-    def method_missing(method, *args)
-      if method.to_s =~ /(.*)=/
-        attr = $1.to_sym
-        html[attr] = args.shift
-      end
-    end
   end
 end

data/lib/tableasy/table.rb

@@ -0,0 +1,13 @@
+module Tableasy
+  class Table
+    attr_reader :rows
+
+    def initialize
+      @rows = []
+    end
+
+    def add_row(cells, html = {})
+      @rows << Row.new(cells.compact, html)
+    end
+  end
+end

data/lib/tableasy/table/cell.rb

@@ -0,0 +1,29 @@
+module Tableasy
+  class Table
+    class Cell
+      include HtmlAttributes
+      attr_accessor :value, :header
+      attr_reader :subject
+
+      def initialize(subject, value, header = false)
+        @subject = subject
+        @header = header
+        self.value = value
+      end
+
+      def value=(value)
+        if value.is_a?(Tableasy::Formatter::Column)
+          @value = @subject.send(value.column) if value.column
+          value.execute(self)
+        else
+          value = @subject.send(value) if value.is_a?(Symbol)
+          @value = value
+        end
+      end
+
+      def tag
+        @header ? 'th' : 'td'
+      end
+    end
+  end
+end

data/lib/tableasy/table/row.rb

@@ -0,0 +1,22 @@
+module Tableasy
+  class Table
+    class Row
+      include HtmlAttributes
+      attr_reader :cells
+
+      def initialize(cells, html = {})
+        @cells = cells.select {|cell| cell.value }
+        @total, @header = html.delete(:total), html.delete(:header)
+        @html = html
+      end
+
+      def total_row?
+        @total
+      end
+
+      def header_row?
+        @header
+      end
+    end
+  end
+end

data/lib/tableasy/tables_helper.rb

@@ -3,45 +3,57 @@ module Tableasy
     def table_for(klass, list, *columns)
       options = columns.extract_options!
 
+      table = Table.new
+      # Add header row
+      row = columns.collect {|column| header_cell(column, klass) }
+      table.add_row(row, :header => true)
+
+      list.each_with_index do |object, index|
+        table.add_row(table_row(object, columns), :id => dom_id(object, :row), :class => "#{dom_class(object)} #{index.even? ? "odd" : "even"}")
+      end
+
+      if options[:total]
+        item = Total.new(list)
+        caption = I18n.t('tableasy.total', :raise => true) rescue 'Total: '
+        table.add_row(table_row(item, columns[1..-1]).unshift(Table::Cell.new(item, caption, true)), :class => 'total-row', :total => true)
+      end
+
+      content_tag('table', options[:html]) do
+        table.rows[1..-1].each {|row| yield row } if block_given?
+        table.rows.collect {|row| content_row(row) }.join
+      end
+    end
+
+    def data_list(object, *columns)
+      options = columns.extract_options!
+      table = Table.new
+
+      columns.each do |column|
+        table.add_row([header_cell(column, object.class), Table::Cell.new(object, column)].compact)
+      end
+
       content_tag('table', options[:html]) do
-        content = ''
-        content << content_tag('tr') do
-          columns.select {|column| column.to_sym }.collect do |column|
-            content_tag 'th', klass.human_attribute_name(column.to_sym)
-          end.join
-        end
-
-        content << list.each_with_index.collect do |item, index|
-          row = Row.new(item, columns)
-          row.html[:class] = index.odd? ? 'even' : 'odd'
-          yield row if block_given?
-          content_row(item, row)
-        end.join
-
-        if options[:total]
-          item = Total.new(list)
-          caption = I18n.t('tableasy.total', :raise => true) rescue 'Total: '
-          row = Row.new(item, columns[1..-1].unshift(caption), true)
-          row.html[:class] = 'total-row'
-          yield row if block_given?
-          content << content_row(item, row, :first_header => true)
-        end
-
-        content
+        table.rows.collect {|row| content_row(row) }.join
       end
     end
 
-    def content_row(object, row, options = {})
-      content_tag_for('tr', object, :row, row.html) do
-        ''.tap do |result|
-          if options[:first_header]
-            column = row.columns.shift
-            result << content_tag('th', column.value, column.html)
-          end
-          result << row.columns.collect { |column| content_tag('td', column.value, column.html) }.join
-        end
+    def content_row(row)
+      content_tag('tr', row.html) do
+        row.cells.collect {|cell| content_tag(cell.tag, cell.value, cell.html) }.join
       end
     end
 
+    protected
+
+    def header_cell(column, klass)
+      header = column.to_sym
+      Table::Cell.new(nil, klass.human_attribute_name(header), true) if header
+    end
+
+    def table_row(object, columns)
+      columns.collect do |column|
+        Table::Cell.new(object, column)
+      end
+    end
   end
 end

data/spec/helpers/formatting_helper_spec.rb

@@ -8,14 +8,14 @@ describe 'Formatters' do
   it "should show linked object" do
     formatter = helper.linked(:name)
     formatter.to_sym.should == :name
-    formatter.execute(@andrius).should == '<a href="/people/Andrius">Andrius</a>'
+    Tableasy::Table::Cell.new(@andrius, formatter).value.should == '<a href="/people/Andrius">Andrius</a>'
   end
 
   it "should show object linked to itself" do
     build :project
     formatter = helper.linked_to(:leader)
     formatter.to_sym.should == :leader
-    formatter.execute(@project).should == '<a href="/people/Andrius">Andrius</a>'
+    Tableasy::Table::Cell.new(@project, formatter).value.should == '<a href="/people/Andrius">Andrius</a>'
   end
 
   it "should show nothing when linked object doesn't exist" do
@@ -23,7 +23,7 @@ describe 'Formatters' do
     @project.leader = nil
     formatter = helper.linked_to(:leader)
     formatter.to_sym.should == :leader
-    formatter.execute(@project).should == ''
+    Tableasy::Table::Cell.new(@project, formatter).value.should == ''
   end
 
   it "should show number with percent" do
@@ -33,7 +33,7 @@ describe 'Formatters' do
     formatter = helper.with_percent(:remaining, :work_hours)
     formatter.to_sym.should == :remaining
     ["8 (8.000%)", "-8 (-8.000%)", "8 (61.538%)", "0 (0.000%)"].each do |result|
-      formatter.execute(@andrius).should == result
+      Tableasy::Table::Cell.new(@andrius, formatter).value.should == result
     end
   end
 
@@ -41,7 +41,7 @@ describe 'Formatters' do
     helper.expects(:rand).with(30).returns(23)
     formatter = helper.random(:hours, 100..130)
     formatter.to_sym.should == :hours
-    formatter.execute(nil).should == 123
+    Tableasy::Table::Cell.new(nil, formatter).value.should == 123
   end
 
   describe 'tail_link' do
@@ -51,38 +51,46 @@ describe 'Formatters' do
 
     it "should allow show link with no symbol" do
       formatter = helper.tail_link('hello')
-      formatter.execute(@andrius).should == '<a href="/people/Andrius">hello</a>'
+      Tableasy::Table::Cell.new(@andrius, formatter).value.should == '<a href="/people/Andrius">hello</a>'
       formatter.to_sym.should == nil
     end
 
     it "should allow passing custom url" do
       formatter = helper.tail_link('hello', :edit)
-      formatter.execute(@andrius).should == '<a href="/edit/people/Andrius">hello</a>'
+      Tableasy::Table::Cell.new(@andrius, formatter).value.should == '<a href="/edit/people/Andrius">hello</a>'
     end
 
     it "should allow passing custom url and html attributes" do
       formatter = helper.tail_link('hello', :edit, :method => :delete)
-      formatter.execute(@andrius).should == helper.link_to('hello', [:edit, @andrius], :method => :delete)
+      Tableasy::Table::Cell.new(@andrius, formatter).value.should == helper.link_to('hello', [:edit, @andrius], :method => :delete)
     end
 
     it "should allow creating ajax link" do
       formatter = helper.tail_link('hello', :edit, :ajax => true)
-      formatter.execute(@andrius).should == helper.link_to_remote('hello', :url => [:edit, @andrius])
+      Tableasy::Table::Cell.new(@andrius, formatter).value.should == helper.link_to_remote('hello', :url => [:edit, @andrius])
     end
 
     it "should allow creating edit url" do
-      formatter = helper.edit_link('Edit')
-      formatter.execute(@andrius).should == helper.link_to('Edit', [:edit, @andrius])
+      formatter = helper.edit_link('(edit)')
+      Tableasy::Table::Cell.new(@andrius, formatter).value.should == helper.link_to('(edit)', [:edit, @andrius])
     end
 
     it "should allow creating ajax edit url" do
-      formatter = helper.edit_link('Edit', :ajax => true)
-      formatter.execute(@andrius).should == helper.link_to_remote('Edit', :url => [:edit, @andrius], :method => :get)
+      formatter = helper.edit_link('(edit)', :ajax => true)
+      Tableasy::Table::Cell.new(@andrius, formatter).value.should == helper.link_to_remote('(edit)', :url => [:edit, @andrius], :method => :get)
     end
 
     it "should allow creating delete link" do
-      formatter = helper.destroy_link('Delete')
-      formatter.execute(@andrius).should == helper.link_to('Delete', @andrius, :method => :delete, :confirm => 'Are you sure?')
+      formatter = helper.destroy_link('(delete)')
+      Tableasy::Table::Cell.new(@andrius, formatter).value.should == helper.link_to('(delete)', @andrius, :method => :delete, :confirm => 'Are you sure?')
     end
   end
+
+  it "should allow creating header cell" do
+    formatter = helper.header_row('Hello')
+    cell = Tableasy::Table::Cell.new(@andrius, formatter)
+    cell.value.should == 'Hello'
+    cell.html[:colspan].should == 2
+    cell.header.should == true
+  end
 end

data/spec/helpers/tables_helper_spec.rb

@@ -11,8 +11,8 @@ describe Tableasy::TablesHelper do
   it "should yield row object with columns and record when creating table using block" do
     build :project
     output = helper.table_for(Project, [@project], :name, :leader) do |row|
-      row.columns[0].value = row.record.name
-      row.columns[1].value = 'xxxxx'
+      row.cells[0].value = row.cells[0].subject.name
+      row.cells[1].value = 'xxxxx'
     end
 
     output.should == "<table><tr><th>Name</th><th>Leader</th></tr><tr class=\"project odd\" id=\"row_project_1\"><td>project</td><td>xxxxx</td></tr></table>"
@@ -21,13 +21,11 @@ describe Tableasy::TablesHelper do
   it "should allow passing custom html options for row and columns" do
     build :project
     output = helper.table_for(Project, [@project], :name) do |row|
-      row.title = 'my row'
       row.html[:class] = 'my-row'
-      row.columns[0].align = 'center'
-      row.columns[0].html[:class] = 'name'
+      row.cells[0].html[:class] = 'name'
     end
 
-    output.should == "<table><tr><th>Name</th></tr><tr class=\"project my-row\" id=\"row_project_1\" title=\"my row\"><td align=\"center\" class=\"name\">project</td></tr></table>"
+    output.should == "<table><tr><th>Name</th></tr><tr class=\"my-row\" id=\"row_project_1\"><td class=\"name\">project</td></tr></table>"
   end
 
   it "should allow creating a table with totals row" do
@@ -38,22 +36,22 @@ describe Tableasy::TablesHelper do
 <tr><th>Name</th><th>Id</th></tr>\
 <tr class=\"person odd\" id=\"row_person_1\"><td>Admin</td><td>1</td></tr>\
 <tr class=\"person even\" id=\"row_person_1\"><td>Andrius</td><td>1</td></tr>\
-<tr class=\"tableasy_total total-row\" id=\"row_tableasy_total_2\"><th>Total: </th><td>2</td></tr>\
+<tr class=\"total-row\"><th>Total: </th><td>2</td></tr>\
 </table>"
   end
 
   it "should allow creating custom total row" do
     build :admin, :andrius
     output = helper.table_for(Person, [@admin, @andrius], :name, :id, :total => true) do |row|
-      row.columns[0].value = 'Total of:' if row.total_row?
-      row.columns[1].value = "@#{row.record.id}"
+      row.cells[0].value = 'Total of:' if row.total_row?
+      row.cells[1].value = "@#{row.cells[1].subject.id}"
     end
 
     output.should == "<table>\
 <tr><th>Name</th><th>Id</th></tr>\
 <tr class=\"person odd\" id=\"row_person_1\"><td>Admin</td><td>@1</td></tr>\
 <tr class=\"person even\" id=\"row_person_1\"><td>Andrius</td><td>@1</td></tr>\
-<tr class=\"tableasy_total total-row\" id=\"row_tableasy_total_2\"><th>Total of:</th><td>@2</td></tr>\
+<tr class=\"total-row\"><th>Total of:</th><td>@2</td></tr>\
 </table>"
   end
 
@@ -74,7 +72,7 @@ describe Tableasy::TablesHelper do
 <tr><th>Name</th><th>Id2</th><th>Id</th></tr>\
 <tr class=\"person odd\" id=\"row_person_1\"><td>Admin</td><td>2</td><td>1 (50.000%)</td></tr>\
 <tr class=\"person even\" id=\"row_person_1\"><td>Andrius</td><td>2</td><td>1 (50.000%)</td></tr>\
-<tr class=\"tableasy_total total-row\" id=\"row_tableasy_total_2\"><th>Total: </th><td>4</td><td>2 (50.000%)</td></tr>\
+<tr class=\"total-row\"><th>Total: </th><td>4</td><td>2 (50.000%)</td></tr>\
 </table>"
   end
 
@@ -90,4 +88,13 @@ describe Tableasy::TablesHelper do
     output = helper.table_for(Project, [@project], :name, :html => {:id => 'my_table'})
     output.should == "<table id=\"my_table\"><tr><th>Name</th></tr><tr class=\"project odd\" id=\"row_project_1\"><td>project</td></tr></table>"
   end
+
+  describe 'data list' do
+    it "should allow building data list" do
+      build :andrius
+      output = helper.data_list(@andrius, :name, :id)
+
+      output.should == "<table><tr><th>Name</th><td>Andrius</td></tr><tr><th>Id</th><td>1</td></tr></table>"
+    end
+  end
 end

data/spec/table/cell_spec.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe Tableasy::Table::Cell do
+  before do
+    build :andrius
+  end
+
+  describe 'with cell created' do
+    before do
+      @cell = Tableasy::Table::Cell.new(@andrius, 'andrius')
+    end
+
+    it "should be created" do
+      @cell.subject.should == @andrius
+      @cell.value = 'andrius'
+      @cell.header.should be_false
+      @cell.tag.should == 'td'
+    end
+
+    it "should allow to assign html attributes" do
+      @cell.html[:class] = 'class'
+      @cell.html.should == {:class => 'class'}
+    end
+  end
+
+  it "should allow to create header cell" do
+    cell = Tableasy::Table::Cell.new(@andrius, 'andrius', true)
+    cell.header.should be_true
+    cell.tag.should == 'th'
+  end
+
+  it "should take value from object if symbol is passed as value" do
+    cell = Tableasy::Table::Cell.new(@andrius, :name)
+    cell.value.should == 'Andrius'
+  end
+
+  it "should execute formatter if it's passed as value" do
+    f = Tableasy::Formatter.new {|cell, string| cell.value += string }
+    cf = Tableasy::Formatter::Column.new(self, f, :to_s, ' hello')
+    cell = Tableasy::Table::Cell.new(@andrius, cf)
+    cell.value.should == 'Andrius hello'
+  end
+end

data/spec/table/row_spec.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe Tableasy::Table::Row do
+  it "should skip cells that have value nil" do
+    cell1 = Tableasy::Table::Cell.new(nil, 'a')
+    cell2 = Tableasy::Table::Cell.new(nil, nil)
+    row = Tableasy::Table::Row.new([cell1, cell2])
+    row.cells.should == [cell1]
+  end
+
+  it "should allow marking row as total row" do
+    row = Tableasy::Table::Row.new([], :total => true)
+    row.should be_total_row
+  end
+
+  it "should allow marking row as header row" do
+    row = Tableasy::Table::Row.new([], :header => true)
+    row.should be_header_row
+  end
+
+  it "should allow passing html attributes" do
+    row = Tableasy::Table::Row.new([], :title => 'hello')
+    row.html[:title].should == 'hello'
+  end
+end

data/spec/table/table_spec.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe Tableasy::Table do
+  describe 'with created table' do
+    before :each do
+      build :andrius
+      @table = Tableasy::Table.new
+      @cell = Tableasy::Table::Cell.new(nil, 'val')
+    end
+
+    it "should allow to add row" do
+      @table.add_row([@cell, @cell])
+      @table.rows[0].cells.should == [@cell, @cell]
+    end
+
+    it "should allow to add row with html" do
+      @table.add_row([@cell], :class => 'total')
+      @table.rows[0].html.should == {:class => 'total'}
+    end
+  end
+end

data/tableasy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tableasy}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrius Chamentauskas"]
-  s.date = %q{2010-02-24}
+  s.date = %q{2010-03-04}
   s.description = %q{Rails tables builder gem that makes creating tables painless. Includes ability to write custom column formatters or even customize row completely.
 Includes library of predefined column formatters. Also has ability to generate "totals" row.}
   s.email = %q{sinsiliux@gmail.com}
@@ -26,10 +26,11 @@ Includes library of predefined column formatters. Also has ability to generate "
      "VERSION",
      "lib/formatters.rb",
      "lib/tableasy.rb",
-     "lib/tableasy/column.rb",
      "lib/tableasy/formatter.rb",
      "lib/tableasy/html_attributes.rb",
-     "lib/tableasy/row.rb",
+     "lib/tableasy/table.rb",
+     "lib/tableasy/table/cell.rb",
+     "lib/tableasy/table/row.rb",
      "lib/tableasy/tables_helper.rb",
      "lib/tableasy/total.rb",
      "spec/blueprint.rb",
@@ -38,6 +39,9 @@ Includes library of predefined column formatters. Also has ability to generate "
      "spec/helpers/tables_helper_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
+     "spec/table/cell_spec.rb",
+     "spec/table/row_spec.rb",
+     "spec/table/table_spec.rb",
      "tableasy.gemspec"
   ]
   s.homepage = %q{http://github.com/sinsiliux/tableasy}
@@ -50,6 +54,9 @@ Includes library of predefined column formatters. Also has ability to generate "
      "spec/helpers/formatting_helper_spec.rb",
      "spec/spec_helper.rb",
      "spec/fake_models.rb",
+     "spec/table/cell_spec.rb",
+     "spec/table/table_spec.rb",
+     "spec/table/row_spec.rb",
      "spec/blueprint.rb"
   ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tableasy
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andrius Chamentauskas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 +02:00
+date: 2010-03-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,10 +82,11 @@ files:
 - VERSION
 - lib/formatters.rb
 - lib/tableasy.rb
-- lib/tableasy/column.rb
 - lib/tableasy/formatter.rb
 - lib/tableasy/html_attributes.rb
-- lib/tableasy/row.rb
+- lib/tableasy/table.rb
+- lib/tableasy/table/cell.rb
+- lib/tableasy/table/row.rb
 - lib/tableasy/tables_helper.rb
 - lib/tableasy/total.rb
 - spec/blueprint.rb
@@ -94,6 +95,9 @@ files:
 - spec/helpers/tables_helper_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/table/cell_spec.rb
+- spec/table/row_spec.rb
+- spec/table/table_spec.rb
 - tableasy.gemspec
 has_rdoc: true
 homepage: http://github.com/sinsiliux/tableasy
@@ -128,4 +132,7 @@ test_files:
 - spec/helpers/formatting_helper_spec.rb
 - spec/spec_helper.rb
 - spec/fake_models.rb
+- spec/table/cell_spec.rb
+- spec/table/table_spec.rb
+- spec/table/row_spec.rb
 - spec/blueprint.rb

data/lib/tableasy/column.rb

@@ -1,17 +0,0 @@
-module Tableasy
-  class Column
-    include HtmlAttributes
-    attr_reader :value
-
-    def initialize(record, value)
-      @record = record
-      self.value = value
-    end
-
-    def value=(value)
-      value = value.execute(@record) if value.is_a?(Tableasy::ColumnFormatter)
-      value = @record.send(value) if value.is_a?(Symbol)
-      @value = value
-    end
-  end
-end

data/lib/tableasy/row.rb

@@ -1,20 +0,0 @@
-module Tableasy
-  class Row
-    include HtmlAttributes
-    attr_reader :record, :columns
-
-    def initialize(record, columns, total_row = false)
-      @record = record
-
-      @columns = columns.collect do |value|
-        Column.new(record, value)
-      end
-      @total_row = total_row
-      @html = {}
-    end
-
-    def total_row?
-      @total_row
-    end
-  end
-end