tabulo 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02a658d45fe5df2a6b02a39ff1ef8b85b9406a5d
-  data.tar.gz: 1edee8575e0098a1d5b383f596ff8ef77e3916a0
+  metadata.gz: 1dc99325b75930d06ef7865ccf9cf88149040598
+  data.tar.gz: 1fbcea2102de94f56ba29d7d763db7b4e164fd10
 SHA512:
-  metadata.gz: 2d76f4fd33ede6de1a466affd190c6377f8e0a29b2c3986c7c4c83c0ac8001b285f880589d5a74668b572e8219c570f3aaa391b0dd8839f89c478f58b9bbc5f2
-  data.tar.gz: c4766b9abff559fd30f65356731e18311984b459bd67e11b7dc308bf93c92a2fab4902c6ea0c13bab81ffe5459df134074d93b2beec3ec26af8d8b5a4f4899df
+  metadata.gz: b106d3d9c33e003bba7ad38065c54ba25a7f348d58bd20b5508dd512d6fb0a0600f89ba7c4a5f8239736ff2add5a490ae0d7f6bf5952a21e2fc8a80176ea2091
+  data.tar.gz: f50e7092a449944c3bff02fe8ee5a477bb94b3b5ef80232f12aa1ec4a397ed43e47011b8cc45856d847a33616c00dd0ed6e371092479d48ae95808f0a9838843

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 **/.*.swp
+coverage

data/.travis.yml

@@ -1,5 +1,6 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.5
-before_install: gem install bundler -v 1.13.7
+  - 2.2.0
+  - 2.3.1
+before_install: gem install bundler -v 1.14.6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+
+## v0.2.1
+
+* Code tidy-ups
+* Tidy-ups and improvements to README, including adding badges for test coverage etc..
+
 ## v0.2.0
 
 * Allow columns to be initialized with `columns` option in `Table` initializer

data/README.md

@@ -1,10 +1,20 @@
 # Tabulo
 
+[![Gem Version][GV img]][Gem Version]
+[![Build Status][BS img]][Build Status]
+[![Dependency Status][DS img]][Dependency Status]
+[![Coverage Status][CS img]][Coverage Status]
+
 ## Overview
 
 Tabulo generates ASCII tables.
 
-A `Tabulo::Table` can, of course, be printed:
+```ruby
+table = Tabulo::Table.new([1, 2, 50000000]) do |t|
+  t.add_column("N", &:itself)
+  t.add_column("Doubled") { |n| n * 2 }
+end
+```
 
 ```
 > puts table
@@ -16,7 +26,7 @@ A `Tabulo::Table` can, of course, be printed:
 | 50000000 | 10000000 |
 ```
 
-But it is also `Enumerable`, so you can process one row at a time:
+A `Tabulo::Table` is an `Enumerable`, so you can process one row at a time:
 
 ```ruby
 table.each do |row|
@@ -25,7 +35,7 @@ table.each do |row|
 end
 ```
 
-And rows are themselves `Enumerable`, providing access to the underlying cell values:
+Each `Tabulo::Row` is also an `Enumerable`, which provides access to the underlying cell values:
 
 ```ruby
 table.each do |row|
@@ -79,11 +89,9 @@ end
 Or equivalently:
 
 ```ruby
-Tabulo::Table.new([1, 2, 5], columns: %i(itself even odd))
+Tabulo::Table.new([1, 2, 5], columns: %i(itself even? odd?))
 ```
 
-The resulting table looks like this:
-
 ```
 > puts table
 +----------+----------+----------+
@@ -102,7 +110,7 @@ the header text:
 table = Tabulo::Table.new([1, 2, 5]) do |t|
   t.add_column("N", &:itself)
   t.add_column("Doubled") { |n| n * 2 }
-  t.add_column(:odd?)  # we can mix and match
+  t.add_column(:odd?)
 end
 ```
 
@@ -258,3 +266,12 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/matt-h
 The gem is available as open source under the terms of the [MIT
 License](http://opensource.org/licenses/MIT).
 
+[Gem Version]: https://rubygems.org/gems/tabulo
+[Build Status]: https://travis-ci.org/matt-harvey/tabulo
+[Dependency Status]: https://gemnasium.com/matt-harvey/tabulo
+[Coverage Status]: https://coveralls.io/r/matt-harvey/tabulo
+
+[GV img]: https://img.shields.io/gem/v/tabulo.svg
+[BS img]: https://img.shields.io/travis/matt-harvey/tabulo.svg
+[DS img]: https://img.shields.io/gemnasium/matt-harvey/tabulo.svg
+[CS img]: https://img.shields.io/coveralls/matt-harvey/tabulo.svg

data/lib/tabulo/column.rb

@@ -13,9 +13,6 @@ module Tabulo
 
       # TODO Should be able to set these default on a Table-by-Table basis.
       @width = options[:width] || Table::DEFAULT_COLUMN_WIDTH
-
-      @horizontal_rule_character =
-        options[:horizontal_rule_character] || Table::DEFAULT_HORIZONTAL_RULE_CHARACTER
     end
 
     def header_cell
@@ -23,7 +20,7 @@ module Tabulo
     end
 
     def horizontal_rule
-      @horizontal_rule_character * @width
+      Table::HORIZONTAL_RULE_CHARACTER * @width
     end
 
     def body_cell(source)
@@ -50,8 +47,6 @@ module Tabulo
           [0, padding]
         when :right
           [padding, 0]
-        else
-          raise "Unrecognized alignment: #{real_alignment}"
         end
 
       "#{' ' * left_padding}#{content}#{' ' * right_padding}"

data/lib/tabulo/table.rb

@@ -4,7 +4,8 @@ module Tabulo
     include Enumerable
 
     DEFAULT_COLUMN_WIDTH = 8
-    DEFAULT_HORIZONTAL_RULE_CHARACTER = "-"
+    HORIZONTAL_RULE_CHARACTER = "-"
+    CORNER_CHARACTER = "+"
 
     attr_reader :columns
 
@@ -24,41 +25,15 @@ module Tabulo
       @wrap_body_cells_to = opts[:wrap_body_cells_to]
       @sources = sources
       @joiner = "|"
-      @corner_character = "+"
-      @horizontal_rule_character = "-"
       @truncation_indicator = "~"
       @padding_character = " "
       @default_column_width = DEFAULT_COLUMN_WIDTH
-      @columns = opts[:columns].map do |item|
-        case item
-        when Column
-          item
-        else
-          Column.new({
-            label: item.to_sym,
-            header: item.to_s,
-            align_header: :center,
-            horizontal_rule_character: @horizontal_rule_character,
-            width: @default_column_width,
-            formatter: :to_s.to_proc
-          })
-        end
-      end
+      @columns = opts[:columns].map { |item| make_column(item) }
       yield self if block_given?
     end
 
     def add_column(label, options = {}, &extractor)
-      @columns << Column.new({
-        label: label.to_sym,
-        header: label.to_s,
-        truncate: true,
-        align_header: :center,
-        horizontal_rule_character: @horizontal_rule_character,
-        width: @default_column_width,
-        extractor: extractor || (label.respond_to?(:to_proc) ? label.to_proc : proc { nil }),
-        formatter: :to_s.to_proc
-
-      }.merge(options))
+      @columns << make_column(label, extractor: extractor)
     end
 
     def to_s
@@ -85,7 +60,7 @@ module Tabulo
     end
 
     def horizontal_rule
-      format_row(false, @horizontal_rule_character, @corner_character, &:horizontal_rule)
+      format_row(false, HORIZONTAL_RULE_CHARACTER, CORNER_CHARACTER, &:horizontal_rule)
     end
 
     def formatted_body_row(source, options = { with_header: false })
@@ -135,5 +110,21 @@ module Tabulo
     def join_lines(lines)
       lines.join($/)  # join strings with cross-platform newline
     end
+
+    def make_column(item, options = { })
+      case item
+      when Column
+        item
+      else
+        Column.new({
+          label: item.to_sym,
+          header: item.to_s,
+          align_header: :center,
+          width: @default_column_width,
+          formatter: :to_s.to_proc
+
+        }.merge(options))
+      end
+    end
   end
 end

data/lib/tabulo/version.rb

@@ -1,3 +1,3 @@
 module Tabulo
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/tabulo.gemspec

@@ -21,7 +21,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.required_ruby_version = "~> 2.0"
+
+  spec.add_development_dependency "bundler", "~> 1.14.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "coveralls"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tabulo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.14.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.14.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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: Enumerable ASCII table
 email:
 - software@matthewharvey.net
@@ -85,9 +113,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="