table_cloth 0.3.0.beta1 → 0.3.0.beta2

data/lib/table_cloth/base.rb

@@ -3,14 +3,16 @@ module TableCloth
     NoPresenterError = Class.new(Exception)
 
     attr_reader :collection, :view
-    class_attribute :config, instance_accessor: false
-    self.config = Class.new { include ConfigurableElements }
 
     def initialize(collection, view)
       @collection = collection
       @view       = view
     end
 
+    def config
+      self.class.config
+    end
+
     class << self
       def presenter(klass=nil)
         return @presenter = klass if klass
@@ -47,6 +49,10 @@ module TableCloth
         @columns ||= {}
         @columns[options[:name]] = options
       end
+
+      def config
+        @config ||= TableCloth::Configuration.new
+      end
     end
   end
 end

data/lib/table_cloth/configurable_elements.rb

@@ -6,7 +6,7 @@ module TableCloth
 
     included do
       OPTIONS.each do |option|
-        cattr_accessor option
+        class_attribute option
         self.send "#{option}=", ActiveSupport::OrderedOptions.new
       end
     end

data/lib/table_cloth/configuration.rb

@@ -10,6 +10,11 @@ module TableCloth
       def config_for(type)
         self.send(type).to_hash
       end
+      alias [] config_for
+    end
+
+    def [](key)
+      self.send(key)
     end
   end
 end

data/lib/table_cloth/presenter.rb

@@ -57,16 +57,21 @@ module TableCloth
     end
 
     def wrapper_tag(type, value=nil, options={}, &block)
-      table_config = table.class.config.send(type).to_hash
-      tag_options = TableCloth.config_for(type)
-      tag_options.merge!(table_config)
-      tag_options.merge!(options)
+      options = tag_options(type, options)
 
       content = if block_given?
-        v.content_tag(type, tag_options, &block)
+        v.content_tag(type, options, &block)
       else
-        v.content_tag(type, value, tag_options)
+        v.content_tag(type, value, options)
       end
     end
+
+    private
+
+    def tag_options(type, options={})
+      options = options.dup
+      options.merge!(table.config[type])
+      options.merge!(TableCloth.config_for(type))
+    end
   end
 end

data/lib/table_cloth/version.rb

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

data/spec/lib/base_spec.rb

@@ -48,6 +48,18 @@ describe TableCloth::Base do
     end
   end
 
+  context ".config" do
+    it "returns a configurable class" do
+      expect(subject.config).to be_kind_of TableCloth::Configuration
+    end
+
+    context "for an instance" do
+      it "returns a configurable class" do
+        expect(table_instance.config).to be_kind_of TableCloth::Configuration
+      end
+    end
+  end
+
   context 'presenters' do
     it 'has a presenter method' do
       subject.should respond_to :presenter

data/spec/lib/configuration_spec.rb

@@ -3,33 +3,21 @@ require 'spec_helper'
 describe TableCloth::Configuration do
   subject { Class.new(TableCloth::Configuration) }
 
-  it 'configures table options' do
-    subject.table.classes = 'table'
-    subject.table.classes.should == 'table'
+  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
 
-  it 'configures thead options' do
-    subject.thead.classes = 'thead'
-    subject.thead.classes.should == 'thead'
-  end
-
-  it 'configures th options' do
-    subject.th.classes = 'th'
-    subject.th.classes.should == 'th'
-  end
-
-  it 'configures tbody options' do
-    subject.tbody.classes = 'tbody'
-    subject.tbody.classes.should == 'tbody'
-  end
-
-  it 'configures tr options' do
-    subject.tr.classes = 'tr'
-    subject.tr.classes.should == 'tr'
-  end
+  context "[] accessor" do
+    let(:option) { TableCloth::Configuration::OPTIONS.first }
 
-  it 'configures td options' do
-    subject.td.classes = 'td'
-    subject.td.classes.should == 'td'
+    it "returns the option" do
+      subject.send(option).classes = "something"
+      expect(subject.new[option].classes).to eq("something")
+    end
   end
 end

data/spec/lib/presenter_spec.rb

@@ -59,13 +59,13 @@ describe TableCloth::Presenter do
 
   context 'tags' do
     it '.wrapper_tag includes config for a tag in block form' do
-      TableCloth::Configuration.table.should_receive(:to_hash).and_return(class: "stuff")
+      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'
     end
 
     it '.wrapper_tag includes config for a tag without a block' do
-      TableCloth::Configuration.table.should_receive(:to_hash).and_return(class: "stuff")
+      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'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_cloth
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta1
+  version: 0.3.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec