table_cloth 0.3.0.beta3 → 0.3.1.alpha1

data/lib/table_cloth.rb

@@ -14,6 +14,7 @@ module TableCloth
 
   module Presenters
     autoload :Default, "table_cloth/presenters/default"
+    autoload :Sortable, "table_cloth/presenters/sortable"
   end
 
   module Extensions

data/lib/table_cloth/column.rb

@@ -15,8 +15,12 @@ module TableCloth
       end
     end
 
-    def human_name
-      options[:label] || name.to_s.humanize
+    def human_name(view)
+      if options[:label].kind_of? Proc
+        view.instance_exec(&options[:label])
+      else
+        options[:label] || name.to_s.humanize
+      end
     end
   end
 end

data/lib/table_cloth/configuration.rb

@@ -12,7 +12,7 @@ module TableCloth
 
     class << self
       def configure(&block)
-        block.arity > 0 ? block.call(self) : yield
+        yield TableCloth.config
       end
     end
 

data/lib/table_cloth/presenter.rb

@@ -10,10 +10,6 @@ module TableCloth
       @table = table_definition.new(objects, view)
     end
 
-    def v
-      view_context
-    end
-
     def render_table
       raise NoMethodError, "You must override the .render method"
     end
@@ -40,7 +36,7 @@ module TableCloth
 
     def column_names
       @column_names ||= columns.each_with_object([]) do |column, names|
-        names << column.human_name
+        names << column.human_name(view_context)
       end
     end
 
@@ -70,10 +66,20 @@ module TableCloth
 
     def tag_options(type, options={})
       options = options.dup
-      options.merge!(table.config.config_for(type))
-      options.merge!(TableCloth.config.config_for(type))
+      if TableCloth.config.respond_to?(type)
+        options.merge!(table.config.config_for(type))
+        options.merge!(TableCloth.config.config_for(type))
+      end
 
       options
     end
+
+    def v
+      view_context
+    end
+
+    def params
+      v.params
+    end
   end
 end

data/lib/table_cloth/presenters/sortable.rb

@@ -0,0 +1,49 @@
+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/lib/table_cloth/version.rb

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

data/spec/lib/column_spec.rb

@@ -25,12 +25,17 @@ describe TableCloth::Column do
   context "human name" do
     it "returns the label when set" do
       column = FactoryGirl.build(:column, options: { label: "Whatever" })
-      expect(column.human_name).to eq("Whatever")
+      expect(column.human_name(view_context)).to eq("Whatever")
     end
 
     it "humanizes the symbol if no label is set" do
       column = FactoryGirl.build(:column, name: :email)
-      expect(column.human_name).to eq("Email")
+      expect(column.human_name(view_context)).to eq("Email")
+    end
+
+    it "runs with a proc" do
+      column = FactoryGirl.build(:column, options: { label: Proc.new{ tag :span }} )
+      expect(column.human_name(view_context)).to eq("<span />")
     end
   end
 end

data/spec/lib/configuration_spec.rb

@@ -9,4 +9,10 @@ describe TableCloth::Configuration do
       expect(subject).to respond_to option
     end
   end
+
+  specify ".configure returns the TableCloth global config" do
+    config = double("config")
+    TableCloth.stub config: config
+    expect {|b| described_class.configure(&b) }.to yield_with_args(config)
+  end
 end

data/spec/lib/presenters/sortable_spec.rb

@@ -0,0 +1,55 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_cloth
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta3
+  version: 0.3.1.alpha1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -203,6 +203,7 @@ 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
@@ -221,6 +222,7 @@ 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
@@ -273,6 +275,7 @@ 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