greeklish_iso843 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d4c26155ee5e66d06b9a44cc5a452bcac2ed78a9f5ed889c6ec9540a9fc5853
-  data.tar.gz: 22c733cff1a29127b39a36ca69caa9cd73d96b6e55009ebb017d0fa517484d01
+  metadata.gz: e5b8b86245593bbc327610d0bf977b6c148278bdf9f3dbdd35669235ae0eba94
+  data.tar.gz: 75207253c6b33972822551a7408b803cc8e5456067366f36ca919cc1b8b170aa
 SHA512:
-  metadata.gz: 46c846c9b550c56a8530c232bc4db7d1eb561484d716758e62a23a4dd50956f63a29df91c99410ef7f9b4028f315660c42b21e4607b5200f3a9ea254dd2a2cc2
-  data.tar.gz: 802ac4eef5af569b492991de5316e7390cf2377acd05d04f3dbcacc8b0adba528d9835be250fd34b64231c9d7ef2917e9f6e614c22cb2289e9fae3b6f886417d
+  metadata.gz: 7e440ef3f49da6b2ac6a19c54d7d271a4c6431ea48fb40eb0fa0f7503ab08b6b02cb997f03e86b40e1b30b35c42b99e95b901c22892b0d7303c57fd6b1711681
+  data.tar.gz: a8c1fa769ad472322100822b08466355e5b2a921fe36f22f78fff159018f9ddf4a925ff853a857d158933b14a8415055154a434e87c2aa482d8fc64ff600f7c5

data/CHANGELOG.md

@@ -7,6 +7,15 @@ The format is based on [Keep a Changelog][] and this project adheres to
 
 ## [Unreleased][]
 
+## [0.4.0][] - 2021-04-28
+
+### Changed
+
+- Return match as-is if it cannot be handled instead of crashing
+- Raise `UnhandledCaseError` in case of an unhandled case when converting pair
+  for υ or φ (should never happen)
+- Rewrite a significant part of the code to make it more readable
+
 ## [0.3.0][] - 2021-03-06
 
 ### Changed
@@ -34,4 +43,5 @@ Initial release.
 [Semantic Versioning]: http://semver.org/spec/v2.0.0.html
 [0.2.0]: https://github.com/agorf/greeklish_iso843/compare/0.1.0...0.2.0
 [0.3.0]: https://github.com/agorf/greeklish_iso843/compare/0.2.0...0.3.0
-[Unreleased]: https://github.com/agorf/greeklish_iso843/compare/0.3.0...HEAD
+[0.4.0]: https://github.com/agorf/greeklish_iso843/compare/0.3.0...0.4.0
+[Unreleased]: https://github.com/agorf/greeklish_iso843/compare/0.4.0...HEAD

data/README.md

@@ -66,7 +66,8 @@ verbose output.
 
 ## Acknowledgements
 
-This library was based on [an official, buggy implementation in JavaScript][js].
+This library was initially based on [an official, buggy implementation in
+JavaScript][js].
 
 [js]: http://www.passport.gov.gr/passports/GrElotConverter/GrElotConverter.html
 

data/lib/greeklish_iso843/greek_text.rb

@@ -5,8 +5,12 @@ class GreeklishIso843::GreekText
 
   GREEK_VOWELS = 'αάεέηήιίϊΐοόυύϋΰωώ'.freeze
 
+  PAIRS_FOR_V_OR_F = %w[αυ αύ ευ εύ ηυ ηύ].freeze
+
   GREEK_LETTERS_AFTER_V = "#{GREEK_VOWELS}βγδζλμνρ".freeze
 
+  GREEK_LETTERS_AFTER_F = 'θκξπστφχψ'.freeze
+
   REPLACEMENTS = {
     'αι' => 'ai',
     'αί' => 'ai',
@@ -68,7 +72,11 @@ class GreeklishIso843::GreekText
     'ώ' => 'o'
   }.freeze
 
-  REPLACEMENTS_REGEXP = /#{REPLACEMENTS.keys.join('|')}/i.freeze
+  REPLACEMENT_KEYS_REGEXP = /#{REPLACEMENTS.keys.join('|')}/i.freeze
+
+  class Error < StandardError; end
+
+  class UnhandledCaseError < Error; end
 
   attr_reader :text
 
@@ -81,66 +89,73 @@ class GreeklishIso843::GreekText
   end
 
   def to_greeklish
-    text.gsub(REPLACEMENTS_REGEXP) do |match|
-      match_data = Regexp.last_match
-      next_char = match_data.post_match[0]&.downcase
-      greeklish = REPLACEMENTS[match.downcase]
-      greek = match
-
-      if greeklish
-        greek = match + next_char.to_s
-      else
-        greeklish = convert_to_greeklish(match, match_data, next_char)
-      end
-
-      fix_case(greeklish, greek)
+    text.gsub(REPLACEMENT_KEYS_REGEXP) do |match|
+      greeklish = REPLACEMENTS[match.downcase] ||
+        convert_pair(match, Regexp.last_match)
+
+      next match if greeklish.nil? # Unhandled case. Return as-is.
+
+      fix_case(greeklish, match)
     end
   end
 
-  private def capitalized?(text)
-    GREEK_UPPER[text[0]]
-  end
+  private def convert_pair(match, match_data)
+    return 'ts' if match.casecmp?('τς')
 
-  private def lowercase_char?(char)
-    GREEK_LOWER[char]
+    next_char = match_data.post_match[0]&.downcase
+
+    if match.casecmp?('μπ')
+      prev_char = match_data.pre_match[-1]&.downcase
+      return convert_mp_or_b(prev_char, next_char)
+    end
+
+    if PAIRS_FOR_V_OR_F.any? { |pair| match.casecmp?(pair) }
+      return convert_pair_for_v_or_f(match, next_char)
+    end
+
+    match # Unhandled case. Return as-is.
   end
 
-  private def fix_case(greeklish, greek)
-    return greeklish if !capitalized?(greek[0])
+  private def fix_case(greeklish, match)
+    return greeklish if !uppercase?(match[0])
 
-    if greek.length == 1 || capitalized?(greek[1])
+    if match.size == 1 || uppercase?(match[1])
       greeklish.upcase
     else
-      greeklish[0].upcase + greeklish[1..-1]
+      greeklish[0].upcase + greeklish[1].to_s
     end
   end
 
   private def convert_mp_or_b(prev_char, next_char)
-    if prev_char && lowercase_char?(prev_char) && # *μπ
-        next_char && lowercase_char?(next_char) # and μπ*
+    if prev_char && lowercase?(prev_char) && # *μπ
+        next_char && lowercase?(next_char) # and μπ*
       'mp'
     else # μπ* or *μπ
       'b'
     end
   end
 
-  private def convert_v_or_f(next_char)
-    if next_char && GREEK_LETTERS_AFTER_V[next_char]
-      'v'
-    else
-      'f'
+  private def convert_pair_for_v_or_f(match, next_char)
+    v_or_f = convert_v_or_f(next_char)
+
+    if v_or_f.nil?
+      raise UnhandledCaseError # Should never happen
     end
+
+    REPLACEMENTS[match[0].downcase] + v_or_f
   end
 
-  private def convert_to_greeklish(match, match_data, next_char)
-    return 'ts' if match.casecmp?('τς')
+  private def uppercase?(char)
+    GREEK_UPPER[char]
+  end
 
-    if match.casecmp?('μπ')
-      prev_char = match_data.pre_match[-1]&.downcase
-      return convert_mp_or_b(prev_char, next_char)
-    end
+  private def lowercase?(char)
+    GREEK_LOWER[char]
+  end
+
+  private def convert_v_or_f(next_char)
+    return 'f' if next_char.nil? || GREEK_LETTERS_AFTER_F[next_char]
 
-    # αυ αύ ευ εύ ηυ ηύ
-    REPLACEMENTS[match[0].downcase] + convert_v_or_f(next_char)
+    'v' if GREEK_LETTERS_AFTER_V[next_char]
   end
 end

data/lib/greeklish_iso843/version.rb

@@ -1,3 +1,3 @@
 module GreeklishIso843
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greeklish_iso843
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Angelos Orfanakos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-06 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: rubygems@angelos.dev