table_go 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  data.tar.gz: 466df5bf94ac3a8efe5fe4c6d65d5e8ff45c5218
-  metadata.gz: 9b876f90007f7dde16692e8bb973b3115ed37966
 SHA512: 
-  data.tar.gz: 077564168872054f188cb8a5b7ba79a5eb424de627fcb6a522f342a1757e9b065af699e2a7862ef260bb0f85764241ae3df10bbf13de9f98ff2dcd30928a75fd
-  metadata.gz: 501d9814cbea4d8cc017b570e38ff3cf6784f0b4c3b02cc0ee67005b7c6168c16ce82750c5027d7e5ac7f7b6c7c35b5367e386182ea4b8210b76351a5f5e6de6
+  data.tar.gz: 481cf5ca22106044d461a815a0ef99d2ce8ee3b520344a706bb820ecd73aa257da15d27626ac094779d151d4b8d0bd1bb39db1d6df76658bad2ec536bb11fb14
+  metadata.gz: f197dd914b380fb7b8aec24e85a799d78a8763e6f20f724ab8087267e46d9a728e775f2b4b2441772c83fa4327622ac7d6a9ed77724a9773f67274dd9bfb6f0a
+SHA1: 
+  data.tar.gz: 634fdc3e6767ebdd65407ea8bcc0c687cd867911
+  metadata.gz: b72b3f7fe7cbe432565be223b5c454714fd89a04

data/.rspec

@@ -1 +1 @@
---format documentation --color --fail-fast
+--format documentation --color

data/Gemfile

@@ -1,17 +1,11 @@
 source 'http://rubygems.org'
-gem 'rails'
+gem 'actionpack'
 gem 'fastercsv'
 
 group :development, :test do
-  # gem 'sqlite3-ruby'
-  gem 'rspec-rails'
-  #gem 'pry-rails'
-  #gem 'ruby-debug'
+  gem 'rspec'
+  gem 'haml'
+  gem 'haml-rails'
+  # gem 'pry-rails'
+  gem 'ruby-debug'
 end
-
-group :test do
-end
-
-
-# Specify your gem's dependencies in table_go.gemspec
-# gemspec

data/Gemfile.lock

@@ -1,9 +1,6 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
-      mail (~> 2.4.4)
     actionpack (3.2.9)
       activemodel (= 3.2.9)
       activesupport (= 3.2.9)
@@ -17,33 +14,27 @@ GEM
     activemodel (3.2.9)
       activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
     activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.2)
     builder (3.0.4)
-    diff-lcs (1.1.3)
+    columnize (0.3.4)
+    diff-lcs (1.2.1)
     erubis (2.7.0)
     fastercsv (1.5.4)
+    haml (3.1.3)
+    haml-rails (0.3.4)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      haml (~> 3.0)
+      railties (~> 3.0)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
     json (1.7.5)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.19)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
     multi_json (1.4.0)
-    polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -51,14 +42,6 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
-      bundler (~> 1.0)
-      railties (= 3.2.9)
     railties (3.2.9)
       actionpack (= 3.2.9)
       activesupport (= 3.2.9)
@@ -67,19 +50,22 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.2)
+    rbx-require-relative (0.0.5)
     rdoc (3.12)
       json (~> 1.4)
-    rspec-core (2.12.1)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
-    rspec-rails (2.12.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -87,15 +73,14 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  actionpack
   fastercsv
-  rails
-  rspec-rails
+  haml
+  haml-rails
+  rspec
+  ruby-debug

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Lars Gollnow
+Copyright (c) 2012 Lars Gollnow, Vladimir Glusic
 
 MIT License
 

data/lib/table_go/formatter.rb

@@ -69,7 +69,3 @@ module TableGo
 
   end
 end
-
-
-    #   when Time
-    #     I18n.l(value.localtime, :format => :compact)

data/lib/table_go/helpers.rb

@@ -2,10 +2,12 @@ module TableGo
   module Helpers
 
     def table_go_for(collection, model_klass, options = {}, &block)
-      if request && request.format.csv?
-        capture { TableGo.render_csv(collection, model_klass, options, &block).html_safe }
-      else
-        capture { TableGo.render_html(collection, model_klass, self, options, &block) }
+      capture do
+        if request && request.format.csv?
+          TableGo.render_csv(collection, model_klass, options, &block).html_safe
+        else
+          TableGo.render_html(collection, model_klass, self, options, &block)
+        end
       end
     end
 

data/lib/table_go/renderers/html_renderer.rb

@@ -4,42 +4,40 @@ module TableGo
       include RendererBase
 
       def render_template
-        template.content_tag :table, table_html do
-          template.concat template.content_tag(:caption, title) if title
-          template.concat table_head
-          template.concat table_body
+        content_tag(:table, table_html) do
+          concat(content_tag(:caption, title)) if title
+          concat(table_head)
+          concat(table_body)
         end
       end
 
       def table_head
-        template.content_tag :thead do
-          template.content_tag(:tr) do
+        content_tag(:thead) do
+          content_tag(:tr) do
             source_table.columns.each do |column|
-              template.concat template.content_tag(:th, label_for_column(column), html_options_for_header(column))
+              concat(content_tag(:th, label_for_column(column), html_options_for_header(column)))
             end
           end
         end
-
       end
 
       def table_body
-        template.content_tag :tbody do
-
+        content_tag(:tbody) do
           source_table.collection.each do |record|
-             tr = template.content_tag(:tr, html_options_for_row(record)) do
+             tr = content_tag(:tr, html_options_for_row(record)) do
               source_table.columns.each do |column|
                 value = value_from_record_by_column(record, column)
-                template.concat template.content_tag(:td, apply_formatter(record, column, value), html_options_for_cell(record, column, value))
+                concat(content_tag(:td, apply_formatter(record, column, value), html_options_for_cell(record, column, value)))
               end
              end
-             template.concat tr
+             concat(tr)
           end
         end
       end
 
       def table_foot
-        template.content_tag :tfoot do
-          template.content_tag :tr do
+        content_tag(:tfoot) do
+          content_tag(:tr) do
           end
         end
       end

data/lib/table_go/renderers/renderer_base.rb

@@ -2,13 +2,13 @@ module TableGo
   module Renderers
     module RendererBase
       extend ActiveSupport::Concern
-      include ActionView::Helpers::CaptureHelper
 
       included do
         attr_accessor :source_table, :title, :table_html, :row_html, :template
-        # attr_accessor :output_buffer
+        delegate :content_tag, :concat, :to => :template
       end
 
+
       def apply_options(options)
         self.title      = options.delete(:title)
         self.table_html = options.delete(:table_html)
@@ -20,68 +20,88 @@ module TableGo
       end
 
 
-      def label_for_column(column)
-        column.label || begin
-          if column.method && 1==3# reflection = source_table.model_klass.reflections[column.name]
-            reflection.klass.human_attribute_name(column.method).html_safe
-          # if column.method && reflection = source_table.model_klass.reflections[column.name]
-          #   reflection.klass.human_attribute_name(column.method).html_safe
-          else
-            column.human_attribute_name
+
+      private
+
+        def label_for_column(column)
+          column.label || begin
+            if column.method && 1==3# reflection = source_table.model_klass.reflections[column.name]
+              reflection.klass.human_attribute_name(column.method).html_safe
+            # if column.method && reflection = source_table.model_klass.reflections[column.name]
+            #   reflection.klass.human_attribute_name(column.method).html_safe
+            else
+              column.human_attribute_name
+            end
           end
         end
-      end
 
-      def html_options_for_header(column)
-        {}.tap do |h|
-          (column.header_html || {}).each do |k, v|
-            h[k] = v.is_a?(Proc) ? v.call(column) : v
+        def html_options_for_header(column)
+          {}.tap do |h|
+            (column.header_html || {}).each do |k, v|
+              h[k] = v.is_a?(Proc) ? v.call(column) : v
+            end
           end
         end
-      end
 
-      def html_options_for_row(record)
-        {}.tap do |h|
-          (row_html || {}).each do |k, v|
-            h[k] = v.is_a?(Proc) ? v.call(record) : v
+        def html_options_for_row(record)
+          {}.tap do |h|
+            (row_html || {}).each do |k, v|
+              h[k] = v.is_a?(Proc) ? v.call(record) : v
+            end
           end
         end
-      end
 
-      def html_options_for_cell(record, column, value)
-        {}.tap do |h|
-          (column.column_html || {}).each do |k, v|
-            h[k] = v.is_a?(Proc) ? v.call(record, column, value) : v
+        def html_options_for_cell(record, column, value)
+          {}.tap do |h|
+            (column.column_html || {}).each do |k, v|
+              h[k] = v.is_a?(Proc) ? v.call(record, column, value) : v
+            end
           end
         end
-      end
 
-      # def render_record(record, column)
-      #   apply_formatter(record, column, value_from_record_by_column(record, column))
-      # end
+        def value_from_record_by_column(record, column)
+          if record.respond_to?(column.name)
+            value = record.send(column.name)
+            column.method ? value.send(column.method) : value
+          else
+            ''
+          end
+        end
 
-      def value_from_record_by_column(record, column)
-        if record.respond_to?(column.name)
-          value = record.send(column.name)
-          column.method ? value.send(column.method) : value
-        else
-          ''
+        def apply_formatter(record, column, value)
+          case
+            when formatter = column.as
+              Formatter.apply(formatter, record, column, value)
+            when formatter = column.send
+              Formatter.apply_send(formatter, record, column, value)
+            when formatter = column.block
+              apply_formatter_for_block(formatter, record, column, value)
+            else
+              value
+          end
         end
-      end
 
 
-      def apply_formatter(record, column, value)
-        if formatter = column.as
-          Formatter.apply(formatter, record, column, value)
-        elsif formatter = column.send
-          Formatter.apply_send(formatter, record, column, value)
-        elsif formatter = column.block
-          Formatter.apply(formatter, record, column, value )
-          # capture { Formatter.apply(formatter, record, column, value )}
-        else
-          value
+
+        def apply_formatter_for_block(formatter, record, column, value)
+          s = nil
+          capture_view do
+            s = Formatter.apply(formatter, record, column, value )
+          end.presence || s # for compatibility to legacy haml "- t.column :ident"
+        end
+
+        def capture_view(&proc)
+          @capturer ||= template.is_haml? ? capture_haml : capture_action_view
+          @capturer.call(proc)
+        end
+
+        def capture_haml(&proc)
+          lambda { |c| template.capture_haml { c.call } }
+        end
+
+        def capture_action_view
+          lambda { |c| template.capture { c.call } }
         end
-      end
 
     end
   end

data/lib/table_go/version.rb

@@ -1,3 +1,3 @@
 module TableGo
-  VERSION = '0.1.9'
+  VERSION = '0.2.0'
 end

data/lib/table_go.rb

@@ -27,6 +27,11 @@ module TableGo
     renderer.render_template
   end
 
+  def self.formatters
+    Formatter.formatters
+  end
+
 end
 
+
 require 'table_go/railtie' if defined?(Rails)

data/spec/fixtures/simple_table.html.haml

@@ -0,0 +1,9 @@
+= table_go_for(articles, Article) do |t|
+  - t.column :ident
+  - t.column :custom_single_cell do |value, record, column|
+    = "Ident: %s - Title: %s" % [record.ident, record.title]
+  - t.column :custom_multiline_cell do |value, record, column|
+    = "Ident: %s -" % record.ident
+    = " Title: %s" % record.title
+  - t.column :custom_single_cell_with_backwards_compatibility do |value, record, column|
+    - "Ident: %s" % record.ident

data/spec/spec_helper.rb

@@ -1,17 +1,19 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'rails'
-require 'rspec-rails'
+# require 'rails'
+require 'rspec'
 require 'action_controller'
 # require 'active_model'
 require 'ostruct'
 require 'table_go'
+require 'haml'
 # require 'pry'
 
 RSpec.configure do |config|
-  # some (optional) config here
 end
 
+
+
 class String
   def cleanup_html
     self.gsub(/\n/,'').gsub(/>\s*</, "><").strip
@@ -30,6 +32,9 @@ class Article < OpenStruct
   def self.column_names
     [:ident, :title, :date_of_order, :vat, :price, :xmas_bonus, :my_type]
   end
-
 end
 
+
+def read_file_from_fixtures_path(file)
+  File.read(File.dirname(__FILE__) + '/fixtures/%s' % file)
+end

data/spec/table_go/helper_spec.rb

@@ -0,0 +1,63 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+ActionView::Base.send :include, TableGo::Helpers
+
+describe TableGo::Helpers do
+
+  let(:articles) do
+    [ Article.new(:title => 'iPutz',
+        :date_of_order => Date.new(2012), :ident => 1, :vat => 19, :price => 5, :xmas_bonus => true,
+        :my_type => 'super_type'),
+      Article.new(:title => 'Nutzbook',
+        :date_of_order => Date.new(2012), :ident => 2, :vat => 19, :price => 5, :xmas_bonus => false,
+        :my_type => 'hardware_type') ]
+  end
+
+  let(:template) do
+    ActionView::Base.new.tap do |view|
+      view.output_buffer = ActiveSupport::SafeBuffer.new rescue ''
+    end
+  end
+
+
+  describe 'integtation in haml template' do
+
+    let(:subject) do
+      Haml::Engine.new(read_file_from_fixtures_path('simple_table.html.haml'))
+    end
+
+
+   it "description" do
+      subject.render(template, :articles => articles).cleanup_html.should == %Q(
+        <table>
+          <thead>
+            <tr>
+              <th>Ident</th>
+              <th>Custom single cell</th>
+              <th>Custom multiline cell</th>
+              <th>Custom single cell with backwards compatibility</th>
+            </tr></thead>
+          <tbody>
+            <tr>
+              <td>1</td>
+              <td>Ident: 1 - Title: iPutz</td>
+              <td>Ident: 1 - Title: iPutz</td>
+              <td>Ident: 1</td>
+            </tr>
+            <tr>
+              <td>2</td>
+              <td>Ident: 2 - Title: Nutzbook</td>
+              <td>Ident: 2 - Title: Nutzbook</td>
+              <td>Ident: 2</td>
+            </tr>
+          </tbody>
+        </table>
+      ).cleanup_html
+    end
+
+
+  end
+
+end
+

data/spec/table_go/renderers/html_renderer_spec.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 require 'spec_helper'
 
+
 describe TableGo::Renderers::HtmlRenderer do
 
   let(:articles) do
@@ -97,12 +98,12 @@ describe TableGo::Renderers::HtmlRenderer do
                  :label  => 'with custom formatter',
                  :as => lambda { |value, record, column| value.to_s.reverse }
 
-        # t.column :date_of_order,
-        #          :label => 'with block level custom formatter' do |value, record, column|
+        t.column :info_text,
+                 :label => 'with block level custom formatter' do |value, record, column|
 
-        #   "a special<br/>value"
+          "a special<br/>value"
 
-        # end
+        end
 
         t.column :xmas_bonus,
                  :as => :boolean,
@@ -129,6 +130,7 @@ describe TableGo::Renderers::HtmlRenderer do
               <th class="date" id="date_column" style="xyz">Date of order</th>
               <th>Date of order</th>
               <th>with custom formatter</th>
+              <th>with block level custom formatter</th>
               <th>as boolean</th>
               <th>My type</th>
             </tr>
@@ -141,6 +143,7 @@ describe TableGo::Renderers::HtmlRenderer do
               <td class="date" id="date_1" style="xyz">2012-01-01</td>
               <td>Jan 01</td>
               <td>10-10-2102</td>
+              <td>a special<br/>value</td>
               <td>&#10004;</td>
               <td>Super Type</td>
             </tr>
@@ -151,6 +154,7 @@ describe TableGo::Renderers::HtmlRenderer do
               <td class="date" id="date_2" style="xyz">2012-01-01</td>
               <td>Jan 01</td>
               <td>10-10-2102</td>
+              <td>a special<br/>value</td>
               <td>&#10008;</td>
               <td>Hardware Type</td>
             </tr>
@@ -162,5 +166,6 @@ describe TableGo::Renderers::HtmlRenderer do
 
   end
 
+
 end
 

data/table_go.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'fastercsv'
 
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'haml'
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: table_go
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors: 
 - Lars Gollnow
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-25 00:00:00 Z
+date: 2013-09-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -39,6 +39,14 @@ dependencies:
     - *id002
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
+  type: :development
+  version_requirements: *id005
 description: simple, flexible and fast html table generator
 email: 
 - lg@megorei.com
@@ -70,7 +78,9 @@ files:
 - lib/table_go/table.rb
 - lib/table_go/table_renderer.rb
 - lib/table_go/version.rb
+- spec/fixtures/simple_table.html.haml
 - spec/spec_helper.rb
+- spec/table_go/helper_spec.rb
 - spec/table_go/renderers/csv_renderer_spec.rb
 - spec/table_go/renderers/html_renderer_spec.rb
 - table_go.gemspec
@@ -98,6 +108,8 @@ signing_key:
 specification_version: 4
 summary: ""
 test_files: 
+- spec/fixtures/simple_table.html.haml
 - spec/spec_helper.rb
+- spec/table_go/helper_spec.rb
 - spec/table_go/renderers/csv_renderer_spec.rb
 - spec/table_go/renderers/html_renderer_spec.rb