kor 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f945e02d461ae630c93756a59d37a1adbc2c3783
-  data.tar.gz: 6eb078d973ea6ea8e185461501518639951949f5
+  metadata.gz: 213bc92a1e8a6d511e108a2787c0f367e4ee2479
+  data.tar.gz: e6a3ed24eaec50fc2ed402ba3e3281e417cb00a9
 SHA512:
-  metadata.gz: bccf7c8361ee7937e60d8740b98b906e2ae10444298fb386a231f12a3280614ba99b166923ce92c21bdcfc5bc6d1c9d81420a1c75cd2fc30048a3f152fa7cd1c
-  data.tar.gz: fffda929139840318ea989547d663675124bd5022c42cb14cea70be5a8f42f5c76a599702167f1b2e7c51b717b28f8faccc978213c05e98bbebb5f915d66c425
+  metadata.gz: 999684aa144d469eac4c7e03a642a38d494395d87b5344c941dd53ef68699cd824f09fb1b90f4140f532c4dde0d0fb3058e558776eda58ab0b5bc2ace2ad6097
+  data.tar.gz: 27f9c02f6423fe31e33f241a66e8d57db64e98ec51740e219f2bf8dee7c578156f39027cbf7500c32c212fee8b6b3532b56312404ecca314cf672be1541e5cba

data/lib/kor.rb

@@ -1,5 +1,12 @@
 module Kor
   class NotKeyError < StandardError
+    def initialize(*)
+      super
+      warn "[DEPRECATED] #{self.class} was deprecated"
+    end
+  end
+
+  class ReadError < StandardError
   end
 
   require "kor/cli"

data/lib/kor/input/csv.rb

@@ -3,9 +3,6 @@ require 'csv'
 module Kor
   module Input
     class Csv < Base
-      class ReadError < StandardError
-      end
-
       DELIM = ","
 
       def head

data/lib/kor/input/csv_test.rb

@@ -22,7 +22,7 @@ CSV
     io2 = StringIO.new("")
     csv = Kor::Input::Csv.new(io2)
     head, err = go { csv.head }
-    unless Kor::Input::Csv::ReadError === err
+    unless Kor::ReadError === err
       t.error("expect Kor::Input::Csv::ReadError got #{err.class}:#{err}")
     end
   end

data/lib/kor/input/markdown.rb

@@ -8,20 +8,22 @@ module Kor
       end
 
       def head
-        line = io.gets.strip
+        line = io.gets
+        raise ReadError, "cannot get markdown header" unless line
+        line.strip!
         first_index = line[0] == '|' ? 1 : 0
         keys = line.split('|')[first_index..-1].map(&:strip)
-        # skip separate line
-        io.gets
+
+        separate_line = io.gets
+        raise ReadError, "cannot get markdown header" unless separate_line
+
         if @filter_key
-          @filter_key = @filter_key.split(",").map do |key|
-            if index = keys.index(key)
-              index
-            else
-              raise NotKeyError, "`#{key}' is a not key of this table"
-            end
-          end
-          keys = @filter_key.map{ |index| keys[index] }
+          filter_keys = @filter_key.split(",")
+          filter_keys = keys.select { |key|
+            filter_keys.include?(key)
+          }
+          keys = filter_keys
+          @filter_key = filter_keys.map { |key| keys.index(key) }
         end
         keys
       end

data/lib/kor/input/markdown_test.rb

@@ -19,6 +19,18 @@ MARKDOWN
   end
 
   def test_head(t)
+    md = Kor::Input::Markdown.new(StringIO.new)
+    _, err = go { md.head }
+    unless Kor::ReadError === err
+      t.error("expect raise an error Kor::ReadError got #{err.class}:#{err}")
+    end
+
+    md = Kor::Input::Markdown.new(StringIO.new("|foo|\n"))
+    _, err = go { md.head }
+    unless Kor::ReadError === err
+      t.error("expect raise an error Kor::ReadError got #{err.class}:#{err}")
+    end
+
     @io.rewind
     md = Kor::Input::Markdown.new(@io)
     head = md.head
@@ -40,23 +52,17 @@ MARKDOWN
     opt = OptionParser.new
     md.parse(opt)
 
-    opt.parse ["--key=bar,nothing"]
-    _, err = go { md.head }
-    unless Kor::NotKeyError === err
-      t.error("expect raise an error Kor::NotKeyError got #{err.class}:#{err}")
-    end
-
     @io.rewind
-    opt.parse ["--key=bar,foo"]
+    opt.parse ["--key=bar,foo,non"]
     actual = md.head
-    expect = %w(bar foo)
+    expect = %w(foo bar)
     if actual != expect
       t.error("expect #{expect} got #{actual}")
     end
 
     expects = [
-      %w(2 1),
-      %w(b a),
+      %w(1 2),
+      %w(a b),
       nil, nil, nil, nil, nil
     ].each do |expect|
       actual = md.gets

data/lib/kor/output/markdown.rb

@@ -14,8 +14,9 @@ module Kor
       def head(keys)
         if @select_key
           select_keys = @select_key.split(",")
+          select_keys.select!{ |key| keys.include?(key) }
           @select_key = select_keys.map do |key|
-            keys.index(key) or raise NotKeyError, "`#{key}' is not a key of this table"
+            keys.index(key)
           end
           keys = select_keys
         end

data/lib/kor/output/markdown_test.rb

@@ -16,17 +16,12 @@ module KorOutputMarkdownTest
     md = Kor::Output::Markdown.new(io)
     opt = OptionParser.new
     md.parse(opt)
-    opt.parse ["--key=foo,nothing"]
-    _, err = go { md.head(["foo", "bar", "baz"]) }
-    unless Kor::NotKeyError === err
-      t.error("expect raise Kor::Output::Markdown::NotKeyError got #{err.class}:#{err}")
-    end
 
-    opt.parse ["--key=bar,foo"]
+    opt.parse ["--key=bar,foo,non"]
     _, err = go { md.head(["foo", "bar", "baz"]) }
     t.error("expect not raise got #{err.class}:#{err}") if err
     if io.string != "| bar | foo |\n| --- | --- |\n"
-      t.error("expect bar,foo header got #{head}")
+      t.error("expect bar,foo header got #{io.string}")
     end
   end
 

data/lib/kor/version.rb

@@ -1,3 +1,3 @@
 module Kor
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kor
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-10 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler