easy_table 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9a2da962aa6bcd923d6612331f8be26a9e2197e
-  data.tar.gz: 248021bb512247b8e636fe287da61e73c3f76a3e
+  metadata.gz: 6162558a23ee392fde530fb336a4eacea249cf34
+  data.tar.gz: 393f00005cb26d539ecb048e587d874265f2e053
 SHA512:
-  metadata.gz: a27ec18427dab8aefeee319b39f3aea4b1ebd0fc54d7eedc6be84fa8d5f38c59e4f80bf62de07e692dac05bb323653a8976f519cc443f9826483d662be212c78
-  data.tar.gz: e84af18ce0c7f2e9bc9d4e0d71536a45029e2d22990a21cd73d9efdc040b66639a0e71e1a1c03861e531de55776efdd4b7af195b96a02d68f29ac28f8ffd9784
+  metadata.gz: 2c69e4ee289a8c17bf46d39e42fe09d9fef23ebff60958022933919bae03a692db443b883f7898eb0bec458258b91efd841418f0b21ad7a8d3ac484c12e733c8
+  data.tar.gz: 623d48a187589ab8d9b84b5019aa826d6c47ddaeef17da0745c73947054db93e6ad9da904933a4d9ac651d555702e1a245e7ddb7fa5b246265bda6f9a8e2bfa8

data/.travis.yml

@@ -1,3 +1,7 @@
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.3.4
+
+gemfile:
+  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_5.gemfile

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "rails-4" do
+  gem "actionpack", "4.2.9"
+end
+
+appraise "rails-5" do
+  gem "actionpack", "5.1.2"
+end

data/circle.yml

@@ -1,4 +1,11 @@
 machine:
   ruby:
-    version: 2.2.2
+    version: 2.3.4
 
+dependencies:
+  post:
+    - bundle exec appraisal install
+
+test:
+  override:
+    - bundle exec appraisal rake test

data/easy_table.gemspec

@@ -17,5 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'activemodel', '> 4.2'
   gem.add_dependency 'actionpack', '> 4.2'
-  gem.add_dependency 'rubytree', '~> 0.8.3'
+  gem.add_dependency 'rubytree', '~> 1.0'
+
+  gem.add_development_dependency "appraisal"
 end

data/gemfiles/rails_4.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mocha"
+gem "shoulda"
+gem "rake"
+gem "actionpack", "4.2.9"
+
+gemspec path: "../"

data/gemfiles/rails_4.gemfile.lock

@@ -0,0 +1,89 @@
+PATH
+  remote: ..
+  specs:
+    easy_table (0.0.9)
+      actionpack (> 4.2)
+      activemodel (> 4.2)
+      rubytree (~> 1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (4.2.9)
+      actionview (= 4.2.9)
+      activesupport (= 4.2.9)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.9)
+      activesupport (= 4.2.9)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activemodel (4.2.9)
+      activesupport (= 4.2.9)
+      builder (~> 3.1)
+    activesupport (4.2.9)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.3)
+    erubis (2.7.0)
+    i18n (0.8.6)
+    json (2.1.0)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    metaclass (0.0.4)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
+    mocha (1.2.1)
+      metaclass (~> 0.0.1)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    rack (1.6.8)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.8)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    rake (12.0.0)
+    rubytree (1.0.0)
+      json (~> 2.1)
+      structured_warnings (~> 0.3)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.2.2)
+    shoulda-matchers (2.8.0)
+      activesupport (>= 3.0.0)
+    structured_warnings (0.3.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (= 4.2.9)
+  appraisal
+  easy_table!
+  mocha
+  rake
+  shoulda
+
+BUNDLED WITH
+   1.16.1

data/gemfiles/rails_5.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mocha"
+gem "shoulda"
+gem "rake"
+gem "actionpack", "5.1.2"
+
+gemspec path: "../"

data/gemfiles/rails_5.gemfile.lock

@@ -0,0 +1,86 @@
+PATH
+  remote: ..
+  specs:
+    easy_table (0.0.9)
+      actionpack (> 4.2)
+      activemodel (> 4.2)
+      rubytree (~> 1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (5.1.2)
+      actionview (= 5.1.2)
+      activesupport (= 5.1.2)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.2)
+      activesupport (= 5.1.2)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activemodel (5.1.2)
+      activesupport (= 5.1.2)
+    activesupport (5.1.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    erubi (1.6.1)
+    i18n (0.8.6)
+    json (2.1.0)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    metaclass (0.0.4)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
+    mocha (1.2.1)
+      metaclass (~> 0.0.1)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    rack (2.0.3)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    rake (12.0.0)
+    rubytree (1.0.0)
+      json (~> 2.1)
+      structured_warnings (~> 0.3)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.2.2)
+    shoulda-matchers (2.8.0)
+      activesupport (>= 3.0.0)
+    structured_warnings (0.3.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (= 5.1.2)
+  appraisal
+  easy_table!
+  mocha
+  rake
+  shoulda
+
+BUNDLED WITH
+   1.16.1

data/lib/easy_table.rb

@@ -1,4 +1,4 @@
-require "easy_table/version"
+require 'easy_table/version'
 
 require 'action_view'
 require 'easy_table/action_view_extensions/table_helper'
@@ -11,5 +11,4 @@ require 'easy_table/table_builder'
 require 'tree'
 
 module EasyTable
-
 end

data/lib/easy_table/action_view_extensions/table_helper.rb

@@ -7,8 +7,7 @@ module EasyTable
         t.build
       end
     end
-
   end
 end
 
-ActionView::Base.send :include, EasyTable::ActionViewExtensions::TableHelper
+ActionView::Base.send :include, EasyTable::ActionViewExtensions::TableHelper

data/lib/easy_table/components/base.rb

@@ -7,4 +7,4 @@ module EasyTable
       end
     end
   end
-end
+end

data/lib/easy_table/components/column.rb

@@ -3,10 +3,15 @@ module EasyTable
     class Column
       include Base
 
-      delegate :tag, :capture, :content_tag, :to => :@template
+      delegate :tag, :capture, :content_tag, to: :@template
 
       def initialize(node, title, label, opts, template, block)
-        @node, @title, @label, @template, @block, @opts = node, title, label, template, block, opts
+        @node = node
+        @title = title
+        @label = label
+        @template = template
+        @block = block
+        @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|
@@ -21,11 +26,11 @@ module EasyTable
       end
 
       def td(record)
-        if @block.present?
-          html = capture { @block.call(record, self) }
-        else
-          html = record.send(@title).to_s
-        end
+        html = if @block.present?
+                 capture { @block.call(record, self) }
+               else
+                 record.send(@title).to_s
+               end
         concat(content_tag(:td, html, html_opts(record)))
       end
 
@@ -37,17 +42,17 @@ module EasyTable
 
       def concat(tag)
         @template.safe_concat(tag) unless tag.nil?
-        ""
+        ''
       end
 
       def html_opts(record)
         @opts.inject({}) do |h, e|
           k, v = *e
           h[k] = case v
-                   when Proc
-                     v.call(record)
-                   else
-                     v
+                 when Proc
+                   v.call(record)
+                 else
+                   v
                  end
           h
         end

data/lib/easy_table/components/columns.rb

@@ -3,9 +3,11 @@ module EasyTable
     module Columns
       def column(title, label_or_opts = nil, opts = {}, &block)
         if label_or_opts.is_a?(Hash) && label_or_opts.extractable_options?
-          label, opts = nil, label_or_opts
+          label = nil
+          opts = label_or_opts
         else
-          label, opts = label_or_opts, opts
+          label = label_or_opts
+          opts = opts
         end
         child = node << Tree::TreeNode.new(title)
         column = Column.new(child, title, label, opts, @template, block)
@@ -19,4 +21,4 @@ module EasyTable
       end
     end
   end
-end
+end

data/lib/easy_table/components/span.rb

@@ -6,11 +6,16 @@ module EasyTable
       include Spans
 
       def initialize(node, title, label, html_opts, template, block)
-        @node, @title, @label, @template, @block, @html_opts = node, title, label, template, block, html_opts
+        @node = node
+        @title = title
+        @label = label
+        @template = template
+        @block = block
+        @html_opts = html_opts
         block.call(self)
       end
 
-      delegate :tag, :content_tag, :to => :@template
+      delegate :tag, :content_tag, to: :@template
 
       def head
         opts = @html_opts.merge(colspan: colspan, scope: 'col')
@@ -36,9 +41,8 @@ module EasyTable
 
       def concat(tag)
         @template.safe_concat(tag)
-        ""
+        ''
       end
-
     end
   end
-end
+end

data/lib/easy_table/components/spans.rb

@@ -24,4 +24,4 @@ module EasyTable
       end
     end
   end
-end
+end

data/lib/easy_table/table_builder.rb

@@ -1,10 +1,9 @@
 module EasyTable
   class TableBuilder
-
     include EasyTable::Components::Columns
     include EasyTable::Components::Spans
 
-    delegate :tag, :content_tag, :to => :@template
+    delegate :tag, :content_tag, to: :@template
 
     def initialize(collection, template, options)
       @collection = collection
@@ -49,11 +48,9 @@ module EasyTable
       rows.shift
       rows.each do |row|
         concat(
-            content_tag(:tr) do
-              row.map { |node| node.content }.each do |span_or_column|
-                span_or_column.head
-              end
-            end
+          content_tag(:tr) do
+            row.map(&:content).each(&:head)
+          end
         )
       end
     end
@@ -62,28 +59,28 @@ module EasyTable
       tr_opts = @tr_opts.inject({}) do |h, e|
         k, v = *e
         h[k] = case v
-                 when Proc
-                   v.call(record)
-                 else
-                   v
+               when Proc
+                 v.call(record)
+               else
+                 v
                end
         h
       end
 
-      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 = "#{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
+          tr_opts.merge(id: id) : tr_opts
     end
 
     def concat(tag)
       @template.safe_concat(tag)
-      ""
+      ''
     end
 
     def options_from_hash(args)
       args.last.is_a?(Hash) ? args.pop : {}
     end
   end
-end
+end

data/lib/easy_table/version.rb

@@ -1,4 +1,3 @@
 module EasyTable
-  VERSION = "0.0.8"
+  VERSION = '0.0.9'.freeze
 end
-

data/test/action_view_extensions/table_helper_test.rb

@@ -1,8 +1,4 @@
-if __FILE__== $0
-  require '../test_helper'
-else
-  require 'test_helper'
-end
+require 'test_helper'
 
 class TableHelperTest < ActionView::TestCase
 

data/test/components/spans_test.rb

@@ -1,8 +1,4 @@
-if __FILE__== $0
-  require '../test_helper'
-else
-  require 'test_helper'
-end
+require 'test_helper'
 
 class SpansTest < ActionView::TestCase
   include EasyTable::Components::Spans

data/test/test_helper.rb

@@ -15,16 +15,15 @@ require 'shoulda-context'
 
 module Rails
   def self.env
-    ActiveSupport::StringInquirer.new("test")
+    ActiveSupport::StringInquirer.new('test')
   end
 end
 
-$:.unshift File.expand_path("../../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'easy_table'
 
 I18n.default_locale = :en
 
 class ActionView::TestCase
   include EasyTable::ActionViewExtensions::TableHelper
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_table
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Jakub Głuszecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: HTML tables made easy (in Rails 4 & 5)
 email:
 - jakub.gluszecki@gmail.com
@@ -61,12 +75,17 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - circle.yml
 - easy_table.gemspec
+- gemfiles/rails_4.gemfile
+- gemfiles/rails_4.gemfile.lock
+- gemfiles/rails_5.gemfile
+- gemfiles/rails_5.gemfile.lock
 - lib/easy_table.rb
 - lib/easy_table/action_view_extensions/table_helper.rb
 - lib/easy_table/components/base.rb
@@ -99,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: HTML tables made easy (in Rails 4 & 5)