voxbi 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05056623951099fe54a19cc240148481ee89a86e
-  data.tar.gz: b60a9b28c61553f53b104ceb6bb8576900d49942
+  metadata.gz: 66709d394039ca32bf2e281070564b930df34563
+  data.tar.gz: 92ee45c2410eb395252fed922f5a101776c4d820
 SHA512:
-  metadata.gz: 5a3f3878b356561b8ff19ea66e61706bd7256370220414ea26806d61bbd0aa5c4e55882c4a4fd64f0775697d1f3152454c72a2e43eb73696db2212edf560e79d
-  data.tar.gz: a51f578adb007d28c8927a609b7bded9bf4ed58032d302d2b8e58ad49b653b04cc280a03ad8006b7414da9c90290f0cd9f17d0c15be9b4959005e128875fcef9
+  metadata.gz: c6f273ead2258f7ecb5c8a468b73f5691052025c2d7224f657eb2243fe62843c440b70175f48ea6ff53da47b679cec6c3c11ed395ff7eb32518ec282c552befa
+  data.tar.gz: 39b04b8eb7ce1d87e35c3dde0a847925fbd0efa99ec095a69d33fca4183202c8ea8583385f5a8d77c7f50f1508419afde29739cbd3485985a225dfd5a5218120

data/lib/modules/rulable.rb

@@ -3,23 +3,13 @@ require "csv"
 
 module Rulable
   DATA_PATH = File.expand_path('../../data', __dir__)
-  CSV_FILENAMES = %w(conversion linkage exceptions available_pairs).freeze
-  JSON_FILENAMES = %w(dictionary).freeze
+  CSV_FILENAMES = %i(conversion linkage exceptions available_pairs).freeze
+  JSON_FILENAMES = %i(dictionary).freeze
 
-  CSV_FILENAMES.each do |filename|
-    define_method(filename) do
-      memoize_file_content(filename, :csv)
-    end
-  end
-
-  JSON_FILENAMES.each do |filename|
-    define_method(filename) do
-      memoize_file_content(filename, :json)
-    end
+  def self.included(klass)
+    klass.extend(Macros)
   end
 
-  private
-
   def memoize_file_content(filename, file_format)
     instance_variable_get("@#{filename}") ||
     instance_variable_set("@#{filename}", parse_rule_file(filename, file_format))
@@ -44,4 +34,23 @@ module Rulable
     "#{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

data/lib/services/get_pairs_service.rb

@@ -1,6 +1,8 @@
 class GetPairsService
   include Rulable
 
+  memoize_csv :available_pairs
+
   attr_reader :phonetic_text
 
   def initialize(phonetic_text)

data/lib/services/linkage_service.rb

@@ -1,6 +1,8 @@
 class LinkageService
   include Rulable
 
+  memoize_csv :linkage
+
   attr_accessor :prepared_text, :phonetic_text
 
   def initialize(prepared_text, phonetic_text)
@@ -9,10 +11,7 @@ class LinkageService
   end
 
   def call
-    dup_phonetic_text
     apply_linkage
-
-    @dup_phonetic_text
   end
 
   private
@@ -23,15 +22,17 @@ class LinkageService
 
   def apply_linkage
     prepared_text.each_with_index do |word, index|
-      if @dup_phonetic_text[index+1]
-        link_string = word[-1] + @dup_phonetic_text[index+1][0]
+      if dup_phonetic_text[index+1]
+        link_string = word[-1] + dup_phonetic_text[index+1][0]
         linkage_rule = linkage_rule_for(link_string)
 
         if linkage_rule
-          @dup_phonetic_text[index+1] = linkage_rule[1].to_s + @dup_phonetic_text[index+1]
+          dup_phonetic_text[index+1] = linkage_rule[1].to_s + dup_phonetic_text[index+1]
         end
       end
     end
+
+    dup_phonetic_text
   end
 
   def linkage_rule_for(link_string)

data/lib/services/phonetics_converter_service.rb

@@ -3,6 +3,8 @@ require "timeout"
 class PhoneticsConverterService
   include Rulable
 
+  memoize_csv :conversion
+
   DEFAULT_TIMEOUT = 5.freeze
 
   attr_accessor :word, :phonetized_word

data/lib/voxbi.rb

@@ -11,6 +11,8 @@ DEFAULT_OUTPUT_PATH = "#{DATA_PATH}/#{DEFAULT_OUTPUT_FILENAME}.wav".freeze
 class Voxbi
   include Rulable
 
+  memoize_json :dictionary
+
   attr_accessor :text
 
   def initialize(text)

data/voxbi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'voxbi'
-  s.version       = '1.0'
+  s.version       = '1.0.1'
   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'
+  version: 1.0.1
 platform: ruby
 authors:
 - Galaad Gauthier
@@ -325,6 +325,7 @@ files:
 - lib/services/phonetics_converter_service.rb
 - lib/services/prepare_text_service.rb
 - lib/voxbi.rb
+- voxbi-1.0.gem
 - voxbi.gemspec
 homepage: https://github.com/Galaad-Gauthier/VoxBi
 licenses: