alexa_modelbuilder 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7adaae5e55c22c5a56b8638f9d4136ccd3c26f79
-  data.tar.gz: 415679be2f5e3495c35aa270dd32d2bb44128e61
+  metadata.gz: a547500e95eeeadcec607967625ad47db8e74ae7
+  data.tar.gz: b83dd6487e2774444abbdb2df0594eccd939a872
 SHA512:
-  metadata.gz: 967e8ca5b53a155590556be2647677325514d92e74706044846d02aa5287e51e4e7364d54696196ce5f38d1b165cf3ae9e390a98687a01eba1259928fe74172f
-  data.tar.gz: d36b7804a5cbfd00fcc2931e5a5389f464e19d08873f124de4b05a151da1fe94c42d10be2b24c4b3c22531a9e1231c49c826d056202722a4f8638cdb7f3b1828
+  metadata.gz: a61d11aee196ce8c44ef060395d77db5add8c9f270cb9d17650188228f0828b80ee39ea66dad5f9d94519131cda3b968875e8c0ffcd9240bf388dc12883ae8d6
+  data.tar.gz: cd26e6b949d90941f6f36feefcba5178a69fdee3a7ec7bdc61fd5d444414a78710e5f140b24dacccfa5214eb13a0f841d4e79555df9346fc11b88346ecc6b3c0

data.tar.gz.sig

@@ -1,2 +1,2 @@
-��O���q��2�Qg�^�j䚇���	�)9��v����vMxL�;�Ǟ��_Wj�c\,�kI�K7��4���gT��4�X�k0\�|��zty��)-O'�6�C�n�t�� �}���cjo�"Of���k	����)�mG�=�[[�C��0�3�:������}F`�˺���:k�2��2���+�
B;�Sp<~���ㄱ2�m���/���y�s���@0�Ϸb���ڥ�h�Nb�������F�$��Wr�
-��}
+�m4�؍$sr���1��x��3�e���_0���X�k8Je��A���>�]�ֲ�T����a������g$Zy�l� }��}�9��f�d5r��>�!�]�]=im �Jː�Ĝ�y�&��0&��=���
+�	�&5'"�����
��%�m�����h�G��P�噞^���9�������$/�gZHŒ���027����Sr���1V�g��I!s{�U�X��(�7���D�`�M�U2��

data/lib/alexa_modelbuilder.rb

@@ -80,11 +80,11 @@ class AlexaModelBuilder
   end
   
   def to_h()
-    @h
+    @interact_model
   end
   
   def to_json(pretty: true)
-    pretty ? JSON.pretty_generate(@h) : @h.to_json
+    pretty ? JSON.pretty_generate(@interact_model) : @interact_model.to_json
   end
   
   def to_s()
@@ -95,21 +95,45 @@ class AlexaModelBuilder
 
   def parse(lines)
 
-    patterns = [
+    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],
+        [:intent, /slots:/, :slots],
           [:slots, /(.*)/, :slot],
       [:all, /#/, :comment]
     ]
 
-    lp = LineParser.new patterns
-    r = lp.parse lines
-
-    h = {
+    a = %w(
+      vendorId
+      locale
+      name
+      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 = lp.to_h
+    puts 'h: ' + h.inspect if @debug
+    
+    model = {
       'interactionModel' => {
         'languageModel' => {
           'invocationName' => '',
@@ -119,65 +143,64 @@ class AlexaModelBuilder
       }
     }
 
-    lm = h['interactionModel']['languageModel']
-    lm['invocationName'] = r[0][1].values.first
+    lm = model['interactionModel']['languageModel']
+    lm['invocationName'] = h[:invocation]
 
-    raw_intents = r.select {|x| x.first == :intent}
+    intents = h[:intent].map do |row|
 
-    intents = raw_intents.map do |x|
+      name, value = row.is_a?(Hash) ? row.to_a.first : [row, {}]
+      intent = {'name' => name  , 'samples' => value[:utterance] || [] }
 
-      raw_utterances = x[3].select {|y| y.first == :utterance}
+      slots = value[:slots]
 
-      utterances = raw_utterances.map {|z| z[2].first.rstrip }
+      if slots then
 
-      intent = {'name' => x[1].values.first, 'samples' => utterances }
-      raw_slots = x[3].find {|x| x.first == :slots }
+        a = slots.is_a?(Array) ? value[:slots] : [slots]
 
-      if raw_slots then
-        
-        intent['slots'] = raw_slots[3].map do |slot|
+        intent['slots'] = a.map do |slot|
 
-          name, type = slot[2].first.split(/: */,2)
+          name, type = slot.split(/: */,2)
           {'name' => name, 'type' => type, 'samples' => []}
 
-        end
+        end    
+
       end
 
       intent
 
     end
 
-
     lm['intents'] = intents
 
-    raw_types = r.find {|x| x.first == :types}
+    if h[:types] then
 
-    if raw_types then
+      (h[:types].is_a?(Array) ? h[:types] : [h[:types]]).map do |raw_type|
 
-      name, raw_val = raw_types[2][1].first.split(/: */)
-      values = raw_val.split(/, */)
+          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
+          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
+          lm['types'] = types
+      end
 
     end
 
-    @h = h
+    @interact_model = model
 
   end
 

metadata

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