tabelr 0.0.6 → 0.0.7

data/lib/tabelr/table_formater.rb

@@ -7,6 +7,8 @@ module Tabelr
     end
 
     def go json, output
+      raise 'aw' if output.respond_to? :Append
+
       parse json
       analyse
       dump output
@@ -22,12 +24,19 @@ module Tabelr
     end
 
     def parse json
-      # header
-      json['data'].first.each_key { |key| stash key }
-      bank
+      @header = true
+      json.each_value { |h| parse_hash h }
+    end
+
+    def parse_hash hash
+      if @header
+        hash.first.each_key { |key| stash key }
+        bank
+        @header = false
+      end
 
       # content/row
-      json['data'].each do |line|
+      hash.each do |line|
         line.each_value { |value| stash value }
         bank
       end
@@ -43,16 +52,15 @@ module Tabelr
     end
 
     def dump output
-      output.printf divider
+      output << divider
       @lines.each_with_index do |line, index|
-        output.printf divider if index == 1
+        output << divider if index == 1
         line.each_with_index do |item, i|
-          output.printf format item.to_s, @max_len[i]
+          output << format(item.to_s, @max_len[i])
         end
-        output.printf "|\n"
+        output << "|\n"
       end
-      output.printf divider
-      output.flush
+      output << divider
     end
 
     def max a, b

data/lib/tabelr.rb

@@ -6,12 +6,13 @@ module Tabelr
 
     def run
       args = parse_args
+      return unless valid? args
+
       @tf = TableFormator.new
 
       json = JSON.parse(File.read(args[0]))
-      output = STDOUT
-      output = File.open(args[1], 'w') unless args[1].nil?
-
+      # output = STDOUT
+      output = $stdout
       @tf.go json, output
     end
 
@@ -23,5 +24,17 @@ module Tabelr
       commands
     end
 
+    def valid? args
+      if args.nil? or args[0].nil?
+        puts "Man, you gotta give me a file to read from!"
+        return
+      end
+      unless File.exist?(args[0])
+        puts "Man, you gotta give me a valid file to read from!"
+        return
+      end
+      true
+    end
+
   end
 end

data/tabelr.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name          = "tabelr"
   s.summary       = "Creates neat aligned ascii tables from a json input"
   s.description   = "Creates neat aligned ascii tables from a json input"
-  s.version       = "0.0.6"
+  s.version       = "0.0.7"
   s.author        = "Ian Vaughan"
   s.email         = "tabelr@ianvaughan.co.uk"
   s.homepage      = "http://ianvaughan.co.uk"

data/test/example2.json

@@ -0,0 +1,56 @@
+{
+  "data":
+  [
+    {
+      "column1": "This",
+      "column2": "is",
+      "column3": "quite",
+      "column4": "cool!"
+    },
+    {
+      "column1": "This",
+      "column2": "is the longest field",
+      "column3": "by far",
+      "column4": 1241
+    },
+    {
+      "column1": "Short",
+      "column2": "fields",
+      "column3": "fit",
+      "column4": "in"
+    },
+    {
+      "column1": "other",
+      "column2": "eg",
+      "column3": null,
+      "column4": 33221199999999991111211111111111
+    }
+  ],
+  "doesnt matter":
+  [
+    {
+      "column1": "This",
+      "column2": "is",
+      "column3": "quite",
+      "column4": "cool!"
+    },
+    {
+      "column1": "This",
+      "column2": "is the longest field",
+      "column3": "by far",
+      "column4": 1241
+    },
+    {
+      "column1": "Short",
+      "column2": "fields",
+      "column3": "fit",
+      "column4": "in"
+    },
+    {
+      "column1": "other---------------------",
+      "column2": "eg",
+      "column3": null,
+      "column4": 3322119999999999
+    }
+  ]
+}

data/test/example2.txt

@@ -0,0 +1,12 @@
++----------------------------+----------------------+---------+----------------------------------+
+| column1                    | column2              | column3 | column4                          |
++----------------------------+----------------------+---------+----------------------------------+
+| This                       | is                   | quite   | cool!                            |
+| This                       | is the longest field | by far  | 1241                             |
+| Short                      | fields               | fit     | in                               |
+| other                      | eg                   |         | 33221199999999991111211111111111 |
+| This                       | is                   | quite   | cool!                            |
+| This                       | is the longest field | by far  | 1241                             |
+| Short                      | fields               | fit     | in                               |
+| other--------------------- | eg                   |         | 3322119999999999                 |
++----------------------------+----------------------+---------+----------------------------------+

data/test/test_all.rb

@@ -0,0 +1,3 @@
+require "test/unit"
+require "./test/test_tabelr"
+require "./test/test_table_formater"

data/test/test_tabelr.rb

@@ -1,11 +1,63 @@
 require "test/unit"
+require 'stringio'
 require_relative '../lib/tabelr'
 
 class TestTabelr < Test::Unit::TestCase
-  def test_file
+
+  def test_output
+    stdout_orig = $stdout
+    $stdout = StringIO.new
+    yield if block_given?
+    result = $stdout.string.dup
+    $stdout = stdout_orig
+    result
+  end
+
+  # run
+
+  def test_run
     ARGV[0] = 'test/example.json'
-    ARGV[1] = 'test/test.run'
-    Tabelr.run
-    assert_equal File.read('test/output.txt'), File.read(ARGV[1])
+    result = test_output do
+      Tabelr.run
+    end
+    assert_equal File.read('test/example.txt'), result
+  end
+
+  # #parse-args
+
+  def test_parse_args_no_args
+    ARGV.clear
+    result = Tabelr.parse_args
+    assert_equal [], result
+  end
+
+  def test_parse_args_one_arg
+    ARGV[0] = ''
+    result = Tabelr.parse_args
+    assert_equal [''], result
   end
+
+  # valid
+
+  def test_valid_with_no_args
+    result = test_output do
+      Tabelr.valid? nil
+    end
+    assert_equal "Man, you gotta give me a file to read from!\n", result
+  end
+
+  def test_valid_one_invalid_arg
+    result = test_output do
+      Tabelr.valid? ['']
+    end
+    assert_equal "Man, you gotta give me a valid file to read from!\n", result
+  end
+
+  def test_valid_with_one_valid_arg
+    result = test_output do
+      Tabelr.valid? [__FILE__]
+    end
+    assert_equal "", result
+  end
+
 end

data/test/test_table_formater.rb

@@ -0,0 +1,31 @@
+require "test/unit"
+require_relative '../lib/tabelr/table_formater'
+require 'json'
+
+class TestTabelr < Test::Unit::TestCase
+
+  def setup
+    @tf = Tabelr::TableFormator.new
+    @input = JSON.parse(File.read('test/example.json'))
+  end
+
+  def test_no_file
+    # ARGV[1] = 'test/test.run'
+    output = ''
+    @tf.go @input, output
+    assert_equal output, File.read('test/example.txt')
+  end
+
+  def test_larger_hash
+    # ARGV[0] = 'test/example2.json'
+    # ARGV[1] = 'test/test.run'
+    # Tabelr.run
+    # assert_equal File.read('test/example2.txt'), File.read(ARGV[1])
+    # File.delete ARGV[1]
+  end
+
+  # def test_no_file
+  #   Tabelr.run
+  #   assert_equal "No file"
+  # end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabelr
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
+date: 2012-05-01 00:00:00.000000000 Z
 dependencies: []
 description: Creates neat aligned ascii tables from a json input
 email: tabelr@ianvaughan.co.uk
@@ -25,9 +25,12 @@ files:
 - stash
 - tabelr.gemspec
 - test/example.json
-- test/output.txt
-- test/test.run
+- test/example.txt
+- test/example2.json
+- test/example2.txt
+- test/test_all.rb
 - test/test_tabelr.rb
+- test/test_table_formater.rb
 homepage: http://ianvaughan.co.uk
 licenses: []
 post_install_message: 
@@ -53,4 +56,6 @@ signing_key:
 specification_version: 3
 summary: Creates neat aligned ascii tables from a json input
 test_files:
+- test/test_all.rb
 - test/test_tabelr.rb
+- test/test_table_formater.rb

data/test/test.run

@@ -1,8 +0,0 @@
-+---------+----------------------+---------+------------------+
-| column1 | column2              | column3 | column4          |
-+---------+----------------------+---------+------------------+
-| This    | is                   | quite   | cool!            |
-| This    | is the longest field | by far  | 1241             |
-| Short   | fields               | fit     | in               |
-| other   | eg                   |         | 3322119999999999 |
-+---------+----------------------+---------+------------------+