table_creator 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 332bd4ea2ac0af888861df66f9c77a1dcdbccd96
-  data.tar.gz: e08ba3193eabfb901dc6c9d7fd0e0a7114797a27
+  metadata.gz: d59a47b0e8e98ff7d163d597470f3041634a2772
+  data.tar.gz: d749f3c76d7e52a07c8c180f8e25bcd95e6d56a8
 SHA512:
-  metadata.gz: 26fda13a7187b87ce7b587a287dabbd212310cf5bba29d12a837f141435ce685a55c59bc781ee4236a53751f6683a664e37f48b12488aea145e4bf25b50c5b05
-  data.tar.gz: '01078e18ef529bfd2364d90adf1833b4e640889425cf94b3062d0b6a628815c85bc9f02b5e2cfc5d2840b83bd8556bf9313d83fdab9b9acae249d532ebb4332e'
+  metadata.gz: 54a1a35bbd0871c87a694c7ff60894f9e1d82551d4312cfb31d5e57baa8d801ccd4783f83d95c81a2155881b55179c786e17f51c1d1dc91851bd963b50e88b3d
+  data.tar.gz: 80e4c44a6671f5c41ae8d2e098e5524fa66f4a341a171babf3d84dd6fb6e4be9aa087e05e967f73c28c4e6c364a964b8d1c753d9838089dd2493af52394c6c47

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 0.1.1
+
+* Restore support for manual links
+
 ## 0.1.0
 
 * Improve class names

data/lib/table_creator/col.rb

@@ -67,6 +67,10 @@ module TableCreator
       else
         @data
       end
+
+      # Links are passed in manually too
+      link_to ||= @link_to
+
       col_tag = type == :header ? :th : :td
       content = content_tag :a, content, :href => link_to if link_to
       content = content_tag :a, content, :name => anchor if anchor

data/lib/table_creator/version.rb

@@ -1,3 +1,3 @@
 module TableCreator
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/data_table_spec.rb

@@ -1,7 +1,15 @@
 require 'spec_helper'
 
 describe TableCreator::Table do
-  let(:row) { ['col1', 2, Money.new(3), Booking.new(42, '22TEST')] }
+  let(:row) {
+    [
+      'col1',
+      2,
+      Money.new(3),
+      Booking.new(42, '22TEST'),
+      { data: '22TEST', link_to: '/bookings/42' }
+    ]
+  }
   let(:money_class) {
     Class.new do
       def initialize(dollars)
@@ -46,7 +54,7 @@ describe TableCreator::Table do
   end
 
   it 'should generate csv' do
-    expect(subject.to_csv).to eq 'col1,2,3.00,22TEST'
+    expect(subject.to_csv).to eq 'col1,2,3.00,22TEST,22TEST'
   end
 
   it 'should generate html' do
@@ -58,6 +66,7 @@ describe TableCreator::Table do
       '<td class="number">2</td>'\
       '<td class="money">$3.00</td>'\
       '<td class="booking"><a href="/bookings/42">22TEST</a></td>'\
+      '<td class="text"><a href="/bookings/42">22TEST</a></td>'\
       '</tr>'\
       '</tbody>'\
       '</table>'

data/spec/result_group_spec.rb

@@ -39,7 +39,7 @@ end
 describe TableCreator::ResultGroup, 'when aggregating' do
   let(:row1) { double(odd: true, amount: Money.new(1), quantity: 1) }
   let(:row2) { double(odd: false, amount: Money.new(9), quantity: 3) }
-  let(:row3) { double(odd: true, amount: Money.new(4), quantity: 4) }
+  let(:row3) { double(odd: true, amount: Money.new(4), quantity: 1) }
   subject { TableCreator::ResultGroup.new(nil, [row1, row2, row3]) }
 
   it 'should not allow non standard/implemented aggregates' do
@@ -52,7 +52,7 @@ describe TableCreator::ResultGroup, 'when aggregating' do
   it 'should aggregate on multiple levels' do
     expect(subject.sum).to be nil
     subject.aggregate(amount: :sum, quantity: :sum)
-    expect(subject.sum).to eq(amount: Money.new(14), quantity: 8)
+    expect(subject.sum).to eq(amount: Money.new(14), quantity: 5)
   end
 
   it 'should group and aggregate at each level' do
@@ -60,10 +60,32 @@ describe TableCreator::ResultGroup, 'when aggregating' do
     expect(subject.sum).to be nil
     subject.aggregate(amount: :sum, quantity: :sum)
     expect(subject.rows[0].group_object).to eq 'true'
-    expect(subject.rows[0].sum).to eq(amount: Money.new(5), quantity: 5)
+    expect(subject.rows[0].sum).to eq(amount: Money.new(5), quantity: 2)
     expect(subject.rows[1].group_object).to eq 'false'
     expect(subject.rows[1].sum).to eq(amount: Money.new(9), quantity: 3)
   end
+
+  context 'to_data_rows' do
+    subject {
+      result = TableCreator::ResultGroup.new(nil, [row1, row2, row3])
+      result.group([:odd, :quantity])
+      result.to_data_rows do |row_group, row|
+        [row_group.try(:group_object), row]
+      end
+    }
+
+    specify do
+      expect(subject).to eq [
+        { class: 'd1 l2 summary', data: ['true', nil] },
+        { class: 'd0 l2 summary', data: ['1', nil] },
+        [nil, row1],
+        [nil, row3],
+        { class: 'd1 l2 summary', data: ['false', nil] },
+        { class: 'd0 l2 summary', data: ['3', nil] },
+        [nil, row2]
+      ]
+    end
+  end
 end
 
 class Money

data/spec/support/coverage_loader.rb

@@ -1,4 +1,4 @@
 require 'simplecov-rcov'
 require 'coveralls'
 require 'coverage/kit'
-Coverage::Kit.setup(minimum_coverage: 76.5)
+Coverage::Kit.setup(minimum_coverage: 88.1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_creator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael Noack