table_cloth 0.3.1.alpha1 → 0.3.2

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in tablecloth.gemspec
 gemspec
+
+gem 'actionpack', '>= 3.0', '< 4.1', github: 'rails/rails', branch: 'master'

data/README.md

@@ -1,7 +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!
+
+The primary goal of Table Cloth is to remove the complexity that usually comes with making tables with dynamic content.
+HTML Tables frequently can get out of hand when you start to add conditionals, removing columns, etc..
 
 Follow me! [@robertoross](http://twitter.com/robertoross)
 
@@ -147,7 +149,7 @@ class UserTable < TableCloth::Base
   actions do
     action {|object| link_to "Edit", edit_object_path(object) }
   end
-  
+
   config.table.class = ''
   config.thead.class = ''
   config.th.class    = ''
@@ -192,7 +194,6 @@ This would render something alow the lines of:
 ## Thanks
 
 - TableCloth was built during my open source time at [philosophie](http://gophilosophie.com)
-- simple_form for the idea of ```simple_table_for```
 
 ## Contributing
 

data/lib/generators/templates/table.rb

@@ -13,7 +13,7 @@ class <%= class_name %>Table < TableCloth::Base
   #
   # Columns can also have conditionals if you want.
   # The conditions are checked against the table's methods.
-  # As a convience, the table has a #view method which will return the current view context.
+  # As a convenience, the table has a #view method which will return the current view context.
   # This gives you access to current user, params, etc...
   #
   # column :email, if: :admin?
@@ -31,6 +31,6 @@ class <%= class_name %>Table < TableCloth::Base
   #   action {|object| link_to "Edit", edit_object_path(object) }
   #   action(if: :valid?) {|object| link_to "Invalidate", invalidate_object_path(object) }
   # end
-  # 
+  #
   # If action provides an "if:" option, it will call that method on the object. It can also take a block with an arity of 1.
 end

data/lib/table_cloth.rb

@@ -1,7 +1,6 @@
 require "action_view"
 require "active_support/core_ext/class"
 require "table_cloth/version"
-require "table_cloth/configurable_elements"
 
 module TableCloth
   autoload :Base, "table_cloth/base"
@@ -28,6 +27,9 @@ module TableCloth
   end
 end
 
-TableCloth::Base.presenter ::TableCloth::Presenters::Default
+# Set the default presenter
+TableCloth::Base.presenter(TableCloth::Presenters::Default)
 
-ActionView::Base.send(:include, TableCloth::ActionViewExtension)
+ActiveSupport.on_load(:action_view) do
+  include TableCloth::ActionViewExtension
+end

data/lib/table_cloth/base.rb

@@ -51,7 +51,11 @@ module TableCloth
       end
 
       def config
-        @config ||= Configuration.new
+        @config ||= if superclass.respond_to?(:config)
+          superclass.config.dup
+        else
+          Configuration.new
+        end
       end
     end
   end

data/lib/table_cloth/builder.rb

@@ -19,9 +19,6 @@ module TableCloth
       end
     end
 
-    def initialize
-    end
-
     def to_s
       presenter.render_table
     end

data/lib/table_cloth/column.rb

@@ -3,12 +3,12 @@ module TableCloth
     attr_reader :options, :name
 
     def initialize(name, options={})
-      @name    = name
+      @name = name
       @options = options
     end
 
     def value(object, view, table=nil)
-      if options[:proc] && options[:proc].respond_to?(:call)
+      if options[:proc].respond_to?(:call)
         view.instance_exec(object, view, &options[:proc])
       else
         object.send(name)

data/lib/table_cloth/configuration.rb

@@ -1,8 +1,11 @@
 module TableCloth
   class Configuration
-    OPTIONS = %w(table thead th tbody tr td).map(&:to_sym)
+    ELEMENT_OPTIONS = %w(table thead th tbody tr td).map(&:to_sym)
 
-    OPTIONS.each do |option|
+    GENERAL_OPTIONS = %w(alternating_rows).map(&:to_sym)
+    attr_accessor *GENERAL_OPTIONS
+
+    ELEMENT_OPTIONS.each do |option|
       class_eval <<-OPTION, __FILE__, __LINE__+1
         def #{option}
           @#{option}_option ||= ActiveSupport::OrderedOptions.new
@@ -17,7 +20,8 @@ module TableCloth
     end
 
     def config_for(type)
-      send(type).to_hash
+      value = send(type)
+      value.respond_to?(:to_hash) ? value.to_hash : value
     end
     alias [] config_for
   end

data/lib/table_cloth/extensions/actions.rb

@@ -17,7 +17,11 @@ module TableCloth
         private
 
         def action_collection
-          @action_collection ||= ActionCollection.new
+          @action_collection ||= if superclass.respond_to? :action_collection
+            superclass.action_collection.dup
+          else
+            ActionCollection.new
+          end
         end
       end
     end

data/lib/table_cloth/presenter.rb

@@ -1,13 +1,11 @@
 module TableCloth
   class Presenter
-    attr_reader :view_context, :table_definition, :objects,
-      :table
+    attr_reader :view_context, :objects, :table
 
     def initialize(objects, table, view)
       @objects = objects
-      @table_definition = table
       @view_context = view
-      @table = table_definition.new(objects, view)
+      @table = table.new(objects, view)
     end
 
     def render_table
@@ -23,14 +21,9 @@ module TableCloth
     end
 
     def columns
-      @columns ||= table.class.columns.map do |name, options|
-        column = options[:class].new(name, options[:options])
-
-        if ColumnJury.new(column, table).available?
-          column
-        else
-          nil
-        end
+      @columns ||= table.class.columns.map do |name, column_hash|
+        column = column_hash[:class].new(name, column_hash[:options])
+        ColumnJury.new(column, table).available? ? column : nil
       end.compact
     end
 
@@ -55,10 +48,10 @@ module TableCloth
     def wrapper_tag(type, value=nil, options={}, &block)
       options = tag_options(type, options)
 
-      content = if block_given?
-        v.content_tag(type, options, &block)
+      if block_given?
+        view_context.content_tag(type, options, &block)
       else
-        v.content_tag(type, value, options)
+        view_context.content_tag(type, value, options)
       end
     end
 

data/lib/table_cloth/presenters/default.rb

@@ -9,13 +9,13 @@ module TableCloth
 
       def render_rows
         wrapper_tag :tbody do
-          v.raw objects.inject('') {|r, object| r + render_row(object) }
+          v.raw objects.inject("") {|r, object| r + render_row(object) }
         end
       end
 
       def render_row(object)
         wrapper_tag :tr do
-          v.raw columns.inject('') {|tds, column| tds + render_td(column, object) }
+          v.raw columns.inject("") {|tds, column| tds + render_td(column, object) }
         end
       end
 
@@ -36,7 +36,7 @@ module TableCloth
       def render_header
         wrapper_tag :thead do
           wrapper_tag :tr do
-            v.raw column_names.inject('') {|tags, name| tags + wrapper_tag(:th, name) }
+            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.3.1.alpha1"
+  VERSION = "0.3.2"
 end

data/spec/lib/base_spec.rb

@@ -58,6 +58,17 @@ describe TableCloth::Base do
         expect(table_instance.config).to be_kind_of TableCloth::Configuration
       end
     end
+
+    context "inheritance" do
+      let(:parent_class) { Class.new(TableCloth::Base) }
+      let(:child_class) { Class.new(parent_class) }
+
+      before { parent_class.config.table.class = "inherit-me" }
+
+      it "inherits from a parent class's configuration" do
+        expect(child_class.config.table[:class]).to eq "inherit-me"
+      end
+    end
   end
 
   context 'presenters' do

data/spec/lib/configuration_spec.rb

@@ -2,11 +2,20 @@ require 'spec_helper'
 
 describe TableCloth::Configuration do
   subject { TableCloth::Configuration.new }
-  let(:options) { TableCloth::Configuration::OPTIONS }
 
-  it "has accessors for all options" do
-    options.each do |option|
-      expect(subject).to respond_to option
+  context "element options" do
+    TableCloth::Configuration::ELEMENT_OPTIONS.each do |option|
+      it "has an accessor for #{option}" do
+        expect(subject).to respond_to option
+      end
+    end
+  end
+
+  context "general options" do
+    TableCloth::Configuration::GENERAL_OPTIONS.each do |option|
+      it "has an accessor for #{option}" do
+        expect(subject).to respond_to option
+      end
     end
   end
 

data/spec/lib/presenter_spec.rb

@@ -4,11 +4,8 @@ describe TableCloth::Presenter do
   subject { TableCloth::Presenter.new(objects, dummy_table, view_context) }
   let(:dummy_table) { Class.new(DummyTable) }
   let(:dummy_model) { FactoryGirl.build(:dummy_model) }
-
   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 ".columns" do
     it "returns all columns from the table" do
@@ -24,7 +21,7 @@ describe TableCloth::Presenter do
     context "that are unavaialble" do
       let(:dummy_table) { FactoryGirl.build(:dummy_table, email: {if: :admin?}) }
       let(:table_instance) { dummy_table.new(objects, view_context) }
-      before(:each) do 
+      before(:each) do
         table_instance.stub admin?: false
         subject.stub table: table_instance
       end
@@ -44,14 +41,14 @@ describe TableCloth::Presenter do
     before(:each) { table_instance.stub admin?: false, awesome?: true }
 
     it 'returns all names' do
-      subject.column_names.should == ["Id", "Name", "Email"]
+      expect(subject.column_names).to eq ["Id", "Name", "Email"]
     end
   end
 
   it 'returns all values for a row' do
-    subject.row_values(dummy_model).should == [dummy_model.id, dummy_model.name, dummy_model.email]
+    expect(subject.row_values(dummy_model)).to eq [dummy_model.id, dummy_model.name, dummy_model.email]
   end
-  
+
   it 'generates the values for all of the rows' do
     expected = objects.map {|o| [o.id, o.name, o.email] }
     expect(subject.rows).to eq(expected)

data/table_cloth.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = TableCloth::VERSION
   gem.authors       = ["Robert Ross"]
   gem.email         = ["robert@creativequeries.com"]
-  gem.description   = %q{Table Cloth helps you create a table easily.}
-  gem.summary       = %q{Table Cloth provides an easy and intuitive DSL for creating tables in rails views.}
+  gem.description   = %q{Table Cloth helps you create tables easily.}
+  gem.summary       = %q{Table Cloth provides an easy and intuitive DSL for creating tables for Rails views.}
   gem.homepage      = "http://www.github.com/bobbytables/table_cloth"
 
   gem.files         = `git ls-files`.split($/)
@@ -27,5 +27,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rake')
   gem.add_development_dependency('rb-fsevent', '~> 0.9.1')
 
-  gem.add_dependency('actionpack', '~> 3.2')
+  gem.add_dependency('actionpack', '>= 3.1', '< 4.1')
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: table_cloth
 version: !ruby/object:Gem::Version
-  version: 0.3.1.alpha1
-  prerelease: 6
+  version: 0.3.2
+  prerelease: 
 platform: ruby
 authors:
 - Robert Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -160,18 +160,24 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
   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: '3.2'
-description: Table Cloth helps you create a table easily.
+        version: '4.1'
+description: Table Cloth helps you create tables easily.
 email:
 - robert@creativequeries.com
 executables: []
@@ -194,7 +200,6 @@ files:
 - lib/table_cloth/builder.rb
 - lib/table_cloth/column.rb
 - lib/table_cloth/column_jury.rb
-- lib/table_cloth/configurable_elements.rb
 - lib/table_cloth/configuration.rb
 - lib/table_cloth/extensions/actions.rb
 - lib/table_cloth/extensions/actions/action.rb
@@ -203,7 +208,6 @@ files:
 - lib/table_cloth/extensions/actions/jury.rb
 - lib/table_cloth/presenter.rb
 - lib/table_cloth/presenters/default.rb
-- lib/table_cloth/presenters/sortable.rb
 - lib/table_cloth/version.rb
 - spec/factories/actions.rb
 - spec/factories/columns.rb
@@ -222,7 +226,6 @@ files:
 - spec/lib/extensions/actions_spec.rb
 - spec/lib/presenter_spec.rb
 - spec/lib/presenters/default_spec.rb
-- spec/lib/presenters/sortable_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_model.rb
 - spec/support/dummy_table.rb
@@ -247,15 +250,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Table Cloth provides an easy and intuitive DSL for creating tables in rails
+summary: Table Cloth provides an easy and intuitive DSL for creating tables for Rails
   views.
 test_files:
 - spec/factories/actions.rb
@@ -275,7 +278,6 @@ test_files:
 - spec/lib/extensions/actions_spec.rb
 - spec/lib/presenter_spec.rb
 - spec/lib/presenters/default_spec.rb
-- spec/lib/presenters/sortable_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_model.rb
 - spec/support/dummy_table.rb
@@ -284,3 +286,4 @@ test_files:
 - spec/support/matchers/element_matchers.rb
 - spec/support/shared_config_examples.rb
 - spec/support/view_mocks.rb
+has_rdoc: 

data/lib/table_cloth/configurable_elements.rb

@@ -1,14 +0,0 @@
-module TableCloth
-  module ConfigurableElements
-    OPTIONS = %w(table thead th tbody tr td).map(&:to_sym)
-
-    extend ActiveSupport::Concern
-
-    included do
-      OPTIONS.each do |option|
-        class_attribute option
-        self.send "#{option}=", ActiveSupport::OrderedOptions.new
-      end
-    end
-  end
-end

data/lib/table_cloth/presenters/sortable.rb

@@ -1,49 +0,0 @@
-module TableCloth
-  module Presenters
-    class Sortable < Default
-      def render_header
-        wrapper_tag :thead do
-          wrapper_tag :tr, v.raw(row_headers.join("\n"))
-        end
-      end
-
-      def render_sortable(column)
-        query_string = sort_query(sort_params_for(column))
-        wrapper_tag(:a, column.human_name, href: "?#{query_string}")
-      end
-
-      def row_headers
-        columns.map do |column|
-          if !!column.options[:sortable]
-            wrapper_tag :th, render_sortable(column), class: "sortable-column"
-          else
-            column.human_name
-          end
-        end
-      end
-
-      private
-
-      def sort_params_for(column)
-        direction = params[:direction]
-        new_direction = (direction == "asc") ? "desc" : "asc"
-
-        params.update({sort_by: column.name.to_s, direction: new_direction})
-      end
-
-      def sort_query(params)
-        params.stringify_keys.map{|k,v| "#{CGI.escape(k)}=#{CGI.escape(v)}" }.join("&")
-      end
-
-      def header_values
-        columns.map do |column|
-          if !!column.options[:sortable]
-            render_sortable(column)
-          else
-            column.human_name
-          end
-        end
-      end
-    end
-  end
-end

data/spec/lib/presenters/sortable_spec.rb

@@ -1,55 +0,0 @@
-require "spec_helper"
-
-describe TableCloth::Presenters::Sortable do
-  let(:dummy_table) { FactoryGirl.build(:dummy_table, name: {sortable: true} ) }
-  let(:dummy_model) { FactoryGirl.build(:dummy_model) }
-  let(:objects) { FactoryGirl.build_list(:dummy_model, 3) }
-  let(:view_context) { ActionView::Base.new }
-  subject { TableCloth::Presenters::Sortable.new(objects, dummy_table, view_context) }
-  let(:params) { {sort_by: "", direction: "asc"} }
-  let(:column) { subject.columns.first }
-
-  before do
-    dummy_table.presenter(described_class)
-    subject.stub params: params
-    column.options[:sortable] = true
-  end
-
-  it "inherits from default" do
-    expect(described_class).to be < TableCloth::Presenters::Default
-  end
-
-  context ".render_sortable" do
-    before do
-      column.stub human_name: "Header"
-    end
-
-    it "renders an a tag" do
-      element = to_element(subject.render_sortable(column), "a")
-      expect(element.node_name).to eq("a")
-    end
-
-    it "renders an a tag with href direction keys" do
-      params[:direction] = "desc"
-      element = to_element(subject.render_sortable(column), "a")
-      query_string = element[:href]
-
-      expect(query_string).to include "direction=asc"
-    end
-
-    it "renders an a tag with href sort by keys" do
-      params[:sort_by] = "desc"
-      element = to_element(subject.render_sortable(column), "a")
-      query_string = element[:href]
-
-      expect(query_string).to include "sort_by=#{column.name}"
-    end
-  end
-
-  context "thead" do
-    it "includes a css class for a sortable column" do
-      header = to_element(subject.render_header, "thead")
-      expect(header.at_css("th.sortable-column")).to be_present
-    end
-  end
-end