rdioid 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f8b63dcc16df01167fee9c8c07702dbebe3141d
-  data.tar.gz: f3993d9d7e610c881e687669c7c01c813d8824e8
+  metadata.gz: 92ad9d720f318c61bec6a12e928245487533593b
+  data.tar.gz: 33194807ec2607b86800a85601ba8012e94022f8
 SHA512:
-  metadata.gz: 5b578278e0c8c7e4f310c380b7813601386d7609d633017745cac2e1c934bfc05ec1f28767699f1dd052e6e059ecc9c77fa6ab112a580243c38b86f47c3c371a
-  data.tar.gz: d23962e4e07e5c2d2314719c001e7b4edf923699242d4883cec594275df94ddb3338aee6eb18d800604eb2e1b3de40303db8068853138ba912b70287a8e4dee0
+  metadata.gz: fe58ed8a6a93304f551684dd8193affe7cab1c9f0054d5e871bc53988f336e426d9e28a078e78b033fa4ba019a0007c2f4e2b624ecf1b41f34569802fbfb9912
+  data.tar.gz: 8c955bf2d33b217f0fc57db12495f1c7557471614b0a7a1d16a6f5077fae355a272122ac277a29df7b0c4efea34610994223a8bc55c557a3280c75050bea1f29

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.2.2
-before_install: gem install bundler -v 1.10.5
+  - 2.2.3
+before_install: gem install bundler -v 1.10.6

data/README.md

@@ -68,7 +68,7 @@ rdioid_client.request_device_code
 
 code = '2479RA'
 
-# poll this method at a rate of "interval_s", waiting for a response without an "error"
+# poll this method at a rate of "interval_s", waiting for a response with an "access_token"
 #
 rdioid_client.request_token_with_device_code(code)
 # => { "error_description" => "user has not approved this code yet", "error" => "pending_authorization" }

data/lib/rdioid/client.rb

@@ -1,5 +1,5 @@
 module Rdioid
-  # Once *Rdioid* is configured with all required values, *Rdioid::Client* is
+  # Once *Rdioid* is configured with all required values, <b>Rdioid::Client</b> is
   # able to make requests to the <b>Web Service API</b>.
   class Client
     ##
@@ -53,11 +53,10 @@ module Rdioid
     #   # => http://test.com/#state=new_user&error=access_denied
     #
     def self.authorization_url(options = {})
-      query = {
-        :response_type => 'code',
-        :client_id => Rdioid.config.client_id,
-        :redirect_uri => Rdioid.config.redirect_uri
-      }.merge(options)
+      query = { :response_type => 'code' }.merge(options)
+
+      query[:client_id] = Rdioid.config.client_id
+      query[:redirect_uri] = Rdioid.config.redirect_uri
 
       authorization_query = HTTP::Message.escape_query(query)
 
@@ -113,8 +112,8 @@ module Rdioid
     ##
     # Requests an OAuth +device_code+ for the <b>Device Code Grant</b>.
     #
-    # @param options [Hash] additional request values
-    # @option options [String] :scope the desired scope you wish to have access to
+    # @param body [Hash] additional request values
+    # @option body [String] :scope the desired scope you wish to have access to
     #
     # @return [Hash] response from the Web Service API
     #
@@ -124,10 +123,8 @@ module Rdioid
     #   rdioid_client.request_device_code
     #   # => { "expires_in_s" => 1800, "device_code" => "2479RA", "interval_s" => 5, "verification_url" => "rdio.com/device" }
     #
-    def request_device_code(options = {})
-      body = {
-        :client_id => Rdioid.config.client_id,
-      }.merge(options)
+    def request_device_code(body = {})
+      body[:client_id] = Rdioid.config.client_id
 
       request(Rdioid::OAUTH_DEVICE_CODE_ENDPOINT, :body => body)
     end
@@ -136,8 +133,8 @@ module Rdioid
     # Requests an OAuth +access_token+ using the <b>Authorization Code Grant</b>.
     #
     # @param code [String] OAuth code received from the +.authorization_url+ redirect
-    # @param options [Hash] additional request values
-    # @option options [String] :scope the desired scope you wish to have access to
+    # @param body [Hash] additional request values
+    # @option body [String] :scope the desired scope you wish to have access to
     #
     # @return [Hash] response from the Web Service API
     #
@@ -151,12 +148,10 @@ module Rdioid
     #   rdioid_client.request_token_with_authorization_code(code)
     #   # => { "error_description" => "unknown authorization code ImSLMoN02mqBkO", "error" => "invalid_grant" }
     #
-    def request_token_with_authorization_code(code, options = {})
-      body = {
-        :grant_type => 'authorization_code',
-        :code => code,
-        :redirect_uri => Rdioid.config.redirect_uri
-      }.merge(options)
+    def request_token_with_authorization_code(code, body = {})
+      body[:grant_type] = 'authorization_code'
+      body[:code] = code
+      body[:redirect_uri] = Rdioid.config.redirect_uri
 
       request(Rdioid::OAUTH_TOKEN_ENDPOINT, :body => body)
     end
@@ -164,8 +159,8 @@ module Rdioid
     ##
     # Requests an OAuth +access_token+ using the <b>Client Credentials</b>.
     #
-    # @param options [Hash] additional request values
-    # @option options [String] :scope the desired scope you wish to have access to
+    # @param body [Hash] additional request values
+    # @option body [String] :scope the desired scope you wish to have access to
     #
     # @return [Hash] response from the Web Service API
     #
@@ -175,10 +170,8 @@ module Rdioid
     #   rdioid_client.request_token_with_client_credentials
     #   # => { "access_token" => "AAAdmanFxdWxlayip", "token_type" => "bearer", "expires_in" => 43200, "scope" => "" }
     #
-    def request_token_with_client_credentials(options = {})
-      body = {
-        :grant_type => 'client_credentials'
-      }.merge(options)
+    def request_token_with_client_credentials(body = {})
+      body[:grant_type] = 'client_credentials'
 
       request(Rdioid::OAUTH_TOKEN_ENDPOINT, :body => body)
     end
@@ -187,8 +180,8 @@ module Rdioid
     # Requests an OAuth +access_token+ using the <b>Device Code Grant</b>.
     #
     # @param device_code [String] +device_code+ received from calling +#request_device_code+
-    # @param options [Hash] additional request values
-    # @option options [String] :scope the desired scope you wish to have access to
+    # @param body [Hash] additional request values
+    # @option body [String] :scope the desired scope you wish to have access to
     #
     # @return [Hash] response from the Web Service API
     #
@@ -205,11 +198,9 @@ module Rdioid
     #   rdioid_client.request_token_with_device_code(device_code)
     #   # => { "error_description" => "no entry found for given device_code", "error" => "invalid_request" }
     #
-    def request_token_with_device_code(device_code, options = {})
-      body = {
-        :grant_type => 'device_code',
-        :device_code => device_code
-      }.merge(options)
+    def request_token_with_device_code(device_code, body = {})
+      body[:grant_type] = 'device_code'
+      body[:device_code] = device_code
 
       request(Rdioid::OAUTH_TOKEN_ENDPOINT, :body => body)
     end
@@ -219,8 +210,8 @@ module Rdioid
     #
     # @param username [String] email address for the User
     # @param password [String] password for the User
-    # @param options [Hash] additional request values
-    # @option options [String] :scope the desired scope you wish to have access to
+    # @param body [Hash] additional request values
+    # @option body [String] :scope the desired scope you wish to have access to
     #
     # @return [Hash] response from the Web Service API
     #
@@ -235,12 +226,10 @@ module Rdioid
     #   rdioid_client.request_token_with_password(username, password)
     #   # => { "error_description" => "This client is not authorized to use the password grant", "error" => "unauthorized_client" }
     #
-    def request_token_with_password(username, password, options = {})
-      body = {
-          :grant_type => 'password',
-          :username => username,
-          :password => password
-      }.merge(options)
+    def request_token_with_password(username, password, body = {})
+      body[:grant_type] = 'password'
+      body[:username] = username
+      body[:password] = password
 
       request(Rdioid::OAUTH_TOKEN_ENDPOINT, :body => body)
     end
@@ -249,8 +238,8 @@ module Rdioid
     # Requests an OAuth +access_token+ using the <b>Refresh Token</b>.
     #
     # @param refresh_token [String] refresh token previously issued during an +access_token+ request
-    # @param options [Hash] additional request values
-    # @option options [String] :scope the desired scope you wish to have access to
+    # @param body [Hash] additional request values
+    # @option body [String] :scope the desired scope you wish to have access to
     #
     # @return [Hash] response from the Web Service API
     #
@@ -264,11 +253,9 @@ module Rdioid
     #    rdioid_client.request_token_with_refresh_token(refresh_token)
     #    # => { "error_description" =>  "invalid refresh token", "error" => "invalid_grant" }
     #
-    def request_token_with_refresh_token(refresh_token, options = {})
-      body = {
-        :grant_type => 'refresh_token',
-        :refresh_token => refresh_token
-      }.merge(options)
+    def request_token_with_refresh_token(refresh_token, body = {})
+      body[:grant_type] = 'refresh_token'
+      body[:refresh_token] = refresh_token
 
       request(Rdioid::OAUTH_TOKEN_ENDPOINT, :body => body)
     end

data/lib/rdioid/version.rb

@@ -1,3 +1,3 @@
 module Rdioid
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/rdioid.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Brent Redd"]
   spec.email         = ["reddshack@gmail.com"]
 
-  spec.summary       = %q{Simple Rdio Web Services API wrapper with OAuth 2.0}
-  spec.description   = %q{Handles OAuth 2.0 authentication and API calls for Rdio Web Services API.}
+  spec.summary       = %q{Simple Rdio Web Service API wrapper with OAuth 2.0}
+  spec.description   = %q{Handles OAuth 2.0 authentication and API calls for Rdio Web Service API.}
   spec.homepage      = "https://github.com/reddshack/rdioid"
   spec.license       = "MIT"
 
@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdioid
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Brent Redd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -56,18 +56,17 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Handles OAuth 2.0 authentication and API calls for Rdio Web Services
-  API.
+        version: '3.0'
+description: Handles OAuth 2.0 authentication and API calls for Rdio Web Service API.
 email:
 - reddshack@gmail.com
 executables: []
@@ -108,9 +107,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: Simple Rdio Web Services API wrapper with OAuth 2.0
+summary: Simple Rdio Web Service API wrapper with OAuth 2.0
 test_files: []
 has_rdoc: