tiny-classifier 2.1 → 2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eb179e8a3a17711921f6bd0af6132909ace2f90
-  data.tar.gz: 2f029f934ddb3f5277980228800fa24093491bab
+  metadata.gz: 9e7e246aa9446d56c68ea631b0c2dda4bd0fb506
+  data.tar.gz: 42f9c4ca23ca91a6d2e9e2121d7eb860ded738c5
 SHA512:
-  metadata.gz: 9ecc0831b783aed6891e09fe73260f0eef63f021e450bf4db89cea267b4797cffade8f74b05530a058646d77ca1265a24ea7287e6754e132ec1e724d0ae21611
-  data.tar.gz: aa5e0822ebcbc19b5497f1596be44b3b01e0fe184903d8b111fa9eae635f5bfd8c94ed34bda5a98658514cf10d185806abbd0eb12a124beba92943750bf107a0
+  metadata.gz: 3964e9cc15c6c7a4e6f49a6a7e945f3596c863169c812303293ca1c92a66407a0d96bd6abc3e4a521fa40eca524eece08bb98315521cedfe1fc816e599af80fe
+  data.tar.gz: 0fb9acbac0b1fc12fa72381af63085f7bf2f1aef6674ecfced6ebf6d0645a7ca274d27ae708ce6ea26f85f54fefb66ccd6b1fe2b5e0ff6c3308d30257b489c75

data/Rakefile

@@ -26,3 +26,8 @@ end
 
 helper.install
 spec = helper.gemspec
+
+desc "Run tests"
+task :test do
+  ruby("test/run-test.rb")
+end

data/bin/tc-classify

@@ -15,6 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "tiny-classifier/classifier"
+require "tiny-classifier/command/classify"
 
-TinyClassifier::Classifier.run
+TinyClassifier::Command::Classify.run

data/bin/tc-generate-classifier

@@ -15,6 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "tiny-classifier/classifier-generator"
+require "tiny-classifier/command/generate-classifier"
 
-TinyClassifier::ClassifierGenerator.run
+TinyClassifier::Command::GenerateClassifier.run

data/bin/tc-retrain

@@ -15,6 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "tiny-classifier/retrainer"
+require "tiny-classifier/command/retrain"
 
-TinyClassifier::Retrainer.run
+TinyClassifier::Command::Retrain.run

data/bin/tc-train

@@ -15,6 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "tiny-classifier/trainer"
+require "tiny-classifier/command/train"
 
-TinyClassifier::Trainer.run
+TinyClassifier::Command::Train.run

data/bin/tc-untrain

@@ -15,6 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "tiny-classifier/untrainer"
+require "tiny-classifier/command/untrain"
 
-TinyClassifier::Untrainer.run
+TinyClassifier::Command::Untrain.run

data/lib/tiny-classifier/category-manager.rb

@@ -0,0 +1,61 @@
+# Copyright (C) 2017 YUKI "Piro" Hiroshi
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module TinyClassifier
+  class CategoryManager
+    attr_reader :chosen
+
+    def initialize(categories)
+      @categories = categories.strip.split(",")
+      normalize_all
+      clanup
+    end
+
+    def all
+      @categories
+    end
+
+    def valid?(category)
+      category = normalize(category)
+      @categories.include?(category)
+    end
+
+    def basename
+      @categories.join("-").downcase
+    end
+
+    def normalize(category)
+      category
+        .downcase
+        .strip
+        .capitalize
+    end
+
+    private
+    def normalize_all
+      @categories.collect! do |category|
+        normalize(category)
+      end
+    end
+
+    def clanup
+      @categories.reject! do |category|
+          category.empty?
+      end
+      @categories.uniq!
+      @categories.sort!
+    end
+  end
+end

data/lib/tiny-classifier/command/base.rb

@@ -0,0 +1,162 @@
+# Copyright (C) 2017 YUKI "Piro" Hiroshi
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "pathname"
+require "optparse"
+require "classifier-reborn"
+require "tiny-classifier/tokenizer"
+require "tiny-classifier/category-manager"
+require "tiny-classifier/input"
+require "tiny-classifier/errors"
+
+module TinyClassifier
+  module Command
+    class Base
+      class << self
+        def run(argv=nil)
+          argv ||= ARGV.dup
+          command = new(argv)
+          command.run
+        end
+      end
+
+      attr_reader :tokenizer
+      attr_writer :classifier
+
+      def initialize(argv=[])
+        @categories = nil
+        @tokenizer = Tokenizer.new
+        @data_dir = Dir.pwd
+        @verbose = false
+      end
+
+      def run
+        raise NoCategories.new unless @categories
+      end
+
+      def parse_command_line_options(command_line_options)
+        option_parser.parse!(command_line_options)
+      end
+
+      def classifier
+        @classifier ||= prepare_classifier
+      end
+
+      def data_file_name
+        "tc.#{@categories.basename}.dat"
+      end
+
+      def data_file_path
+        @data_file_path ||= prepare_data_file_path
+      end
+
+      private
+      def option_parser
+        @option_parser ||= create_option_parser
+      end
+
+      def create_option_parser
+        parser = OptionParser.new
+
+        parser.on("-d PATH", "--data-dir=PATH",
+                  "Path to the directory to store training data file (default=current directory)") do |data_dir|
+          @data_dir = data_dir
+        end
+
+        parser.on("-c CATEGORIES", "--categories=CATEGORIES",
+                  "List of categories (comma-separated)") do |categories|
+          @categories = CategoryManager.new(categories)
+        end
+
+        parser.on("-t TOKENIZER", "--tokenizer=TOKENIZER",
+                  "Tokenizer (default=#{@tokenizer})") do |tokenizer|
+          @tokenizer.type = tokenizer
+        end
+
+        parser.on("-v", "--verbose",
+                  "Output internal information (for debugging)") do |verbose|
+          @verbose = verbose
+        end
+
+        parser
+      end
+
+      def prepare_data_file_path
+        path = Pathname(@data_dir)
+        path += data_file_name
+        log("file: #{path}")
+        path
+      end
+
+      def prepare_classifier
+        if data_file_path.exist?
+          data = File.read(data_file_path.to_s)
+          Marshal.load(data)
+        else
+          ClassifierReborn::Bayes.new(*@categories.all)
+        end
+      end
+
+      def save
+        data = Marshal.dump(classifier)
+        File.open(data_file_path, "w") do |file|
+          file.write(data)
+        end
+      end
+
+      def input
+        @input ||= prepare_input
+      end
+
+      def prepare_input
+        input = Input.new
+        raise NoInput.new unless input.given?
+        tokenized = @tokenizer.tokenize(input.read)
+        log("tokenizer: #{@tokenizer.type}")
+        log("tokenized: #{tokenized}")
+        tokenized
+      end
+
+      def prepare_category(category)
+        raise NoCategory.new unless category
+
+        category = @categories.normalize(category)
+
+        unless @categories.valid?(category)
+          raise InvalidCategory.new(category, @categories.all)
+        end
+        category
+      end
+
+      def handle_error(error)
+        case error
+        when TinyClassifierError
+          error(error.message)
+        else
+          error(error.inspect)
+        end
+        false
+      end
+
+      def error(message)
+        $stderr.puts(message)
+      end
+
+      def log(message)
+        $stderr.puts(message) if @verbose
+      end
+    end
+  end
+end

data/lib/tiny-classifier/{classifier.rb → command/classify.rb}

@@ -13,29 +13,26 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "tiny-classifier/base"
+require "tiny-classifier/command/base"
 
 module TinyClassifier
-  class Classifier < Base
-    class << self
-      def run(argv=nil)
-        argv ||= ARGV.dup
-        classifier = new
-        classifier.parse_command_line_options(argv)
-        classifier.run
+  module Command
+    class Classify < Base
+      def initialize(argv=[])
+        super
+        parse_command_line_options(argv)
       end
-    end
 
-    attr_writer :classifier
+      def run
+        super
+        raise NoEffectiveInput.new if input.empty?
+        raise NoTrainingData.new(data_file_path) unless data_file_path.exist?
 
-    def run
-      if input.empty?
-        error("Error: No effective input.")
-        false
-      else
         category = classifier.classify(input)
-        puts category.downcase
+        $stdout.puts(category.downcase)
         true
+      rescue StandardError => error
+        handle_error(error)
       end
     end
   end

data/lib/tiny-classifier/command/generate-classifier.rb

@@ -0,0 +1,88 @@
+# Copyright (C) 2017 YUKI "Piro" Hiroshi
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "tiny-classifier/command/base"
+require "fileutils"
+require "base64"
+
+module TinyClassifier
+  module Command
+    class GenerateClassifier < Base
+      def initialize(argv=[])
+        super
+
+        @output_dir = Dir.pwd
+        option_parser.on("-o PATH", "--output-dir=PATH",
+                         "Path to the classifier command to be saved (default=current directory)") do |output_dir|
+          @output_dir = output_dir
+        end
+
+        parse_command_line_options(argv)
+      end
+  
+      def run
+        super
+        unless data_file_path.exist?
+          raise NoTrainingData.new(data_file_path)
+        end
+        unless prepare_output_file_path.parent.exist?
+          raise InvalidOutputDir.new(prepare_output_file_path.parent)
+        end
+
+        FileUtils.mkdir_p(output_file_path.parent)
+        File.open(output_file_path, "w") do |file|
+          file.puts("#!/usr/bin/env ruby")
+          file.puts("require \"base64\"")
+          file.puts("require \"classifier-reborn\"")
+          file.puts("require \"tiny-classifier/command/classify\"")
+          file.puts("classifier_code = Base64.strict_decode64(\"#{encoded_classifier}\")")
+          file.puts("command = TinyClassifier::Command::Classify.new([")
+          file.puts("  \"--categories=#{@categories.all.join(",")}\",")
+          file.puts("  \"--tokenizer=#{@tokenizer.type}\",")
+          file.puts("])")
+          file.puts("command.classifier = Marshal.load(classifier_code)")
+          file.puts("command.run")
+        end
+        FileUtils.chmod("a+x", output_file_path)
+        true
+      rescue StandardError => error
+        handle_error(error)
+      end
+
+      def classifier_name
+        @classifier_name ||= "tc-classify-#{@categories.basename}"
+      end
+
+      def output_file_path
+        @output_file_path ||= prepare_output_file_path
+      end
+
+      private
+      def encoded_classifier
+        @encoded_classifier ||= prepare_encoded_classifier
+      end
+  
+      def prepare_encoded_classifier
+        classifier_code = Marshal.dump(classifier)
+        Base64.strict_encode64(classifier_code)
+      end
+  
+      def prepare_output_file_path
+        path = Pathname(@output_dir)
+        path + classifier_name
+      end
+    end
+  end
+end

data/lib/tiny-classifier/command/retrain.rb

@@ -0,0 +1,75 @@
+# Copyright (C) 2017 YUKI "Piro" Hiroshi
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "tiny-classifier/command/train"
+
+module TinyClassifier
+  module Command
+    class Retrain < Base
+      def initialize(argv=[])
+        super
+        option_parser.banner += " WRONG CORRECT"
+        *categories = parse_command_line_options(argv)
+        @wrong_category = categories.shift
+        @correct_category = categories.shift
+      end
+
+      def run
+        super
+        prepare_categories
+        raise NoEffectiveInput.new if input.empty?
+        raise NoTrainingData.new(data_file_path) unless data_file_path.exist?
+
+        classifier.untrain(@wrong_category, input)
+        classifier.train(@correct_category, input)
+        save
+        true
+      rescue StandardError => error
+        handle_error(error)
+      end
+
+      private
+      def prepare_categories
+        begin
+          @wrong_category = prepare_category(@wrong_category)
+        rescue StandardError => error
+          case error
+          when NoCategory
+            raise NoWrongCategory.new
+          when InvalidCategory
+            raise InvalidWrongCategory.new(@wrong_category, @categories.all)
+          else
+            raise error
+          end
+        end
+
+        begin
+          @correct_category = prepare_category(@correct_category)
+        rescue StandardError => error
+          case error
+          when NoCategory
+            raise NoCorrectCategory.new
+          when InvalidCategory
+            raise InvalidCorrectCategory.new(@correct_category, @categories.all)
+          else
+            raise error
+          end
+        end
+
+        log("training as: #{@wrong_category} => #{@correct_category}")
+      end
+    end
+  end
+end

data/lib/tiny-classifier/{retrainer.rb → command/train.rb}

@@ -13,33 +13,29 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "tiny-classifier/trainer"
+require "tiny-classifier/command/base"
 
 module TinyClassifier
-  class Retrainer < Trainer
-    class << self
-      def run(argv=nil)
-        argv ||= ARGV.dup
-        retrainer = new
-        *categories = retrainer.parse_command_line_options(argv)
-        retrainer.run(wrong: categories[0],
-                      correct: categories[1])
+  module Command
+    class Train < Base
+      def initialize(argv=[])
+        super
+        option_parser.banner += " CATEGORY"
+        *categories = parse_command_line_options(argv)
+        @category = categories.first
       end
-    end
 
-    def run(params)
-      if input.empty?
-        error("Error: No effective input.")
-        false
-      else
-        @category = params[:wrong]
-        prepare_category
-        classifier.send("untrain_#{@category}", input)
-        @category = params[:correct]
-        prepare_category
-        classifier.send("train_#{@category}", input)
+      def run
+        super
+        @category = prepare_category(@category)
+        log("training as: #{@category}")
+        raise NoEffectiveInput.new if input.empty?
+
+        classifier.train(@category, input)
         save
         true
+      rescue StandardError => error
+        handle_error(error)
       end
     end
   end

data/lib/tiny-classifier/command/untrain.rb

@@ -0,0 +1,43 @@
+# Copyright (C) 2017 YUKI "Piro" Hiroshi
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "tiny-classifier/command/base"
+
+module TinyClassifier
+  module Command
+    class Untrain < Base
+      def initialize(argv=[])
+        super
+        option_parser.banner += " CATEGORY"
+        *categories = parse_command_line_options(argv)
+        @category = categories.first
+      end
+
+      def run
+        super
+        @category = prepare_category(@category)
+        log("untraining as: #{@category}")
+        raise NoEffectiveInput.new if input.empty?
+        raise NoTrainingData.new(data_file_path) unless data_file_path.exist?
+
+        classifier.untrain(@category, input)
+        save
+        true
+      rescue StandardError => error
+        handle_error(error)
+      end
+    end
+  end
+end

data/lib/tiny-classifier/errors.rb

@@ -0,0 +1,104 @@
+# Copyright (C) 2017 YUKI "Piro" Hiroshi
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module TinyClassifier
+  class TinyClassifierError < StandardError
+  end
+
+  class NoInput < TinyClassifierError
+    def message
+      "No input. You need to give any input via the STDIN."
+    end
+  end
+
+  class NoEffectiveInput < TinyClassifierError
+    def message
+      "No effective input."
+    end
+  end
+
+  class NoCategories < TinyClassifierError
+    def message
+      "You need to specify categories."
+    end
+  end
+
+  class NoCategory < TinyClassifierError
+    def message
+      "You need to specify a category for the input."
+    end
+  end
+
+  class NoWrongCategory < NoCategory
+    def message
+      "You need to specify a category to untrain the input."
+    end
+  end
+
+  class NoCorrectCategory < NoCategory
+    def message
+      "You need to specify a category to retrain the input."
+    end
+  end
+
+  class InvalidCategory < TinyClassifierError
+    attr_reader :category, :categories
+
+    def initialize(category, categories)
+      @category = category
+      @categories = categories
+    end
+
+    def message
+      "You need to specify one of valid categories: #{@categories.join(", ")}"
+    end
+  end
+
+  class InvalidWrongCategory < InvalidCategory
+    def message
+      "You need to specify one of valid categories to untrain: #{@categories.join(", ")}"
+    end
+  end
+
+  class InvalidCorrectCategory < InvalidCategory
+    def message
+      "You need to specify one of valid categories to retrain: #{@categories.join(", ")}"
+    end
+  end
+
+  class NoTrainingData < TinyClassifierError
+    attr_reader :data_dir
+
+    def initialize(data_dir)
+      @data_dir = data_dir
+    end
+
+    def message
+      "There is no training data at #{@data_dir}."
+    end
+  end
+
+  class InvalidOutputDir < TinyClassifierError
+    attr_reader :output_dir
+
+    def initialize(output_dir)
+      @output_dir = output_dir
+    end
+
+    def message
+      "#{@output_dir} is not available as the output directory."
+    end
+  end
+end

data/lib/tiny-classifier/{untrainer.rb → input.rb}

@@ -13,21 +13,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "tiny-classifier/trainer"
-
 module TinyClassifier
-  class Untrainer < Trainer
-    def run(params)
-      @category = params[:category]
-      prepare_category
-      if input.empty?
-        error("Error: No effective input.")
-        false
-      else
-        classifier.send("untrain_#{@category}", input)
-        save
-        true
-      end
+  class Input
+    def initialize(data = nil)
+      @data = data
+    end
+
+    def given?
+      return true if @data or $stdin.is_a?(StringIO)
+      File.pipe?(STDIN)
+    end
+
+    def read
+      @data ||= $stdin.readlines.join(" ").strip
     end
   end
 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 = "2.1"
+  spec.version = "2.2"
   spec.homepage = "https://github.com/piroor/tiny-classifier"
   spec.authors = ["YUKI \"Piro\" Hiroshi"]
   spec.email = ["piro.outsider.reflex@gmail.com"]
@@ -39,4 +39,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("classifier-reborn")
   spec.add_runtime_dependency("natto")
+
+  spec.add_development_dependency("bundler")
+  spec.add_development_dependency("rake")
+  spec.add_development_dependency("test-unit")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny-classifier
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: '2.2'
 platform: ruby
 authors:
 - YUKI "Piro" Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: classifier-reborn
@@ -38,15 +38,57 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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: rake
+  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: test-unit
+  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: ''
 email:
 - piro.outsider.reflex@gmail.com
 executables:
-- tc-classify
 - tc-generate-classifier
+- tc-untrain
 - tc-retrain
 - tc-train
-- tc-untrain
+- tc-classify
 extensions: []
 extra_rdoc_files: []
 files:
@@ -58,13 +100,16 @@ files:
 - bin/tc-retrain
 - bin/tc-train
 - bin/tc-untrain
-- lib/tiny-classifier/base.rb
-- lib/tiny-classifier/classifier-generator.rb
-- lib/tiny-classifier/classifier.rb
-- lib/tiny-classifier/retrainer.rb
+- lib/tiny-classifier/category-manager.rb
+- lib/tiny-classifier/command/base.rb
+- lib/tiny-classifier/command/classify.rb
+- lib/tiny-classifier/command/generate-classifier.rb
+- lib/tiny-classifier/command/retrain.rb
+- lib/tiny-classifier/command/train.rb
+- lib/tiny-classifier/command/untrain.rb
+- lib/tiny-classifier/errors.rb
+- lib/tiny-classifier/input.rb
 - lib/tiny-classifier/tokenizer.rb
-- lib/tiny-classifier/trainer.rb
-- lib/tiny-classifier/untrainer.rb
 - tiny-classifier.gemspec
 homepage: https://github.com/piroor/tiny-classifier
 licenses:

data/lib/tiny-classifier/base.rb

@@ -1,136 +0,0 @@
-# Copyright (C) 2017 YUKI "Piro" Hiroshi
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-require "pathname"
-require "optparse"
-require "classifier-reborn"
-require "tiny-classifier/tokenizer"
-
-module TinyClassifier
-  class Base
-    attr_reader :tokenizer
-
-    def initialize
-      @tokenizer = Tokenizer.new
-      @data_dir = Dir.pwd
-      @verbose = false
-    end
-
-    def parse_command_line_options(command_line_options)
-      option_parser.parse!(command_line_options)
-    end
-
-    def classifier
-      @classifier ||= prepare_classifier
-    end
-
-    private
-    def option_parser
-      @option_parser ||= create_option_parser
-    end
-
-    def create_option_parser
-      parser = OptionParser.new
-
-      parser.on("-d PATH", "--data-dir=PATH",
-                "Path to the directory to store training data file (default=current directory)") do |data_dir|
-        @data_dir = data_dir
-      end
-
-      parser.on("-c CATEGORIES", "--categories=CATEGORIES",
-                "List of categories (comma-separated)") do |categories|
-        @categories = normalize_categories(categories)
-        log("categories: #{@categories}")
-      end
-
-      parser.on("-t TOKENIZER", "--tokenizer=TOKENIZER",
-                "Tokenizer (default=#{@tokenizer})") do |tokenizer|
-        @tokenizer.type = tokenizer
-      end
-
-      parser.on("-v", "--verbose",
-                "Output internal information (for debugging)") do |verbose|
-        @verbose = verbose
-      end
-
-      parser
-    end
-
-    def normalize_categories(categories)
-      categories
-        .strip
-        .downcase
-        .split(",")
-        .collect(&:strip)
-        .reject do |category|
-          category.empty?
-        end
-        .sort
-        .collect(&:capitalize)
-    end
-
-    def data_file_name
-      @data_file_basename ||= prepare_data_file_name
-    end
-
-    def prepare_data_file_name
-      categories = @categories.join("-").downcase
-      "tc.#{categories}.dat"
-    end
-
-    def data_file_path
-      @data_file_path ||= prepare_data_file_path
-    end
-
-    def prepare_data_file_path
-      path = Pathname(@data_dir)
-      path + data_file_name
-    end
-
-    def prepare_classifier
-      if data_file_path.exist?
-        data = File.read(data_file_path.to_s)
-        Marshal.load(data)
-      else
-        ClassifierReborn::Bayes.new(*@categories)
-      end
-    end
-
-    def input
-      @input ||= prepare_input
-    end
-
-    def prepare_input
-      unless File.pipe?(STDIN)
-        error("Error: No effective input. You need to give any input via the STDIN.")
-        exit(false)
-      end
-      @input = $stdin.readlines.join(" ")
-      @input = @tokenizer.tokenize(@input)
-      log("tokenizer: #{@tokenizer.type}")
-      @input.strip!
-      log("input: #{@input}")
-      @input
-    end
-
-    def error(message)
-      STDERR.puts(message)
-    end
-
-    def log(message)
-      STDERR.puts(message) if @verbose
-    end
-  end
-end

data/lib/tiny-classifier/classifier-generator.rb

@@ -1,88 +0,0 @@
-# Copyright (C) 2017 YUKI "Piro" Hiroshi
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-require "tiny-classifier/base"
-require "tiny-classifier/classifier"
-require "fileutils"
-require "base64"
-
-module TinyClassifier
-  class ClassifierGenerator < Base
-    class << self
-      def run(argv=nil)
-        argv ||= ARGV.dup
-        generator = new
-        generator.parse_command_line_options(argv)
-        generator.run
-      end
-    end
-
-    def initialize
-      super
-      @output_dir = Dir.pwd
-      option_parser.on("-o PATH", "--output-dir=PATH",
-                       "Path to the classifier command to be saved (default=current directory)") do |output_dir|
-        @output_dir = output_dir
-      end
-    end
-
-    def run
-      File.open(output_file_path, "w") do |file|
-        file.puts("#!/usr/bin/env ruby")
-        file.puts("require \"base64\"")
-        file.puts("require \"classifier-reborn\"")
-        file.puts("require \"tiny-classifier/classifier\"")
-        file.puts("classifier_code = Base64.strict_decode64(\"#{encoded_classifier}\")")
-        file.puts("classifier = TinyClassifier::Classifier.new")
-        file.puts("classifier.classifier = Marshal.load(classifier_code)")
-        file.puts("classifier.tokenizer.type = \"#{@tokenizer.type}\"")
-        file.puts("classifier.run")
-      end
-      FileUtils.chmod("a+x", output_file_path)
-    end
-
-    private
-    def encoded_classifier
-      @encoded_classifier ||= prepare_encoded_classifier
-    end
-
-    def prepare_encoded_classifier
-      classifier = Classifier.new
-      classifier.parse_command_line_options(ARGV.dup)
-      FileUtils.mkdir_p(output_file_path.parent)
-
-      classifier_code = Marshal.dump(classifier.classifier)
-      Base64.strict_encode64(classifier_code)
-    end
-
-    def classifier_name
-      @classifier_name ||= prepare_classifier_name
-    end
-
-    def prepare_classifier_name
-      categories = @categories.join("-").downcase
-      "tc-classify-#{categories}"
-    end
-
-    def output_file_path
-      @output_file_path ||= prepare_output_file_path
-    end
-
-    def prepare_output_file_path
-      path = Pathname(@output_dir)
-      path + classifier_name
-    end
-  end
-end

data/lib/tiny-classifier/trainer.rb

@@ -1,74 +0,0 @@
-# Copyright (C) 2017 YUKI "Piro" Hiroshi
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-require "tiny-classifier/base"
-
-module TinyClassifier
-  class Trainer < Base
-    class << self
-      def run(argv=nil)
-        argv ||= ARGV.dup
-        trainer = new
-        *categories = trainer.parse_command_line_options(argv)
-        trainer.run(category: categories.first)
-      end
-    end
-
-    def initialize
-      super
-      option_parser.banner += " CATEGORY"
-    end
-
-    def run(params)
-      @category = params[:category]
-      prepare_category
-      if input.empty?
-        error("Error: No effective input.")
-        false
-      else
-        classifier.send("train_#{@category}", input)
-        save
-        true
-      end
-    end
-
-    private
-    def prepare_category
-      unless @category
-        error("Error: You need to specify the category for the input.")
-        exit(false)
-      end
-
-      @category = @category.downcase.strip
-
-      if @category.empty?
-        error("Error: You need to specify the category for the input.")
-        exit(false)
-      end
-
-      unless @categories.include?(@category.capitalize)
-        error("Error: You need to specify one of valid categories: #{@categories.join(', ')}")
-        exit(false)
-      end
-    end
-
-    def save
-      data = Marshal.dump(classifier)
-      File.open(data_file_path, "w") do |file|
-        file.write(data)
-      end
-    end
-  end
-end