table-for 3.7.0 → 4.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1aabb31a760c3e8a7a3daebaaa15bc31bb048a6e32ed6ea0bff5a806bee36ff
-  data.tar.gz: 8fd9a0f9f7d84599be3a1451a8aaebf56fa591c977cb5d3d243d001caa291c7d
+  metadata.gz: e5bed81d1e22d5fdf3b12ca65ad622183a29be000a0640e04839daf8b05f01f2
+  data.tar.gz: 8eedfdbe148548812fd11506a8b7d7e539357558a4f07d9862a7df5b952b047f
 SHA512:
-  metadata.gz: 9496076ac639882e9f6efbfc081e86ca1ac2f45c4137b9aec6044089cf96bb0f2b6a3647ae442f0ba75ea910acdbc2a781700ff8888995f093a5045988364998
-  data.tar.gz: ed794daad6b98d873a98ceb996589b47dc9586b495e8911f71a6199a768a4a05bf7196bc2f9fa3a424b1b66e1000e41874f6242374383d3f122997dfee191ec8
+  metadata.gz: 37e7eda28341ee122acac91dcba49a6c2b3871e7568d65fe20dff95b92316abfb27f3b98f070f74f8020b002a2632382b870f41689f33011e9943df5a7ae9042
+  data.tar.gz: 73c19c3b50a34b241ab0221e8e5ad479cf1a4bce52d954ccf1897ab2e88bfc33bbd2440b3c95a4703a3307ca8a62a83ff52bd91e274b0defb0d3673d9d6e7f71

data/.gitignore

@@ -3,4 +3,5 @@
 /pkg/*
 .bundle
 spec/database.yml
-Gemfile.lock
+Gemfile.lock
+.byebug_history

data/.rspec

@@ -0,0 +1,3 @@
+--colour
+--backtrace
+--format documentation

data/.ruby-version

@@ -0,0 +1 @@
+3.3.0

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
+gem 'blocks'
+
 gemspec

data/Gemfile.lock

@@ -1,137 +1,175 @@
 PATH
   remote: .
   specs:
-    table-for (3.7.0)
+    table-for (4.0.0.rc1)
+      blocks (>= 4.0.0)
       rails (>= 3.0.0)
-      with_template (~> 0.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.3)
-    blocks (2.8.0)
-      call_with_params (~> 0.0.2)
-      hashie
+    actioncable (5.2.8.1)
+      actionpack (= 5.2.8.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.8.1)
+      actionpack (= 5.2.8.1)
+      actionview (= 5.2.8.1)
+      activejob (= 5.2.8.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.8.1)
+      actionview (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.8.1)
+      activesupport (= 5.2.8.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.8.1)
+      activesupport (= 5.2.8.1)
+      globalid (>= 0.3.6)
+    activemodel (5.2.8.1)
+      activesupport (= 5.2.8.1)
+    activerecord (5.2.8.1)
+      activemodel (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
+      arel (>= 9.0)
+    activestorage (5.2.8.1)
+      actionpack (= 5.2.8.1)
+      activerecord (= 5.2.8.1)
+      marcel (~> 1.0.0)
+    activesupport (5.2.8.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (9.0.0)
+    blocks (4.0.1)
       rails (>= 3.0.0)
-    builder (3.0.4)
-    call_with_params (0.0.2)
-      activesupport (>= 3.0.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    hashie (3.6.0)
-    hike (1.2.3)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.8.6)
-    mail (2.5.5)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    builder (3.2.4)
+    concurrent-ruby (1.2.3)
+    crass (1.0.6)
+    date (3.3.4)
+    diff-lcs (1.3)
+    erubi (1.12.0)
+    globalid (1.1.0)
+      activesupport (>= 5.0)
+    i18n (1.14.4)
+      concurrent-ruby (~> 1.0)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
     metaclass (0.0.1)
-    mime-types (1.25.1)
-    mini_portile2 (2.0.0)
+    method_source (1.0.0)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.5)
+    minitest (5.22.3)
     mocha (0.10.3)
       metaclass (~> 0.0.1)
-    multi_json (1.11.2)
-    nokogiri (1.6.7.1)
-      mini_portile2 (~> 2.0.0.rc2)
-    polyglot (0.3.5)
-    rack (1.4.7)
-    rack-cache (1.5.1)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    net-imap (0.4.10)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.4.0.1)
+      net-protocol
+    nio4r (2.7.1)
+    nokogiri (1.16.3)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    racc (1.7.3)
+    rack (2.2.9)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails (5.2.8.1)
+      actioncable (= 5.2.8.1)
+      actionmailer (= 5.2.8.1)
+      actionpack (= 5.2.8.1)
+      actionview (= 5.2.8.1)
+      activejob (= 5.2.8.1)
+      activemodel (= 5.2.8.1)
+      activerecord (= 5.2.8.1)
+      activestorage (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
+      bundler (>= 1.3.0)
+      railties (= 5.2.8.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (5.2.8.1)
+      actionpack (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
+      method_source
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+      thor (>= 0.19.0, < 2.0)
+    rake (13.1.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-rails (3.4.0)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.11)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    sprockets (4.2.1)
+      concurrent-ruby (~> 1.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.7.3)
+      mini_portile2 (~> 2.8.0)
     supermodel (0.1.4)
       activemodel (>= 3.0.0.beta)
-    thor (0.19.1)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.46)
-    with_model (1.2.1)
-      activerecord (>= 3.0)
-    with_template (0.2.0)
-      blocks (~> 2.8.0)
-      rails (>= 3.0.0)
+    thor (1.3.1)
+    thread_safe (0.3.6)
+    timeout (0.4.1)
+    tzinfo (1.2.11)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.6)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    with_model (2.1.2)
+      activerecord (>= 4.2, < 6.0)
     xml-simple (1.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  blocks
   mocha (= 0.10.3)
   nokogiri
-  rspec-rails (>= 2.0.0.beta.20)
+  rspec-rails (~> 3.8)
   sqlite3
   supermodel
   table-for!
@@ -139,4 +177,4 @@ DEPENDENCIES
   xml-simple (= 1.1.1)
 
 BUNDLED WITH
-   1.17.3
+   2.5.5

data/app/views/table_for/_table_for.html.erb

@@ -1,77 +1,104 @@
-<% table.define :table do |options| %>
-  <%= content_tag :table, options[:table_html] do %>
-    <%= table.render :header %>
-    <%= table.render :body %>
-    <%= table.render :footer %>
-  <% end %>
+<% table.define :table,
+  wrapper: :content_tag,
+  wrapper_html_option: :table_html,
+  wrapper_tag: :table do %>
+  <%= table.render :header %>
+  <%= table.render :body %>
+  <%= table.render :footer %>
 <% end %>
 
-<% table.define :header do |options| %>
-  <%= table.content_tag_with_block options[:thead_tag], options[:thead_html] do %>
-    <%= table.render :header_row %>
-  <% end %>
+<% table.define :header,
+  wrap_all: :thead_tag,
+  wrapper: :header_row do |options| %>
+  <% table.columns.each do |column| %>
+      <%#
+          Passing column twice has the effect of both passing column as the first argument to
+          the definition of :header_column and also merging its options into the generated
+          Blocks::RuntimeContext
+      %>
+      <%= table.render :header_column, column, column %>
+    <% end %>
 <% end %>
 
-<% table.define :header_row do |options| %>
-  <%= content_tag :tr, options[:header_row_html] do %>
-    <%= table.render :header_column, :collection => table.columns %>
-  <% end %>
-<% end %>
+<% table.define :thead_tag,
+  with: :content_tag,
+  html_option: :thead_html,
+  tag: thead_tag if thead_tag %>
+
+<% table.define :header_row,
+  with: :content_tag,
+  html_option: :header_row_html,
+  tag: :tr  %>
 
 <% table.define :header_column do |column, options| %>
   <%= content_tag :th, table.header_column_html(column, options) do %>
-    <%= table.render "#{column.name}_header", column, column.options %>
+    <%= table.render "#{column.name}_header", column %>
   <% end %>
 <% end %>
 
 <%# Define a header block for each column, named using that column's name with the word "_header" appended to it %>
-<% table.define lambda {|column| "#{column.name}_header" }, :collection => table.columns do |column, options| %>
-  <%= table.header_cell_content(column, options) %>
+<% table.columns.each do |column| %>
+  <% table.define "#{column.name}_header" do |options| %>
+    <%= table.header_cell_content(column, options) %>
+  <% end %>
 <% end %>
 
 <% table.define :body do |options| %>
-  <%= table.content_tag_with_block options[:tbody_tag], options[:tbody_html] do %>
+  <%= table.content_tag options[:tbody_tag], options[:tbody_html] do %>
     <%= table.render :data_row, :collection => records %>
   <% end %>
 <% end %>
 
-<% table.define :data_row do |record, options| %>
+<% table.define :data_row do |options| %>
+  <% record = options[:object] %>
   <% table.set_current_record_and_index(record, options[:current_index]) %>
   <%= content_tag :tr, table.call_each_hash_value_with_params(options[:data_row_html], record) do %>
-    <%= table.render :data_column, record, :collection => table.columns %>
+    <% table.columns.each do |column| %>
+      <%= table.render column.name, 
+        record,
+        column,
+        defaults: {
+          wrapper: :data_column
+        } %>
+    <% end %>
   <% end %>
 <% end %>
 
-<% table.define :data_column do |column, record, options| %>
-  <%= content_tag :td,
-        table.call_each_hash_value_with_params(options[:data_column_html],
-                                               record,
-                                               column) do
-      table.render(column.name, record, column, column.options)
-    end %>
-<% end %>
+<% table.define :data_column,
+  with: :content_tag,
+  html_option: :data_column_html,
+  tag: :td %>
 
 <%# Define a block for each column, named using that column's name %>
-<% table.define lambda {|column| column.name }, :collection => table.columns, :link_html => {} do |record, column, options| -%>
-<%= table.cell_content(record, column, options) -%>
-<% end -%>
+<% table.columns.each do |column| %>
+  <% table.define column.name, :link_html => {} do |record, column, options| -%>
+    <%= table.cell_content(record, column, options) -%>
+  <% end -%>
+<% end %>
 
-<% table.define :footer do |options| %>
-  <%= table.content_tag_with_block options[:tfoot_tag], options[:tfoot_html] do %>
-    <%= table.render :footer_row %>
-  <% end %>
-<% end if table.defined?(:footer_content) %>
+<% if table.block_defined?(:footer_content) %>
+  <% table.define :footer,
+    wrap_all: :tfoot_tag,
+    outer_wrapper: :footer_row,
+    wrapper: :footer_column,
+    with: :footer_content
+  %>
 
-<% table.define :footer_row do |options| %>
-  <%= content_tag :tr, options[:footer_row_html] do %>
-    <%= table.render :footer_column %>
-  <% end %>
-<% end if table.defined?(:footer_content) %>
+  <% table.define :tfoot_tag,
+    with: :content_tag,
+    html_option: :tfoot_html,
+    tag: tfoot_tag if tfoot_tag %>
 
-<% table.define :footer_column do |options| %>
-  <%= content_tag :td, {:colspan => table.columns.length}.merge(table.blocks[:footer_content].options[:footer_column_html] || {}) do %>
-    <%= table.render :footer_content %>
-  <% end %>
-<% end if table.defined?(:footer_content) %>
+  <% table.define :footer_row,
+    with: :content_tag,
+    html_option: :footer_row_html,
+    tag: :tr  %>
+
+  <% table.define :footer_column,
+    with: :content_tag,
+    html_option: :footer_column_html,
+    tag: :td,
+    html: { colspan: table.columns.length } %>
+<% end %>
 
 <%= table.render :table %>

data/lib/table_for/base.rb

@@ -1,19 +1,18 @@
-require 'with_template'
 require 'blocks'
 
 module TableFor
-  class Base < WithTemplate::Base
-    alias columns queued_blocks
-
+  class Base < Blocks::Builder
     attr_accessor :current_record
     alias_method :current_row, :current_record
 
     attr_accessor :current_index
     alias_method :current_row_index, :current_index
 
+    attr_accessor :columns
 
     def initialize(view, options={})
-      super(view, TableFor.config.merge(options))
+      self.columns = []
+      super(view, options)
     end
 
     def header(name, options={}, &block)
@@ -26,20 +25,20 @@ module TableFor
 
     def column(*args, &block)
       options = args.extract_options!
-      queue(*args, options, &block)
+      columns << define(*args, options, &block).clone
       if options[:link_url] ||
          options[:link_action] ||
          options[:link_method] ||
          options[:link_confirm] ||
          options[:link]
-        around(columns.last.name) do |content_block, record, column, options|
-          options = options.merge(column.options)
+        surround(columns.last.name) do |content_block, record, column, options|
+          # options = options.merge(column)
           url = if options[:link_url]
             call_with_params(options[:link_url], record)
           else
             [
               options[:link_action],
-              options[:link_namespace] || global_options[:link_namespace],
+              options[:link_namespace],
               record
             ].flatten.compact
           end
@@ -58,7 +57,7 @@ module TableFor
       if options[:sortable]
         order = options[:order] ? options[:order].to_s : column.name.to_s
 
-        sort_modes = options[:sort_modes].presence || TableFor.config.sort_modes
+        sort_modes = options[:sort_modes].presence || options_set.default_options[:sort_modes]
         current_sort_mode = (view.params[:order] != order || view.params[:sort_mode].blank?) ? nil : view.params[:sort_mode]
         current_sort_mode = sort_modes[sort_modes.index(current_sort_mode.to_sym)] rescue nil if current_sort_mode
         sort_class = "sorting#{"_#{current_sort_mode}" if current_sort_mode}"
@@ -68,7 +67,7 @@ module TableFor
       header_column_html
     end
 
-    def header_cell_content(column, options={})
+    def header_cell_content(column, options)
       unless options[:header] == false
         header_sort_link(column, options) do
           if options[:header]
@@ -76,7 +75,7 @@ module TableFor
           elsif column.anonymous
             nil
           else
-            I18n.t("#{translation_lookup_prefix}.#{column.name.to_s.underscore}", :default => column.name.to_s.titleize)
+            I18n.t("#{translation_lookup_prefix(options)}.#{column.name.to_s.underscore}", :default => column.name.to_s.titleize)
           end
         end
       end
@@ -105,7 +104,7 @@ module TableFor
       if options[:sortable] && (options[:header] || !column.anonymous)
         order = options[:order] ? options[:order].to_s : column.name.to_s
 
-        sort_modes = options[:sort_modes].presence || TableFor.config.sort_modes
+        sort_modes = options[:sort_modes].presence || options_set.default_options[:sort_modes]
         current_sort_mode = (view.params[:order] != order || view.params[:sort_mode].blank?) ? nil : view.params[:sort_mode]
         next_sort_mode_index = sort_modes.index(current_sort_mode.to_sym) + 1 rescue 0
         if next_sort_mode_index == sort_modes.length
@@ -128,14 +127,18 @@ module TableFor
       end
     end
 
+    def call_each_hash_value_with_params(*)
+      super
+    end
+
     private
-    def translation_lookup_prefix
-      if global_options[:records].respond_to?(:model)
-        "activerecord.attributes.#{global_options[:records].model.to_s.underscore}"
-      elsif global_options[:records].all? {|record| record.is_a?(ActiveRecord::Base) && record.class == global_options[:records].first.class }
-        "activerecord.attributes.#{global_options[:records].first.class.to_s.underscore}"
-      elsif global_options[:records].all? {|record| record.class == global_options[:records].first.class }
-        "tables.columns.#{global_options[:records].first.class.to_s.underscore}"
+    def translation_lookup_prefix(options)
+      if options[:records].respond_to?(:model)
+        "activerecord.attributes.#{options[:records].model.to_s.underscore}"
+      elsif options[:records].all? {|record| record.is_a?(ActiveRecord::Base) && record.class == options[:records].first.class }
+        "activerecord.attributes.#{options[:records].first.class.to_s.underscore}"
+      elsif options[:records].all? {|record| record.class == options[:records].first.class }
+        "tables.columns.#{options[:records].first.class.to_s.underscore}"
       else
         "tables.columns"
       end

data/lib/table_for/version.rb

@@ -1,3 +1,3 @@
 module TableFor
-  VERSION = "3.7.0"
+  VERSION = "4.0.0.rc1"
 end

data/lib/table_for/view_additions.rb

@@ -2,7 +2,7 @@ module TableFor
   module ViewAdditions
     module ClassMethods
       def table_for(records, options={}, &block)
-        TableFor::Base.new(self, options.merge(:variable => "table", :records => records)).render_template("table_for/table_for", &block)
+        TableFor::Base.new(self, TableFor.config.merge(options.merge(builder_variable: :table, records: records))).render(partial: "table_for/table_for", &block)
       end
     end
   end

data/lib/table_for.rb

@@ -1,5 +1,4 @@
-require "action_view"
-require "with_template"
+require "blocks"
 require "table_for/engine"
 
 module TableFor
@@ -7,12 +6,14 @@ module TableFor
   autoload :ViewAdditions, "table_for/view_additions"
 
   mattr_accessor :config
-  @@config = Hashie::Mash.new
-  # set these to nil in setup block if you do not want thead, tbody, or tfoot tags rendered
-  @@config.thead_tag = :thead
-  @@config.tbody_tag = :tbody
-  @@config.tfoot_tag = :tfoot
-  @@config.sort_modes = [:asc, :desc]
+  @@config = {
+    defaults: {
+      thead_tag: :thead,
+      tbody_tag: :tbody,
+      tfoot_tag: :tfoot,
+      sort_modes: [:asc, :desc]
+    }
+  }
 
   # Default way to setup TableFor
   def self.setup

data/spec/integration/table_for_spec.rb

@@ -1,12 +1,12 @@
 require "spec_helper"
+require 'byebug'
 
-describe "table_for" do
-  with_model :user do
+describe "table-for" do
+  with_model :User do
     table do |t|
-      t.integer "id"
-      t.string "email"
-      t.string "first_name"
-      t.string "last_name"
+      t.string :email
+      t.string :first_name
+      t.string :last_name
     end
   end
 
@@ -17,12 +17,13 @@ describe "table_for" do
     end
   end
 
-  before :each do
-    User.create! id: 1, :email => "andrew.hunter@livingsocial.com", :first_name => "Andrew", :last_name => "Hunter"
-    User.create! id: 2, :email => "todd.fisher@livingsocial.com", :first_name => "Todd", :last_name => "Fisher"
-    User.create! id: 3, :email => "jon.phillips@livingsocial.com", :first_name => "Jon", :last_name => "Phillips"
+  before do
+    User.create! :email => "andrew.hunter@livingsocial.com", :first_name => "Andrew", :last_name => "Hunter"
+    User.create! :email => "todd.fisher@livingsocial.com", :first_name => "Todd", :last_name => "Fisher"
+    User.create! :email => "jon.phillips@livingsocial.com", :first_name => "Jon", :last_name => "Phillips"
     @users = User.all
     @view = ActionView::Base.new("app/views")
+    
     @view.class.send(:define_method, :user_path) do |user|
       "/users/#{user.id}"
     end
@@ -58,7 +59,7 @@ describe "table_for" do
         table.column :last_name
       end
 
-      buffer.strip.should eql "My new table definition"
+      buffer.strip.should eql "<table>My new table definition</table>"
     end
 
     it "should be able to specify html attributes" do
@@ -72,7 +73,7 @@ describe "table_for" do
     it "should be able to replace the thead block" do
       buffer = @view.table_for @users[0,1] do |table|
         table.define :header do
-          "<thead><tr><th>My new header definition</th></tr></thead>".html_safe
+          "<th>My new header definition</th>".html_safe
         end
         table.column :first_name
       end
@@ -232,7 +233,7 @@ describe "table_for" do
     it "should be able to override the definition for a particular column header block" do
       buffer = @view.table_for @users[0,1] do |table|
         table.column :email, :header => "Email Address"
-        table.define :email_header do |column, options|
+        table.define :email_header do |options|
           "My Own Header (Replaced #{options[:header]})"
         end
       end
@@ -248,7 +249,7 @@ describe "table_for" do
     it "should be able to override the definition for a particular column header block using the table_for 'header' method" do
       buffer = @view.table_for @users[0,1] do |table|
         table.column :email, :header => "Email Address"
-        table.header :email do |column, options|
+        table.header :email do |options|
           "My Own Header (Replaced #{options[:header]})"
         end
       end
@@ -458,7 +459,7 @@ describe "table_for" do
   describe "data_column block" do
     it "should be able to replace the data_column block" do
       buffer = @view.table_for @users[0, 1] do |table|
-        table.define :data_column do |column, user, options|
+        table.define :data_column do |content_block, user, column, options|
           "<td>#{column.name.to_s.titleize} value is #{user.send(column.name)}</td>".html_safe
         end
         table.column :email
@@ -545,6 +546,11 @@ describe "table_for" do
   describe "column data contents block" do
     context "when passing a link param" do
       it "render a link surrounding a table cell's content when it is true" do
+        # a little bit of hackery here as different versions of Rails start changing how url_for 
+        #  and routing works, so harder to simulate here
+        @view.class.define_method(:url_for) do |args|
+          user_path(args.first)
+        end
         buffer = @view.table_for @users do |table|
           table.column :email, link: true
         end
@@ -576,6 +582,11 @@ describe "table_for" do
       @view.class.send(:define_method, :profile_user_path) do |user|
         "/profile/users/#{user.id}"
       end
+      # a little bit of hackery here as different versions of Rails start changing how url_for 
+      #  and routing works, so harder to simulate here
+      @view.class.define_method(:url_for) do |args|
+        send("#{args.first}_user_path", args.last)
+      end
       buffer = @view.table_for @users, link_namespace: :admin do |table|
         table.column :email, link: true
         table.column :id, link_namespace: :profile, link: true

data/spec/spec_helper.rb

@@ -1,12 +1,22 @@
-require 'rubygems'
-require 'bundler/setup'
+begin
+  require 'debugger'
+rescue LoadError
+end
+
+begin
+  require 'byebug'
+rescue LoadError
+end
 
-Bundler.require(:default)
+begin
+  require 'ruby-debug'
+rescue LoadError
+end
 
+require 'rails/all'
 require 'table-for'
 require 'ostruct'
 require 'xmlsimple'
-require 'active_record'
 require 'active_support/all'
 require 'with_model'
 

data/spec/table_for/base_spec.rb

@@ -4,7 +4,7 @@ describe TableFor::Base do
   before(:each) do
     @view_class = Class.new
     @view = @view_class.new
-    @view_class.send(:include, Blocks::ViewAdditions)
+    @view_class.send(:include, Blocks::ViewExtensions)
     @base = TableFor::Base.new(@view)
     @records = [OpenStruct.new(:id => 1)]
     @column = stub(:name => :my_column, :anonymous => false)
@@ -14,28 +14,22 @@ describe TableFor::Base do
     it "should define a block with the specified options and force header to be present" do
       proc = Proc.new {}
       @base.header(:first_name, :option_1 => 10, :option2 => "abcd", &proc)
-      block = @base.blocks[:first_name_header]
-      block.should be_present
-      block.should be_a(Blocks::Container)
-      block.block.should eql(proc)
-      block.options.should eql(:option_1 => 10, :option2 => "abcd", :header => true)
+      block = @base.block_definitions[:first_name_header]
+      block.should be_a(Blocks::BlockDefinition)
+      block.standard_options.should eql(block: proc, :option_1 => 10, :option2 => "abcd", :header => true)
 
       @base.header(:last_name, :header => "LAST NAME", &proc)
-      block = @base.blocks[:last_name_header]
-      block.should be_present
-      block.should be_a(Blocks::Container)
-      block.block.should eql(proc)
-      block.options.should eql(:header => "LAST NAME")
+      block = @base.block_definitions[:last_name_header]
+      block.should be_a(Blocks::BlockDefinition)
+      block.standard_options.should eql(block: proc, header: "LAST NAME")
     end
 
     it "should not require options to be passed" do
       proc = Proc.new {}
       @base.header(:last_name, &proc)
-      block = @base.blocks[:last_name_header]
-      block.should be_present
-      block.should be_a(Blocks::Container)
-      block.block.should eql(proc)
-      block.options.should eql(:header => true)
+      block = @base.block_definitions[:last_name_header]
+      block.should be_a(Blocks::BlockDefinition)
+      block.standard_options.should eql(block: proc, header: true)
     end
   end
 
@@ -43,21 +37,17 @@ describe TableFor::Base do
     it "should define a block named footer_content with the specified options" do
       proc = Proc.new {}
       @base.footer :option_1 => "First Option", &proc
-      block = @base.blocks[:footer_content]
-      block.should be_present
-      block.should be_a(Blocks::Container)
-      block.block.should eql(proc)
-      block.options.should eql(:option_1 => "First Option")
+      block = @base.block_definitions[:footer_content]
+      block.should be_a(Blocks::BlockDefinition)
+      block.standard_options.should eql(block: proc, :option_1 => "First Option")
     end
 
     it "should not require options to be passed" do
       proc = Proc.new {}
       @base.footer(&proc)
-      block = @base.blocks[:footer_content]
-      block.should be_present
-      block.should be_a(Blocks::Container)
-      block.block.should eql(proc)
-      block.options.should eql({})
+      block = @base.block_definitions[:footer_content]
+      block.should be_a(Blocks::BlockDefinition)
+      block.standard_options.should eql(block: proc)
     end
   end
 

data/spec/table_for/view_additions_spec.rb

@@ -6,39 +6,39 @@ describe TableFor::ViewAdditions do
     @view = @view_class.new
     @view_class.send(:include, ActionView::Helpers::TextHelper)
     @view_class.send(:include, TableFor::ViewAdditions::ClassMethods)
-    @view_class.send(:include, Blocks::ViewAdditions)
+    @view_class.send(:include, Blocks::ViewExtensions)
     @records = [OpenStruct.new(:id => 1)]
     @column = stub(:name => :my_column)
   end
 
   describe "#table_for" do
-    it "should call render_template on the TableFor::Base instance" do
-      TableFor::Base.expects(:new).returns(mock(:render_template => ""))
+    it "should call render on the TableFor::Base instance" do
+      TableFor::Base.expects(:new).returns(mock(:render => ""))
       @view.table_for(@records)
     end
 
     it "should pass the view as the first parameter to TableFor::Base initialization" do
-      TableFor::Base.expects(:new).with {|view, options| view == @view}.returns(mock(:render_template => ""))
+      TableFor::Base.expects(:new).with {|view, options| view == @view}.returns(mock(:render => ""))
       @view.table_for(@records)
     end
 
     it "should default the template to render" do
-      TableFor::Base.any_instance.expects(:render_template).with {|template| template == "table_for/table_for"}.returns("")
+      TableFor::Base.any_instance.expects(:render).with(partial: "table_for/table_for").returns("")
       @view.table_for(@records)
     end
 
     it "should default the variable to 'table' to render" do
-      TableFor::Base.expects(:new).with {|view, options| options[:variable] == "table"}.returns(mock(:render_template => ""))
+      TableFor::Base.expects(:new).with {|view, options| options[:runtime][:builder_variable] == "table"}.returns(mock(:render => ""))
       @view.table_for(@records)
     end
 
     it "should default the records to the collection passed in" do
-      TableFor::Base.expects(:new).with {|view, options| options[:records] == @records}.returns(mock(:render_template => ""))
+      TableFor::Base.expects(:new).with {|view, options| options[:runtime][:records] == @records}.returns(mock(:render => ""))
       @view.table_for(@records)
     end
 
     it "should add any runtime options to the options initialized for TableFor::Base" do
-      TableFor::Base.expects(:new).with {|view, options| options[:option1] == 1 && options[:option2] == "2"}.returns(mock(:render_template => ""))
+      TableFor::Base.expects(:new).with {|view, options| options[:option1] == 1 && options[:option2] == "2"}.returns(mock(:render => ""))
       @view.table_for(@records, :option1 => 1, :option2 => "2")
     end
   end

data/table-for.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails", ">= 3.0.0"
-  spec.add_dependency "with_template", "~> 0.2.0"
+  spec.add_dependency "blocks", ">= 4.0.0"
 
-  spec.add_development_dependency "rspec-rails", ">= 2.0.0.beta.20"
+  spec.add_development_dependency "rspec-rails", "~> 3.8"
   spec.add_development_dependency "mocha", "0.10.3"
   spec.add_development_dependency "xml-simple", "1.1.1"
   spec.add_development_dependency "supermodel"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table-for
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - Andrew Hunter
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2024-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: with_template
+  name: blocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta.20
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta.20
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,8 @@ extra_rdoc_files: []
 files:
 - ".byebug_history"
 - ".gitignore"
+- ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.rdoc
 - Gemfile
@@ -171,7 +173,7 @@ homepage: http://github.com/hunterae/table-for
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -186,9 +188,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: table-for is a table builder for an array of objects, easily allowing overriding
   of how any aspect of the table is generated