alexa-rails 0.1.7 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f7424bec9291cbc50679c312fd312806dd0bfa4e8305204f57a6ddf6b62de2e
-  data.tar.gz: 4b503fd5f01d4b15ff12e8fef2054fd251f1005a9a32516c1e8eac00fb4dad33
+  metadata.gz: 679d2d2731372782d8475c8fc1fd1e34649270aa88a6c5ff47a3a4f9ed2bff11
+  data.tar.gz: 3b2f0968c98fc26e92ce8ece3b519c97115eb562e02903ccfbc56d5e19676df4
 SHA512:
-  metadata.gz: 7d797df382fb66afc6def0947558e74219c87955c022a0151d7e0044fe1b1605ac23db0b9312eca60fd82d4fb038d01355c48ee152d89de7db97a4b7ae6f54e9
-  data.tar.gz: 5d4ba2496b7054b58a4925e40ee4815b5d75c40438574e8c9dd939bf693b03d909eec63779f18d6c6751201062aca89a5e60f94eb9bea9efe845135e0318aea2
+  metadata.gz: c980eca419ad58dafaad43473f953868c49b10d7692fdb81a14c79a978111be27c0ada1123b6c17c401a70788f2083d402b5082e88f2873f22a6520283579be0
+  data.tar.gz: ba6c9e3c01f4be64c4e7891c80457684ad33ad6da2ad515e7cb11815159641e8e10dc0bbb8fe004c428c733d097e7c4b4c886f28651175f9c5fc26d38ccdf52b

data/README.md

@@ -22,18 +22,21 @@ $ rake db:migrate
 
 ### Configuration
 
-Set alexa skill IDs in environment config (ex: config/environments/development.rb).
-
+Add `config/initializers/alexa.rb` and add the following configuration
 
 ```ruby
-  # config/environments/development.rb
+    Alexa.configure do |config|
+      # Location permissions type
+      config.location_permission_type = :country_and_postal_code # or full_address
 
-  # For request validation
-  config.x.alexa.skill_ids = [
-    "amzn1.ask.skill.xxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx"
-  ]
+      # Default title used on the display cards for your skill
+      config.default_card_title = "My Alexa skill"
 
-  config.x.alexa.default_card_title = "Alexa rails"
+      # Add ID of your skills. Used for request verification
+      config.skill_ids = [
+        "amzn1.ask.skill.xxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx"
+      ]
+    end
 ```
 
 Mount the engine for routes handling in your routes

data/app/views/alexa/output/cards/_simple.json.erb

@@ -1,5 +1,5 @@
 {
   "type": "Simple",
-  "title":  "<%= (content_for(:card_title) || Rails.configuration.x.alexa.default_card_title || "Card Title").strip %>",
+  "title":  "<%= (content_for(:card_title) || Alexa.configuration.default_card_title).strip %>",
   "content": <%= raw content.strip.to_json %>
 }

data/app/views/alexa/permission_consents/device_address.text.erb

@@ -3,5 +3,9 @@
 <% end %>
 
 <% content_for :permissions_scope do %>
-  read::alexa:device:all:address
+  <% if Alexa.configuration.location_permission_type == :country_and_postal_code  %>
+    read::alexa:device:all:address:country_and_postal_code
+  <% else %>
+    read::alexa:device:all:address
+  <% end %>
 <% end %>

data/lib/alexa-rails.rb

@@ -6,6 +6,7 @@ require 'alexa/response'
 require 'alexa/session'
 require 'alexa/slot'
 require 'alexa/version'
+require 'alexa/configuration'
 require 'alexa/responses/bye'
 require 'alexa/responses/delegate'
 require 'alexa/responses/permission_consents/device_address'
@@ -13,7 +14,18 @@ require 'alexa/intent_handlers/base'
 require_relative '../app/models/alexa/user'
 require_relative '../app/models/alexa/usage'
 
-
 module Alexa
-  # Your code goes here...
+  # Manage configuration following the pattern from:
+  # https://brandonhilkert.com/blog/ruby-gem-configuration-patterns/
+  class << self
+    attr_writer :configuration
+  end
+
+  def self.configuration
+    @_configuration ||= Alexa::Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
 end

data/lib/alexa/configuration.rb

@@ -0,0 +1,11 @@
+module Alexa
+  class Configuration
+    attr_accessor :location_permission_type, :default_card_title, :skill_ids
+
+    def initialize
+      @location_permission_type = nil
+      @default_card_title = 'Card title'
+      @skill_ids = []
+    end
+  end
+end

data/lib/alexa/device.rb

@@ -28,33 +28,29 @@ module Alexa
     # Makes an API to amazon alexa's device location service and returns the
     # location hash
     def location
-      @_location ||= get_location
+      @_location ||= begin
+        if Alexa.configuration.location_permission_type == :full_address
+          get_address
+        elsif Alexa.configuration.location_permission_type == :country_and_postal_code
+          get_address(only: :country_and_postal_code)
+        end
+      end
     end
 
     private
 
-    def get_location
+    def get_address(only: nil)
       url = "#{@context.api_endpoint}/v1/devices/#{id}/settings/address"
+      url = url + "/countryAndPostalCode" if only == :country_and_postal_code
       conn = Faraday.new(url: url) do |conn|
-        conn.options["open_timeout"] = 2
-        conn.options["timeout"] = 3
+        conn.options["open_timeout"] = 20
+        conn.options["timeout"] = 10
         conn.adapter :net_http
         conn.headers["Authorization"] = "Bearer #{@context.api_access_token}"
       end
-      begin
-        resp = conn.get
-        if resp.status == 200
-          return JSON.parse(resp.body)
-        end
-      rescue Faraday::ConnectionFailed, JSON::ParserError => e
-        Raven.capture_exception(
-          e,
-          extra: {
-            deviceId: id,
-            apiEndPoint: @context.api_endpoint
-          }
-        )
-        return {}
+      resp = conn.get
+      if resp.status == 200
+        return JSON.parse(resp.body)
       end
     end
   end

data/lib/alexa/request.rb

@@ -73,7 +73,7 @@ module Alexa
     end
 
     def valid?
-      Rails.configuration.x.alexa.skill_ids.include?(application_id)
+      Alexa.configuration.skill_ids.include?(application_id)
     end
 
     def intent_name

data/lib/alexa/version.rb

@@ -1,3 +1,3 @@
 module Alexa
-  VERSION = '0.1.7'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alexa-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 2.0.0
 platform: ruby
 authors:
 - Sri Vishnu Totakura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,6 +72,7 @@ files:
 - app/views/layouts/alexa/application.html.erb
 - config/routes.rb
 - lib/alexa-rails.rb
+- lib/alexa/configuration.rb
 - lib/alexa/context.rb
 - lib/alexa/device.rb
 - lib/alexa/engine.rb