rhapsody 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTdjMGFkMTc2M2I2YjM1MzJhZTU1MTU2NDhhMWZhMjEwNzJiM2U1MA==
+    YTI4NTFkYTdiZGZiNDZmMTE3MjU1YjVjZjEyNmFhNWM4MWUyYTNjOA==
   data.tar.gz: !binary |-
-    ZDFmMmVkMTgyMjgwYjdjZTQ3ZDI2ZTkwNWJhYmI0YWMzMjA1Y2Y3Nw==
+    ZjNiNDJmYTI2M2M2YzdhNDg2MWZiODhjYWE1NWJjZDU4NjZiM2Q3Zg==
 SHA512:
   metadata.gz: !binary |-
-    YjVkNGE3NjdlNTE4NWNhZjgzNzFlOTU1MWMzNTQxMWYyODhmZWY5YzRiMGIz
-    Yzk0NTE3YjY1NTgwMTI0YWI0NDhhZjU3ZDVlNWQ4ZmJjNTEyNTc2NjY4YTk0
-    OGY0MmU0NThhZGQ2Y2M5OWY0MjQ2NTFlNzE5ODI1MjE0NzY4OTA=
+    MDVjZjI4YTI0NjIxZTMzYWNjMTk4MzZhNjUxNGIzMTIwZDgxMzE3ZjBkM2E0
+    ZGVmYWJmOWNlMzMwMjUwMjAwZDg2NWZkM2RkY2I0YWI5NjJlNTlhMGQwNDFm
+    ODYzNWUzNTNiNWQ0MTRmMTYwNTliYTlmMDI1YWFmZGEyNDFiNDY=
   data.tar.gz: !binary |-
-    MDI2OWZiNTZjNWVmNWM2NmVmNzAxYzZhYzI3MWFiNTVhMDY4MWJiZjRmZjY4
-    YzdkNTczZDQ3N2JkMGZiNjc1ZmEyZmRiYjUzNTU0OTc4M2QwNDU5ZGNjMjNl
-    MzBmMzQxMWJkNzE1NjRhMjM2Y2NmY2EwMTE2ZTkwNDRmNTlhY2I=
+    NWIwM2M0NzIzYzUyYjRjNDZmMjA4NWYwNjRmYTljODE3MTczY2Q4NmU5MTU3
+    MGQ0ZWYyMjdmZjhhZWZjNDZiY2ZjNWMxNzk2MTMzNDc4ZDYzMmQzODNkNGY4
+    MDBjZmEyYjI1YzYyMDhiMGQ0YTRjMDU5MzRiNzZmMzY3NjllYjA=

data/lib/rhapsody/helpers/faraday_connection.rb

@@ -4,7 +4,6 @@ module Rhapsody::FaradayConnection
   def self.prepare_authentication
     Faraday.new(:url => Rhapsody::HOST_URL) do |faraday|
       faraday.request  :url_encoded
-      faraday.response :logger
       faraday.adapter  Faraday.default_adapter
     end
   end
@@ -12,7 +11,6 @@ module Rhapsody::FaradayConnection
   def self.prepare_authorization(access_token)
     Faraday.new(:url => Rhapsody::HOST_URL) do |faraday|
       faraday.request  :url_encoded
-      faraday.response :logger
       faraday.adapter  Faraday.default_adapter
       faraday.authorization :Bearer, access_token
     end

data/lib/rhapsody/models/member.rb

@@ -1,37 +1,41 @@
 class Rhapsody::Member
-  attr_accessor :cobrand,
-                :cocat,
-                :email,
-                :logon,
-                :firstName,
-                :id,
-                :lastName,
-                :locale,
-                :country,
-                :isPublic,
-                :billingPartnerCode,
-                :catalog,
-                :createDate,
-                :isSuspended,
-                :tierCode,
-                :tierName,
-                :productCode,
-                :productName,
-                :expirationDate,
-                :trialLengthDays,
-                :isTrial,
-                :state,
-                :canStreamOnWeb,
-                :canStreamOnMobile,
-                :canStreamOnHomeDevice,
-                :canStreamOnPC,
-                :canUpgradeStreams,
-                :maxStreamCount,
-                :isPlayBasedTier,
-                :isMonthlyPlayBasedTier,
-                :isOneTimePlayBasedTier,
-                :totalPlays,
-                :playsRemaining
+  ATTR_LIST = [
+    :cobrand,
+    :cocat,
+    :email,
+    :logon,
+    :firstName,
+    :id,
+    :lastName,
+    :locale,
+    :country,
+    :isPublic,
+    :billingPartnerCode,
+    :catalog,
+    :createDate,
+    :isSuspended,
+    :tierCode,
+    :tierName,
+    :productCode,
+    :productName,
+    :expirationDate,
+    :trialLengthDays,
+    :isTrial,
+    :state,
+    :canStreamOnWeb,
+    :canStreamOnMobile,
+    :canStreamOnHomeDevice,
+    :canStreamOnPC,
+    :canUpgradeStreams,
+    :maxStreamCount,
+    :isPlayBasedTier,
+    :isMonthlyPlayBasedTier,
+    :isOneTimePlayBasedTier,
+    :totalPlays,
+    :playsRemaining
+  ]
+
+  attr_accessor *ATTR_LIST
 
   def initialize(options)
     if options
@@ -40,4 +44,5 @@ class Rhapsody::Member
       end
     end
   end
+
 end

data/lib/rhapsody/version.rb

@@ -1,3 +1,3 @@
 module Rhapsody
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/helpers/authentication_helper.rb

@@ -0,0 +1,46 @@
+require 'json'
+
+module AuthenticationHelper
+
+  # using password grant get an access token
+  def AuthenticationHelper.get_access_token
+    oauth_path = 'https://api.rhapsody.com/oauth/token'
+    yaml = ConfigHelper.load
+    config_variables = yaml['config_variables']
+    api_key = config_variables['API_KEY']
+    api_secret = config_variables['API_SECRET']
+    username = config_variables['USERNAME']
+    password = config_variables['PASSWORD']
+
+    connection = Faraday.new(:url => Rhapsody::HOST_URL) do |faraday|
+      faraday.request  :url_encoded
+      faraday.basic_auth(api_key, api_secret)
+      faraday.adapter  Faraday.default_adapter
+    end
+
+    post_hash = {
+      username: username,
+      password: password,
+      grant_type: 'password'
+    }
+
+    raw_response = connection.post(oauth_path, post_hash)
+    json_response = JSON.parse(raw_response.env[:body])
+    access_token = json_response['access_token']
+  end
+
+  # typical post hash
+  def AuthenticationHelper.post_hash
+    yaml = ConfigHelper.load
+    config_variables = yaml['config_variables']
+    api_key = config_variables['API_KEY']
+    api_secret = config_variables['API_SECRET']
+
+    options = {
+      api_key: api_key,
+      api_secret: api_secret,
+      auth_code: 'fakeauthcode',
+      redirect_url: 'http://api.soundtracking.dev:3000/auth/rhapsody/authorize'
+    }
+  end
+end

data/spec/rhapsody/controllers/clients_controller_spec.rb

@@ -5,4 +5,67 @@ describe Rhapsody::ClientsController do
     host_url = Rhapsody::HOST_URL
     expect(host_url).to eql('https://api.rhapsody.com')
   end
+
+  it 'has attributes' do
+    options = AuthenticationHelper.post_hash
+    client_controller = Rhapsody::ClientsController.new(options)
+
+    expect(client_controller).to respond_to(:api_key)
+    expect(client_controller).to respond_to(:api_secret)
+    expect(client_controller).to respond_to(:auth_code)
+    expect(client_controller).to respond_to(:redirect_url)
+    expect(client_controller).to respond_to(:raw_reponse)
+    expect(client_controller).to respond_to(:json_response)
+    expect(client_controller).to respond_to(:response_status)
+    expect(client_controller).to respond_to(:access_token)
+    expect(client_controller).to respond_to(:refresh_token)
+    expect(client_controller).to respond_to(:expires_in)
+  end
+
+  it '#me_account' do
+    options = AuthenticationHelper.post_hash
+    client_controller = Rhapsody::ClientsController.new(options)
+    client_controller.access_token = AuthenticationHelper.get_access_token
+
+    member = client_controller.me_account
+
+    member_attributes = [
+      :cobrand,
+      :cocat,
+      :email,
+      :logon,
+      :firstName,
+      :id,
+      :lastName,
+      :locale,
+      :country,
+      :isPublic,
+      :billingPartnerCode,
+      :catalog,
+      :createDate,
+      :isSuspended,
+      :tierCode,
+      :tierName,
+      :productCode,
+      :productName,
+      :expirationDate,
+      :trialLengthDays,
+      :isTrial,
+      :state,
+      :canStreamOnWeb,
+      :canStreamOnMobile,
+      :canStreamOnHomeDevice,
+      :canStreamOnPC,
+      :canUpgradeStreams,
+      :maxStreamCount,
+      :isPlayBasedTier,
+      :isMonthlyPlayBasedTier,
+      :isOneTimePlayBasedTier,
+      :totalPlays,
+      :playsRemaining
+    ]
+    member_attributes.each do |attr|
+      expect(member).to respond_to(attr)
+    end
+  end
 end

data/spec/rhapsody/rhapsody_spec.rb

@@ -8,9 +8,15 @@ describe Rhapsody do
     expect(config_variables).not_to be_empty
     expect(config_variables['API_KEY'].length).not_to eql(0)
     expect(config_variables['API_SECRET'].length).not_to eql(0)
+    expect(config_variables['USERNAME'].length).not_to eql(0)
+    expect(config_variables['PASSWORD'].length).not_to eql(0)
   end
 
   it 'checks version' do
-    expect(Rhapsody::VERSION).to eql('0.0.6')
+    expect(Rhapsody::VERSION).to eql('0.0.7')
+  end
+
+  it 'has a helper for getting an access token' do
+    expect(AuthenticationHelper.get_access_token).not_to eql(0)
   end
 end

data/spec/spec_helper.rb

@@ -4,10 +4,14 @@ require 'factory_girl'
 # Load config.yml
 require_relative './config_helper'
 
+# Load helpers
+require_relative './helpers/authentication_helper'
+
 # Load gem files
 require_relative '../lib/rhapsody/controllers/clients_controller'
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
   config.include ConfigHelper
+  config.include AuthenticationHelper
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhapsody
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jason Kim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,7 @@ files:
 - lib/rhapsody/version.rb
 - rhapsody.gemspec
 - spec/config_helper.rb
+- spec/helpers/authentication_helper.rb
 - spec/rhapsody/controllers/clients_controller_spec.rb
 - spec/rhapsody/controllers/members_controller_spec.rb
 - spec/rhapsody/helpers/faraday_connection_spec.rb
@@ -91,6 +92,7 @@ specification_version: 4
 summary: ! 'NOT READY: A Ruby object-oriented interface to the Rhapsody REST API'
 test_files:
 - spec/config_helper.rb
+- spec/helpers/authentication_helper.rb
 - spec/rhapsody/controllers/clients_controller_spec.rb
 - spec/rhapsody/controllers/members_controller_spec.rb
 - spec/rhapsody/helpers/faraday_connection_spec.rb