voxbi 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d1e9129064fe112b7ed8c8f3dc8c77c614a64fa
-  data.tar.gz: 81db7b7d05fedf7cb5b36cf055874aab4be19af7
+  metadata.gz: 41108b63c80b692d9f0c3eba09782a7565c6bd68
+  data.tar.gz: 465f1b68e7ee7e455bfe3bffc074322f8478f257
 SHA512:
-  metadata.gz: 1448af100511cc73c6eea9f4b8cfc84f3a4066cc2dc2992ed4b190ff8b0b56c5002b4dd7160e29cb81df3fd976fe650b9c76f8dd570ce1827e8042a30c3c51a9
-  data.tar.gz: 49a858265edda4769b8734d451d359879afb64c396d8bf29f36bb3da1baf0b2b37c4e200f9a1c192dbd25b7281b707459fe8ec085c45d58253af3a1bba243a14
+  metadata.gz: 65a76f3ed1361264dad019b6926c0ca03f4b5529cb0a1849691dbf62eda709f0c3ef87235f54356c4b525507e72bf1b8d0605e63b6b856fc63e92054b659fd52
+  data.tar.gz: 2f6b3087dbee91a0fc32397bda8c94de254f9b5fa1e860356824f9450328ae399917549322568fa6573c22fdaada08f524c7394a5889437a358928a510847b60

data/lib/modules/rule_parsable.rb

@@ -0,0 +1,30 @@
+require "json"
+require "csv"
+
+module RuleParsable
+  DATA_PATH = File.expand_path('../../data', __dir__)
+
+  def self.included(klass)
+    klass.extend(ClassMethods)
+  end
+
+  module ClassMethods
+    def parse_rule_file(filename, file_format)
+      absolute_file_path = absolute_path_for(filename, file_format)
+
+      case file_format
+      when :csv then parse_csv(absolute_file_path)
+      when :json then JSON.parse(File.read(absolute_file_path))
+      end
+    end
+
+    def parse_csv(file_path)
+      parsed_csv = CSV.read(file_path, col_sep: '#')
+      parsed_csv.first.length > 1 ? Hash[parsed_csv] : parsed_csv.flatten
+    end
+
+    def absolute_path_for(filename, file_format)
+      "#{DATA_PATH}/#{filename}" + ".#{file_format}"
+    end
+  end
+end

data/lib/rule_store.rb

@@ -0,0 +1,22 @@
+class RuleStore
+  include RuleParsable
+
+  CSV_FILENAMES = %i(conversion linkage exceptions available_pairs).freeze
+  JSON_FILENAMES = %i(dictionary).freeze
+
+  def self.class_memoize(filename, file_format)
+    class_variable_set(:"@@#{filename}", parse_rule_file(filename, file_format))
+
+    self.define_singleton_method(filename) do
+      class_variable_get(:"@@#{filename}")
+    end
+  end
+
+  CSV_FILENAMES.each do |filename|
+    class_memoize filename, :csv
+  end
+
+  JSON_FILENAMES.each do |filename|
+    class_memoize filename, :json
+  end
+end

data/lib/services/get_pairs_service.rb

@@ -1,8 +1,4 @@
 class GetPairsService
-  include Rulable
-
-  memoize_csv :available_pairs
-
   attr_reader :phonetic_text
 
   def initialize(phonetic_text)
@@ -22,7 +18,7 @@ class GetPairsService
 
     [].tap do |pairs|
       while word.length != 0
-        matching_pair = available_pairs.detect{ |pair| word.match(/^#{pair}/) }
+        matching_pair = RuleStore.available_pairs.detect{ |pair| word.match(/^#{pair}/) }
         word.sub!(/^#{matching_pair}/,"")
         pairs << matching_pair
       end

data/lib/services/linkage_service.rb

@@ -1,8 +1,4 @@
 class LinkageService
-  include Rulable
-
-  memoize_csv :linkage
-
   attr_accessor :prepared_text, :phonetic_text
 
   def initialize(prepared_text, phonetic_text)
@@ -36,6 +32,6 @@ class LinkageService
   end
 
   def linkage_rule_for(link_string)
-    linkage.select {|k,v| link_string =~ /#{k}/ }.first
+    RuleStore.linkage.select {|k,v| link_string =~ /#{k}/ }.first
   end
 end

data/lib/services/phonetics_converter_service.rb

@@ -1,10 +1,6 @@
 require "timeout"
 
 class PhoneticsConverterService
-  include Rulable
-
-  memoize_csv :conversion
-
   DEFAULT_TIMEOUT = 5.freeze
 
   attr_accessor :word, :phonetized_word
@@ -39,6 +35,6 @@ class PhoneticsConverterService
   end
 
   def conversion_rule_for(word)
-    conversion.detect{ |rule, phonetic| word =~ /#{rule}/ }
+    RuleStore.conversion.detect{ |rule, phonetic| word =~ /#{rule}/ }
   end
 end

data/lib/voxbi.rb

@@ -5,10 +5,6 @@ File.expand_path('..', __dir__).tap do |root_path|
 end
 
 class Voxbi
-  include Rulable
-
-  memoize_json :dictionary
-
   attr_accessor :text
 
   ROOT_PATH = File.expand_path('..', __dir__).freeze
@@ -46,7 +42,7 @@ class Voxbi
 
   def phonetic_text
     @phonetic_text ||= prepared_text.map do |word|
-      dictionary[word] ||
+      RuleStore.dictionary[word] ||
       PhoneticsConverterService.new(word).call
     end
   end

data/voxbi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'voxbi'
-  s.version       = '1.0.4'
+  s.version       = '1.0.5'
   s.date          = '2018-04-03'
   s.summary       = "VoxBi"
   s.description   = "Easy-to-use french voice synthesizer"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voxbi
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Galaad Gauthier
@@ -318,7 +318,8 @@ files:
 - data/pairs/σ.ogg
 - data/pairs/ϵ.ogg
 - lib/extensions/string.rb
-- lib/modules/rulable.rb
+- lib/modules/rule_parsable.rb
+- lib/rule_store.rb
 - lib/services/get_pairs_service.rb
 - lib/services/get_syllables_service.rb
 - lib/services/linkage_service.rb
@@ -326,6 +327,7 @@ files:
 - lib/services/prepare_text_service.rb
 - lib/voxbi.rb
 - voxbi-1.0.1.gem
+- voxbi-1.0.4.gem
 - voxbi-1.0.gem
 - voxbi.gemspec
 homepage: https://github.com/Galaad-Gauthier/VoxBi

data/lib/modules/rulable.rb

@@ -1,56 +0,0 @@
-require "json"
-require "csv"
-
-module Rulable
-  DATA_PATH = File.expand_path('../../data', __dir__)
-  CSV_FILENAMES = %i(conversion linkage exceptions available_pairs).freeze
-  JSON_FILENAMES = %i(dictionary).freeze
-
-  def self.included(klass)
-    klass.extend(Macros)
-  end
-
-  def memoize_file_content(filename, file_format)
-    instance_variable_get("@#{filename}") ||
-    instance_variable_set("@#{filename}", parse_rule_file(filename, file_format))
-  end
-
-  def parse_rule_file(filename, file_format)
-    absolute_file_path = absolute_path_for(filename, file_format)
-
-    case file_format
-    when :csv then parse_csv(absolute_file_path)
-    when :json then JSON.parse(File.read(absolute_file_path))
-    end
-  end
-
-  def parse_csv(file_path)
-    parsed_csv = CSV.read(file_path, col_sep: '#')
-
-    parsed_csv.first.length > 1 ? Hash[parsed_csv] : parsed_csv.flatten
-  end
-
-  def absolute_path_for(filename, file_format)
-    "#{DATA_PATH}/#{filename}" + ".#{file_format}"
-  end
-
-  module Macros
-    def memoize_csv(*filenames)
-      permitted_filenames = filenames.select{ |filename| CSV_FILENAMES.include?(filename)  }
-      memoize_file(permitted_filenames, file_format: :csv)
-    end
-
-    def memoize_json(*filenames)
-      permitted_filenames = filenames.select{ |filename| JSON_FILENAMES.include?(filename)  }
-      memoize_file(permitted_filenames, file_format: :json)
-    end
-
-    def memoize_file(filenames, file_format:)
-      filenames.each do |filename|
-        define_method(filename) do
-          memoize_file_content(filename, file_format)
-        end
-      end
-    end
-  end
-end