charyf 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efad5ad87a312bfef51179279205bfe5b60585d5
-  data.tar.gz: ac9413d5cbf58b5bd492cd9e62b22d7045ca21d6
+  metadata.gz: 85268dbf6cc1d03b50cd87fb6d04c07fb618103e
+  data.tar.gz: 5c5e9fb065243a0baa7066c59c6d5cd475322d90
 SHA512:
-  metadata.gz: d05a975f29957417fad8da4b6d805bd93ce0f90fdeecc5af6ce462142461546f7b2dec294c35b5e84cd25c906bae7e6eb7d9ea2797d82f8eb1ea27f0b07e73db
-  data.tar.gz: 3bb190b57931d0b6bcd75a3f6c579e10d233450d41e10d6aeccc37b597a00aebec9b76d52a2d69e2232f2645c22e39022fd7458648f89d98406678007636754d
+  metadata.gz: 836bbf92eeb0cd151cee5cee6d2954849bd70d7e3f905f24c7fdb3ea585f069dfd85e5b14dba6b4fa2ec535edfe83430cac62a10591c14ba7cd475844a7e2e3f
+  data.tar.gz: ac7f674be428d48b48720ba5dd04d5284aac5e26c3a90db0ad1afd4bd5158bfea06631c0c9cddc2f5662b28239df1d5ad5e8bf82610f9bc432d59ad0af7fa121

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    charyf (0.2.5)
+    charyf (0.2.6)
       charyf_sig (~> 1.1.2)
       colorize (~> 0.8)
       i18n (~> 0.9)

data/lib/charyf/utils/all.rb

@@ -1,6 +1,3 @@
-require_relative 'parser/parser'
-require_relative 'parser/en_parser'
-
 require_relative 'storage/provider'
 
 require_relative 'application'

data/lib/charyf/utils/application.rb

@@ -103,13 +103,6 @@ module Charyf
       klass
     end
 
-    def parser
-      klass = Charyf::Utils::Parser.get(config.i18n.locale)
-      raise Charyf::Utils::InvalidConfiguration.new("No parser for locale '#{config.i18n.locale}' found") unless klass
-
-      klass
-    end
-
     def routing
       klass = Charyf::Engine::Routing.list[config.router]
 

data/lib/charyf/utils/application/bootstrap.rb

@@ -44,16 +44,6 @@ module Charyf
         I18n.load_path << Dir[Charyf._gem_source.join('locale', '**', '*.yml').to_s]
       end
 
-      #
-      # Validates that all required strategies are fulfilled and the application can load
-      #
-      initializer :validate_strategies, group: :all do
-        Charyf.application.session_processor
-        Charyf.application.intent_processors
-        Charyf.application.dispatcher
-        Charyf.application.routing
-      end
-
       #
       # Load APP default files
       #

data/lib/charyf/utils/generators/app_base.rb

@@ -41,11 +41,11 @@ module Charyf
 
       def self.add_shared_options_for(name)
 
-        class_option :intent_processors,   type: :array, aliases: "-ip", default: Defaults::SETTINGS[:intents],
+        class_option :intent_processors,   type: :array, default: Defaults::SETTINGS[:intents],
                                            desc: "Set of intent intent processors to be included in installation" + Defaults.intents_desc,
                                            group: :strategies
 
-        class_option :storage_provider, type: :string, aliases: "-sp", default: Defaults::SETTINGS[:storage],
+        class_option :storage_provider, type: :string, default: Defaults::SETTINGS[:storage],
                                            desc: "Storage provider to be installed by default." + Defaults.storage_desc,
                                            group: :strategies
 
@@ -208,15 +208,14 @@ module Charyf
       end
 
       def intents_gemfile_entries
-        Defaults::INTENT_PROCESSORS.values.map do |details|
+        intents_details.values.map do |details|
           GemfileEntry.version(details[:gem], details[:gem_version], 'Intent processor [generated]')
         end
       end
 
       def storage_gemfile_entries
-        Defaults::STORAGE_PROVIDERS.values.map do |details|
-          GemfileEntry.version(details[:gem], details[:gem_version], 'Storage provider [generated]')
-        end
+        details = storage_details
+        GemfileEntry.version(details[:gem], details[:gem_version], 'Storage provider [generated]')
       end
 
       def charyf_version_specifier(gem_version = Charyf.gem_version)

data/lib/charyf/utils/generators/defaults.rb

@@ -24,7 +24,7 @@ Should not be used on production environments as it is not persisted.
       INTENT_PROCESSORS = {
           adapt: {
               gem: 'adapt-charyf',
-              gem_version: ['>= 0.2.4'],
+              gem_version: ['>= 0.3'],
               require: 'adapt-charyf',
               desc: <<-EOM
 Ruby wrapper around python library from mycroft [adapt]. Works offline.

data/lib/charyf/utils/storage/provider.rb

@@ -1,4 +1,5 @@
 require_relative '../strategy/base_class'
+require_relative '../strategy/owner_class'
 
 module Charyf
   module Utils

data/lib/charyf/version.rb

@@ -11,7 +11,7 @@ module Charyf
   module VERSION
     MAJOR = 0
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charyf
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Richard Ludvigh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-31 00:00:00.000000000 Z
+date: 2018-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charyf_sig
@@ -240,8 +240,6 @@ files:
 - lib/charyf/utils/initializable.rb
 - lib/charyf/utils/logger.rb
 - lib/charyf/utils/machine.rb
-- lib/charyf/utils/parser/en_parser.rb
-- lib/charyf/utils/parser/parser.rb
 - lib/charyf/utils/pipeline.rb
 - lib/charyf/utils/ruby_version_check.rb
 - lib/charyf/utils/storage/provider.rb

data/lib/charyf/utils/parser/en_parser.rb

@@ -1,97 +0,0 @@
-require_relative 'parser'
-
-module Charyf
-  module Utils
-    module Parser
-      # noinspection RubyLiteralArrayInspection,RubyQuotedStringsInspection
-      # English string normalization
-      class English < Base
-
-        strategy_name :en
-
-        CONTRACTION = ["ain't", "aren't", "can't", "could've", "couldn't",
-                       "didn't", "doesn't", "don't", "gonna", "gotta",
-                       "hadn't", "hasn't", "haven't", "he'd", "he'll", "he's",
-                       "how'd", "how'll", "how's", "I'd", "I'll", "I'm",
-                       "I've", "isn't", "it'd", "it'll", "it's", "mightn't",
-                       "might've", "mustn't", "must've", "needn't", "oughtn't",
-                       "shan't", "she'd", "she'll", "she's", "shouldn't",
-                       "should've", "somebody's", "someone'd", "someone'll",
-                       "someone's", "that'll", "that's", "that'd", "there'd",
-                       "there're", "there's", "they'd", "they'll", "they're",
-                       "they've", "wasn't", "we'd", "we'll", "we're", "we've",
-                       "weren't", "what'd", "what'll", "what're", "what's",
-                       "whats",
-                       "what've", "when's", "when'd", "where'd", "where's",
-                       "where've", "who'd", "who'd've", "who'll", "who're",
-                       "who's", "who've", "why'd", "why're", "why's", "won't",
-                       "won't've", "would've", "wouldn't", "wouldn't've",
-                       "y'all", "ya'll", "you'd", "you'd've", "you'll",
-                       "y'aint", "y'ain't", "you're", "you've"].map(&:downcase).freeze
-
-        EXPANSION = ["is not", "are not", "can not", "could have",
-                     "could not", "did not", "does not", "do not",
-                     "going to", "got to", "had not", "has not",
-                     "have not", "he would", "he will", "he is", "how did",
-                     "how will", "how is", "I would", "I will", "I am",
-                     "I have", "is not", "it would", "it will", "it is",
-                     "might not", "might have", "must not", "must have",
-                     "need not", "ought not", "shall not", "she would",
-                     "she will", "she is", "should not", "should have",
-                     "somebody is", "someone would", "someone will",
-                     "someone is", "that will", "that is", "that would",
-                     "there would", "there are", "there is", "they would",
-                     "they will", "they are", "they have", "was not",
-                     "we would", "we will", "we are", "we have",
-                     "were not", "what did", "what will", "what are",
-                     "what is",
-                     "what is", "what have", "when is", "when did",
-                     "where did", "where is", "where have", "who would",
-                     "who would have", "who will", "who are", "who is",
-                     "who have", "why did", "why are", "why is",
-                     "will not", "will not have", "would have",
-                     "would not", "would not have", "you all", "you all",
-                     "you would", "you would have", "you will",
-                     "you are not", "you are not", "you are", "you have"].map(&:downcase).freeze
-
-        TEXT_NUMBERS = ["zero", "one", "two", "three", "four", "five", "six",
-                       "seven", "eight", "nine", "ten", "eleven", "twelve",
-                       "thirteen", "fourteen", "fifteen", "sixteen",
-                       "seventeen", "eighteen", "nineteen", "twenty"].map(&:downcase).freeze
-
-        ARTICLES = ["the", "a", "an"].map(&:downcase).freeze
-
-        def self.normalize(text, remove_articles: true)
-          words = text.split
-
-          normalized = ''
-
-          words.each do |word|
-            next if word.empty?
-            next if remove_articles && ARTICLES.include?(word.downcase)
-
-            # Expand common contractions, e.g. "isn't" -> "is not"
-            if CONTRACTION.include?(word.downcase)
-              capitalize = false
-              if word[0] == word[0].upcase
-                capitalize = true
-              end
-              word = EXPANSION[CONTRACTION.index(word.downcase)]
-
-              word.capitalize! if capitalize
-            end
-
-            if TEXT_NUMBERS.include?(word.downcase)
-              word = TEXT_NUMBERS.index(word.downcase)
-            end
-
-            normalized += " " + word
-          end
-
-          normalized.strip
-        end
-
-      end
-    end
-  end
-end

data/lib/charyf/utils/parser/parser.rb

@@ -1,30 +0,0 @@
-require_relative '../../support/string'
-require_relative '../strategy/base_class'
-require_relative '../strategy/owner_class'
-
-module Charyf
-  module Utils
-    module Parser
-
-      extend Charyf::Strategy::OwnerClass
-
-      class Base
-
-        include Charyf::Strategy::BaseClass
-
-        # TODO sig
-        def self.normalize(text, remove_articles: true)
-          raise Charyf::Utils::NotImplemented.new
-        end
-
-      end # End of base
-
-      # TODO sig
-      def self.get(language)
-        # TODO implement
-        Charyf::Utils::Parser::English
-        list[language]
-      end
-    end
-  end
-end