alexa_modelbuilder 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29a02805ad54f017357ba708f22df04007d448c2
-  data.tar.gz: b0caf4832186a73f8934b8a787a2c24bf945f08b
+  metadata.gz: 66eacd2fdc394f26b8a5a507eca5b9353607e926
+  data.tar.gz: 2e5fa1114547e4195b0785a9c39d25e661668267
 SHA512:
-  metadata.gz: e751188d404f465fcf07d63594e94ca8420db3187d16eb53312edd61dc1b0169b4bc3f53533cd36769723f1df503fe47bee15449a2363415816f326f64132a06
-  data.tar.gz: fb9010de80a78700c832c877dde453d0355aadcc385ea7ddb7c25dd981ddca243bbf127f10ed45a38e15c69e2b3b24082e4108923276f35e4a48e219a8f4c664
+  metadata.gz: f69d6b3eef73d76ff90bad68b185f08029027668a5f147fe28a2c25ac4f1ef652e06f65f835e82aca8ad537a51e10310c2eeeabab8f6dd27cb4783a16073fde9
+  data.tar.gz: 3fcde44f9711facf4abab444d86327dd169c66001da3d97581097b36c8ee033938fc6a1027376266cb1817fb44f4149957bc340a74ecb117a12dc296f6d0790b

data/lib/alexa_modelbuilder.rb

@@ -1,95 +1,95 @@
-#!/usr/bin/env ruby
-
-# file: alexa_modelbuilder.rb
-
-
-require 'json'
-require 'lineparser'
-
-
-class AlexaModelBuilder
-
-  def initialize(s=nil, debug: false, locale: 'en-GB')
-
-    @debug, @locale = debug, locale
-    parse(s) if s
-
-  end
-  
-  def read(s)
-    
-    h = JSON.parse(s, symbolize_names: true)
-    
-    lm = h[:interactionModel][:languageModel]
-    lm[:invocationName]
-
-    out = []
-    out << 'invocation: ' + lm[:invocationName] + "\n"
-    puts lm[:intents].inspect if @debug
-    
-    lm[:intents].each do |intent|
-
-      puts 'intent: ' + intent[:name].inspect if @debug
-      out << intent[:name] + "\n"
-      
-      if intent[:samples] then
-        
-        intent[:samples].each do |utterance|
-          puts 'utterance: ' + utterance.inspect if @debug
-          out << "  " + utterance
-        end
-
-        if intent[:slots] and intent[:slots].any? then
-
-          out << "\n  slots:"
-
-          intent[:slots].each do |slot|
-            out << "    %s: %s" % [slot[:name], slot[:type]]
-          end
-
-        end
-
-        out << "\n" if intent[:samples].any?
-      end
-
-    end
-
-    if lm[:types] and lm[:types].any? then
-
-      out << "types:"
-
-      lm[:types].each do |type|
-        
-        values = type[:values].map do |x| 
-          
-          synonyms = x[:name][:synonyms]
-          val = x[:name][:value]
-          val += ' (' + synonyms.join(', ') + ')' if synonyms and synonyms.any?
-          val
-        end
-        
-        out << "  %s: %s" % [type[:name], values.join(', ')]
-      end
-
-    end
-    out << "\n"
-
-    @s = out.join("\n")
-    #parse(@s)
-    self
-  end
-  
-  def to_h()
-    @h
-  end
-  
-  def to_manifest(json: false)
-    json ? JSON.pretty_generate(@manifest) : @manifest
-  end
-  
-## A guideline of fields to include within the raw document
-  
-=begin
+#!/usr/bin/env ruby
+
+# file: alexa_modelbuilder.rb
+
+
+require 'json'
+require 'lineparser'
+
+
+class AlexaModelBuilder
+
+  def initialize(s=nil, debug: false, locale: 'en-GB')
+
+    @debug, @locale = debug, locale
+    parse(s) if s
+
+  end
+  
+  def read(s)
+    
+    h = JSON.parse(s, symbolize_names: true)
+    
+    lm = h[:interactionModel][:languageModel]
+    lm[:invocationName]
+
+    out = []
+    out << 'invocation: ' + lm[:invocationName] + "\n"
+    puts lm[:intents].inspect if @debug
+    
+    lm[:intents].each do |intent|
+
+      puts 'intent: ' + intent[:name].inspect if @debug
+      out << intent[:name] + "\n"
+      
+      if intent[:samples] then
+        
+        intent[:samples].each do |utterance|
+          puts 'utterance: ' + utterance.inspect if @debug
+          out << "  " + utterance
+        end
+
+        if intent[:slots] and intent[:slots].any? then
+
+          out << "\n  slots:"
+
+          intent[:slots].each do |slot|
+            out << "    %s: %s" % [slot[:name], slot[:type]]
+          end
+
+        end
+
+        out << "\n" if intent[:samples].any?
+      end
+
+    end
+
+    if lm[:types] and lm[:types].any? then
+
+      out << "types:"
+
+      lm[:types].each do |type|
+        
+        values = type[:values].map do |x| 
+          
+          synonyms = x[:name][:synonyms]
+          val = x[:name][:value]
+          val += ' (' + synonyms.join(', ') + ')' if synonyms and synonyms.any?
+          val
+        end
+        
+        out << "  %s: %s" % [type[:name], values.join(', ')]
+      end
+
+    end
+    out << "\n"
+
+    @s = out.join("\n")
+    #parse(@s)
+    self
+  end
+  
+  def to_h()
+    @h
+  end
+  
+  def to_manifest(json: false)
+    json ? JSON.pretty_generate(@manifest) : @manifest
+  end
+  
+## A guideline of fields to include within the raw document
+  
+=begin
 manifest
 
 vendorId: [generate from vendors.first]
@@ -100,213 +100,217 @@ description: input (default)
 keywords: input (default)
 examplePhrases: [generate from intent utterances]
 testingInstructions: input [generate from intent utterances]
-endpoint: input    
-=end
-  
-  def build_manifest(h)    
-    
-    manifest = {
-        "vendorId" => '',
-        "manifest" => {
-            "publishingInformation" => {
-                "locales" => {
-                },
-                "isAvailableWorldwide" => false,
-                "testingInstructions" => "1) Say 'Alexa, say something'",
-                "category" => "SMART_HOME",
-                "distributionCountries" => [
-                ]
-            },
-            "apis" => {
-                "custom" => {
-                    "endpoint" => {
-                        "uri" => "https://someserver.com/alexaskills"
-                    }
-                }
-            },
-            "manifestVersion" => "1.0",
-            "privacyAndCompliance" => {
-                "allowsPurchases" => false,
-                "locales" => {
-                },
-                "isExportCompliant" => true,
-                "isChildDirected" => false,
-                "usesPersonalInfo" => false
-            }
-        }
-    }    
-
-    manifest['vendorId'] = h[:vendor_id] if h[:vendor_id]
-    m = manifest['manifest']
-    
-    h[:locale] ||= @locale
-    
-    
-    info = {}
-    info['summary'] = h[:summary] || h[:name]
-    
-    examples = ["Alexa, open %s." % h[:invocation]]
-    examples += h[:intent].select{|x| x.is_a? Hash}.take(2).map do |x|
-      phrases = x.first[-1][:utterance]
-      puts 'phrases: ' + phrases.inspect if @debug
-      "Alexa, %s." % (phrases.is_a?(Array) ? phrases.first : phrases)
-    end
-    
-    info['examplePhrases'] = examples
-    info['keywords'] = h[:keywords] ? h[:keywords] : \
-        h[:name].split.map(&:downcase)
-
-    info['name'] = h[:name] if h[:name]
-    info['description'] = h[:description] || info['summary']
-    
-    m['publishingInformation']['locales'] = {h[:locale] => info}
-    countries = {gb: %w(GB US), us: %w(US GB)}
-    m['publishingInformation']['distributionCountries'] = \
-        countries[h[:locale][/[A-Z]+/].downcase.to_sym]
-    m['apis']['custom']['endpoint']['uri'] = h[:endpoint] if h[:endpoint]
-    
-    toc = {
-      'termsOfUseUrl' => 'http://www.termsofuse.sampleskill.com',
-      'privacyPolicyUrl' => 'http://www.myprivacypolicy.sampleskill.com'
-    }
-    m['privacyAndCompliance']['locales'] = {h[:locale] => toc}
-
-    
-    instruct = ["open %s" % h[:invocation]]
-    instruct << h[:intent].select{|x| x.is_a? Hash}\
-        .first.values.first[:utterance].first
-
-    tests = instruct.map.with_index {|x, i| "%s) Say 'Alexa, %s'" % [i+1, x]}
-    m['publishingInformation']['testingInstructions'] = tests.join(' ')
-    
-    manifest
-  end
-
-
-  def to_model(json: false)
-    json ? JSON.pretty_generate(@interact_model) : @interact_model
-  end
-  
-  def to_json(pretty: true)
-    pretty ? JSON.pretty_generate(@interact_model) : @interact_model.to_json
-  end
-  
-  def to_s()
-    @s
-  end
-
-  private
-
-  def parse(lines)
-
-    puts 'inside parse' if @debug
-    
-    interaction = [
-      [:root, 'invocation: :invocation', :invocation],
-      [:root, 'types: :types', :types],
-          [:types, /(.*)/, :type],
-      [:root, ':intent', :intent],
-        [:intent, ':utterance', :utterance],
-        [:intent, /slots:/, :slots],
-          [:slots, /(.*)/, :slot],
-      [:all, /#/, :comment]
-    ]
-
-    a = %w(
-      vendorId
-      locale
+endpoint: input    
+=end
+  
+  def build_manifest(h)    
+    
+    manifest = {
+        "manifest" => {
+            "publishingInformation" => {
+                "locales" => {
+                },
+                "isAvailableWorldwide" => false,
+                "testingInstructions" => "1) Say 'Alexa, say something'",
+                "category" => "SMART_HOME",
+                "distributionCountries" => [
+                ]
+            },
+            "apis" => {
+                "custom" => {
+                    "endpoint" => {
+                        "sslCertificateType"=>"Trusted",
+                        "uri" => "https://someserver.com/alexaskills"
+                    }
+                }
+            },
+            "manifestVersion" => "1.0",
+            "privacyAndCompliance" => {
+                "allowsPurchases" => false,
+                "locales" => {
+                },
+                "isExportCompliant" => true,
+                "isChildDirected" => false,
+                "usesPersonalInfo" => false
+            }
+        }
+    }    
+
+    manifest['vendorId'] = h[:vendor_id] if h[:vendor_id]
+    m = manifest['manifest']
+    
+    h[:locale] ||= @locale
+    
+    
+    info = {}
+    info['summary'] = h[:summary] || h[:name]
+    
+    examples = ["Alexa, open %s." % h[:invocation]]
+    examples += h[:intent].select{|x| x.is_a? Hash}.take(2).map do |x|
+      phrases = x.first[-1][:utterance]
+      puts 'phrases: ' + phrases.inspect if @debug
+      "Alexa, %s." % (phrases.is_a?(Array) ? phrases.first : phrases)
+    end
+    
+    info['examplePhrases'] = examples
+    info['keywords'] = h[:keywords] ? h[:keywords] : \
+        h[:name].split.map(&:downcase)
+
+    info['name'] = h[:name] if h[:name]
+    info['description'] = h[:description] || info['summary']
+    
+    m['publishingInformation']['locales'] = {h[:locale] => info}
+    countries = {gb: %w(GB US), us: %w(US GB)}
+    m['publishingInformation']['distributionCountries'] = \
+        countries[h[:locale][/[A-Z]+/].downcase.to_sym]
+    m['apis']['custom']['endpoint']['uri'] = h[:endpoint] if h[:endpoint]
+    
+    toc = {
+      'termsOfUseUrl' => 'http://www.termsofuse.sampleskill.com',
+      'privacyPolicyUrl' => 'http://www.myprivacypolicy.sampleskill.com'
+    }
+    m['privacyAndCompliance']['locales'] = {h[:locale] => toc}
+
+    
+    instruct = ["open %s" % h[:invocation]]
+    instruct << h[:intent].select{|x| x.is_a? Hash}\
+        .first.values.first[:utterance].first
+
+    tests = instruct.map.with_index {|x, i| "%s) Say 'Alexa, %s'" % [i+1, x]}
+    m['publishingInformation']['testingInstructions'] = tests.join(' ')
+    
+    manifest
+  end
+
+
+  def to_model(json: false)
+    json ? JSON.pretty_generate(@interact_model) : @interact_model
+  end
+  
+  def to_json(pretty: true)
+    pretty ? JSON.pretty_generate(@interact_model) : @interact_model.to_json
+  end
+  
+  def to_s()
+    @s
+  end
+
+  private
+
+  def parse(lines)
+
+    puts 'inside parse' if @debug
+    
+    interaction = [
+      [:root, 'invocation: :invocation', :invocation],
+      [:root, 'types: :types', :types],
+          [:types, /(.*)/, :type],
+      [:root, ':intent', :intent],
+        [:intent, ':utterance', :utterance],
+        [:intent, /slots:/, :slots],
+          [:slots, /(.*)/, :slot],
+      [:all, /#/, :comment]
+    ]
+
+    a = %w(
+      vendorId
+      locale
       name
-      summary
-      description
+      summary
+      description
       keywords
       examplePhrases
-      testingInstructions
-      endpoint
-    )
-
-
-    manifest = a.map do |word|
-      x = word.gsub(/(?<=.)(?=[A-Z])/,'_').downcase
-      [:root, "%s: :%s" % [x,x], x.to_sym]
-    end
-        
-    a2 =  manifest + interaction
-    puts 'a2: ' + a2.inspect if @debug
-    lp = LineParser.new a2, debug: @debug
-    lp.parse lines
-    @h = h = lp.to_h
-    puts 'h: ' + h.inspect if @debug
-    
-    model = {
-      'interactionModel' => {
-        'languageModel' => {
-          'invocationName' => '',
-          'intents' => [],
-          'types' => []
-        }
-      }
-    }
-
-    lm = model['interactionModel']['languageModel']
-    lm['invocationName'] = h[:invocation]
-
-    intents = h[:intent].map do |row|
-
-      name, value = row.is_a?(Hash) ? row.to_a.first : [row, {}]
-      intent = {'name' => name  , 'samples' => value[:utterance] || [] }
-
-      slots = value[:slots]
-
-      if slots then
-
-        a = slots.is_a?(Array) ? value[:slots] : [slots]
-
-        intent['slots'] = a.map do |slot|
-
-          name, type = slot.split(/: */,2)
-          {'name' => name, 'type' => type, 'samples' => []}
-
-        end    
-
-      end
-
-      intent
-
-    end
-
-    lm['intents'] = intents
-
-    if h[:types] then
-
-      (h[:types].is_a?(Array) ? h[:types] : [h[:types]]).map do |raw_type|
-
-          name, raw_val = raw_type.split(/: */)
-          values = raw_val.split(/, */)
-
-          types = {'name' => name, 'values' => []}
-          
-          types['values'] = values.map do |raw_val|
-            
-            name, raw_synonyms = raw_val.split(/ *\(/,2)
-                    
-            h2 = {'name' => {'value' => name }}
-            
-            if raw_synonyms then
-              synonyms = raw_synonyms[0..-2].split(/, */)
-              h2['synonyms'] = synonyms
-            end
-            
-            h2
-          end
-
-          lm['types'] = types
-      end
-
-    end
-
-    @manifest = build_manifest h
-    @interact_model = model
-
-  end
-
-end
+      testingInstructions
+      endpoint
+    )
+
+
+    manifest = a.map do |word|
+      x = word.gsub(/(?<=.)(?=[A-Z])/,'_').downcase
+      [:root, "%s: :%s" % [x,x], x.to_sym]
+    end
+        
+    a2 =  manifest + interaction
+    puts 'a2: ' + a2.inspect if @debug
+    lp = LineParser.new a2, debug: @debug
+    lp.parse lines
+    @h = h = lp.to_h
+    puts 'h: ' + h.inspect if @debug
+    
+    model = {
+      'interactionModel' => {
+        'languageModel' => {
+          'invocationName' => '',
+          'intents' => [],
+          'types' => []
+        }
+      }
+    }
+
+    lm = model['interactionModel']['languageModel']
+    lm['invocationName'] = h[:invocation]
+
+    intents = h[:intent].map do |row|
+
+      name, value = row.is_a?(Hash) ? row.to_a.first : [row, {}]
+      
+      value[:utterance] ||= []
+      samples = value[:utterance].is_a?(Array) ? value[:utterance] : \
+          [value[:utterance]]
+      intent = {'name' => name  , 'samples' => samples}
+
+      slots = value[:slots]
+
+      if slots then
+
+        a = slots.is_a?(Array) ? value[:slots] : [slots]
+
+        intent['slots'] = a.map do |slot|
+
+          name, type = slot.split(/: */,2)
+          {'name' => name, 'type' => type, 'samples' => []}
+
+        end    
+
+      end
+
+      intent
+
+    end
+
+    lm['intents'] = intents
+
+    if h[:types] then
+
+      (h[:types].is_a?(Array) ? h[:types] : [h[:types]]).map do |raw_type|
+
+          name, raw_val = raw_type.split(/: */)
+          values = raw_val.split(/, */)
+
+          types = {'name' => name, 'values' => []}
+          
+          types['values'] = values.map do |raw_val|
+            
+            name, raw_synonyms = raw_val.split(/ *\(/,2)
+                    
+            h2 = {'name' => {'value' => name }}
+            
+            if raw_synonyms then
+              synonyms = raw_synonyms[0..-2].split(/, */)
+              h2['synonyms'] = synonyms
+            end
+            
+            h2
+          end
+
+          lm['types'] = types
+      end
+
+    end
+
+    @manifest = build_manifest h
+    @interact_model = model
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alexa_modelbuilder
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   EgZc9/Cpxo+WohlXR69qWm5QxX8PvdLu5ZjGD2OH5pBAPToJQyk9O8kZB9OdDMZT
   tns=
   -----END CERTIFICATE-----
-date: 2018-06-30 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lineparser