tablette 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f83697c1dd90783d78f2546b086b06e1e6e81c75
-  data.tar.gz: 5ef338d4f482e73d5ea26091edbd627dd2a52dda
+  metadata.gz: 550320b22ddde53a83685fb4dd811f40eb8a40c6
+  data.tar.gz: 09e6070ab5d3c1c51c6b0d249959699069ec38d9
 SHA512:
-  metadata.gz: 7d21661c594405a8c22f199a9b7eb6e674fae89225905495a348b9728fa5d237a31d4ef32640e5d4adb3a7925adf2ff9a717c89e5b0ab629fd1993c6adae663e
-  data.tar.gz: 87cf990bd62c7150a37350080a9f3381723132fc56d5149a4c49b5cf5c8841efb40bb6e747dabf849d79b31030d339640b2adadd506ed080094fc72ce4c5dce6
+  metadata.gz: dc38e73adf2b70043862e62e308823d806450967f41bcf3fe84a1634457e6f31c1e136e356f0fbcaa5337c16ba17a022d2f2aad7e37fd054997b96f1c11ed20b
+  data.tar.gz: 8999b0e49499c5abddcb6da1dcbd48d07c976775a78ac3d9b0d0023e9b38ed9ca3fdba5184b9cf40f50f29fcf8d911becebe4fbe0ec4677f4056bfeb17e54ee6

data/lib/tablette.rb

@@ -2,6 +2,7 @@ require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/inclusion'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/array/wrap'
 require 'active_support/configurable'
 
 require 'tablette/version'

data/lib/tablette/columns.rb

@@ -40,8 +40,10 @@ module Tablette
       options[:colspan]
     end
 
+    attr_reader :key, :value
+
     protected
-    attr_accessor :key, :value
+    attr_writer :key, :value
   end
 
   class BodyColumn < Column
@@ -64,11 +66,7 @@ module Tablette
     protected
     def html_content(collection, resource_class = nil)
       return @renderer.wrap_content(value).call(collection, resource_class) if value.is_a?(Proc)
-      if resource_class.respond_to?(:human_attribute_name) && key.present?
-        resource_class.human_attribute_name(key)
-      else
-        key
-      end
+      key
     end
   end
 

data/lib/tablette/element.rb

@@ -6,13 +6,9 @@ module Tablette
     
     def initialize(*args, &definition)
       options = args.extract_options!
-      if options.include? :renderer
-        @renderer = options.delete :renderer
-      end
-      
-      if options.include? :helper
-        @helper = options.delete :helper
-      end
+      @renderer = options.delete(:renderer) { @renderer }
+      @helper = options.delete(:helper) { @helper }
+      @header_builder = options.delete(:header_builder) { @header_builder }
       
       instance_exec(&definition) if block_given?
       config.merge!(options)

data/lib/tablette/element/nesting.rb

@@ -24,16 +24,11 @@ module Tablette
           items = instance_variable_get("@#{ivar_name}") || []
           return items if args.blank? && block.blank?
           
-          inherited_config = {
-            :renderer => @renderer,
-            :helper   => @helper
-          }
-          
           if args.last.kind_of? Hash
             last = args.pop
-            args << last.merge(inherited_config)
+            args << last.merge(self.inherited_config)
           else
-            args << inherited_config
+            args << self.inherited_config
           end
           
           value = klass.new(*args, &block)
@@ -45,7 +40,6 @@ module Tablette
           instance_variable_set("@#{ivar_name}", items)
           value
         end
-        protected accessor_name
       end
 
       # Defines top-level shortcut DSL method.
@@ -73,6 +67,16 @@ module Tablette
       end
     end
 
+    protected
+
+    def inherited_config
+      {
+        :renderer       => @renderer,
+        :helper         => @helper,
+        :header_builder => @header_builder
+      }
+    end
+
     private
     def _get_chained(context, chain, *args, &block)
       key = chain.shift

data/lib/tablette/html_renderer.rb

@@ -7,7 +7,14 @@ module Tablette
     def produce_element(tag, attributes, content)
       content = content.join if content.kind_of? Array
   
-      "<#{tag} #{to_html_args(attributes)}>#{content}</#{tag}>"
+      buffer = "<#{tag}"
+      if attributes.any?
+        buffer << " #{to_html_args(attributes)}"
+      end
+
+      buffer << ">#{content}</#{tag}>"
+
+      buffer
     end
   
     def to_html(root)

data/lib/tablette/table.rb

@@ -14,6 +14,8 @@ module Tablette
     def initialize(*args, &block)
       @renderer = HTMLRenderer.new
       @helper = nil
+      @header_builder = nil
+      @cached_autoheader = nil
       
       super
     end
@@ -33,7 +35,8 @@ module Tablette
     def to_html(*args)
       columns = 0
 
-      all_sections = [ self.header!, self.body, self.footer! ].flatten
+      all_sections = [ self.header!, build_autoheader(args), self.body, self.footer! ].flatten!
+
       all_sections.each do |section|
         section_columns = section.columns_for_section args
         columns = section_columns if section_columns > columns
@@ -43,7 +46,61 @@ module Tablette
         section.update_auto_colspan! columns, args
       end
 
-      @renderer.to_html(super)
+      @sections_to_render = all_sections
+      begin
+        @renderer.to_html(super)
+      ensure
+        @sections_to_render = nil
+      end
+    end
+
+    private
+
+    def html_content(*args)
+      buffer = ""
+
+      @sections_to_render.each do |e|
+        buffer << e.to_html(*args)
+      end
+
+      buffer
+    end
+
+    def build_autoheader(args)
+      if !nonempty_table_section?(self.header!, args) && !@header_builder.nil?
+        body = self.body
+
+        auto_header = Header.new(inherited_config) do
+          body.each do |body_section|
+            body_section.row.each do |body_row|
+              row do
+                body_row.column.each do |body_column|
+                  options = { :html_options => { :colspan => body_column.colspan(args) } }
+
+                  builder_options, block = @header_builder.build body_column.key
+                  options.merge! builder_options
+
+                  column options, &block
+                end
+              end
+            end
+          end
+        end
+
+        [ auto_header ]
+      else
+        [ ]
+      end
+    end
+
+    def nonempty_table_section?(section, args)
+      section.any? do |entry|
+        entry.row.any? do |row|
+          row.column.any? do |column|
+            column.colspan(args) != "auto"
+          end
+        end
+      end
     end
   end
 end

data/lib/tablette/version.rb

@@ -1,3 +1,3 @@
 module Tablette
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/grid_spec.rb

@@ -59,18 +59,16 @@ describe 'Grid' do
         with_tag 'tr', count: 4
       end
     end
-  end
-
-  context 'with active record objects' do
-    subject { sample_table_active_record }
 
-    it 'should get right headings from active record' do
-      subject.should have_tag 'thead', count: 1 do
-        with_tag 'th', text: 'Humanized id', count: 1
-        with_tag 'th', text: 'Humanized age', count: 1
+    it 'should have automatically generated header' do
+      subject.should have_tag 'table', count: 1 do
+        with_tag 'tbody', count: 1
+        with_tag 'thead', count: 1 do
+          with_tag 'th', text: 'id header', count: 1
+          with_tag 'th', text: 'age header', count: 1
+        end
+        with_tag 'tr', count: 4
       end
-
-      subject.should_not have_tag 'tfoot'
     end
   end
 end

data/spec/support/sample_table.rb

@@ -1,8 +1,8 @@
 require 'ostruct'
 
-class ActiveRecordMock
-  def self.human_attribute_name(name)
-    "Humanized #{name.to_s}"
+class TestHeaderBuilder
+  def build(key)
+    [ {}, proc { "#{key} header" } ]
   end
 end
 
@@ -74,12 +74,7 @@ def sample_table_full_described
 end
 
 def sample_table_short
-  table = Tablette::Table.new do
-    header do
-      column 'Id'
-      column 'Age'
-    end
-
+  table = Tablette::Table.new(:header_builder => TestHeaderBuilder.new) do
     column :id
     column :age
   end
@@ -99,5 +94,5 @@ def sample_table_active_record
     column :id
     column :age
   end
-  table.to_html(sample_collection, ActiveRecordMock)
+  table.to_html(sample_collection)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tablette
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Victor Sokolov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport