alexa_objects 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27c6becd500bc169ede65b66b7c7bbe58b3d030f
-  data.tar.gz: f4c66ee2745fefe112c65924cbb1c58f1740cc83
+  metadata.gz: 52f730ddeb0df6293146ee102df2e607ffd6eb40
+  data.tar.gz: a772c3a94362b5229d7a61d220ba595af1adafe7
 SHA512:
-  metadata.gz: f124f81f470089002bf9ea67a1a2ea9ff82133d189b3db6e95c0d98091413ef8903d97f0d339be19a88908adc1d5d61b66a114e684e7b038925cef31d3dd56c1
-  data.tar.gz: e804a8998daabbc564ac50559d45a95e2706c1dc471019136e8e70e0a6e177af4bfaf29d34230c9a276d974c976eee44fecdd1ba7394f8e343c3bdc79a4918fc
+  metadata.gz: 60eb8b142bc67a077ab0257e979ed866a632a9a05f24db438ee25824322c3256b5aa82de9738d925bde6e427b7702440712028328c1dc8a0257dd82b7505a67b
+  data.tar.gz: 10ea57a3292d9c28f96da651d10e51bea8f0d83b4a31faeaa6f07f6dbc0417f7d937b79ac2650acd0651439206b1d162c0b89564051996e5cc1e101f73928e4d

data/alexa_objects.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency 'recursive-open-struct'
+
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/lib/alexa_objects/echo_request.rb

@@ -1,3 +1,4 @@
+require 'recursive-open-struct'
 module AlexaObjects
   class EchoRequest
     attr_reader :intent_name, :slots, :timestamp, :request_type, :session_new, :user_id, :access_token, :application_id
@@ -44,9 +45,7 @@ module AlexaObjects
 
     private 
     def build_struct(hash)
-      if hash.nil?
-        nil
-      else
+      unless hash.nil?
         slot_names = hash.keys.map {|k| k.to_sym.downcase }
         slot_values = hash.values.map { |v| v["value"] }
         Struct.new(*slot_names).new(*slot_values)

data/lib/alexa_objects/response.rb

@@ -2,15 +2,15 @@ module AlexaObjects
   class Response
     attr_accessor :session_attributes, :spoken_response, :card_title, :card_content, :reprompt_text, :end_session, :speech_type, :text_type
 
-    def initialize
-      @session_attributes = {}
-      @speech_type = "PlainText"
-      @spoken_response = nil
-      @card_title = nil
-      @card_content = nil
-      @reprompt_text = nil
-      @text_type = "text"
-      @end_session = true
+    def initialize(params={})
+      @session_attributes = params[:session_attributes] || {}
+      @speech_type = params[:speech_type] || "PlainText"
+      @spoken_response = params[:spoken_response] || nil
+      @card_title = params[:card_title] || nil
+      @card_content = params[:card_content] || nil
+      @reprompt_text = params[:reprompt_text] || nil
+      @text_type = params[:text_type] || "text"
+      @end_session = params[:end_session] || true
     end
 
     def add_attribute(key, value)
@@ -21,8 +21,8 @@ module AlexaObjects
       @session_attributes[key] << value if @session_attributes[key]
     end
 
-    def with_card
-      {
+    def to_hash(with_card: false)
+      hash = {
         "version" => "2.0",
         "sessionAttributes" => @session_attributes,
         "response" => {
@@ -44,14 +44,16 @@ module AlexaObjects
           "shouldEndSession" => end_session 
         }
       }
+
+      return with_card ? hash : hash.tap { |hs| hs["response"].delete("card") }
     end
 
     def link_card
-      self.with_card.tap { |hs| hs["response"]["card"] = {"type" => "LinkAccount"} }
+      self.hash(with_card: true).tap { |hs| hs["response"]["card"] = {"type" => "LinkAccount"} }
     end
 
-    def without_card
-      self.with_card.tap { |hs| hs["response"].delete("card") }
+    def to_json(with_card: false)
+      return self.to_hash(with_card: with_card).to_json
     end
   end
 end

data/lib/alexa_objects/version.rb

@@ -1,3 +1,3 @@
 module AlexaObjects
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: alexa_objects
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Kyle Lucas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: recursive-open-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A pairing of objects for parsing Amazon Echo/Alexa skill requests.