table_cloth 0.3.0.beta2 → 0.3.0.beta3

data/lib/table_cloth/base.rb

@@ -51,7 +51,7 @@ module TableCloth
       end
 
       def config
-        @config ||= TableCloth::Configuration.new
+        @config ||= Configuration.new
       end
     end
   end

data/lib/table_cloth/configuration.rb

@@ -1,20 +1,24 @@
 module TableCloth
   class Configuration
-    include ConfigurableElements
+    OPTIONS = %w(table thead th tbody tr td).map(&:to_sym)
+
+    OPTIONS.each do |option|
+      class_eval <<-OPTION, __FILE__, __LINE__+1
+        def #{option}
+          @#{option}_option ||= ActiveSupport::OrderedOptions.new
+        end
+      OPTION
+    end
 
     class << self
       def configure(&block)
         block.arity > 0 ? block.call(self) : yield
       end
-
-      def config_for(type)
-        self.send(type).to_hash
-      end
-      alias [] config_for
     end
 
-    def [](key)
-      self.send(key)
+    def config_for(type)
+      send(type).to_hash
     end
+    alias [] config_for
   end
 end

data/lib/table_cloth/presenter.rb

@@ -70,8 +70,10 @@ module TableCloth
 
     def tag_options(type, options={})
       options = options.dup
-      options.merge!(table.config[type])
-      options.merge!(TableCloth.config_for(type))
+      options.merge!(table.config.config_for(type))
+      options.merge!(TableCloth.config.config_for(type))
+
+      options
     end
   end
 end

data/lib/table_cloth/version.rb

@@ -1,3 +1,3 @@
 module TableCloth
-  VERSION = "0.3.0.beta2"
+  VERSION = "0.3.0.beta3"
 end

data/lib/table_cloth.rb

@@ -2,9 +2,9 @@ require "action_view"
 require "active_support/core_ext/class"
 require "table_cloth/version"
 require "table_cloth/configurable_elements"
-require "table_cloth/base"
 
 module TableCloth
+  autoload :Base, "table_cloth/base"
   autoload :Configuration, "table_cloth/configuration"
   autoload :Builder, "table_cloth/builder"
   autoload :Column, "table_cloth/column"
@@ -20,10 +20,11 @@ module TableCloth
     autoload :Actions, "table_cloth/extensions/actions"
   end
 
-  def config_for(type)
-    Configuration.config_for(type).dup
+  class << self
+    def config
+      @config ||= Configuration.new
+    end
   end
-  module_function :config_for
 end
 
 TableCloth::Base.presenter ::TableCloth::Presenters::Default

data/spec/lib/configuration_spec.rb

@@ -1,23 +1,12 @@
 require 'spec_helper'
 
 describe TableCloth::Configuration do
-  subject { Class.new(TableCloth::Configuration) }
+  subject { TableCloth::Configuration.new }
+  let(:options) { TableCloth::Configuration::OPTIONS }
 
-  context "options" do
-    TableCloth::Configuration::OPTIONS.each do |option|
-      it "configures #{option} options" do
-        subject.send(option).classes = "option_value"
-        expect(subject.send(option).classes).to eq("option_value")
-      end
-    end
-  end
-
-  context "[] accessor" do
-    let(:option) { TableCloth::Configuration::OPTIONS.first }
-
-    it "returns the option" do
-      subject.send(option).classes = "something"
-      expect(subject.new[option].classes).to eq("something")
+  it "has accessors for all options" do
+    options.each do |option|
+      expect(subject).to respond_to option
     end
   end
 end

data/spec/lib/presenter_spec.rb

@@ -57,17 +57,46 @@ describe TableCloth::Presenter do
     expect(subject.rows).to eq(expected)
   end
 
-  context 'tags' do
-    it '.wrapper_tag includes config for a tag in block form' do
-      TableCloth::Configuration.table.should_receive(:to_hash).once.and_return(class: "stuff")
-      table = subject.wrapper_tag(:table) { "Hello "}
-      Nokogiri::HTML(table).at_xpath('//table')[:class].should == 'stuff'
+  context '.wrapper_tag' do
+    it "creates a tag with a block" do
+      table = subject.wrapper_tag(:table) { "Hello" }
+      element = to_element(table, "table")
+      expect(element).to be_present
+      expect(element.text).to eq("Hello")
     end
 
-    it '.wrapper_tag includes config for a tag without a block' do
-      TableCloth::Configuration.table.should_receive(:to_hash).once.and_return(class: "stuff")
-      table = subject.wrapper_tag(:table, 'Hello')
-      Nokogiri::HTML(table).at_xpath('//table')[:class].should == 'stuff'
+    it "creates a tag without a block" do
+      table = subject.wrapper_tag(:table, "Hello")
+      element = to_element(table, "table")
+      expect(element).to be_present
+      expect(element.text).to eq("Hello")
+    end
+
+    context "config" do
+      let(:config) { double("config", config_for: { class: "table_class" }) }
+
+      it "inherits options from global config" do
+        TableCloth.config.stub config_for: {class: "global_class"}
+        tag = subject.wrapper_tag(:table, "Hello")
+        element = to_element(tag, "table")
+
+        expect(element[:class]).to eq("global_class")
+      end
+
+      it "includes config sent to it" do
+        tag = subject.wrapper_tag(:table, "Hello", {class: "passed_class"})
+        element = to_element(tag, "table")
+
+        expect(element[:class]).to eq("passed_class")
+      end
+
+      it "includes config from the table instance" do
+        dummy_table.stub config: config
+        tag = subject.wrapper_tag(:table, "Hello", {class: "passed_class"})
+        element = to_element(tag, "table")
+
+        expect(element[:class]).to eq("table_class")
+      end
     end
   end
 end

data/spec/lib/presenters/default_spec.rb

@@ -60,41 +60,6 @@ describe TableCloth::Presenters::Default do
     end
   end
 
-  context 'configuration' do
-    let(:doc) { Nokogiri::HTML(subject.render_table) }
-
-    it 'tables have a class attached' do
-      TableCloth.stub config_for: {class: "table"}
-      doc.at_xpath('//table')[:class].should include 'table'
-    end
-
-    it 'thead has a class attached' do
-      TableCloth.stub config_for: {class: "thead"}
-      doc.at_xpath('//thead')[:class].should include 'thead'
-    end
-
-    it 'th has a class attached' do
-      TableCloth.stub config_for: {class: "th"}
-      doc.at_xpath('//th')[:class].should include 'th'
-    end
-
-    it 'tbody has a class attached' do
-      TableCloth.stub config_for: {class: "tbody"}
-      doc.at_xpath('//tbody')[:class].should include 'tbody'
-    end
-
-    it 'tr has a class attached' do
-      TableCloth.stub config_for: {class: "tr"}
-      doc.at_xpath('//tr')[:class].should include 'tr'
-    end
-
-    it 'td has a class attached' do
-      TableCloth.stub config_for: {class: "td"}
-      doc.at_xpath('//td')[:class].should include 'td'
-    end
-
-  end
-
   context "column configuration" do
     let(:column) { FactoryGirl.build(:column, options: {td_options: {class: "email_column"}}) }
     let(:model) { FactoryGirl.build(:dummy_model) }
@@ -117,43 +82,4 @@ describe TableCloth::Presenters::Default do
       end
     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
-
-    include_examples "table configuration"
-
-    context "is extendable" do
-      let(:parent_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
-
-      let(:dummy_table) do
-        Class.new(parent_table)
-      end
-      
-      include_examples "table configuration"
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -21,4 +21,5 @@ 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 ElementHelpers
 end

data/spec/support/element_helpers.rb

@@ -0,0 +1,5 @@
+module ElementHelpers
+  def to_element(string, type)
+    Nokogiri::HTML(string).at_xpath(".//#{type}")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_cloth
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta2
+  version: 0.3.0.beta3
   prerelease: 6
 platform: ruby
 authors:
@@ -225,6 +225,7 @@ files:
 - spec/support/dummy_model.rb
 - spec/support/dummy_table.rb
 - spec/support/dummy_table_with_value_options.rb
+- spec/support/element_helpers.rb
 - spec/support/matchers/element_matchers.rb
 - spec/support/shared_config_examples.rb
 - spec/support/view_mocks.rb
@@ -276,6 +277,7 @@ test_files:
 - spec/support/dummy_model.rb
 - spec/support/dummy_table.rb
 - spec/support/dummy_table_with_value_options.rb
+- spec/support/element_helpers.rb
 - spec/support/matchers/element_matchers.rb
 - spec/support/shared_config_examples.rb
 - spec/support/view_mocks.rb