kor-input-yaml 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5dd331e9dda4ba71e23393dc1bf05c0b7ce7d43
-  data.tar.gz: 33bf11a35ab58d6bfc16e3679dcf2baf6f36a897
+  metadata.gz: fe43c8a5a7e5ac8c61d32f8f627d05df1fcfb715
+  data.tar.gz: 8486005be3f33555dced1c0b7fd2d70ee5e8a54d
 SHA512:
-  metadata.gz: b8b031fa5158e3d901d0773b0751fae89c9929aa864656fd6b7d5b3312b1fccc92f60eb0e394a1f0cfe551abb4fb3c0211dec61f91ed1d36f6eeb47ccf87e054
-  data.tar.gz: b0fc4540c9c3dd2c0d2cc95b5ec2aa37e3ee06b1e4051b29bf1aa4873bbc8d93195b14ccac72f1a11c97e8a6c965ef4edb7c236bfef28d27754a3a969139c0b6
+  metadata.gz: 6b5f9656b7acd1634183c0698eaa22860911985921589a5e5db7f7d996888423e9ceb9d7f5e0fdee5ba7f9b65e05935b4280c1f2d86801cee84d88f2622f08d7
+  data.tar.gz: d587c0c7c60f52b22791f259a9df5ba47536fe32c2e9e8067e37eb646174889617b372f2a159936ee981229cef1a58d7b52bbe0c39da39db787705d6fe2479ca

data/README.md

@@ -26,6 +26,12 @@ $ kor yaml markdown < table.yml
 | --- | --- | --- |
 | 100 | 200 |  |
 |  | 500 | 600 |
+
+$ kor yaml --key=bar,foo markdown < table.yml
+| bar | foo |
+| --- | --- |
+| 200 | 100 |
+| 500 |  |
 ```
 
 ## Installation

data/lib/kor/input/yaml.rb

@@ -3,12 +3,17 @@ require 'yaml'
 module Kor
   module Input
     class Yaml
+      DEFAULT_GUESS_TIME = 5
+      START = "---"
+
       def initialize(io)
         @io = io
         @keys = []
         @yamls = []
         @prekeys = nil
         @count = 0
+        @stock = []
+        @guess_time = DEFAULT_GUESS_TIME
         @fiber = Fiber.new do
           @yamls.each do |yaml|
             Fiber.yield @keys.map{ |k| yaml[k] }
@@ -19,46 +24,48 @@ module Kor
       end
 
       def parse(opt)
-        opt.on("--key=KEY", "preset keys (e.g. foo,bar,baz)") do |arg|
+        opt.on("--key=KEY", "select keys (e.g. foo,bar,baz)") do |arg|
           @prekeys = arg
         end
+        opt.on("--guess-time=NUM", "guess number of times (default #{DEFAULT_GUESS_TIME})") do |arg|
+          @guess_time = arg.to_i
+        end
       end
 
       def head
         if @prekeys
-          line = @io.gets
-          if line.index(START) != 0
-            @io.seek(line.length, IO::SEEK_CUR)
-          end
           @keys = @prekeys.split(",")
         else
-          @yamls = YAML.load_stream(@io.read)
-          @keys = @yamls.map do |yaml|
-            yaml.keys
+          while yaml = read_yaml
+            @yamls << yaml
+            if 0 < @guess_time && @guess_time <= @yamls.length
+              break
+            end
           end
-          @keys.flatten!.uniq!
-          @keys
+          @keys = @yamls.map { |yaml| yaml.keys }
+          @keys.flatten!
+          @keys.uniq!
         end
+        @keys
       end
 
-      START = "---"
-      EOF = "\n"
-
       def gets
         if @prekeys
-          stock = ""
-          while line = @io.gets
-            stock << line
-            if line.index(START) == 0
-              break
-            end
+          if yaml = read_yaml
+            @keys.map{ |key| yaml[key] }
+          else
+            nil
+          end
+        elsif 0 < @guess_time
+          if @count < @guess_time
+            @count += 1
+            return resume
           end
-          if stock == ""
-            return nil
+          if yaml = read_yaml
+            @keys.map { |k| yaml[k] }
+          else
+            nil
           end
-          yaml = YAML.load(stock)
-          @count += 1
-          @keys.map{ |key| yaml[key] }
         else
           resume
         end
@@ -66,6 +73,22 @@ module Kor
 
       private
 
+      def read_yaml
+        while line = @io.gets
+          @stock << line
+          if line.index(START) == 0
+            if 1 < @stock.length
+              break
+            end
+          end
+        end
+        if @stock.empty?
+          return nil
+        end
+        last_index = line ? -2 : -1
+        YAML.load(@stock.slice!(0..last_index).join)
+      end
+
       def resume
         @fiber.resume
       rescue FiberError

data/lib/kor/input/yaml/version.rb

@@ -1,7 +1,7 @@
 module Kor
   module Input
     class Yaml
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/lib/kor/input/yaml_test.rb

@@ -63,6 +63,25 @@ YAML
     end
   end
 
+  def test_gets_with_none_guess(t)
+    yaml = ready
+    opt = OptionParser.new
+    yaml.parse(opt)
+    opt.parse ["--guess-time=0"]
+    yaml.head
+
+    expects = [
+      [100, 200, nil],
+      [nil, 500, 600],
+      nil, nil, nil, nil, nil
+    ].each do |expect|
+      actual = yaml.gets
+      if actual != expect
+        t.error("expect #{expect} got #{actual}")
+      end
+    end
+  end
+
   def test_gets_with_prekeys(t)
     yaml = ready
     opt = OptionParser.new
@@ -82,6 +101,25 @@ YAML
     end
   end
 
+  def test_e2e(t)
+    actual = `ruby -ryaml -e '3.times { [{"a"=>1},{"b"=>2},{"c"=>3}].each{|h| puts YAML.dump(h)} }' | bundle ex kor yaml --guess-time=3 csv`
+    expect = <<-CSV
+a,b,c
+1,,
+,2,
+,,3
+1,,
+,2,
+,,3
+1,,
+,2,
+,,3
+CSV
+    if actual != expect
+      t.error("expect #{expect.inspect} got #{actual.inspect}")
+    end
+  end
+
   private
 
   def go

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kor-input-yaml
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-10 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kor