onvkv_seteyoposecetv 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dda8cbef0af2fb3f15792ed13551e79ac02bbae9d0225f74b8442bdeb2af546
-  data.tar.gz: '08fa22a2cfaf673c49d9abd20c85c5b1cddc8f49f192b62d914e0af1007612bb'
+  metadata.gz: a61180e12638ebb76484ad9ecca13737fd3174ec5abfe142607da265efe57591
+  data.tar.gz: c7744ef9db149efb34aad660ba369a7fe63e70dd3fcb777fd6f5cad56e70ccb2
 SHA512:
-  metadata.gz: cc097c974d24f26e2187d6ae747f1477bc040b22cc01aeeed4068053bdc0eeeb5f99e95871a3797d2eec7184aa8a28ae380adffe5f96ac98dcddc4e4fa553375
-  data.tar.gz: 1a00bada3a095f6a435e85a0cded4bcba3dd94929ef21ef1e7085d1e039153429e0c334afcc95cb10b67a16cc053eb07969530c26a8a6171ac19b18eafa082fc
+  metadata.gz: 10dd12a5e0493c81f0b3011952f823c93276eeb12ce97071c226d4041240320becb79ec9eab3d043dd4870f0a7a7439c0aeddfd278e5db6e30a1fa29c706f68c
+  data.tar.gz: 36ff32778e3cf41d3f6be6fbe20c48ab8bb870a3635609a6b7b01cc9ae9b261a4068026c3b808b05738243db0ee939f806e1cc4bbc0a0a62f74f38fdafcb2f48

data/lib/conjugators/action_verbs/past_one.rb

@@ -2,6 +2,12 @@ module Conjugators
   module ActionVerbs
     class PastOne
       extend Conjugators::ActionVerbs::Shared
+
+      # Constants for diphthong patterns
+      UE_CK_PATTERN = /ue[ck]\z/.freeze  # ue followed by c or k
+      UE_OTHER_PATTERN = /ue[^ck]\z/.freeze  # ue followed by other consonants
+      VO_PATTERN = /vok\z/.freeze  # vo followed by k
+
       # SHORTEN, STRESS, ASPIRATE final vowel
       def initialize(verb, irregular_pattern: nil)
         @verb = verb
@@ -194,20 +200,31 @@ module Conjugators
       end
 
       def hgrade_final_vowel!
-        final_vowel_index = @verb_to_conjugate.rindex(/[aeēiov]/)
         hgrade_form = identify_hgrade_form(@verb_to_conjugate)
 
-        if hgrade_form == :basic
-          final_vowel          = @verb_to_conjugate[final_vowel_index]
+        case hgrade_form
+        when :ue_ck_diphthong
+          # -uec- or -uek- h-grades as -uehc- or -uehk-
+          if @verb_to_conjugate.end_with?('uec')
+            @verb_to_conjugate.sub!(/uec\z/, 'uehc')
+          else
+            @verb_to_conjugate.sub!(/uek\z/, 'uehk')
+          end
+        when :ue_other_diphthong
+          # -ue[^ck]- h-grades by changing 'ue' to 'uyi'
+          last_consonant = @verb_to_conjugate[-1]
+          @verb_to_conjugate.sub!(/ue[^ck]\z/, "uyi#{last_consonant}")
+        when :vo_diphthong
+          # -vok- h-grades as -vwik-
+          @verb_to_conjugate.sub!(/vok\z/, 'vwik')
+        when :basic
+          final_vowel_index = @verb_to_conjugate.rindex(/[aeēiov]/)
+          final_vowel = @verb_to_conjugate[final_vowel_index]
           h_graded_final_vowel = self.class.basic_hgrades[final_vowel]
-
           @verb_to_conjugate[final_vowel_index] = h_graded_final_vowel
-
-        elsif hgrade_form == :double_consonant
-
+        when :double_consonant
           @verb_to_conjugate[-1] = 'iy' #e.g. kerr -> keriy
-        elsif hgrade_form == :kk_or_consonant_cluster
-
+        when :kk_or_consonant_cluster
           @verb_to_conjugate[-1] = "i#{@verb_to_conjugate[-1]}" #e.g. homp -> homip
         end
 
@@ -215,6 +232,11 @@ module Conjugators
       end
 
       def identify_hgrade_form(verb)
+        # First check for diphthong patterns
+        return :ue_ck_diphthong if verb.match?(UE_CK_PATTERN)
+        return :ue_other_diphthong if verb.match?(UE_OTHER_PATTERN)
+        return :vo_diphthong if verb.match?(VO_PATTERN)
+
         final_vowel_index = verb.rindex(/[aeēiouv]/)
 
         # what is to the right of that final vowel

data/lib/conjugators/stative_verbs/present_tense.rb

@@ -137,7 +137,7 @@ module Conjugators
         when"ē"
           "ecē" + @verb[1..-1]
         when "v"
-          "ece" + @verb
+          "ece" + @verb[1..-1]
         when "o"
           "ec"  + @verb
         when "e"
@@ -180,7 +180,7 @@ module Conjugators
         when"ē"
           "ecē" + verb[1..-1]
         when "v"
-          "ece" + verb
+          "ece" + @verb[1..-1]
         when "o"
           "ec"  + verb
         when "e"

data/lib/onvkv_seteyoposecetv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OnvkvSeteyoposecetv
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onvkv_seteyoposecetv
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tad Hosford