rhapsody 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGYzZDhmZWMxZTY5MzU4ZWE2ODM2NGNkMjQ4ZDYxZWQ5NTMxZDJkMQ==
+    ZWU1YzAyZDA5NDAzOTlmMmVkNzEzMGYxZWNmZjZmMTE1ZmU2ZWRmMg==
   data.tar.gz: !binary |-
-    ODY3OWIwMDMwZjg4OGFhMTgzNzM5NjQ5Yzc3Y2Y2YWU5ZWVkMjJiNw==
+    M2JkNDUxOTJjYWQ4MGNmZjg2YjgyOTczMTY2YTZkYjJjYjgyYjQ5OQ==
 SHA512:
   metadata.gz: !binary |-
-    MmNlOTYwYTY5NGYxODFlYzg1YzlkZjc5NzM1OTUzYmU4MDM2NDVlZGRiM2E3
-    MmFjNmIwYmJhYmIyOWJlZTQyYTRkYTBmYzIzMTAxZjAxMzAzY2Y2ZDA0MmQ0
-    Y2JhNzM5NTJmYWFiNzc3YzY4MzVlMjRmODA3ZTMyMGE1YjlhYmM=
+    Y2ZmNGE4MmQzYTcxMTYwYTg0ZmI1YWRlMTQ1ZTM0NmQxNDg0MjVlYWQxNmU4
+    NDQ4ZTc0MDBjOGRmZDI1NTQ3ZjNlZWUxY2M3ZDViM2RjNzY5MjdiOWJmMGQw
+    MDhhOWFiMTBmMDE1ZDY5N2I0ZGZlMmYyMGVmNDZjZWNkNmI1ODA=
   data.tar.gz: !binary |-
-    YmJmNzRjNDRhZDQyY2ZhNWIzMzkzNDM1ZjU5NWRjMmZlNWQzZTg5NmYwNjU1
-    MjQyMjZiM2JiYjBkMWNhZGY3YmFkZTJjODgzZWJmMTkyNGI4NDgzYTM2ZWFk
-    ZGM1YmEwYmY3NTBjMzYyZmE2MWY0YzNmYmE5YjQyNzRkYmJhNmQ=
+    ZmNiNjc4NGM4ZGQwYmMxZGNhYzI5YzlmYzUyMDBmM2VmMzJhYjI3YWFkZTc4
+    OWIyNDljYWIyZTRiYjIxODRhOTBiZTE5NGE1MmE0Mjk0YzQ1NWYzYjA1YjQz
+    NzBiNmY2NWRkZmMzZmU2MDkzM2NlMGRjNmJlZGU3NTlhZDQ3Y2Q=

data/lib/rhapsody/models/member.rb

@@ -1,48 +1,69 @@
 class Rhapsody::Member
-  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
+  require 'json'
+
+  ATTR_LIST_HASH = [
+    {attribute: :cobrand, type: 'String'},
+    {attribute: :cocat, type: 'String'},
+    {attribute: :email, type: 'String'},
+    {attribute: :logon, type: 'String'},
+    {attribute: :first_name, type: 'String'},
+    {attribute: :id, type: 'String'},
+    {attribute: :last_name, type: 'String'},
+    {attribute: :locale, type: 'String'},
+    {attribute: :country, type: 'String'},
+    {attribute: :is_public, type: 'Boolean'},
+    {attribute: :billing_partner_code, type: 'String'},
+    {attribute: :create_date, type: 'Integer'},
+    {attribute: :is_suspended, type: 'Boolean'},
+    {attribute: :tier_code, type: 'String'},
+    {attribute: :tier_name, type: 'String'},
+    {attribute: :product_code, type: 'String'},
+    {attribute: :product_name, type: 'String'},
+    {attribute: :expiration_date, type: 'Integer'},
+    {attribute: :trial_length_days, type: 'Integer'},
+    {attribute: :is_trial, type: 'Boolean'},
+    {attribute: :state, type: 'String'},
+    {attribute: :can_stream_on_web, type: 'Boolean'},
+    {attribute: :can_stream_on_mobile, type: 'Boolean'},
+    {attribute: :can_stream_on_home_device, type: 'Boolean'},
+    {attribute: :can_stream_on_pc, type: 'Boolean'},
+    {attribute: :can_upgrade_streams, type: 'Boolean'},
+    {attribute: :max_stream_count, type: 'Integer'},
+    {attribute: :is_play_based_tier, type: 'Boolean'},
+    {attribute: :is_monthly_play_based_tier, type: 'Boolean'},
+    {attribute: :is_one_time_play_based_tier, type: 'Boolean'},
+    {attribute: :total_plays, type: 'Integer'},
+    {attribute: :plays_remaining, type: 'Integer'}
   ]
 
-  attr_accessor *ATTR_LIST
+  class << self
+    def attr_list_hash_attr
+      ATTR_LIST_HASH.map {|hash| hash[:attribute] }
+    end
+
+    # TODO: This needs to be global / base
+    def define_attr_accessor(key)
+      __send__(:attr_accessor, key)
+    end
+
+    def to_camelcase(key)
+      key.to_s.underscore
+    end
+  end
 
   def initialize(options)
     if options
       options.each do |key, value|
-        instance_variable_set("@#{key}", value)
+        key = Rhapsody::Member.to_camelcase(key)
+
+        # Set attr_accessor dynamically
+        Rhapsody::Member.define_attr_accessor(key)
+
+        # Set value for the attribute
+        send("#{key}=", value)
       end
     end
   end
 
+
 end

data/lib/rhapsody/version.rb

@@ -1,3 +1,3 @@
 module Rhapsody
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/helpers/authentication_helper.rb

@@ -29,6 +29,38 @@ module AuthenticationHelper
     access_token = json_response['access_token']
   end
 
+  def AuthenticationHelper.get_connected_client
+    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])
+
+    client = Rhapsody::ClientsController.new({
+      api_key: config_variables['API_KEY'],
+      api_secret: config_variables['API_SECRET'],
+      access_token: json_response['access_token'],
+      refresh_token: json_response['refresh_token']
+    })
+  end
+
   # typical post hash
   def AuthenticationHelper.post_hash
     yaml = ConfigHelper.load

data/spec/rhapsody/controllers/clients_controller_spec.rb

@@ -65,7 +65,14 @@ describe Rhapsody::ClientsController do
       :playsRemaining
     ]
     member_attributes.each do |attr|
-      expect(member).to respond_to(attr)
+      expect(member).to respond_to(attr.to_s.underscore)
     end
   end
+
+  it '#renew' do
+    client_controller = AuthenticationHelper.get_connected_client
+    client_controller.renew
+
+    expect(client_controller.response_status).to eql(200)
+  end
 end

data/spec/rhapsody/rhapsody_spec.rb

@@ -13,7 +13,7 @@ describe Rhapsody do
   end
 
   it 'checks version' do
-    expect(Rhapsody::VERSION).to eql('0.0.8')
+    expect(Rhapsody::VERSION).to eql('0.0.9')
   end
 
   it 'has a helper for getting an access token' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhapsody
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Jason Kim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler