diachronr 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b2e2d058e7f5f172916afd00f908040629c680a
-  data.tar.gz: d2f09d22747c1a296eb934cb46cd71a2b532d000
+  metadata.gz: c7a9f9ac16985d1197cc75c73f57ece689819fa2
+  data.tar.gz: 3fcf7b9076fca9df034ffccd3823ec48065b3ebf
 SHA512:
-  metadata.gz: 3359a50b580a06e15ff588e7dffc85e7cf8ab7e2ef4714111e26881722cd6a3950f133eeb00dd648e30b4e5b9b650e3591117c0a16e6c4b17c6e56bf375bfdd5
-  data.tar.gz: 3db05f89d3c90c60014449877464124d5dd1696320ea57106ea89a81a142f171ba60b211e4333ed23fe000d2513674f07feb478f52b5808e75a2fc584ebbe033
+  metadata.gz: 80339def600f19d8f298b89b4e41b893007edf69ffe0a3a60011bcacf2f4dae9fab8ba595c5b516cdf89132e1b8c9ca180facf99a163b37f8f013f7bd36162fd
+  data.tar.gz: bc001bb0c87a86b017374037fecdf2b85e3b35e765bfae332933fc76b818f56c4b6104840abd426526ebc0021d9fe35867b983d0d46266d599cff093ec1d73f2

data/lib/diachronr/rule.rb

@@ -24,13 +24,14 @@ module Diachronr
     end
 
     def get_categories(value, categories)
-      categories.select { |c| value.include? c.sign }
+      categories.select { |c| value && value.include?(c.sign) }
     end
 
     def new_to(categories, category_index, index)
       t = get_categories(to, categories)[category_index]
       return to if t.nil?
-      t.contents[index]
+      contents = t.contents.chars.include?(',') ? t.contents.split(',') : t.contents.chars
+      contents[index]
     end # new_to
 
     def new_from(category, char)
@@ -40,7 +41,8 @@ module Diachronr
     def category_rules(categories)
       rules = []
       get_categories(from, categories).each_with_index do |cat, i|
-        cat.contents.each_char.with_index do |f, fi|
+        contents = cat.contents.chars.include?(',') ? cat.contents.split(',') : cat.contents.chars
+        contents.each.with_index do |f, fi|
           rules << Rule.new(
             "#{new_from(cat, f)}/#{new_to(categories, i, fi)}/#{condition}"
           )

data/lib/diachronr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Diachronr
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/test/diachronr_test.rb

@@ -31,8 +31,15 @@ class DiachronrTest < Minitest::Test
   def test_apply_ruleset
     r = Diachronr::RuleSet.load 'test/fixtures/seonic_to_varag.yml'
     r.options['seonic'].each do |seonic, varag|
-      assert_equal r.apply(seonic), varag
+      assert_equal varag, r.apply(seonic)
     end
   end
 
-end
+  def test_apply_ruleset_multi_category
+    r = Diachronr::RuleSet.load 'test/fixtures/multi-char.yml'
+    r.options['test'].each do |from, to|
+      assert_equal to, r.apply(from)
+    end
+  end
+
+end

data/test/fixtures/multi-char.yml

@@ -0,0 +1,13 @@
+rewrites: []
+categories:
+  - A=st,zd
+  - B=ff,vv
+  - C=kʷ,
+  - D=wh,
+rules:
+  - A/B/_
+  - C/D/_
+test:
+  star: ffar
+  zdar: vvar
+  kʷékʷlos: whéwhlos

data/test/fixtures/seonic_to_varag.yml

@@ -116,4 +116,4 @@ seonic:
   kerric: garrag
   anvo: anb
   tactus: dath # dathe
-  luukas: lah
+  luukas: lah

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diachronr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Miker Irick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2022-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -87,6 +87,7 @@ files:
 - lib/diachronr/ruleset.rb
 - lib/diachronr/version.rb
 - test/diachronr_test.rb
+- test/fixtures/multi-char.yml
 - test/fixtures/seonic_to_varag.yml
 - test/test_helper.rb
 homepage: http://michaelirick.com
@@ -115,5 +116,6 @@ specification_version: 4
 summary: applies diachronic sound changes to constructed languages
 test_files:
 - test/diachronr_test.rb
+- test/fixtures/multi-char.yml
 - test/fixtures/seonic_to_varag.yml
 - test/test_helper.rb