alexa_transmission 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ba3dd2fc051ffe864e44491a654ed6fef176fae
-  data.tar.gz: df7afea7bbde79f5e8c2f327622ff3dcb8eccb2e
+  metadata.gz: 82680284e5a7e45464f7d22d9a21d215a948570d
+  data.tar.gz: 73aa685a0b858726958d07d6c483d236223f16eb
 SHA512:
-  metadata.gz: b59462d18364cabb8aae3cce3b67b748142531f4f35b3c602f3edb8e26e8bd714c1a9cbc9e0e90896ccab99a0823ac738f8e70e329bb310246df10a523a57309
-  data.tar.gz: 938fc69a2bc31b8ce3b0b99a28d2c1e74efcd8069f798d38f5e19c6f071cb13110a64025eb0742380fc4980d5b49dc142fa2db41da5a852a6eb5533eb6e94a26
+  metadata.gz: 13b0870f7741d53000d5e610b68dd18c4e251a5f6a2e9a8182b552d46a326d0da348eb4f6c5e0be395386752fae295dd8db11a80818f16d594e1321bc69cd789
+  data.tar.gz: 663bb70023e781f394031e6c36a93aafec452200ad6b3dd19c9320fc3dd9ea9d737013fecbea681cd87379025e77e2cf5abc38cb332ad5a5b547949e2cf5f5b1

data/alexa_transmission.gemspec

@@ -5,7 +5,7 @@ require 'alexa_transmission/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "alexa_transmission"
-  spec.version       = AlexaTransmission::VERSION
+  spec.version       = Transmission::VERSION
   spec.authors       = ["kylegrantlucas"]
   spec.email         = ["kglucas93@gmail.com"]
 
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'toname'
   spec.add_runtime_dependency 'transmission_api'
   spec.add_runtime_dependency 'activesupport'
-  spec.add_runtime_dependency 'sinatra'
+  spec.add_runtime_dependency 'sinatra-contrib'
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/alexa_transmission.rb

@@ -1,52 +1,23 @@
-Bundler.require
 require "alexa_transmission/version"
 require 'transmission_api'
-require 'sinatra/base'
 require 'to_name'
 require 'active_support/core_ext/array'
+require 'sinatra/extension'
 
-module Sinatra
-  module Transmission
-    def self.registered(app)
-      app.post '/alexa_transmission' do
-         #halt 400, "" unless settings.config.application_id && @application_id == settings.config.application_id
+module Transmission
+  extend Sinatra::Extension
 
-        if @echo_request.launch_request?
-          response = AlexaObjects::Response.new
-          response.spoken_response = "I'm ready to check your downloads."
-          response.end_session = false
-          response.without_card.to_json
-          puts @echo_request.slots
-        elsif @echo_request.intent_name == "CheckTransmission"
-          transmission_api_client = ::TransmissionApi::Client.new(
-                                    :username => settings.config.transmission.username,
-                                    :password => settings.config.transmission.password,
-                                    :url      => settings.config.transmission.rpc_url
-                                  )
+  helpers do
+    def check_transmission
+      transmission_api_client = ::TransmissionApi::Client.new(
+                                  :username => settings.config.transmission.username,
+                                  :password => settings.config.transmission.password,
+                                  :url      => settings.config.transmission.rpc_url
+                                )
 
-           parsed_files = transmission_api_client.all.map{|x| {percent_completed: x["percentDone"], name: ToName.to_name(x["name"].gsub(/\+/, '.').gsub(' ', '.'))} if x["percentDone"] != 1}.compact
-
-           parsed_strings = parsed_files.map {|x| "#{x[:name].name}#{" Episode #{x[:name].episode}" if x[:name].episode} is at #{x[:percent_completed]*100} percent" }.to_sentence
-
-          response = AlexaObjects::Response.new
-          response.end_session = true
-          response.spoken_response = parsed_strings
-            
-          response.without_card.to_json
-        elsif @echo_request.intent_name == "EndSession"
-          puts @echo_request.slots
-          response = AlexaObjects::Response.new
-          response.end_session = true
-          response.spoken_response = "exiting couchpoato"
-          response.without_card.to_json
-        elsif @echo_request.session_ended_request?
-          response = AlexaObjects::Response.new
-          response.end_session = true
-          response.without_card.to_json
-        end
-      end
+      parsed_files = transmission_api_client.all.map{|x| {percent_completed: x["percentDone"], name: ToName.to_name(x["name"].gsub(/\+/, '.').gsub(' ', '.'))} if x["percentDone"] != 1}.compact
+      parsed_strings = parsed_files.map {|x| "#{x[:name].name}#{" Episode #{x[:name].episode}" if x[:name].episode} is at #{(x[:percent_completed]*100).round} percent" }.to_sentence
+      AlexaObjects::Response.new(spoken_response: parsed_strings).to_json            
     end
   end
-
-  register Transmission
 end

data/lib/alexa_transmission/custom_slots.rb

@@ -0,0 +1,5 @@
+module Transmission
+  def self.custom_slots
+    File.read(File.expand_path('../../../skills_config/custom_slots.txt', __FILE__))
+  end
+end

data/lib/alexa_transmission/intent_schema.rb

@@ -1,7 +1,5 @@
-module Sinatra
-  module Transmission
-    def self.intent_schema
-      File.read(File.expand_path('../../../skills_config/intent_schema.txt', __FILE__))
-    end
+module Transmission
+  def self.intent_schema
+    File.read(File.expand_path('../../../skills_config/intent_schema.txt', __FILE__))
   end
-end
+end

data/lib/alexa_transmission/sample_utterances.rb

@@ -1,7 +1,5 @@
-module Sinatra
-  module Transmission
-    def self.sample_utterances
-      File.read(File.expand_path('../../../skills_config/sample_utterances.txt', __FILE__))
-    end
+module Transmission
+  def self.sample_utterances
+    File.read(File.expand_path('../../../skills_config/sample_utterances.txt', __FILE__))
   end
-end
+end

data/lib/alexa_transmission/version.rb

@@ -1,3 +1,3 @@
-module AlexaTransmission
-  VERSION = "1.0.1"
+module Transmission
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alexa_transmission
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - kylegrantlucas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-14 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alexa_objects
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -141,8 +141,7 @@ files:
 - bin/console
 - bin/setup
 - lib/alexa_transmission.rb
-- lib/alexa_transmission/custom_schema.rb
-- lib/alexa_transmission/endpoint.rb
+- lib/alexa_transmission/custom_slots.rb
 - lib/alexa_transmission/intent_schema.rb
 - lib/alexa_transmission/sample_utterances.rb
 - lib/alexa_transmission/version.rb

data/lib/alexa_transmission/custom_schema.rb

@@ -1,7 +0,0 @@
-module Sinatra
-  module Transmission
-    def self.custom_schema
-      File.read(File.expand_path('../../../skills_config/custom_schema.txt', __FILE__))
-    end
-  end
-end

data/lib/alexa_transmission/endpoint.rb

@@ -1,7 +0,0 @@
-module Sinatra
-  module Transmission
-    def self.endpoint
-      '/alexa_transmission'
-    end
-  end
-end