table_cloth 0.4.0 → 0.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 749bf677a3ffe591ab0f3a1a61ca5f016d7f91bd
+  data.tar.gz: d103710bf95ca76c6ea6eaadbf6b99a438aa5a0d
+SHA512:
+  metadata.gz: 2c17f9cc988b73d71b911caa21c33f9a77397c5020c4150b3453ce00a887af9456bfa74d05c1617cebe3ced9311156e5eb189df17ed5116e759df48f982abce7
+  data.tar.gz: 91c0569d11104abef8adc608d7e6cbc0ce654ddddc6cd9938178c640cf1ba36ea8242028cfffe0c1b7ea21a570d55a458b164f4db417df06a546a37fe5ace362

data/README.md

@@ -25,6 +25,7 @@ And then execute:
 
 Table Cloth can use defined tables in app/tables or you can build them on the fly.
 
+
 Table models can be generated using rails generators.
 
 ```
@@ -177,6 +178,8 @@ class UserTable < TableCloth::Base
 end
 ```
 
+Table header (```th```) elements can be configured in a similar fashion with the ```th_options``` key.
+
 Not good enough? Fine... you can do row / column specific config as well for a TD.
 
 ```ruby

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
 
 RSpec::Core::RakeTask.new(:spec)
 task default: :spec

data/lib/generators/templates/table.rb

@@ -1,7 +1,4 @@
 class <%= class_name %>Table < TableCloth::Base
-  # To include actions on this table, uncomment this line
-  # include TableCloth::Extensions::Actions
-
   # Define columns with the #column method
   # column :name, :email
 

data/lib/table_cloth/base.rb

@@ -1,5 +1,7 @@
 module TableCloth
   class Base
+    include TableCloth::Extensions::Actions
+
     NoPresenterError = Class.new(Exception)
 
     attr_reader :collection, :view
@@ -59,4 +61,4 @@ module TableCloth
       end
     end
   end
-end
+end

data/lib/table_cloth/presenter.rb

@@ -27,12 +27,6 @@ module TableCloth
       end.compact
     end
 
-    def column_names
-      @column_names ||= columns.each_with_object([]) do |column, names|
-        names << column.human_name(view_context)
-      end
-    end
-
     def row_values(object)
       columns.each_with_object([]) do |column, values|
         values << column.value(object, view_context, table)
@@ -49,9 +43,10 @@ module TableCloth
 
     def tag_options(type, options={})
       options = options.dup
+
       if TableCloth.config.respond_to?(type)
-        options.merge!(table.config.config_for(type))
-        options.merge!(TableCloth.config.config_for(type))
+        options = table.config.config_for(type).merge(options)
+        options = TableCloth.config.config_for(type).merge(options)
       end
 
       options

data/lib/table_cloth/presenters/default.rb

@@ -24,8 +24,10 @@ module TableCloth
 
       def thead_row
         @thead_row ||= ElementFactory::Element.new(:tr, tag_options(:tr)).tap do |row|
-          column_names.each do |name|
-            row << ElementFactory::Element.new(:th, tag_options(:th).merge(text: name))
+          columns.each do |column|
+            th_options = column.options[:th_options] || {}
+            name = column.human_name(view_context)
+            row << ElementFactory::Element.new(:th, tag_options(:th, th_options).merge(text: name))
           end
         end
       end

data/lib/table_cloth/version.rb

@@ -1,3 +1,3 @@
 module TableCloth
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/lib/base_spec.rb

@@ -90,4 +90,10 @@ describe TableCloth::Base do
       expect { sibling1_class.config.table.cellpadding = '0' }.not_to change { sibling2_class.config.table.cellpadding }
     end
   end
-end
+
+  describe '.actions' do
+    it 'exists in class' do
+      expect(subject).to respond_to(:actions)
+    end
+  end
+end

data/spec/lib/extensions/actions_spec.rb

@@ -3,40 +3,32 @@ require "spec_helper"
 describe TableCloth::Extensions::Actions do
   let(:dummy_table) { FactoryGirl.build(:dummy_table) }
 
-  context "inclusion" do
-    it "gives the table class an actions method" do
-      expect { dummy_table.send(:include, described_class) }.to change { dummy_table.respond_to? :actions }.to true
+  describe '.actions' do
+    it "yields an ActionCollection block" do
+      block_type = nil
+      dummy_table.actions { block_type = self }
+      expect(block_type).to be_kind_of TableCloth::Extensions::Actions::ActionCollection
     end
 
-    context ".actions" do
-      before(:each) { dummy_table.send(:include, described_class) }
-
-      it "yields an ActionCollection block" do
-        block_type = nil
-        dummy_table.actions { block_type = self }
-        expect(block_type).to be_kind_of TableCloth::Extensions::Actions::ActionCollection
-      end
-
-      it "creates an actions column on the table" do
-        dummy_table.actions { }
-        expect(dummy_table.columns).to have_key :actions
-      end
+    it "creates an actions column on the table" do
+      dummy_table.actions { }
+      expect(dummy_table.columns).to have_key :actions
+    end
 
-      it "accepts options" do
-        dummy_table.actions(if: :admin?) { }
-        expect(dummy_table.columns[:actions][:options]).to have_key :if
-      end
+    it "accepts options" do
+      dummy_table.actions(if: :admin?) { }
+      expect(dummy_table.columns[:actions][:options]).to have_key :if
+    end
 
-      it "sets a collection key for the column pointing to the collection object" do
-        dummy_table.actions { }
-        expect(dummy_table.columns[:actions][:options][:collection]).to be_kind_of TableCloth::Extensions::Actions::ActionCollection
-      end
+    it "sets a collection key for the column pointing to the collection object" do
+      dummy_table.actions { }
+      expect(dummy_table.columns[:actions][:options][:collection]).to be_kind_of TableCloth::Extensions::Actions::ActionCollection
+    end
 
-      it "sets the column class to an action column" do
-        dummy_table.actions { }
-        column = dummy_table.columns[:actions]
-        expect(column[:class]).to eq(TableCloth::Extensions::Actions::Column)
-      end
+    it "sets the column class to an action column" do
+      dummy_table.actions { }
+      column = dummy_table.columns[:actions]
+      expect(column[:class]).to eq(TableCloth::Extensions::Actions::Column)
     end
   end
-end
+end

data/spec/lib/presenter_spec.rb

@@ -29,19 +29,6 @@ describe TableCloth::Presenter do
       specify "are not returned" do
         expect(subject).to have(0).columns
       end
-
-      specify "name is not returned" do
-        expect(subject.column_names).not_to include "email"
-      end
-    end
-  end
-
-  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
-      expect(subject.column_names).to eq ["Id", "Name", "Email"]
     end
   end
 

data/spec/lib/presenters/default_spec.rb

@@ -12,26 +12,25 @@ describe TableCloth::Presenters::Default do
   subject { TableCloth::Presenters::Default.new(objects, dummy_table, view_context) }
 
   describe "#thead" do
-    let(:column_names) { ["Col1", "Col2"] }
     let(:thead) { Nokogiri::HTML(subject.thead.to_s) }
 
-    before(:each) do
-      subject.stub column_names: column_names
-    end
-
     it "creates a thead" do
       expect(thead).to have_tag "thead"
     end
 
     it "creates th's" do
-      expect(thead.css("th").size).to be 2
+      expect(thead.css("th").size).to be subject.columns.size
     end
 
     it "creates th's with the correct text" do
       thead.css("th").each_with_index do |th, i|
-        expect(th.text).to eq(column_names[i])
+        expect(th.text).to eq(subject.columns[i].human_name(view_context))
       end
     end
+
+    it "creates th's with the correct options" do
+      thead.at_css("th").attr(:class).should == "th_options_class"
+    end
   end
 
   describe "#render_table" do

data/spec/support/dummy_table.rb

@@ -1,5 +1,5 @@
 class DummyTable < TableCloth::Base
-  column :id
+  column :id, th_options: {class: "th_options_class"}
   column :name
   column :email
 end

data/table_cloth.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('factory_girl')
   gem.add_development_dependency('guard-rspec')
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('rb-fsevent', '~> 0.9.1')
+  gem.add_development_dependency('rb-fsevent', '~> 0.9.4')
 
-  gem.add_dependency('actionpack', '>= 3.1', '< 4.1')
-  gem.add_dependency('element_factory', '~> 0.1.0')
+  gem.add_dependency('actionpack', '>= 3.1', '< 4.2')
+  gem.add_dependency('element_factory', '~> 0.1.2')
 end

metadata

@@ -1,198 +1,175 @@
 --- !ruby/object:Gem::Specification
 name: table_cloth
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.4.1
 platform: ruby
 authors:
 - Robert Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: simplecov
   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: awesome_print
   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: nokogiri
   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: pry
   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: 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
-    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: rake
   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: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: element_factory
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
 description: Table Cloth helps you create tables easily.
 email:
 - robert@creativequeries.com
@@ -200,9 +177,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - Guardfile
@@ -254,27 +231,26 @@ files:
 - table_cloth.gemspec
 homepage: http://www.github.com/bobbytables/table_cloth
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Table Cloth provides an easy and intuitive DSL for creating tables for Rails
   views.
 test_files:
@@ -303,4 +279,3 @@ test_files:
 - spec/support/matchers/element_matchers.rb
 - spec/support/shared_config_examples.rb
 - spec/support/view_mocks.rb
-has_rdoc: