alexa_couchpotato 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 329c465b1de9775844b6ce0e2977ca0a49e8c430
-  data.tar.gz: 3413379420a981eebe178293602fb763873df4ef
+  metadata.gz: 358053305ed6ded66ba962ecb2b15283200e462d
+  data.tar.gz: ef8a0bb1e58957fb1d0bb703d401999b1ca2b176
 SHA512:
-  metadata.gz: ed408d76eb1d7b9ff785f3f21bd02efd0f233f4820ecb873dc2a4b0e4c7558778a21fbeb3b81a0020e0cf624f3971bcea2be1a26c2a58d5831bf4b4794c683d3
-  data.tar.gz: 89e59fcf734cea2cd83346915dbd3a71c3589a8b6a92b3c95ef63e53bd8a1b3421a3c910aae0086f6de15adb0e4de5f37389b934232a4368c6090851728bc028
+  metadata.gz: ec6273f02e6c5820b25ffa238e9681c238c8e9442dbdd8087275daea6999f8d236ad21e42d5934891ba68dc46d51804c2e729097f8bffc545ef18b24220b67cb
+  data.tar.gz: 1be50a16fa0587dee096976ada4c0dcebf8460543e073a29eef05626776ce367a2bfe25644b7ab8db99c3dfdc260d55955416540be4b342de726b0bbaa0ac632

data/alexa_couchpotato.gemspec

@@ -5,7 +5,7 @@ require 'alexa_couchpotato/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "alexa_couchpotato"
-  spec.version       = Sinatra::Couchpotato::VERSION
+  spec.version       = Couchpotato::VERSION
   spec.authors       = ["Kyle Lucas"]
   spec.email         = ["kglucas93@gmail.com"]
   spec.summary       = %q{A sinatra middleware for alexa couhpotato actions.}
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'numbers_in_words'
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'chronic'
-  spec.add_runtime_dependency 'sinatra'
+  spec.add_runtime_dependency 'sinatra-contrib'
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/alexa_couchpotato.rb

@@ -7,103 +7,84 @@ require 'active_support'
 require 'active_support/core_ext'
 require 'chronic'
 require 'alexa_couchpotato/version'
-require 'sinatra/base'
+require 'sinatra/extension'
 
-module Sinatra
-  module Couchpotato
-    def self.registered(app)
-      app.post '/alexa_cp' do
-        content_type :json
-        search_endpoint = "http://#{settings.config.couchpotato.url}/movies/api/#{settings.config.couchpotato.api_key}/search" 
-        add_endpoint = "http://#{settings.config.couchpotato.url}/movies/api/#{settings.config.couchpotato.api_key}/movie.add"
+module Couchpotato
+  extend Sinatra::Extension
 
-        #halt 400, "" unless settings.config.application_id && @application_id == settings.config.application_id
-
-        if @echo_request.launch_request?
-          response = AlexaObjects::Response.new
-          response.spoken_response = "I'm ready to download you movies."
-          response.end_session = false
-          response.without_card.to_json
-          puts @echo_request.slots
-        elsif @echo_request.intent_name == "ControlCouchpotato"
-          count = 1
-          begin
-            case count
-            when 1
-              title = @echo_request.slots["movie"]
-            when 2
-              word_arr =  @echo_request.slots["movie"].split(' ')
-              nums = word_arr.map {|x|x.in_numbers}
-              title = ""
-              word_arr.each_with_index do |x, index|
-                title << (nums[index] != 0 ? "#{nums[index]}" : x)
-                title << " " unless index == word_arr.length-1
-              end
-            end
-            query = HTTParty.get(URI.escape("#{search_endpoint}?q=#{title}"))
-            if query["movies"] && query["movies"].count == 1
-              movie = query["movies"].first
-            elsif query["movies"] && query["movies"].count > 1
-              movie = query["movies"]
-            end
-            movie = false if count == 5 && movie.nil?
-            count += 1      
-          end until movie != nil
-          response = AlexaObjects::Response.new
-
-          if [movie].flatten(1).count == 1 && movie != false
-            add_query = HTTParty.get(URI.escape("#{add_endpoint}?title=#{movie["titles"].first}&identifier#{movie["imdb"]}"))
-            if add_query["success"] = true
-              response.end_session = true
-              response.spoken_response = "okay, downloading #{movie["titles"].first}"
-            elsif movie && add_query["success"] = false
-              response.end_session = true
-              response.spoken_response = "sorry, I wasn't able to find #{@echo_request.slots["movie"]} because it wouldn't add to the server"
-            end
-          elsif movie != false && [movie].flatten(1).count > 1
-            @@movies = movie
-            response.end_session = false
-            response.reprompt_text = "Which movie would you like me to download? #{movie.map {|m| m["titles"].first }.to_sentence(:last_word_connector => ' or ')}"
-          elsif movie == false
-            response.end_session = true
-            response.spoken_response = "sorry, I wasn't able to find #{@echo_request.slots["movie"]} because the search came up empty"
-          else
-            response.end_session = true
-            response.spoken_response = "sorry, I wasn't able to find #{@echo_request.slots["movie"]} because the search came up empty"
+  helpers do
+    def control_couchpotato
+      count = 1
+      begin
+        case count
+        when 1
+          title = @echo_request.slots["movie"]
+        when 2
+          word_arr =  @echo_request.slots["movie"].split(' ')
+          nums = word_arr.map {|x|x.in_numbers}
+          title = ""
+          word_arr.each_with_index do |x, index|
+            title << (nums[index] != 0 ? "#{nums[index]}" : x)
+            title << " " unless index == word_arr.length-1
           end
+        end
+        
+        query = HTTParty.get(URI.escape("#{search_endpoint}?q=#{title}"))
+        
+        if query["movies"] && query["movies"].count == 1
+          movie = query["movies"].first
+        elsif query["movies"] && query["movies"].count > 1
+          movie = query["movies"]
+        end
+        
+        movie = false if count == 5 && movie.nil?
+        count += 1      
+      end until movie != nil
 
-          response.without_card.to_json
-        elsif @echo_request.intent_name == "RespondCouchpotato"
-          ordinal = Chronic::Numerizer.numerize(@echo_request.slots["listvalue"]).split(' ').last
-          number = ordinal[0]
-          movie = @@movies[number.to_i+1]
-          query = HTTParty.get(URI.escape("#{add_endpoint}?title=#{movie["titles"].first}&identifier#{movie["imdb"]}"))
-          response = AlexaObjects::Response.new
-          if movie != false && query["success"] = true
-            response.end_session = true
-            response.spoken_response = "okay, downloading #{movie["titles"].first}"
-          elsif movie == false
-            response.end_session = true
-            response.spoken_response = "sorry, I wasn't able to find #{@echo_request.slots["movie"]} because the search came up empty"
-          elsif movie && query["success"] = false
-            response.end_session = true
-            response.spoken_response = "sorry, I wasn't able to find #{@echo_request.slots["movie"]} because it wouldn't add to the server"
-          end
-          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
+      response = AlexaObjects::Response.new
+
+      if [movie].flatten(1).count == 1 && movie != false
+        add_query = HTTParty.get(URI.escape("#{add_endpoint}?title=#{movie["titles"].first}&identifier#{movie["imdb"]}"))
+        if add_query["success"] = true
+          response.spoken_response = "okay, downloading #{movie["titles"].first}"
+        elsif movie && add_query["success"] = false
+          response.spoken_response = "sorry, I wasn't able to find #{@echo_request.slots["movie"]} because it wouldn't add to the server"
         end
+      elsif movie != false && [movie].flatten(1).count > 1
+        @@movies = movie
+        response.end_session = false
+        response.reprompt_text = "Which movie would you like me to download? #{movie.map {|m| m["titles"].first }.to_sentence(:last_word_connector => ' or ')}"
+      elsif movie == false
+        response.spoken_response = "sorry, I wasn't able to find #{@echo_request.slots["movie"]} because the search came up empty"
+      else
+        response.spoken_response = "sorry, I wasn't able to find #{@echo_request.slots["movie"]} because the search came up empty"
       end
+
+      response.to_json
     end
-  end
 
-  register Couchpotato
-end
+    def respond_couchpotato
+      ordinal = Chronic::Numerizer.numerize(@echo_request.slots["listvalue"]).split(' ').last
+      number = ordinal[0]
+      movie = @@movies[number.to_i+1]
+      query = HTTParty.get(URI.escape("#{add_endpoint}?title=#{movie["titles"].first}&identifier#{movie["imdb"]}"))
+      response = AlexaObjects::Response.new
+      if movie != false && query["success"] = true
+        response.spoken_response = "okay, downloading #{movie["titles"].first}"
+      elsif movie == false
+        response.spoken_response = "sorry, I wasn't able to find #{@echo_request.slots["movie"]} because the search came up empty"
+      elsif movie && query["success"] = false
+        response.spoken_response = "sorry, I wasn't able to find #{@echo_request.slots["movie"]} because it wouldn't add to the server"
+      end
+      response.to_json
+    end
+
+    def add_endpoint
+      "http://#{settings.config.couchpotato.url}/movies/api/#{settings.config.couchpotato.api_key}/movie.add"
+    end
+
+    def search_endpoint
+      "http://#{settings.config.couchpotato.url}/movies/api/#{settings.config.couchpotato.api_key}/search" 
+    end
+  end
+end

data/lib/alexa_couchpotato/custom_slots.rb

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

data/lib/alexa_couchpotato/intent_schema.rb

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

data/lib/alexa_couchpotato/sample_utterances.rb

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

data/lib/alexa_couchpotato/version.rb

@@ -1,5 +1,4 @@
-module Sinatra
-  module Couchpotato
-    VERSION = "1.1.0"
-  end
+module Couchpotato
+  VERSION = "1.2.0"
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alexa_couchpotato
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Kyle Lucas
 autorequire: 
 bindir: bin
 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: json
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +193,6 @@ files:
 - alexa_couchpotato.gemspec
 - lib/alexa_couchpotato.rb
 - lib/alexa_couchpotato/custom_slots.rb
-- lib/alexa_couchpotato/endpoint.rb
 - lib/alexa_couchpotato/intent_schema.rb
 - lib/alexa_couchpotato/sample_utterances.rb
 - lib/alexa_couchpotato/version.rb

data/lib/alexa_couchpotato/endpoint.rb

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