alexa_generator 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0515d8aff0f5502ee500bf27643d2db00c5f2257
-  data.tar.gz: d54b203ce894bcbfc40604c78e5f5442d5315755
+  metadata.gz: df62fac43ca92e9a3c82c42a1fae04bd1feecc1a
+  data.tar.gz: 89650a53d1d39eb8469beef10a1999e8a671ae96
 SHA512:
-  metadata.gz: e2c2dd3201dd4f1b5928f1459ab2fb1353b5f2a88d4e2037fc17434960966ba63e602ece410236c44ea7fbfa1b8a03d365621b15ea17fb5869a3f9bbd3b9131f
-  data.tar.gz: 005652fc3257af55532d8dc618268a5b8bcf66e4819fb01ccf2692157cf1ed8834109ec3c4dc10ac48d07c84747d164acc4bcfe775bd030f8d961082345e9d89
+  metadata.gz: 44a03f30c76b4f5c7d7085413e606ba77c3b1d4371c08c497d50270b8864e1362efdd8d8163e1dac80cec0c03042c662c841075ad5305efc97952f25bef7f479
+  data.tar.gz: a515a2e4824e6d1d3ae968a0c59bf7dabbc454f440ea7f64f0bd08a5d124e85f2591a887463ce75004ff31f4d259f9959b0b879fcc7c2a3498b5faa3ac1bef57

data/lib/alexa_generator/interaction_model.rb

@@ -92,10 +92,7 @@ module AlexaGenerator
           slot_value_combinations.each do |value_binding|
             raw_template = template.template.dup
 
-            # puts value_binding.inspect
-
             value_binding.each do |binding|
-              # puts "----> #{binding}"
               binding.bind_to_template!( raw_template )
             end
 
@@ -111,6 +108,26 @@ module AlexaGenerator
         "#{intent_name} #{utterance}"
       end
     end
+    
+    def slot_type_values(slot_type)
+      bindings = Set.new
+      @intents.values.each do |intent|
+        intent.slots.each do |slot|
+          if slot.type.to_s == slot_type.to_s
+            bindings += slot.bindings
+          end
+        end
+      end
+      bindings.to_a
+    end
+    
+    def custom_slot_types
+      slots = collect_slot_types
+      custom_types = slots.values.select do |x|
+        AlexaGenerator::Slot::SlotType.custom?(x)
+      end
+      Set.new(custom_types).to_a
+    end
 
     def collect_slot_types
       out = {}

data/lib/alexa_generator/slot.rb

@@ -10,6 +10,10 @@ module AlexaGenerator
       def self.literal?(value)
         [:LITERAL, LITERAL].include?(value.to_sym)
       end
+      
+      def self.custom?(value)
+        !literal?(value) && !value.to_s.start_with?('AMAZON.')
+      end
     end
 
     class Builder
@@ -30,15 +34,16 @@ module AlexaGenerator
       end
 
       def create
-        Slot.new(@name, @type)
+        Slot.new(@name, @type, @bindings)
       end
     end
 
-    attr_reader :name, :type
+    attr_reader :name, :type, :bindings
 
-    def initialize(name, type)
+    def initialize(name, type, bindings)
       @name = name.to_sym
       @type = type
+      @bindings = bindings
     end
 
     def self.build(name, type, &block)

data/lib/alexa_generator/version.rb

@@ -1,3 +1,3 @@
 module AlexaGenerator
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/spec/alexa_generator/interaction_model_spec.rb

@@ -140,11 +140,6 @@ describe AlexaGenerator::InteractionModel do
   end
 
   context 'with a single template' do
-    intents = [
-        AlexaGenerator::Intent.new(
-            :MyIntent, [ AlexaGenerator::Slot.new(:SlotOne, AlexaGenerator::Slot::SlotType::LITERAL) ]
-        )
-    ]
     utterance_templates = [
         AlexaGenerator::SampleUtteranceTemplate.new( :MyIntent, 'Alexa, please {SlotOne}')
     ]
@@ -152,6 +147,11 @@ describe AlexaGenerator::InteractionModel do
         AlexaGenerator::SlotBinding.new( :SlotOne, 'make me a sandwich' ),
         AlexaGenerator::SlotBinding.new( :SlotOne, 'fix my motorcycle' )
     ]
+    intents = [
+        AlexaGenerator::Intent.new(
+            :MyIntent, [ AlexaGenerator::Slot.new(:SlotOne, AlexaGenerator::Slot::SlotType::LITERAL, slot_bindings) ]
+        )
+    ]
 
     it 'should produce bound utterances' do
       actual = AlexaGenerator::InteractionModel.new(intents, utterance_templates, slot_bindings).sample_utterances(:MyIntent)
@@ -163,28 +163,32 @@ describe AlexaGenerator::InteractionModel do
   end
 
   context 'with multiple templates' do
+    s1_bindings = [
+        AlexaGenerator::SlotBinding.new( :SlotOne, 'make me a sandwich' ),
+        AlexaGenerator::SlotBinding.new( :SlotOne, 'fix my motorcycle' )
+    ]
+    s2_bindings = [
+        AlexaGenerator::SlotBinding.new( :SlotTwo, 'one' ),
+        AlexaGenerator::SlotBinding.new( :SlotTwo, 'two' ),
+    ]
+    s3_bindings = [
+        AlexaGenerator::SlotBinding.new( :SlotThree, '6 a.m.' ),
+        AlexaGenerator::SlotBinding.new( :SlotThree, 'noon' ),
+    ]
+    
     intents = [
         AlexaGenerator::Intent.new(
             :MyIntent, [
-                         AlexaGenerator::Slot.new(:SlotOne, AlexaGenerator::Slot::SlotType::LITERAL),
-                         AlexaGenerator::Slot.new(:SlotTwo, AlexaGenerator::Slot::SlotType::NUMBER),
-                         AlexaGenerator::Slot.new(:SlotThree, AlexaGenerator::Slot::SlotType::TIME),
+                         AlexaGenerator::Slot.new(:SlotOne, AlexaGenerator::Slot::SlotType::LITERAL, s1_bindings),
+                         AlexaGenerator::Slot.new(:SlotTwo, AlexaGenerator::Slot::SlotType::NUMBER, s2_bindings),
+                         AlexaGenerator::Slot.new(:SlotThree, AlexaGenerator::Slot::SlotType::TIME, s3_bindings),
                      ],
         )
     ]
     utterance_templates = [
         AlexaGenerator::SampleUtteranceTemplate.new( :MyIntent, 'Alexa, please {SlotOne} {SlotTwo} at {SlotThree}')
     ]
-    slot_bindings = [
-        AlexaGenerator::SlotBinding.new( :SlotOne, 'make me a sandwich' ),
-        AlexaGenerator::SlotBinding.new( :SlotOne, 'fix my motorcycle' ),
-
-        AlexaGenerator::SlotBinding.new( :SlotTwo, 'one' ),
-        AlexaGenerator::SlotBinding.new( :SlotTwo, 'two' ),
-
-        AlexaGenerator::SlotBinding.new( :SlotThree, '6 a.m.' ),
-        AlexaGenerator::SlotBinding.new( :SlotThree, 'noon' ),
-    ]
+    slot_bindings = s1_bindings + s2_bindings + s3_bindings
 
     it 'should produce bound utterances' do
       actual = AlexaGenerator::InteractionModel.new(intents, utterance_templates, slot_bindings).sample_utterances(:MyIntent)
@@ -195,4 +199,36 @@ 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|
+        intent.add_slot(:SlotOne, 'SlotType1') do |slot|
+          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
 end

metadata

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