alexa_generator 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99ce7ef9324a3916c4bcb74eeec1b951d08b9528
-  data.tar.gz: c90ada13a698c92ccb4d1b2d0b550de43ca15ce2
+  metadata.gz: aee459489effcc7826675de4ba5dc8b8f4565014
+  data.tar.gz: 27c1e1164ccc8a245323f3fe66e50526a92febd5
 SHA512:
-  metadata.gz: 871ce5c20db59cb50c4e585c04810f12ca56770fbebc60e91b93e72b01b1305c7b00b998538081e17114e0fa9fa8b8c22840064100c923dcca6c9676bfd3cfa9
-  data.tar.gz: b9c3c54b1c190e8616be539cfbd81cf7413ca61e0cfff925afaf58c7c9e08429ceff119e4f979235f6c00e68ead3a2ea2b6fc1e02387befb460937c67a9fc6e9
+  metadata.gz: 183ea342f89c463192ea44e39d677474a17b55458ca173aa1c30c9c7a6fa4d29277b815bb1d60f6281b7c25ec6ef3f67f25b8da276ac5d749ac7628a42e89610
+  data.tar.gz: fa998af973a54ae82761f5c82564a4a2a740b7a029d8448327595c8256863d73958c934a20397f486bf7188c033e24820e5bb690c18a42717e3c96aaed426dab

data/lib/alexa_generator/interaction_model.rb

@@ -46,17 +46,21 @@ module AlexaGenerator
 
     def intent_schema
       intents = []
-      
+
       @intents.values.each do |intent|
-        slots = []
-        
-        intent.slots.each do |slot|
-          slots << {name: slot.name, type: slot.type}
+        if intent.slots.any?
+          slots = []
+
+          intent.slots.each do |slot|
+            slots << {name: slot.name, type: slot.type}
+          end
+
+          intents << {intent: intent.name, slots: slots}
+        else
+          intents << {intent: intent.name}
         end
-        
-        intents << {intent: intent.name, slots: slots}
       end
-      
+
       { intents: intents }
     end
 
@@ -70,8 +74,8 @@ module AlexaGenerator
         relevant_slots = template.referenced_slots
 
         # Amazon wants only the LITERAL ones
-        relevant_slots.select! do |s| 
-          AlexaGenerator::Slot::SlotType.literal?(slot_types[s.to_sym]) 
+        relevant_slots.select! do |s|
+          AlexaGenerator::Slot::SlotType.literal?(slot_types[s.to_sym])
         end
 
         # Compute all possible value bindings for the relevant slots
@@ -108,7 +112,7 @@ module AlexaGenerator
         "#{intent_name} #{utterance}"
       end
     end
-    
+
     def slot_type_values(slot_type)
       bindings = Set.new
       @intents.values.each do |intent|
@@ -120,7 +124,7 @@ module AlexaGenerator
       end
       bindings.to_a
     end
-    
+
     def custom_slot_types
       slots = collect_slot_types
       custom_types = slots.values.select do |x|
@@ -145,4 +149,4 @@ module AlexaGenerator
       builder.create
     end
   end
-end
+end

data/lib/alexa_generator/version.rb

@@ -1,3 +1,3 @@
 module AlexaGenerator
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/alexa_generator/interaction_model_spec.rb

@@ -53,8 +53,7 @@ describe AlexaGenerator::InteractionModel do
                                          {
                                              intents: [
                                                  {
-                                                     intent: :"AMAZON.CancelIntent",
-                                                     slots: []
+                                                     intent: :"AMAZON.CancelIntent"
                                                  }
                                              ]
                                          })
@@ -77,8 +76,7 @@ describe AlexaGenerator::InteractionModel do
                                          {
                                              intents: [
                                                  {
-                                                     intent: :"AMAZON.CancelIntent",
-                                                     slots: []
+                                                     intent: :"AMAZON.CancelIntent"
                                                  },
                                                  {
                                                      intent: :IntentOne,
@@ -175,7 +173,7 @@ describe AlexaGenerator::InteractionModel do
         AlexaGenerator::SlotBinding.new( :SlotThree, '6 a.m.' ),
         AlexaGenerator::SlotBinding.new( :SlotThree, 'noon' ),
     ]
-    
+
     intents = [
         AlexaGenerator::Intent.new(
             :MyIntent, [
@@ -199,7 +197,7 @@ describe AlexaGenerator::InteractionModel do
       expect(actual).to include('MyIntent Alexa, please {make me a sandwich|SlotOne} {SlotTwo} at {SlotThree}')
     end
   end
-  
+
   context 'with custom slot types' do
     model = AlexaGenerator::InteractionModel.build do |iface|
       iface.add_intent(:IntentOne) do |intent|
@@ -207,31 +205,31 @@ describe AlexaGenerator::InteractionModel do
           slot.add_bindings(*%w(value1 value2 value3))
         end
       end
-      
+
       iface.add_intent(:IntentTwo) do |intent|
         intent.add_slot(:SlotA, 'SlotType1') do |slot|
           slot.add_binding('value4')
         end
-        
+
         intent.add_slot(:SlotB, :SlotType2) do |slot|
           slot.add_binding('valueA')
         end
-        
+
         intent.add_slot(:SlabC, AlexaGenerator::Slot::SlotType::NUMBER)
       end
     end
-    
+
     it 'should map slot bindings appropriately' do
       expect(model.custom_slot_types).to contain_exactly(*%w(SlotType1 SlotType2))
-      
+
       type1_bindings = model.slot_type_values('SlotType1')
       expect(type1_bindings).to contain_exactly(*%w(value1 value2 value3 value4))
-      
+
       type2_bindings = model.slot_type_values('SlotType2')
       expect(type2_bindings).to contain_exactly(*%w(valueA))
     end
   end
-  
+
   context 'with slots not having bindings' do
     it 'should work' do
       model = AlexaGenerator::InteractionModel.build do |iface|
@@ -242,4 +240,22 @@ describe AlexaGenerator::InteractionModel do
       end
     end
   end
-end
+
+  context 'with no slots' do
+    it 'should not show the slots field' do
+      iface = AlexaGenerator::InteractionModel.build do |iface|
+        iface.add_intent(AlexaGenerator::Intent::AmazonIntentType::CANCEL)
+      end
+
+      expect(iface).to be_an_instance_of(AlexaGenerator::InteractionModel)
+      expect(iface.intent_schema).to eq(
+                                         {
+                                             intents: [
+                                                 {
+                                                     intent: :"AMAZON.CancelIntent"
+                                                 }
+                                             ]
+                                         })
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alexa_generator
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Christopher Mullins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec