rails_table_for 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc39558936421adf2e8f1fe5cc4f79d404f423ad2a48ac96aed9b951de5cfb05
-  data.tar.gz: 2459ffa6e9167052e2a2f1e2fe02817c65eb2dafb9267cff706a0b7be9e4dd4b
+  metadata.gz: 155237f1a1d730b42f5163e83f94f851b333abb4629337028eb46921fdb803ea
+  data.tar.gz: de618efd0f8849900c52e83db411a7960c12039cfc9e1e5437cc427e4cee7a44
 SHA512:
-  metadata.gz: 1ae6589f69b463b6d997b2e4a110c63bdbe682554612cdbc7611b0d665344c14c7f703de6b1f834ca3e8477c9ebb7e35eb762d861114153b6a5c242416f36d98
-  data.tar.gz: d6f88eb4659eeda945bfda4c9f23cd924c720052651125a7c7f5d2e9d0d44e2af4425d6d9109dc8c8036453616b57b62a8cedd05cf485522f6baf4a083f5e1a2
+  metadata.gz: a936961884260f6ffed048e9838fa08b1b089903b5a8d6e81618076215452579e73400025f863ca97aebc3c95669eda880ede96e209b62d91cde3b93ceae4073
+  data.tar.gz: 23f1e6a33f112248ca84233af07fcdc815857e348b86a1183cb5bc72b332ae295da34ce229fca428eae3000625cc380b7d541eeb6576c2c5c681a42e35043e47

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# CHANGELOG
+## Master
+
+---
+## 0.2.2
+
+### Bugs Fixed:
+- `table_for` method was nested, resulting in initial load rendering "table_for" as text

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_table_for (0.2.1)
+    rails_table_for (0.2.2)
       rails (>= 5)
 
 GEM

data/lib/rails_table_for.rb

@@ -1,5 +1,5 @@
 require 'rails_table_for/railtie'
-require 'rails_table_for/action_view_ext'
+require 'rails_table_for/table_helper'
 
 module RailsTableFor
   # Your code goes here...

data/lib/rails_table_for/elements/block_column.rb

@@ -3,8 +3,7 @@ require 'rails_table_for/elements/column'
 
 module Elements
   class BlockColumn < Column
-    include Helpers::AutoLink
-    attr_reader :title
+    include Helpers::AutoLink, ActionView::Helpers::TagHelper
 
     def initialize(block, **options)
       @block = block
@@ -12,9 +11,10 @@ module Elements
       @auto_link = options[:auto_link] || false
     end
 
-    def value_for(record)
+    def td(record)
       text = @block.call(record)
-      @auto_link ? auto_link(record, text) : text
+      content = @auto_link ? auto_link(record, text) : text
+      content_tag :td, content
     end
   end
 end

data/lib/rails_table_for/elements/column.rb

@@ -1,7 +1,11 @@
 module Elements
   class Column
-    def value_for(record)
-      raise "Not implemented"
+    def th
+      content_tag :th, @title
+    end
+
+    def td(record)
+      raise 'Not implemented'
     end
   end
 end

data/lib/rails_table_for/elements/field_column.rb

@@ -3,8 +3,7 @@ require 'rails_table_for/elements/column'
 
 module Elements
   class FieldColumn < Column
-    include Helpers::AutoLink
-    attr_reader :title
+    include Helpers::AutoLink, ActionView::Helpers::TagHelper
 
     def initialize(field, **options)
       if field.nil?
@@ -15,9 +14,10 @@ module Elements
       @auto_link = options[:auto_link] || false
     end
 
-    def value_for(record)
+    def td(record)
       text = record.send(@field)
-      @auto_link ? auto_link(record, text) : text
+      content = @auto_link ? auto_link(record, text) : text
+      content_tag :td, content
     end
   end
 end

data/lib/rails_table_for/elements/table.rb

@@ -43,7 +43,7 @@ module Elements
     def head
       content_tag :thead do
         content_tag :tr do
-          @columns.map {|column| content_tag :th, column.title }.join.html_safe
+          @columns.map(&:th).join.html_safe
         end
       end
     end
@@ -56,7 +56,7 @@ module Elements
 
     def body_row(record)
       content_tag :tr do
-        @columns.map {|column| content_tag :td, column.value_for(record) }.join.html_safe
+        @columns.map {|column| column.td(record) }.join.html_safe
       end
     end
   end

data/lib/rails_table_for/table_helper.rb

@@ -0,0 +1,21 @@
+require 'rails_table_for/elements/table'
+
+module TableHelper
+  include ActionView::Helpers::TagHelper
+
+  def table_for(records, **options)
+    options.merge({
+      request_url: request.original_url,
+      request_params: request.params
+    })
+    table = Elements::Table.new(options)
+    if block_given?
+      yield table
+    end
+    table.build(records)
+  end
+end
+
+ActionView::Base.class_eval do
+  include TableHelper
+end

data/lib/rails_table_for/version.rb

@@ -1,3 +1,3 @@
 module RailsTableFor
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_table_for
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Austin Roos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-28 00:00:00.000000000 Z
+date: 2020-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,6 +164,7 @@ files:
 - ".github/ISSUE_TEMPLATE/new-user-story.md"
 - ".github/workflows/tests.yml"
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -177,13 +178,13 @@ files:
 - docs/_config.yml
 - docs/index.md
 - lib/rails_table_for.rb
-- lib/rails_table_for/action_view_ext.rb
 - lib/rails_table_for/elements/block_column.rb
 - lib/rails_table_for/elements/column.rb
 - lib/rails_table_for/elements/field_column.rb
 - lib/rails_table_for/elements/table.rb
 - lib/rails_table_for/helpers/auto_link.rb
 - lib/rails_table_for/railtie.rb
+- lib/rails_table_for/table_helper.rb
 - lib/rails_table_for/version.rb
 - lib/tasks/rails_table_for_tasks.rake
 - rails_table_for.gemspec

data/lib/rails_table_for/action_view_ext.rb

@@ -1,19 +0,0 @@
-require 'rails_table_for/elements/table'
-
-module TableHelper
-  include ActionView::Helpers::TagHelper
-
-  def table_for(records, **options)
-    def table_for(records, **options)
-      table = Elements::Table.new(options)
-      if block_given?
-        yield table
-      end
-      table.build(records)
-    end
-  end
-end
-
-ActionView::Base.class_eval do
-  include TableHelper
-end