alexa_couchpotato 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 358053305ed6ded66ba962ecb2b15283200e462d
-  data.tar.gz: ef8a0bb1e58957fb1d0bb703d401999b1ca2b176
+  metadata.gz: e356f896238345fda48ecbfe32c1f7fbb5bb6290
+  data.tar.gz: 2ee856b691fd3912242722036ebba8531f035931
 SHA512:
-  metadata.gz: ec6273f02e6c5820b25ffa238e9681c238c8e9442dbdd8087275daea6999f8d236ad21e42d5934891ba68dc46d51804c2e729097f8bffc545ef18b24220b67cb
-  data.tar.gz: 1be50a16fa0587dee096976ada4c0dcebf8460543e073a29eef05626776ce367a2bfe25644b7ab8db99c3dfdc260d55955416540be4b342de726b0bbaa0ac632
+  metadata.gz: 9a0a8b27fb90dc481e3ef05bdb754ba3994e569dc4108b20a9df7a78d33a750f0ca6a0e63bafb8f2379d1e724c934889f696d72c4bfb5c26ef76d3922cbf05f4
+  data.tar.gz: 44fb299f131f9aeb66c549b06c5ac33fa90d0063f74d401f7eb25d08996e3240e6821fba79df7c7df9033c120b66e0345b1c0946daa8219736a55e53b6eeb26d

data/Gemfile

@@ -4,7 +4,8 @@ gemspec
 
 gem 'chronic', '~> 0.10.0'
 gem 'chronic_duration', '~> 0'
-gem 'httparty', '~> 0.13.0'
+gem 'curb'
+gem 'oj'
 gem 'numbers_in_words', '~> 0.2.0'
 gem 'sinatra'
 gem 'alexa_objects'

data/README.md

@@ -0,0 +1,26 @@
+# Alexa Couchpotato
+[![Gem Version](https://badge.fury.io/rb/alexa_couchpotato.svg)](http://badge.fury.io/rb/alexa_couchpotato)
+[![Code Climate](https://codeclimate.com/github/kylegrantlucas/alexa_couchpotato/badges/gpa.svg)](https://codeclimate.com/github/kylegrantlucas/alexa_couchpotato) 
+
+A SingingAssistant plugin for using Alexa commands with CouchPotato. 🎥
+
+## Installation
+
+Add this line to your SingingAssistant installation's Gemfile:
+
+```ruby
+gem 'alexa_couchpotato'
+```
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/kylegrantlucas/alexa_couchpotato. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+

data/alexa_couchpotato.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'json'
   spec.add_runtime_dependency 'alexa_objects'
-  spec.add_runtime_dependency 'httparty'
+  spec.add_runtime_dependency 'curb'
+  spec.add_runtime_dependency 'oj'
   spec.add_runtime_dependency 'numbers_in_words'
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'chronic'

data/lib/alexa_couchpotato.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'alexa_objects'
-require 'httparty'
+require 'curb'
+require 'oj'
 require 'numbers_in_words'
 require 'numbers_in_words/duck_punch'
 require 'active_support'
@@ -29,7 +30,7 @@ module Couchpotato
           end
         end
         
-        query = HTTParty.get(URI.escape("#{search_endpoint}?q=#{title}"))
+        query = Oj.load(Curl.get(URI.escape("#{search_endpoint}?q=#{title}").body_str)) rescue nil
         
         if query["movies"] && query["movies"].count == 1
           movie = query["movies"].first
@@ -54,8 +55,6 @@ module Couchpotato
         @@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
@@ -71,9 +70,7 @@ module Couchpotato
       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
+      else
         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

data/lib/alexa_couchpotato/version.rb

@@ -1,4 +1,4 @@
 module Couchpotato
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alexa_couchpotato
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Kyle Lucas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -39,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: curb
+  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: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -185,10 +199,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".gitignore"
 - Gemfile
 - Guardfile
+- README.md
 - Rakefile
 - alexa_couchpotato.gemspec
 - lib/alexa_couchpotato.rb
@@ -220,9 +234,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A sinatra middleware for alexa couhpotato actions.
 test_files: []
-has_rdoc: