easy_table 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6162558a23ee392fde530fb336a4eacea249cf34
-  data.tar.gz: 393f00005cb26d539ecb048e587d874265f2e053
+  metadata.gz: 13ab471adc9ff8d6f3a1ffaeadb7c488362def91
+  data.tar.gz: d4d2c6a3e3984ce4ff5a62f10742442c4876e2a7
 SHA512:
-  metadata.gz: 2c69e4ee289a8c17bf46d39e42fe09d9fef23ebff60958022933919bae03a692db443b883f7898eb0bec458258b91efd841418f0b21ad7a8d3ac484c12e733c8
-  data.tar.gz: 623d48a187589ab8d9b84b5019aa826d6c47ddaeef17da0745c73947054db93e6ad9da904933a4d9ac651d555702e1a245e7ddb7fa5b246265bda6f9a8e2bfa8
+  metadata.gz: d5b69ce31b9462e492973e702ab81c32b190311c89ffb34c487759918bc036a93f67cf7da794eb66e2e850667569e7a0f3ca534b8abeb5ee36085f1f741c2a4c
+  data.tar.gz: 77f05c9b82a004e3aaf26d3f64f19f11f9e9e26b6e6c3bcf41356cefac923b9ce17b2869d00927737e440e1341015da727bff2fae1b87e6210d9eca3cf00c0d7

data/README.md

@@ -1,5 +1,6 @@
 # EasyTable
 
+[![Gem Version](https://badge.fury.io/rb/easy_table.svg)](https://badge.fury.io/rb/easy_table)
 [![Build Status](https://travis-ci.org/cthulhu666/easy_table.png?branch=master)](https://travis-ci.org/cthulhu666/easy_table)
 [![endorse](https://api.coderwall.com/cthulhu666/endorsecount.png)](https://coderwall.com/cthulhu666)
 

data/gemfiles/rails_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    easy_table (0.0.9)
+    easy_table (0.0.10)
       actionpack (> 4.2)
       activemodel (> 4.2)
       rubytree (~> 1.0)

data/gemfiles/rails_5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    easy_table (0.0.9)
+    easy_table (0.0.10)
       actionpack (> 4.2)
       activemodel (> 4.2)
       rubytree (~> 1.0)

data/lib/easy_table/components/column.rb

@@ -14,10 +14,9 @@ module EasyTable
         @opts = opts
         header_opts = @opts.select { |k, _v| k =~ /^header_.*/ }
         header_opts.each { |k, _v| @opts.delete(k) }
-        @header_opts = header_opts.inject({}) do |h, e|
+        @header_opts = header_opts.each_with_object({}) do |e, h|
           k, v = *e
           h[k[7..-1]] = v
-          h
         end
       end
 
@@ -46,7 +45,7 @@ module EasyTable
       end
 
       def html_opts(record)
-        @opts.inject({}) do |h, e|
+        @opts.each_with_object({}) do |e, h|
           k, v = *e
           h[k] = case v
                  when Proc
@@ -54,7 +53,6 @@ module EasyTable
                  else
                    v
                  end
-          h
         end
       end
     end

data/lib/easy_table/table_builder.rb

@@ -5,17 +5,24 @@ module EasyTable
 
     delegate :tag, :content_tag, to: :@template
 
-    def initialize(collection, template, options)
-      @collection = collection
-      @options = options
-      tr_opts = @options.select { |k, _v| k =~ /^tr_.*/ }
-      tr_opts.each { |k, _v| @options.delete(k) }
-      @tr_opts = tr_opts.inject({}) do |h, e|
-        k, v = *e
-        h[k[3..-1]] = v
-        h
+    # NOTE: old versions of ActiveSupport don't have `transform_values!`
+    unless Hash.method_defined? :transform_values!
+      module M
+        refine Hash do
+          def transform_values!
+            return enum_for(:transform_values!) unless block_given?
+            each do |key, value|
+              self[key] = yield(value)
+            end
+          end
+        end
       end
+      using M
+    end
 
+    def initialize(collection, template, options)
+      @collection = collection
+      @options, @tr_opts = parse_options(options)
       @template = template
       @node = Tree::TreeNode.new('root')
     end
@@ -39,11 +46,15 @@ module EasyTable
 
     private
 
+    def parse_options(options)
+      tr_opts = options.select { |k, _v| k =~ /^tr_.*/ }
+      [options.except(*tr_opts.keys), tr_opts.transform_keys { |k| k[3..-1] }]
+    end
+
     def thead
-      rows = node.inject([]) do |arr, n|
+      rows = node.each_with_object([]) do |n, arr|
         arr[n.level] ||= []
         arr[n.level] << n
-        arr
       end
       rows.shift
       rows.each do |row|
@@ -56,31 +67,25 @@ module EasyTable
     end
 
     def tr_opts(record)
-      tr_opts = @tr_opts.inject({}) do |h, e|
-        k, v = *e
-        h[k] = case v
-               when Proc
-                 v.call(record)
-               else
-                 v
-               end
-        h
-      end
+      tr_opts = eval_procs(@tr_opts, record)
 
       id = "#{record.class.model_name.to_s.parameterize}-#{record.to_param}" if record.class.respond_to?(:model_name)
       id ||= "#{record.class.name.to_s.parameterize}-#{record.id}" if record.respond_to?(:id)
 
-      id.present? ?
-          tr_opts.merge(id: id) : tr_opts
+      id.present? ? tr_opts.merge(id: id) : tr_opts
+    end
+
+    def eval_procs(h, record)
+      return h if h.empty?
+      procs = h.select { |_k, v| v.is_a?(Proc) }
+               .transform_values! { |v| v.call(record) }
+      return h if procs.empty?
+      h.merge(procs)
     end
 
     def concat(tag)
       @template.safe_concat(tag)
       ''
     end
-
-    def options_from_hash(args)
-      args.last.is_a?(Hash) ? args.pop : {}
-    end
   end
 end

data/lib/easy_table/version.rb

@@ -1,3 +1,3 @@
 module EasyTable
-  VERSION = '0.0.9'.freeze
+  VERSION = '0.0.10'.freeze
 end

data/test/action_view_extensions/table_helper_test.rb

@@ -1,56 +1,61 @@
 require 'test_helper'
 
 class TableHelperTest < ActionView::TestCase
-
-  context "a table" do
+  context 'a table' do
     setup do
-      @collection = ['foo', 'bar', 'buzz']
-      concat(table_for(@collection, class: 'easy') do |t|
-        t.column :downcase
-        t.column(:upcase) { |e| e.upcase }
-      end)
+      @collection = %w[foo bar buzz]
+      concat(table_for(@collection, class: 'easy', tr_class: 'fun',
+                                    tr_foo: ->(e) { e.length > 3 }) do |t|
+               t.column :downcase
+               t.column(:upcase) { |e| e.upcase } # rubocop:disable Style/SymbolProc
+             end)
     end
 
     should "have 'easy' class" do
       assert_select 'table.easy'
     end
 
-    should "have 3 rows" do
+    should 'have 3 rows' do
       rows = css_select 'table tbody tr'
       assert_equal 3, rows.size
     end
 
-    should "have 2 columns" do
+    should "have rows with 'fun' class" do
+      rows = css_select 'table tbody tr.fun'
+      assert_equal 3, rows.size
+    end
+
+    should 'have 2 columns' do
       cols = css_select 'table tbody tr:first-child td'
       assert_equal 2, cols.size
     end
 
-    should "have proper headers" do
+    should 'have proper headers' do
       headers = css_select 'table thead tr th'
       assert_equal '<th>downcase</th>', headers[0].to_s.strip
       assert_equal '<th>upcase</th>', headers[1].to_s
     end
   end
 
-  context "a complex table" do
+  context 'a complex table' do
     setup do
       Person = Struct.new(:id, :name, :surname, :email, :phone) unless defined?(Person)
       @collection = []
-      @collection << Person.new(1, "John", "Doe", "jdoe@gmail.com", "500600700")
-      @collection << Person.new(2, "Barack", "Obama", "bobama@polskieobozy.com", "501601701")
+      @collection << Person.new(1, 'John', 'Doe', 'jdoe@gmail.com', '500600700')
+      @collection << Person.new(2, 'Barack', 'Obama', 'bobama@polskieobozy.com', '501601701')
       concat(table_for(@collection) do |t|
         t.span(:names) do |s|
           s.column :name, class: 'name', header_class: 'name_head'
           s.column(:surname) { |person| content_tag(:span, person.surname.capitalize) }
         end
         t.span(:contact_data) do |s|
-          s.column :email, class: lambda { |person| ['foo', 'bar', person.email =~ /gmail/ && 'gmail'].compact }
+          s.column :email, class: ->(person) { ['foo', 'bar', person.email =~ /gmail/ && 'gmail'].compact }
           s.column :phone
         end
       end)
     end
 
-    should "have rows with proper id attributes" do
+    should 'have rows with proper id attributes' do
       assert_select 'table tbody tr#tablehelpertest-person-1'
       assert_select 'table tbody tr#tablehelpertest-person-2'
     end
@@ -65,66 +70,66 @@ class TableHelperTest < ActionView::TestCase
       assert_equal 4, row.size
     end
 
-    should "have proper body content" do
-      assert_select 'table tbody tr:first-child td:first-child', {count: 1, text: 'John'}
-      assert_select 'table tbody tr:first-child td:nth-child(2) span', {count: 1, text: 'Doe'}
+    should 'have proper body content' do
+      assert_select 'table tbody tr:first-child td:first-child', count: 1, text: 'John'
+      assert_select 'table tbody tr:first-child td:nth-child(2) span', count: 1, text: 'Doe'
     end
 
-    should "have proper td class in name column" do
+    should 'have proper td class in name column' do
       td = css_select('table tbody tr:first-child td:first-child').first
       assert_equal 'name', td.attributes['class'].value
     end
 
-    should "have proper th class in name column" do
+    should 'have proper th class in name column' do
       td = css_select('table thead tr:nth-child(2) th:first-child').first
       assert_equal 'name_head', td.attributes['class'].value
     end
 
-    should "have proper td class in first row in email column" do
+    should 'have proper td class in first row in email column' do
       td = css_select('table tbody tr:nth-child(1) td:nth-child(3)').first
       assert_equal 'foo bar gmail', td.attributes['class'].value
     end
 
-    should "have proper td class in second row in email column" do
+    should 'have proper td class in second row in email column' do
       td = css_select('table tbody tr:nth-child(2) td:nth-child(3)').first
       assert_equal 'foo bar', td.attributes['class'].value
     end
   end
 
-  context "table with nested spans" do
+  context 'table with nested spans' do
     setup do
       @collection = []
       concat(
-          table_for(@collection) do |t|
-            t.span :span1 do |s1|
-              s1.span :span2 do |s2|
-                s2.column :col1
-                s2.column :col2
-              end
-              s1.span :span3 do |s3|
-                s3.column :col3
-                s3.column :col4
-              end
+        table_for(@collection) do |t|
+          t.span :span1 do |s1|
+            s1.span :span2 do |s2|
+              s2.column :col1
+              s2.column :col2
             end
-            t.span :span4 do |s4|
-              s4.column :col5
-              s4.column :col6
+            s1.span :span3 do |s3|
+              s3.column :col3
+              s3.column :col4
             end
-            t.column :col7, header_rowspan: 3
           end
+          t.span :span4 do |s4|
+            s4.column :col5
+            s4.column :col6
+          end
+          t.column :col7, header_rowspan: 3
+        end
       )
     end
 
-    should "have 3 rows in thead" do
+    should 'have 3 rows in thead' do
       assert_select 'table thead tr', 3
     end
 
-    should "have rowspan=3 in last th of first tr" do
+    should 'have rowspan=3 in last th of first tr' do
       th = css_select('table thead tr:first-child th:last-child').first
       assert_equal '3', th.attributes['rowspan'].value
     end
 
-    should "have 11 th elements in thead" do
+    should 'have 11 th elements in thead' do
       assert_select 'table thead th', count: 11
     end
   end

data/test/components/spans_test.rb

@@ -7,29 +7,27 @@ class SpansTest < ActionView::TestCase
     @node = Tree::TreeNode.new('root')
   end
 
-  should "create a Span given title, a hash and a block" do
+  should 'create a Span given title, a hash and a block' do
     span('title', class: 'klazz') { |s| }
-    s =  node.children.first.content
+    s = node.children.first.content
     assert_equal 'title', s.instance_variable_get(:@title)
   end
 
-  should "create a Span given title, label, a hash and a block" do
+  should 'create a Span given title, label, a hash and a block' do
     span('title', 'label', class: 'klazz') { |s| }
-    s =  node.children.first.content
+    s = node.children.first.content
     assert_equal 'title', s.instance_variable_get(:@title)
   end
 
-  should "create a Span given a hash and a block" do
+  should 'create a Span given a hash and a block' do
     span(class: 'klazz') { |s| }
-    s =  node.children.first.content
+    s = node.children.first.content
     assert_nil s.instance_variable_get(:@title)
   end
 
-  should "create a Span fiven only a block" do
+  should 'create a Span fiven only a block' do
     span { |s| }
     s =  node.children.first.content
     assert_nil s.instance_variable_get(:@title)
   end
-
-
-end
+end

data/test/table_builder_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
 
 class TableBuilderTest < ActionView::TestCase
-
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_table
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Jakub Głuszecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel