onvkv_seteyoposecetv 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dda8cbef0af2fb3f15792ed13551e79ac02bbae9d0225f74b8442bdeb2af546
-  data.tar.gz: '08fa22a2cfaf673c49d9abd20c85c5b1cddc8f49f192b62d914e0af1007612bb'
+  metadata.gz: 3dcc530f6628d1107ea33b5dc39a4ab64ae23b04770556940cfe3c31917938ab
+  data.tar.gz: 354ad7126277dd54b7b7fc8104699eea079781eacd9b8e60424fe2b6290d3eb1
 SHA512:
-  metadata.gz: cc097c974d24f26e2187d6ae747f1477bc040b22cc01aeeed4068053bdc0eeeb5f99e95871a3797d2eec7184aa8a28ae380adffe5f96ac98dcddc4e4fa553375
-  data.tar.gz: 1a00bada3a095f6a435e85a0cded4bcba3dd94929ef21ef1e7085d1e039153429e0c334afcc95cb10b67a16cc053eb07969530c26a8a6171ac19b18eafa082fc
+  metadata.gz: 267287682244eb648d089e1c51f475b0b0cc6ddf21c6cc226de586e536ba6b7ebb37a1bb5434312e2e6c2646ac8aa9ce62c5388300cc40b6d39766c726932071
+  data.tar.gz: 37f6af79a9cb3fbc0f321f9b9d76edcf1984ea33ca9bc5a3af25ff6d4a75135cfa658e4eb1ca143ffdde3ac54563f99997feb66144a8a6b8af7c7bbef565fd8e

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/action_verbs/past_three.rb

@@ -78,22 +78,22 @@ module Conjugators
           return "N/A" if @verb == "ometv" || @verb == "owetv"
           result = send(tense)
           if result[0].is_a?(String)
-            [result.map {|r| r + " towemvts" }]
+            [result.map {|r| r + "t owemvts" }]
           else
             if @irregular
               case result.size
               when 1
-                rr_2plus = result[0].map {|r| "#{r} towemvts (of 2+)" }
+                rr_2plus = result[0].map {|r| "#{r}t owemvts (of 2+)" }
                 [rr_2plus]
               when 2
-                rr2 = result[0].map      {|r| "#{r} towemvts (of 2)" }
-                rr3_plus = result[1].map {|r| "#{r} towemvts (of 3+)"}
+                rr2 = result[0].map      {|r| "#{r}t owemvts (of 2)" }
+                rr3_plus = result[1].map {|r| "#{r}t owemvts (of 3+)"}
                 [rr2, rr3_plus]
               end
             else
               result.map do |verb_form|
                 verb_form.map do |dialectic_option|
-                  "#{dialectic_option} towemvts"
+                  "#{dialectic_option}t owemvts"
                 end
               end
             end
@@ -111,10 +111,10 @@ module Conjugators
             @verb
           end
           results = if verbs_to_conjugate.is_a?(String)
-            [result.map {|r| verbs_to_conjugate.gsub(/etv\z/, 'e ') + r  }]
+            [result.map {|r| verbs_to_conjugate.gsub(/etv\z/, 'et ') + r  }]
           else
             verbs_to_conjugate.map do |verb_to_conjugate|
-              result.map {|r| verb_to_conjugate.gsub(/etv\z/, 'e ') + r }
+              result.map {|r| verb_to_conjugate.gsub(/etv\z/, 'et ') + r }
             end
           end
           if verbs_to_conjugate == @verb

data/lib/conjugators/action_verbs/past_two.rb

@@ -78,22 +78,22 @@ module Conjugators
           return "N/A" if @verb == "ometv" || @verb == "owetv"
           result = send(tense)
           if result[0].is_a?(String)
-            [result.map {|r| r + " towvnks" }]
+            [result.map {|r| r + "t owvnks" }]
           else
             if @irregular
               case result.size
               when 1
-                rr_2plus = result[0].map {|r| "#{r} towvnks (of 2+)" }
+                rr_2plus = result[0].map {|r| "#{r}t owvnks (of 2+)" }
                 [rr_2plus]
               when 2
-                rr2 = result[0].map      {|r| "#{r} towvnks (of 2)" }
-                rr3_plus = result[1].map {|r| "#{r} towvnks (of 3+)"}
+                rr2 = result[0].map      {|r| "#{r}t owvnks (of 2)" }
+                rr3_plus = result[1].map {|r| "#{r}t owvnks (of 3+)"}
                 [rr2, rr3_plus]
               end
             else
               result.map do |verb_form|
                 verb_form.map do |dialectic_option|
-                  "#{dialectic_option} towvnks"
+                  "#{dialectic_option}t owvnks"
                 end
               end
             end
@@ -111,10 +111,10 @@ module Conjugators
             @verb
           end
           results = if verbs_to_conjugate.is_a?(String)
-            [result.map {|r| verbs_to_conjugate.gsub(/etv\z/, 'e ') + r  }]
+            [result.map {|r| verbs_to_conjugate.gsub(/etv\z/, 'et ') + r  }]
           else
             verbs_to_conjugate.map do |verb_to_conjugate|
-              result.map {|r| verb_to_conjugate.gsub(/etv\z/, 'e ') + r }
+              result.map {|r| verb_to_conjugate.gsub(/etv\z/, 'et ') + r }
             end
           end
           if verbs_to_conjugate == @verb

data/lib/conjugators/action_verbs/present_tense.rb

@@ -2,7 +2,7 @@ module Conjugators
   module ActionVerbs
     class PresentTense
       NA                  ="N/A".freeze
-      OMETV_REGEX         = /o[mw]etv/.freeze
+      OMETV_REGEX         = /^o[mw]etv/.freeze
       ETV_REGEX           = /etv$/.freeze
       S                   = ?s.freeze
       ETV                 = "etv".freeze
@@ -22,8 +22,8 @@ module Conjugators
       I_ENDING_REGEX      = /i$/.freeze
       Ē                   = 'ē'.freeze
       IYĒ                 = 'iyē'.freeze
-      E_SPACE             = 'e '.freeze
-      SPACE_TOS           = ' tos'.freeze
+      E_SPACE             = 'et '.freeze
+      SPACE_TOS           = 't os'.freeze
 
       extend Conjugators::ActionVerbs::Shared
       # Note, MVSKOKE language here
@@ -44,9 +44,20 @@ module Conjugators
             :conjugate_2ps => { basic_present: [NA], basic_durative: [NA], tos_auxiliary: [NA], ometv_conjugated_auxiliary: [NA] },
             :conjugate_1pp => { basic_present: [NA], basic_durative: [NA], tos_auxiliary: [NA], ometv_conjugated_auxiliary: [NA] },
             :conjugate_2pp => { basic_present: [NA], basic_durative: [NA], tos_auxiliary: [NA], ometv_conjugated_auxiliary: [NA] },
-            #:conjugate_3ps => { basic_present: [NA], basic_durative: [NA], ometv_conjugated_auxiliary: [NA] },
             :conjugate_3pp => { basic_present: [NA], basic_durative: [NA], ometv_conjugated_auxiliary: [NA] },
-          }
+          },
+          "mometv" => {
+            :conjugate_1ps => { basic_present: [NA], basic_durative: [NA], tos_auxiliary: [NA], ometv_conjugated_auxiliary: [NA] },
+            :conjugate_2ps => { basic_present: [NA], basic_durative: [NA], tos_auxiliary: [NA], ometv_conjugated_auxiliary: [NA] },
+            :conjugate_1pp => { basic_present: [NA], basic_durative: [NA], tos_auxiliary: [NA], ometv_conjugated_auxiliary: [NA] },
+            :conjugate_2pp => { basic_present: [NA], basic_durative: [NA], tos_auxiliary: [NA], ometv_conjugated_auxiliary: [NA] },
+          },
+          "mowetv" => {
+            :conjugate_1ps => { basic_present: [NA], basic_durative: [NA], tos_auxiliary: [NA], ometv_conjugated_auxiliary: [NA] },
+            :conjugate_2ps => { basic_present: [NA], basic_durative: [NA], tos_auxiliary: [NA], ometv_conjugated_auxiliary: [NA] },
+            :conjugate_1pp => { basic_present: [NA], basic_durative: [NA], tos_auxiliary: [NA], ometv_conjugated_auxiliary: [NA] },
+            :conjugate_2pp => { basic_present: [NA], basic_durative: [NA], tos_auxiliary: [NA], ometv_conjugated_auxiliary: [NA] },
+          },
         }
       end
 
@@ -134,17 +145,17 @@ module Conjugators
             if @irregular
               case result.size
               when 1
-                rr_2plus = result[0].map {|r| "#{r} tos (of 2+)" }
+                rr_2plus = result[0].map {|r| "#{r}t os (of 2+)" }
                 [rr_2plus]
               when 2
-                rr2 = result[0].map      {|r| "#{r} tos (of 2)" }
-                rr3_plus = result[1].map {|r| "#{r} tos (of 3+)"}
+                rr2 = result[0].map      {|r| "#{r}t os (of 2)" }
+                rr3_plus = result[1].map {|r| "#{r}t os (of 3+)"}
                 [rr2, rr3_plus]
               end
             else
               result.map do |verb_form|
                 verb_form.map do |dialectic_option|
-                  "#{dialectic_option} tos"
+                  "#{dialectic_option}t os"
                 end
               end
             end
@@ -229,7 +240,7 @@ module Conjugators
               drop_the_etv!
               lgrade_final_vowel!
 
-              if @type == :tos_auxiliary
+              if @type == :tos_auxiliary || @type == :basic_durative
                 @verb_to_conjugate + 'eyē'
               else
                 add_person_marker!(person_marker)
@@ -242,7 +253,7 @@ module Conjugators
             @verb_to_conjugate = @verb.dup
             drop_the_etv!
             lgrade_final_vowel!
-            if @type == :tos_auxiliary
+            if @type == :tos_auxiliary || @type == :basic_durative
               @verb_to_conjugate + 'eyē'
             else
               add_person_marker!(person_marker)

data/lib/conjugators/ometv/past_three.rb

@@ -7,12 +7,12 @@ module Conjugators
 
       def self.person_conjugations
         {
-          '1ps' => %w{towimvts},
-          '2ps' => %w{towetskemvts toweckemvts toweccemvts towetcemvts },
-          '3ps' => %w{towemvts},
-          '1pp' => %w{towēyemvts},
-          '2pp' => %w{towatskemvts towackemvts},
-          '3pp' => %w{towakemvts}
+          '1ps' => %w{owimvts},
+          '2ps' => %w{owetskemvts oweckemvts oweccemvts owetcemvts },
+          '3ps' => %w{owemvts},
+          '1pp' => %w{owēyemvts},
+          '2pp' => %w{owatskemvts owackemvts},
+          '3pp' => %w{owakemvts}
         }
       end
 

data/lib/conjugators/ometv/past_two.rb

@@ -7,12 +7,12 @@ module Conjugators
 
       def self.person_conjugations
         {
-          '1ps' => %w{towivnks},
-          '2ps' => %w{towetskvnks toweckvnks toweccvnks towetcvnks },
-          '3ps' => %w{towvnks},
-          '1pp' => %w{towēyvnks},
-          '2pp' => %w{towatskvnks towackvnks},
-          '3pp' => %w{towakvnks}
+          '1ps' => %w{owivnks},
+          '2ps' => %w{owetskvnks oweckvnks oweccvnks owetcvnks },
+          '3ps' => %w{owvnks},
+          '1pp' => %w{owēyvnks},
+          '2pp' => %w{owatskvnks owackvnks},
+          '3pp' => %w{owakvnks}
         }
       end
 

data/lib/conjugators/ometv/present_tense.rb

@@ -7,12 +7,12 @@ module Conjugators
 
       def self.person_conjugations
         @person_conjugations ||= {
-          '1ps' => %w{towis},
-          '2ps' => %w{towetskes toweckes towecces tontces tonckes tontses },
-          '3ps' => %w{tos},
-          '1pp' => %w{towēs},
-          '2pp' => %w{towatskes towackes towatses }, # towat
-          '3pp' => %w{towakes}
+          '1ps' => %w{owis},
+          '2ps' => %w{owetskes oweckes owecces ontces onckes ontses },
+          '3ps' => %w{os},
+          '1pp' => %w{owēs},
+          '2pp' => %w{owatskes owackes owatses }, # towat
+          '3pp' => %w{owakes}
         }
       end
 

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.4"
 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.4
 platform: ruby
 authors:
 - Tad Hosford