table_cloth 0.2.2 → 0.2.3

data/README.md

@@ -75,7 +75,9 @@ The second approach to making tables with Table Cloth is in the view.
 <%= simple_table_for @users do |t| %>
   <% t.column :name %>
   <% t.column :email %>
-  <% t.action {|user| link_to "View", user %>
+  <% t.actions do %>
+    <% action {|user| link_to "View", user } %>
+  <% end %>
 <% end %>
 ```
 
@@ -106,8 +108,11 @@ A lot of tables have an actions column to give you the full CRUD effect. They ca
 ```
 class UserTable < TableCloth::Base
   column :name
-  action {|object| link_to 'View', object }
-  action(if: :admin?) {|object| link_to 'Delete', object, method: :delete }
+
+  actions do
+    action {|object| link_to 'View', object }
+    action(if: :admin?) {|object| link_to 'Delete', object, method: :delete }
+  end
 
   def admin?
     view.current_user.admin?
@@ -138,7 +143,10 @@ You can also configure specific tables separately.
 ```ruby
 class UserTable < TableCloth::Base
   column :name, :email
-  action(:edit) {|object| link_to "Edit", edit_object_path(object) }
+
+  actions do
+    action {|object| link_to "Edit", edit_object_path(object) }
+  end
   
   config.table.class = ''
   config.thead.class = ''

data/lib/table_cloth/base.rb

@@ -11,12 +11,6 @@ module TableCloth
       @view       = view
     end
 
-    def column_names
-      @column_names ||= columns.each_with_object([]) do |(column_name, column), names|
-        names << column.human_name
-      end
-    end
-
     def columns
       @columns ||= self.class.columns.each_with_object({}) do |(column_name, column), columns|
         columns[column_name] = column if column.available?(self)

data/lib/table_cloth/columns/action.rb

@@ -5,7 +5,7 @@ module TableCloth
         actions_html = actions.each_with_object('') do |action, links|
           if action.available?(table)
             links << "\n"
-            links << view_context.instance_exec(object, view_context, &action.options[:proc])
+            links << (view_context.instance_exec(object, view_context, &action.options[:proc]) || "")
           end
         end
 

data/lib/table_cloth/presenter.rb

@@ -4,10 +4,10 @@ module TableCloth
       :table
 
     def initialize(objects, table, view)
-      @view_context     = view
+      @view_context = view
       @table_definition = table
-      @objects          = objects
-      @table            = table_definition.new(objects, view)
+      @objects = objects
+      @table = table_definition.new(objects, view)
     end
 
     # Short hand so your fingers don't hurt
@@ -28,7 +28,9 @@ module TableCloth
     end
 
     def column_names
-      table.column_names
+      @column_names ||= table.columns.each_with_object([]) do |(column_name, column), names|
+        names << column.human_name
+      end
     end
 
     def row_values(object)

data/lib/table_cloth/version.rb

@@ -1,3 +1,3 @@
 module TableCloth
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/factories/dummy_models.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :dummy_model do
+    sequence(:id) { |n| n }
+    email "robert@example.com"
+    name  "robert"
+  end
+end

data/spec/lib/action_view_extension_spec.rb

@@ -3,14 +3,7 @@ require 'spec_helper'
 describe 'Action View Extension' do
   let(:action_view) { ActionView::Base.new }
   let(:objects) do
-    3.times.map do |n|
-      num = n+1
-      DummyModel.new.tap do |d|
-        d.id    = num # Wat
-        d.email = "robert#{num}@example.com"
-        d.name  = "robert#{num}"
-      end 
-    end
+    3.times.map { FactoryGirl.build(:dummy_model) }
   end
 
   it 'includes to actionview' do
@@ -23,14 +16,6 @@ describe 'Action View Extension' do
     end
 
     doc = Nokogiri::HTML(table)
-    doc.at_xpath('//table').should be_present
-    doc.at_xpath('//tr').xpath('.//th').length.should == 2
-
-    trs = doc.at_xpath('//tbody').xpath('.//tr').to_a
-    trs.each_with_index do |tr, index|
-      tds = tr.xpath('.//td')
-      objects[index].name.should  == tds[0].text
-      objects[index].email.should == tds[1].text
-    end
+    expect(doc.at_xpath('//table')).to be_present
   end
 end

data/spec/lib/actions_spec.rb

@@ -4,26 +4,25 @@ describe TableCloth::Actions do
   subject { TableCloth::Actions }
 
   context "block syntax" do
-
     it "accepts a block" do
       actions = subject.new do
         action { 'Edit' }
       end
 
-      actions.column.should have(1).actions
+      expect(actions.column).to have(1).actions
     end
 
     it "accepts options with a block" do
-      expect do
-        subject.new(class: "actions") do
-          action { "Edit" }
-        end
-      end.not_to raise_error
+      actions = subject.new(class: "actions") do
+        action { "Edit" }
+      end
+
+      expect(actions.options[:class]).to eq("actions")
     end
 
     it ".all returns all actions for the column" do
       actions = subject.new { action { "Edit" } }
-      actions.should have(1).all
+      expect(actions.all.length).to be 1
     end
   end
 end

data/spec/lib/base_spec.rb

@@ -3,17 +3,12 @@ require 'spec_helper'
 describe TableCloth::Base do
   subject { Class.new(TableCloth::Base) }
   let(:view_context) { ActionView::Base.new }
-  let(:dummy_model) do
-    DummyModel.new.tap do |d|
-      d.id    = 1
-      d.email = 'robert@example.com'
-      d.name  = 'robert'
-    end
-  end
+  let(:dummy_model) { FactoryGirl.build(:dummy_model) }
+  let(:table_instance) { subject.new([], view_context) }
 
   context 'columns' do
     it 'has a column method' do
-      subject.should respond_to :column
+      expect(subject).to respond_to :column
     end
 
     it 'column accepts a name' do
@@ -26,109 +21,34 @@ describe TableCloth::Base do
 
     it '.columns returns all columns' do
       subject.column :name
-      subject.should have(1).columns
+      expect(subject).to have(1).columns
     end
 
-    it 'excepts multiple column names' do
+    it 'accepts multiple column names' do
       subject.column :name, :email
-      subject.should have(2).columns
+      expect(subject).to have(2).columns
     end
 
     it 'stores a proc if given in options' do
       subject.column(:name) { 'Wee' }
 
       column = subject.columns[:name]
-      column.options[:proc].should be_present
-      column.options[:proc].should be_kind_of(Proc)
-    end
-
-    it '.column_names returns all names' do
-      subject.column :name, :email
-      subject.new([], view_context).column_names.should == ['Name', 'Email']
-    end
-
-    it '.column_names includes actions when given' do
-      subject.actions { action { } }
-      subject.new([], view_context).column_names.should include 'Actions'
-    end
-
-    it '.column_names does not include actions if all action conditions fail' do
-      subject.actions do
-        action(if: :admin?) { '/' }
-      end
-
-      table = subject.new([], view_context)
-      def table.admin?
-        false
-      end
-
-      table.column_names.should_not include 'Actions'
-    end
-
-    it '.column_names include actions when only partial are available' do
-      subject.actions do
-        action(if: :admin?) { '/' }
-        action(if: :awesome?) { '/' }
-      end
-      
-      table = subject.new([], view_context)
-      def table.admin?
-        false
-      end
-
-      def table.awesome?
-        true
-      end
-
-      table.column_names.should include 'Actions'  
-    end
-
-    it '.column_names uses a name given to it' do
-      subject.column :email, label: 'Email Address'
-      subject.new([], view_context).column_names.should include 'Email Address'
-    end
-
-    it '.column can take a custom column' do
-      email_column = Class.new(TableCloth::Column) do
-        def value(object, view)
-          "AN EMAIL!"
-        end
-      end
-
-      subject.column :email, using: email_column
-      subject.new([dummy_model], view_context)
-
-      subject.columns[:email].value(dummy_model, view_context).should == "AN EMAIL!"
-    end
-  end
-
-  context 'conditions' do
-    context 'if' do
-      subject { DummyTable.new([dummy_model], view_context) }
-
-      it 'includes the id column when admin' do
-        subject.column_names.should include 'Id'
-      end
-
-      it 'exclused the id column when an admin' do
-        def subject.admin?
-          false
-        end
-
-        subject.column_names.should_not include 'Id'
-      end
+      expect(column.options[:proc]).to be_present
+      expect(column.options[:proc]).to be_kind_of(Proc)
     end
 
-    context 'unless' do
-      subject { DummyTableUnlessAdmin.new([dummy_model], view_context) }
-      before(:each) do
-        def subject.admin?
-          false
+    context "custom" do
+      let(:custom_column) do
+        Class.new(TableCloth::Column) do
+          def value(object, view)
+            "AN EMAIL!"
+          end
         end
       end
 
-      it 'includes the id when not an admin' do
-        subject.column_names.should include 'Id'
+      it '.column can take a custom column' do
+        subject.column :email, using: custom_column
+        subject.columns[:email].value(dummy_model, view_context).should == "AN EMAIL!"
       end
     end
   end
@@ -146,7 +66,7 @@ describe TableCloth::Base do
         action { 'Delete' }
       end
 
-      subject.columns[:actions].should have(2).actions
+      expect(subject.columns[:actions]).to be_kind_of TableCloth::Columns::Action
     end
   end
 

data/spec/lib/builder_spec.rb

@@ -5,19 +5,11 @@ describe TableCloth::Builder do
   let(:view_context) { ActionView::Base.new }
 
   context '.build' do
-    it 'can build a table on the fly with a block' do
-      new_table = subject.build([], view_context) do |table|
-        table.column :name
-        table.actions do
-          action { '/model/1/edit' }
-        end
-      end
-
-      new_table.table.columns.length.should == 2
-      new_table.table.columns[:actions].actions.length.should == 1
+    it 'builds a table on the fly with a block' do
+      expect {|b| subject.build([], view_context, &b) }.to yield_control
     end
 
-    it 'can build a table from a class name' do
+    it 'builds a table from a class name' do
       new_table = subject.build([], view_context, with: DummyTable)
       new_table.table.should == DummyTable
     end
@@ -35,9 +27,8 @@ describe TableCloth::Builder do
 
     it '.to_s renders a table' do
       new_table = subject.build([], view_context, with: DummyTable)
-      body      = new_table.to_s
-      doc       = Nokogiri::HTML(body)
-      doc.at_xpath('//table').should be_present
+      new_table.presenter.should_receive(:render_table).once
+      new_table.to_s
     end
   end
 end

data/spec/lib/column_spec.rb

@@ -3,51 +3,39 @@ require 'spec_helper'
 describe TableCloth::Column do
   subject { Class.new(TableCloth::Column) }
   let(:view_context) { ActionView::Base.new }
-  let(:dummy_model) do
-    DummyModel.new.tap do |d|
-      d.id    = 1
-      d.email = 'robert@example.com'
-      d.name  = 'robert'
-    end
-  end
+  let(:dummy_model) { FactoryGirl.build(:dummy_model) }
 
   context 'values' do
-    let(:name_column) do 
-      TableCloth::Column.new(:name)
+    let(:proc) do
+      lambda {|object, view| object.email.gsub("@", " at ")}
     end
 
-    let(:email_column) do
-      proc = lambda {|object, view|
-        object.email
-      }
-
-      TableCloth::Column.new(:my_email, proc: proc)
-    end
+    let(:name_column) { TableCloth::Column.new(:name) }
+    let(:email_column) { TableCloth::Column.new(:my_email, proc: proc) }
 
     it 'returns the name correctly' do
       name_column.value(dummy_model, view_context).should == 'robert'
     end
 
     it 'returns the email from a proc correctly' do
-      email_column.value(dummy_model, view_context).should == 'robert@example.com'
+      email_column.value(dummy_model, view_context).should == 'robert at example.com'
     end
 
     context '.available?' do
-      let(:dummy_table) do
-        Class.new(TableCloth::Table) do
-          column :name, if: :admin?
-
-          def admin?
-            view.admin?
-          end
-        end
-      end
-
       it 'returns true on successful constraint' do
         table  = Class.new(DummyTable).new([dummy_model], view_context)
         column = TableCloth::Column.new(:name, if: :admin?)
         column.available?(table).should be_true
       end
+
+      it 'returns false on failed constraints' do
+        table  = Class.new(DummyTable).new([dummy_model], view_context)
+        table.stub admin?: false
+
+
+        column = TableCloth::Column.new(:name, if: :admin?)
+        column.available?(table).should be_false
+      end
     end
   end
 end

data/spec/lib/presenter_spec.rb

@@ -1,51 +1,62 @@
 require 'spec_helper'
 
 describe TableCloth::Presenter do
+  subject { TableCloth::Presenter.new(objects, dummy_table, view_context) }
   let(:dummy_table) { Class.new(DummyTable) }
-  let(:dummy_model) do
-    DummyModel.new.tap do |d|
-      d.id    = 1
-      d.email = 'robert@example.com'
-      d.name  = 'robert'
-    end
-  end
+  let(:dummy_model) { FactoryGirl.build(:dummy_model) }
 
-  let(:objects) do
-    3.times.map do |n|
-      num = n+1
-      DummyModel.new.tap do |d|
-        d.id    = num # Wat
-        d.email = "robert#{num}@example.com"
-        d.name  = "robert#{num}"
-      end 
-    end
-  end
+  let(:objects) { 3.times.map { FactoryGirl.build(:dummy_model) } }
 
   let(:view_context) { ActionView::Base.new }
   subject { TableCloth::Presenter.new(objects, dummy_table, view_context) }
 
+
+  context ".column_names" do
+    let(:table_instance) { dummy_table.new(objects, view_context) }
+    before(:each) { table_instance.stub admin?: false, awesome?: true }
+
+    it 'returns all names' do
+      dummy_table.column :name, :email
+      subject.column_names.should =~ ["Id", "Name", "Email"]
+    end
+
+    it 'includes actions when given' do
+      dummy_table.actions { action { } }
+      subject.column_names.should include 'Actions'
+    end
+
+    it 'include actions when only partial are available' do
+      dummy_table.actions do
+        action(if: :admin?) { '/' }
+        action(if: :awesome?) { '/' }
+      end
+      subject.column_names.should include 'Actions'  
+    end
+
+    it 'uses a name given to it' do
+      dummy_table.column :email, label: 'Email Address'
+      subject.column_names.should include 'Email Address'
+    end
+  end
+
   it 'returns all values for a row' do
-    subject.row_values(dummy_model).should == [1, 'robert', 'robert@example.com']
+    subject.row_values(dummy_model).should == [dummy_model.id, dummy_model.name, dummy_model.email]
   end
 
   it 'returns an edit link in the actions column' do
     dummy_table.actions do
       action {|object, view| link_to 'Edit', '/model/1/edit' }
     end
-    presenter = TableCloth::Presenter.new(objects, dummy_table, view_context)    
 
-    actions_value = presenter.row_values(dummy_model).last
+    actions_value = subject.row_values(dummy_model).last
     column = Nokogiri::HTML(actions_value)
     column.at_xpath('//a')[:href].should == '/model/1/edit'
     column.at_xpath('//a').text.should == 'Edit'
   end
 
   it 'generates the values for all of the rows' do
-    subject.rows.should == [
-      [1, 'robert1', 'robert1@example.com'],
-      [2, 'robert2', 'robert2@example.com'],
-      [3, 'robert3', 'robert3@example.com']
-    ]
+    expected = objects.map {|o| [o.id, o.name, o.email] }
+    expect(subject.rows).to eq(expected)
   end
 
   context 'tags' do

data/spec/lib/presenters/default_spec.rb

@@ -151,6 +151,22 @@ describe TableCloth::Presenters::Default do
         td = doc.at_css('td:last')
         td[:class].should include "actions"
       end
+
+      context "empty actions" do
+        let(:dummy_table) do
+          Class.new(TableCloth::Base) do
+            actions do
+              action { nil }
+            end
+          end
+        end
+
+        it "changes nil to empty string" do
+          doc = Nokogiri::HTML(subject.render_table)
+          td = doc.at_css('td:last')
+          expect(td.text).to eq "\n"
+        end
+      end
     end
 
     context 'by value of row column' do

data/spec/spec_helper.rb

@@ -1,15 +1,17 @@
 require 'table_cloth'
 require 'awesome_print'
 require 'nokogiri'
+require 'factory_girl'
 require 'pry'
 
 Dir['./spec/support/**/*.rb'].each {|f| require f }
 
+FactoryGirl.find_definitions
+
 ActionView::Base.send :include, TableClothViewMocks
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
-  config.include LetDeclarations
 end

data/spec/support/dummy_table.rb

@@ -1,5 +1,5 @@
 class DummyTable < TableCloth::Base
-  column :id, if: :admin?
+  column :id
   column :name
   column :email
 

data/table_cloth.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('awesome_print')
   gem.add_development_dependency('nokogiri')
   gem.add_development_dependency('pry')
+  gem.add_development_dependency('factory_girl')
   gem.add_development_dependency('guard-rspec')
   gem.add_development_dependency('rake')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_cloth
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +169,7 @@ files:
 - lib/table_cloth/presenter.rb
 - lib/table_cloth/presenters/default.rb
 - lib/table_cloth/version.rb
+- spec/factories/dummy_models.rb
 - spec/lib/action_view_extension_spec.rb
 - spec/lib/actions_spec.rb
 - spec/lib/base_spec.rb
@@ -167,7 +184,6 @@ files:
 - spec/support/dummy_table.rb
 - spec/support/dummy_table_with_actions.rb
 - spec/support/dummy_table_with_value_options.rb
-- spec/support/let_declarations.rb
 - spec/support/shared_config_examples.rb
 - spec/support/view_mocks.rb
 - table_cloth.gemspec
@@ -197,6 +213,7 @@ specification_version: 3
 summary: Table Cloth provides an easy and intuitive DSL for creating tables in rails
   views.
 test_files:
+- spec/factories/dummy_models.rb
 - spec/lib/action_view_extension_spec.rb
 - spec/lib/actions_spec.rb
 - spec/lib/base_spec.rb
@@ -211,6 +228,5 @@ test_files:
 - spec/support/dummy_table.rb
 - spec/support/dummy_table_with_actions.rb
 - spec/support/dummy_table_with_value_options.rb
-- spec/support/let_declarations.rb
 - spec/support/shared_config_examples.rb
 - spec/support/view_mocks.rb

data/spec/support/let_declarations.rb

@@ -1,2 +0,0 @@
-module LetDeclarations
-end