tiny-classifier 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 962697672b93b80fa4ca5efcf46c9e820d184b96
-  data.tar.gz: 199917cf6cae91ae3fed243818bf924426b929ca
+  metadata.gz: e4640ed17e08cec0d4c7e06a7acedc0527669506
+  data.tar.gz: 982f06aad8df916300a18b04ca00ac9e0ae2dceb
 SHA512:
-  metadata.gz: 08b97dcd3859de27e4b39796fecfb57e5a978e55c8d47dcda19e700acee7cd8a7451e3e60f7e74c750530b17ee038222853babd278b63450b1f71cd82c3d5b12
-  data.tar.gz: 5c7be101d3209ff3079e597e069e502be00769aa11bb025825047bcc651bbbda5b1037ac361be4a4531dcea1a4cc32c9f82e922bd461ca4ab438036abbe75446
+  metadata.gz: dd7a63f5ff86e02b32a63a852f40d17ffce45ccd9ee5d68ee1fc131f68d770f595fae5c12a039d207ef557e2ee23229c2bea0755d7c36b84444bd0721e27e29e
+  data.tar.gz: 67ad761ba648d8718b1dd6339e83c221856223e180787d14e7761106b7589e588468f6d47d6bc3f3471d2c591868a0d72756532d5e530f944bc7f8f5e10409f4

data/README.md

@@ -33,6 +33,8 @@ Training:
 % echo "Oh my god!"           | tc-train --labels=positive,negative negative
 ```
 
+The training data will be saved as `tc.positive-negative.dat` (`tc.` is the fixed prefix, `.dat` is the fixed suffix. The middle part is filled by given labels automatically.) in the current directory. If you hope the file to be saved in any different place, please specify `--base-dir=/path/to/data/directory`.
+
 Classifying:
 
 ~~~

data/lib/tiny-classifier/base.rb

@@ -99,7 +99,16 @@ class TinyClassifierBase
     end
   end
 
+  def input
+    @input ||= prepare_input
+  end
+
   def prepare_input
+    unless File.pipe?(STDIN)
+      STDERR.puts("Error: No effective input. You need to give any input via the STDIN.")
+      exit(false)
+    end
+    @input = $stdin.readlines.join("\n")
     tokenize
     @input.strip!
   end
@@ -122,11 +131,4 @@ class TinyClassifierBase
     end
     @input = terms.join(" ").strip
   end
-
-  def save
-    data = Marshal.dump(classifier)
-    File.open(data_file_path, "w") do |file|
-      file.write(data)
-    end
-  end
 end

data/lib/tiny-classifier/classifier.rb

@@ -21,20 +21,17 @@ class Classifier < TinyClassifierBase
       argv ||= ARGV.dup
       classifier = new
       classifier.parse_command_line_options(argv)
-      input = $stdin.readlines.join("\n")
-      classifier.run(input: input)
+      classifier.run
     end
   end
 
   def run(params)
     @label = params[:label]
-    @input = params[:input]
-    prepare_input
-    if @input.empty?
+    if input.empty?
       STDERR.puts("Error: No effective input.")
       false
     else
-      label = classifier.classify(@input)
+      label = classifier.classify(input)
       puts label.downcase
       true
     end

data/lib/tiny-classifier/trainer.rb

@@ -21,9 +21,7 @@ class Trainer < TinyClassifierBase
       argv ||= ARGV.dup
       trainer = new
       *labels = trainer.parse_command_line_options(argv)
-      input = $stdin.readlines.join("\n")
-      trainer.run(label: labels.first,
-                  input: input)
+      trainer.run(label: labels.first)
     end
   end
 
@@ -34,14 +32,12 @@ class Trainer < TinyClassifierBase
 
   def run(params)
     @label = params[:label]
-    @input = params[:input]
     prepare_label
-    prepare_input
-    if @input.empty?
+    if input.empty?
       STDERR.puts("Error: No effective input.")
       false
     else
-      classifier.send("train_#{@label}", @input)
+      classifier.send("train_#{@label}", input)
       save
       true
     end

data/tiny-classifier.gemspec

@@ -21,7 +21,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
 
 Gem::Specification.new do |spec|
   spec.name = "tiny-classifier"
-  spec.version = "1.1"
+  spec.version = "1.2"
   spec.homepage = "https://github.com/piroor/tiny-classifier"
   spec.authors = ["YUKI \"Piro\" Hiroshi"]
   spec.email = ["piro.outsider.reflex@gmail.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny-classifier
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - YUKI "Piro" Hiroshi