phonetics 3.0.7 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a68906250fed12a1fa02fe05294532e502b3f15535817c1ae6e452443f6af39f
-  data.tar.gz: '04884f02d494d0de9332924e83b3da64f63d14be082fc112650234ce41189d5d'
+  metadata.gz: 1e47d71b000fa07bd5cdfdf7e2321512370020280e1d9b227547f21673f8f533
+  data.tar.gz: f917449d2c0f4276b3fd214506e99fd12621f4af1fedfebc7f5bcaff62c22ee1
 SHA512:
-  metadata.gz: 36511ddbdc3f044ff1eb7a9012780cf4c9ca947264721458ba1b3f4328ecea238a809a7990964dca2f9e7d59187e1ddba953253b488580984fbc590426c5c63d
-  data.tar.gz: 880059fcaf040c46fb4ed77d7b33c7ef9261dfd25663c1a7358e89d5d9f734e46b94b8c2888fc1e5d10524b7e97b5723cd6a6407ea1606dbdae6b40bfac23c4b
+  metadata.gz: f804627ad6de25b5c9cadef635abd957fb29eea9f7a7a9be7701b98c07c34afd1d6938135b66887a853a50e88d78a2680f9314ad7ee513513f598209ce703015
+  data.tar.gz: c8300d8122b3539da7fe1b687edd0c7a2d4afc98bd908568925a0153d378bb4c73daf6c8a39b5f12524645da942311dc4f469a1650999c90b1c4e34fb7e203d7

data/.github/workflows/gempush.yml

@@ -3,7 +3,7 @@ name: Ruby Gem
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:
@@ -12,10 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@master
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
+    - name: Set up Ruby 3.1
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
+        ruby-version: 3.1.1
 
     - name: Publish to RubyGems
       run: |

data/.github/workflows/test.yml

@@ -9,12 +9,11 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '2.5.x'
-          - '2.6.x'
+          - '3.1.5'
+          - '3.3.1'
     steps:
-      - uses: actions/checkout@master
-      - name: Setup ruby
-        uses: actions/setup-ruby@v1
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           architecture: 'x64'

data/.rubocop.yml

@@ -2,6 +2,7 @@
 AllCops:
   Exclude:
     - Rakefile
+    - tmp/**/*
 
 Layout/LineLength:
   Enabled: false
@@ -44,4 +45,6 @@ Style/TrailingCommaInHashLiteral:
 
 Layout/HashAlignment:
   EnforcedHashRocketStyle: separator
-  EnforcedColonStyle: separator
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/VERSION

@@ -1 +1 @@
-3.0.7
+3.0.9

data/lib/phonetics/code_generator.rb

@@ -7,7 +7,7 @@ module Phonetics
   class CodeGenerator
     attr_reader :writer
 
-    def initialize(writer = STDOUT)
+    def initialize(writer = $stdout)
       @writer = writer
     end
 
@@ -67,7 +67,7 @@ module Phonetics
 
     def ruby_source
       location = caller_locations.first
-      "#{location.path.split('/')[-4..-1].join('/')}:#{location.lineno}"
+      "#{location.path.split('/')[-4..].join('/')}:#{location.lineno}"
     end
 
     def indent(depth, line)

data/lib/phonetics/distances.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'delegate'
+require 'set'
 
 module Phonetics
   extend self
@@ -131,6 +132,8 @@ module Phonetics
     )
     # rubocop:enable Layout/TrailingWhitespace
 
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     # Parse the ChartData into a lookup table where we can retrieve attributes
     # for each phoneme
     def features
@@ -152,9 +155,9 @@ module Phonetics
           manner.strip!
           positions.zip(columns).each do |position, phoneme_text|
             data = {
-                    position: position,
+              position: position,
               position_index: position_indexes[position],
-                      manner: manner,
+              manner: manner,
             }
             # If there is a character in the first byte then this articulation
             # has a voiceless phoneme. The symbol may use additional characters
@@ -162,7 +165,7 @@ module Phonetics
             unless phoneme_text[0] == ' '
               # Take the first non-blank character string
               symbol = phoneme_text.chars.take_while { |char| char != ' ' }.join
-              phoneme_text = phoneme_text[symbol.chars.size..-1]
+              phoneme_text = phoneme_text[symbol.chars.size..]
 
               phonemes[symbol] = data.merge(voiced: false)
             end
@@ -176,6 +179,8 @@ module Phonetics
         end
       end
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     def phonemes
       @phonemes ||= features.keys
@@ -228,11 +233,12 @@ module Phonetics
 
   def _distance(phoneme1, phoneme2)
     types = [Symbols.fetch(phoneme1), Symbols.fetch(phoneme2)].sort
-    if types == %i[consonant vowel]
+    case types
+    when %i[consonant vowel]
       1.0
-    elsif types == %i[vowel vowel]
+    when %i[vowel vowel]
       Vowels.distance(phoneme1, phoneme2)
-    elsif types == %i[consonant consonant]
+    when %i[consonant consonant]
       Consonants.distance(phoneme1, phoneme2)
     end
   end

data/lib/phonetics/levenshtein.rb

@@ -16,10 +16,12 @@ module Phonetics
   module Levenshtein
     extend ::PhoneticsLevenshteinCBinding
 
+    # rubocop:disable Style/OptionalBooleanParameter
     def self.distance(str1, str2, verbose = false)
       return if str1.nil? || str2.nil?
 
       internal_phonetic_distance(str1, str2, verbose)
     end
+    # rubocop:enable Style/OptionalBooleanParameter
   end
 end

data/lib/phonetics/ruby_levenshtein.rb

@@ -16,6 +16,7 @@ module Phonetics
   class RubyLevenshtein
     attr_reader :str1, :str2, :len1, :len2, :matrix
 
+    # rubocop:disable Style/OptionalBooleanParameter
     def initialize(ipa_str1, ipa_str2, verbose = false)
       @str1 = ipa_str1.each_char.select { |c| Phonetics.phonemes.include?(c) }.join
       @str2 = ipa_str2.each_char.select { |c| Phonetics.phonemes.include?(c) }.join
@@ -26,6 +27,11 @@ module Phonetics
       set_edit_distances(@str1, @str2)
     end
 
+    def self.distance(str1, str2, verbose = false)
+      new(str1, str2, verbose).distance
+    end
+    # rubocop:enable Style/OptionalBooleanParameter
+
     def distance
       return 0 if walk.empty?
 
@@ -33,10 +39,6 @@ module Phonetics
       walk.last[:distance]
     end
 
-    def self.distance(str1, str2, verbose = false)
-      new(str1, str2, verbose).distance
-    end
-
     private
 
     def walk

data/lib/phonetics/transcriptions.rb

@@ -22,13 +22,17 @@ module Phonetics
       return unless entry['ipa']
 
       SourcesByPreference.each do |preferred_source|
-        entry['ipa'].keys.each do |source|
+        entry['ipa'].each_key do |source|
           return entry['ipa'][source] if source =~ preferred_source
         end
       end
       nil
     end
 
+    def words
+      transcriptions.keys
+    end
+
     def transcriptions
       @transcriptions ||= begin
         download! unless File.exist?(TranscriptionFile)
@@ -41,10 +45,13 @@ module Phonetics
       @transcriptions = JSON.parse(File.read(TranscriptionFile))
     end
 
+    # rubocop:disable Security/Open
     def download!
       File.open(Transcriptions, 'w') { |f| f.write(URI.open(TranscriptionsURL).read) }
     end
+    # rubocop:enable Security/Open
 
+    # rubocop:disable Metrics/CyclomaticComplexity
     def trie(max_rarity = nil)
       # Let's turn this:
       #
@@ -114,21 +121,20 @@ module Phonetics
       @tries[max_rarity] ||= begin
         base_trie = {}
         transcriptions.each do |key, entry|
-          if max_rarity
-            next if entry['rarity'].nil? || entry['rarity'] > max_rarity
-          end
+          next if max_rarity && (entry['rarity'].nil? || entry['rarity'] > max_rarity)
 
           entry_data = {
-              word: key,
+            word: key,
             rarity: entry['rarity'],
           }
-          entry.fetch('ipa', []).each do |_source, transcription|
+          entry.fetch('ipa', []).each_value do |transcription|
             base_trie = construct_trie(base_trie, transcription, entry_data)
           end
         end
         base_trie.freeze
       end
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     def walk(ipa)
       ipa.each_char.reduce(trie) { |acc, char| acc[char] }
@@ -153,7 +159,7 @@ module Phonetics
         next_char = chars_remaining[0]
         subtrie[next_char] ||= {}
         subtrie[next_char][:path] ||= subtrie[:path].to_s + next_char
-        subtrie[next_char] = construct_trie(subtrie[next_char], chars_remaining[1..-1], entry_data, depth + 1)
+        subtrie[next_char] = construct_trie(subtrie[next_char], chars_remaining[1..], entry_data, depth + 1)
       end
       subtrie
     end

data/phonetics.gemspec

@@ -11,6 +11,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/JackDanger/phonetics'
   spec.license       = 'MIT'
 
+  spec.required_ruby_version = '>= 2.5'
+
   spec.extensions = ['ext/c_levenshtein/extconf.rb']
 
   # Specify which files should be added to the gem when it is released.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonetics
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.9
 platform: ruby
 authors:
 - Jack Danger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-29 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,14 +149,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: tools for linguistic code using the International Phonetic Alphabet