fix issue #5

Author: andrew2net

.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 *.swp
+.vscode/

.rspec

@@ -0,0 +1 @@
+--require spec_helper

Gemfile

@@ -1 +1,3 @@
 source 'https://rubygems.org'
+
+gemspec

Gemfile.lock

@@ -0,0 +1,42 @@
+PATH
+  remote: .
+  specs:
+    interscript (0.9)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    debase (0.2.4.1)
+      debase-ruby_core_source (>= 0.10.2)
+    debase-ruby_core_source (0.10.7)
+    diff-lcs (1.3)
+    rake (12.3.3)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    ruby-debug-ide (0.7.0)
+      rake (>= 0.8.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.0)
+  debase
+  interscript!
+  rake (~> 12.0)
+  rspec
+  ruby-debug-ide
+
+BUNDLED WITH
+   2.0.1

bin/interscript

@@ -5,18 +5,16 @@ require_relative '../lib/interscript'
 if ARGV.empty?
   puts "write source file, source format, and output file"
 else
-  args = Hash[ ARGV.flat_map{|s| s.scan(/--?([^=\s]+)(?:=(\S+))?/) } ]
+  args = Hash[ARGV.flat_map { |s| s.scan(/--?([^=\s]+)(?:=(\S+))?/) }]
   input = ARGV[0]
   system_code = args["system"]
   output_file = args["output"]
 
   raise "Please enter the system code with --system={system_code}" unless system_code
 
   if output_file
-    Interscript.instance.transliterate_file(system_code, input, output_file)
+    Interscript.transliterate_file(system_code, input, output_file)
   else
-    puts Interscript.instance.transliterate(system_code, IO.read(input))
+    puts Interscript.transliterate(system_code, IO.read(input))
   end
 end
-
-

bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

interscript.gemspec

@@ -20,7 +20,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   spec.bindir = 'bin'
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "debase"
+  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "ruby-debug-ide"
 end

lib/interscript.rb

@@ -1,53 +1,39 @@
-require 'yaml'
-require 'singleton'
+# frozen_string_literal: true
 
-class Interscript
-  include Singleton
-  
-  SYSTEM_DEFINITIONS_PATH = File.expand_path('../../maps', __FILE__)
+require 'yaml'
 
-  def initialize
-    @systems = {}
-  end
+# Transliteration
+module Interscript
+  SYSTEM_DEFINITIONS_PATH = File.expand_path('../maps', __dir__)
 
-  def transliterate_file(system_code, input_file, output_file)
-    input = File.read(input_file)
-    output = transliterate(system_code, input)
+  class << self
+    def transliterate_file(system_code, input_file, output_file)
+      input = File.read(input_file)
+      output = transliterate(system_code, input)
 
-    File.open(output_file, "w") do |f|
-      f.puts(output)
+      File.open(output_file, "w") do |f|
+        f.puts(output)
+      end
+      puts "Output written to: #{output_file}"
     end
-    puts "Output written to: #{output_file}"
-  end
-
-  def load_system_definition(system_code)
-    @systems[system_code] ||= YAML.load_file(File.join(SYSTEM_DEFINITIONS_PATH, "#{system_code}.yaml"))
-  end
-
-  def get_system(system_code)
-    @systems[system_code]
-  end
 
-  def system_char_map(system_code)
-    get_system(system_code)["map"]["characters"]
-  end
-
-  def system_rules(system_code)
-    get_system(system_code)["map"]["rules"]
-  end
+    def load_system_definition(system_code)
+      YAML.load_file(File.join(SYSTEM_DEFINITIONS_PATH, "#{system_code}.yaml"))
+    end
 
-  def transliterate(system_code, string)
-    load_system_definition(system_code)
+    def transliterate(system_code, string)
+      system = load_system_definition(system_code)
 
-    # TODO: also need to support regular expressions via system_rules(system_code), before system_char_map
+      rules = system["map"]["rules"] || []
+      charmap = system["map"]["characters"] || {}
 
-    character_map = system_char_map(system_code)
+      rules.each do |r|
+        string.gsub! %r{#{r["pattern"]}}, r["result"]
+      end
 
-    string.split('').map do |char|
-      converted_char = character_map[char] ? character_map[char] : char
-      string[char] = converted_char
-    end.join('')
+      string.split('').map do |char|
+        charmap[char] || char
+      end.join('')
+    end
   end
-
 end
-

maps/bgnpcgn-rus-Cyrl-Latn-1947.yaml

@@ -153,17 +153,17 @@ tests:
 
 map:
   rules:
-    - pattern: "/([ЄФІЦАаЕеИиЙйОоУуЫыЮюЯяії])\u0415/"
+    - pattern: ([ЄФІЦАаЕеИиЙйОоУуЫыЮюЯяії])\u0415
       result: "\\1YE"
-    - pattern: "/^\u0415/"
-      result: "YE"
-    - pattern: "/([йьъ])\u0415/"
+    - pattern: \b\u0415
+      result: YE
+    - pattern: ([йьъ])\u0415
       result: "\\1YE"
-    - pattern: "/([ЄФІЦАаЕеИиЙйОоУуЫыЮюЯяії])\u0435/"
+    - pattern: ([ЄФІЦАаЕеИиЙйОоУуЫыЮюЯяії])\u0435
       result: "\\1ye"
-    - pattern: "/^\u0435/"
-      result: "ye"
-    - pattern: "/([йьъ])\u0435/"
+    - pattern: \b\u0435
+      result: ye
+    - pattern: ([йьъ])\u0435
       result: "\\1ye"
 
   characters:
@@ -198,7 +198,7 @@ map:
     "\u042b": "Y"
     "\u042c": "\u2019"
     "\u042d": "E"
-    "\u042e": "Y"
+    "\u042e": "Yu"
     "\u042f": "Ya"
     "\u0430": "a"
     "\u0431": "b"
@@ -218,7 +218,7 @@ map:
     "\u0440": "r"
     "\u0441": "s"
     "\u0442": "t"
-    "\u0443": ""
+    "\u0443": "u"
     "\u0444": "f"
     "\u0445": "kh"
     "\u0446": "ts"
@@ -229,5 +229,5 @@ map:
     "\u044b": "y"
     "\u044c": "\u2019"
     "\u044d": "e"
-    "\u044e": "y"
+    "\u044e": "yu"
     "\u044f": "ya"

spec/interscript_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+RSpec.describe Interscript do
+  it "converts rus using bgnpcgn-rus-Cyrl-Latn-1947" do
+    system = YAML.load_file "maps/bgnpcgn-rus-Cyrl-Latn-1947.yaml"
+    system["tests"].each do |test|
+      result = Interscript.transliterate "bgnpcgn-rus-Cyrl-Latn-1947", test["source"]
+      expect(result).to eq test["expected"]
+    end
+  end
+end