greeklish_iso843 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8fdabbc41fcf736259cc0635a62ce9e37ea40b0ddca6279da804de77297ff9b
-  data.tar.gz: dd0dc66e47ebacb5e6db56367887b6bc27c37f1a414907a26db1e24e13b6238c
+  metadata.gz: 46b2cbf0c06d497c6304b9c8cad2c85e29723d741c8f83c74dbb3236463ee4a8
+  data.tar.gz: 2b81ed1ae06fd1bee3951879ccc840eedcf0965a17420d63ba10083acb447d50
 SHA512:
-  metadata.gz: d46ed5272f19fe1aae1579e9eb8bc2740c99cb96201f42148d5caccc95f1a72300f7bf4778251e7744f9803230756c09451596ee828fe3d3fde2690d1749e74a
-  data.tar.gz: 7e30e6a280adc1aadc25c30b2afdbf0277fd93f2f156b628faf08f7f934d816a853de8bc140b74717addbb6650fac457dcce9d7421def07ab6c8f6b0c90a5d84
+  metadata.gz: e946eb95e8666400056fa2e5a07cc3a4b3924607bbc6d2f717c9c022013200629bddfa2d09f72d40ce15cd913c1f8fede0e03d63de85d5833729252e8432cf3d
+  data.tar.gz: b705856436f156c99fb14c316054a2d9d65b953e82acfab9daaeeb61a0dcca8583861c70e222e9264b938f599456408e92d1782916fae62e4f8cea64b997df31

data/CHANGELOG.md

@@ -7,11 +7,26 @@ The format is based on [Keep a Changelog][] and this project adheres to
 
 ## [Unreleased][]
 
+## [0.4.2][] - 2021-05-29
+
+### Changed
+
+- Do not raise `UnhandledCaseError` if next character is a symbol when
+  converting a pair that ends with `υ` to `v` or `f`. For example, `άνευ` would
+  correctly transliterate to `anef` but `άνευ.` would raise due to `.` at the
+  end.
+- Fix case for leading `Θ`, `Χ` and `Ψ` when the word is capitalized. For
+  example, `ψάθα` would correctly transliterate to `psatha`, but `Ψάθα` would
+  incorrectly transliterate to `PSatha`. Now it is transliterated to `Psatha`.
+
 ## [0.4.1][] - 2021-04-29
 
+### Changed
+
 - Do not raise `UnhandledCaseError` if next character is whitespace when
-  converting v or f. For example, `άνευ` would correctly transliterate to `anef`
-  but `άνευ λόγου` would raise due to the whitespace after `ευ`.
+  converting a pair that ends with `υ` to `v` or `f`. For example, `άνευ` would
+  correctly transliterate to `anef` but `άνευ λόγου` would raise due to the
+  whitespace after `ευ`.
 
 ## [0.4.0][] - 2021-04-28
 
@@ -50,4 +65,6 @@ Initial release.
 [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
 [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
+[0.4.1]: https://github.com/agorf/greeklish_iso843/compare/0.4.0...0.4.1
+[0.4.2]: https://github.com/agorf/greeklish_iso843/compare/0.4.1...0.4.2
+[Unreleased]: https://github.com/agorf/greeklish_iso843/compare/0.4.2...HEAD

data/lib/greeklish_iso843/greek_text.rb

@@ -11,8 +11,6 @@ class GreeklishIso843::GreekText
 
   GREEK_LETTERS_AFTER_F = 'θκξπστφχψ'.freeze
 
-  BLANK_REGEXP = /\A[[:space:]]*\z/.freeze
-
   REPLACEMENTS = {
     'αι' => 'ai',
     'αί' => 'ai',
@@ -97,7 +95,7 @@ class GreeklishIso843::GreekText
 
       next match if greeklish.nil? # Unhandled case. Return as-is.
 
-      fix_case(greeklish, match)
+      fix_case(greeklish, match, Regexp.last_match)
     end
   end
 
@@ -118,14 +116,52 @@ class GreeklishIso843::GreekText
     match # Unhandled case. Return as-is.
   end
 
-  private def fix_case(greeklish, match)
-    return greeklish if !uppercase?(match[0])
+  private def fix_case(greeklish, match, match_data)
+    if !uppercase?(match[0])
+      return greeklish
+    end
+
+    if match.size == 1
+      return fix_case_single_letter_match(greeklish, match_data)
+    end
+
+    if match.size == 2
+      return fix_case_two_letter_match(greeklish, match)
+    end
+
+    raise UnhandledCaseError
+  end
+
+  private def fix_case_single_letter_match(greeklish, match_data)
+    if greeklish.size == 1
+      return greeklish.upcase
+    end
 
-    if match.size == 1 || uppercase?(match[1])
-      greeklish.upcase
-    else
-      greeklish[0].upcase + greeklish[1].to_s
+    if greeklish.size == 2 # match is one of Θ, Χ, Ψ
+      return fix_case_th_ch_ps(greeklish, match_data)
     end
+
+    raise UnhandledCaseError
+  end
+
+  private def fix_case_two_letter_match(greeklish, match)
+    if uppercase?(match[1])
+      return greeklish.upcase
+    end
+
+    greeklish[0].upcase + greeklish[1].to_s
+  end
+
+  private def fix_case_th_ch_ps(greeklish, match_data)
+    next_char = match_data.post_match[0]
+
+    if next_char.nil? ||
+        next_char !~ REPLACEMENT_KEYS_REGEXP ||
+        !uppercase?(next_char)
+      return greeklish[0].upcase + greeklish[1].to_s
+    end
+
+    greeklish.upcase
   end
 
   private def convert_mp_or_b(prev_char, next_char)
@@ -156,12 +192,12 @@ class GreeklishIso843::GreekText
   end
 
   private def convert_v_or_f(next_char)
-    return 'f' if blank?(next_char) || GREEK_LETTERS_AFTER_F[next_char]
+    if next_char.nil? ||
+        GREEK_LETTERS_AFTER_F[next_char] ||
+        next_char !~ REPLACEMENT_KEYS_REGEXP
+      return 'f'
+    end
 
     'v' if GREEK_LETTERS_AFTER_V[next_char]
   end
-
-  private def blank?(str)
-    str.nil? || str =~ BLANK_REGEXP
-  end
 end

data/lib/greeklish_iso843/version.rb

@@ -1,3 +1,3 @@
 module GreeklishIso843
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greeklish_iso843
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Angelos Orfanakos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-05-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: rubygems@angelos.dev
@@ -44,7 +44,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Convert Greek text to Greeklish conforming to ISO 843 (ELOT 743)