7digital 0.1.2 → 0.1.5

data/lib/sevendigital/client_configuration.rb

@@ -1,83 +1,85 @@
-require 'ostruct'
-require 'yaml'
-
-module Sevendigital
-
-  DEFAULT_CONFIGURATION = {
-      :api_url =>  "api.7digital.com",
-      :api_version => "1.2",
-      :media_api_url =>  "media-eu.7digital.com",
-      :media_api_version => "media",
-      :account_api_url =>  "account.7digital.com",
-      :account_api_version => "web"
-    }.freeze
-  
-  class ClientConfiguration < OpenStruct
-
-    def initialize(*args)
-
-      super()
-
-      self.override_with(Sevendigital::DEFAULT_CONFIGURATION)
-
-      self.override_with(default_configuration_file)
-
-      args.each do |configuration_argument|
-        self.override_with(configuration_argument)
-      end
-      #puts "Now: #{self.inspect}"
-  
-    end
-
-    def override_with(configuration)
-      #puts "Now: #{self.inspect}"
-      #puts "Overriding with #{configuration.class}: #{configuration.inspect}"
-      return self unless configuration
-      if configuration.kind_of? Hash then
-        table.merge!(configuration)
-        return self
-      end
-      if configuration.kind_of? OpenStruct then
-        table.merge!(configuration.marshal_dump)
-        return self
-      end
-      if (configuration.kind_of? String) && is_it_yml_file?(configuration) then
-        table.merge!(load_configuration_from_yml(configuration, current_environment))
-        return self
-      end
-
-    end
-    
-    def default_configuration_file
-      return nil unless defined?(Rails.root)
-      Rails.root.join('config', 'sevendigital.yml').to_s
-    end
-
-    def current_environment
-      defined?(Rails.env) ? Rails.env  : nil
-    end
-
-    def load_configuration_from_yml(file_name, environment=nil)
-      plain_settings = transform_keys_to_symbols(YAML.load_file(file_name))
-      if (plain_settings[:common] || (environment && plain_settings[environment.to_sym])) then
-        environment_settings = plain_settings[:common] || {}
-        environment_settings.update(plain_settings[environment.to_sym]) if environment
-        environment_settings
-      else
-        plain_settings
-      end
-    end
-
-    private
-
-    def is_it_yml_file?(file_name)
-      file_name.include?('.yml')
-    end
-
-    def transform_keys_to_symbols(hash)
-      return hash if not hash.is_a?(Hash)
-      new_hash = hash.inject({}){|memo,(k,v)| memo[k.to_sym] = transform_keys_to_symbols(v); memo}
-      new_hash
-    end
-  end
-end
+require 'ostruct'
+require 'yaml'
+
+module Sevendigital
+
+  DEFAULT_CONFIGURATION = {
+      :api_url =>  "api.7digital.com",
+      :api_version => "1.2",
+      :media_api_url =>  "stream.svc.7digital.net",
+      :media_api_version => "",
+      :previews_api_url =>  "previews.7digital.com",
+      :previews_api_version => "",
+      :account_api_url =>  "account.7digital.com",
+      :account_api_version => "web"
+    }.freeze
+  
+  class ClientConfiguration < OpenStruct
+
+    def initialize(*args)
+
+      super()
+
+      self.override_with(Sevendigital::DEFAULT_CONFIGURATION)
+
+      self.override_with(default_configuration_file)
+
+      args.each do |configuration_argument|
+        self.override_with(configuration_argument)
+      end
+      #puts "Now: #{self.inspect}"
+  
+    end
+
+    def override_with(configuration)
+      #puts "Now: #{self.inspect}"
+      #puts "Overriding with #{configuration.class}: #{configuration.inspect}"
+      return self unless configuration
+      if configuration.kind_of? Hash then
+        table.merge!(configuration)
+        return self
+      end
+      if configuration.kind_of? OpenStruct then
+        table.merge!(configuration.marshal_dump)
+        return self
+      end
+      if (configuration.kind_of? String) && is_it_yml_file?(configuration) then
+        table.merge!(load_configuration_from_yml(configuration, current_environment))
+        return self
+      end
+
+    end
+    
+    def default_configuration_file
+      return nil unless defined?(Rails.root)
+      Rails.root.join('config', 'sevendigital.yml').to_s
+    end
+
+    def current_environment
+      defined?(Rails.env) ? Rails.env  : nil
+    end
+
+    def load_configuration_from_yml(file_name, environment=nil)
+      plain_settings = transform_keys_to_symbols(YAML.load_file(file_name))
+      if (plain_settings[:common] || (environment && plain_settings[environment.to_sym])) then
+        environment_settings = plain_settings[:common] || {}
+        environment_settings.update(plain_settings[environment.to_sym]) if environment
+        environment_settings
+      else
+        plain_settings
+      end
+    end
+
+    private
+
+    def is_it_yml_file?(file_name)
+      file_name.include?('.yml')
+    end
+
+    def transform_keys_to_symbols(hash)
+      return hash if not hash.is_a?(Hash)
+      new_hash = hash.inject({}){|memo,(k,v)| memo[k.to_sym] = transform_keys_to_symbols(v); memo}
+      new_hash
+    end
+  end
+end

data/lib/sevendigital/client_digestors.rb

@@ -1,122 +1,122 @@
-module Sevendigital
-
-  class Client #:nodoc:
-
-    #@private
-    def api_response_digestor
-      @api_response_digestor ||= ApiResponseDigestor.new(self)
-    end
-
-    #@private
-    def artist_digestor
-      @artist_digestor ||= ArtistDigestor.new(self)
-    end
-
-    #@private
-    def basket_digestor
-      @basket_digestor ||= BasketDigestor.new(self)
-    end
-
-    #@private
-    def basket_item_digestor
-      @basket_item_digestor ||= BasketItemDigestor.new(self)
-    end
-
-    #@private
-    def chart_item_digestor
-      @chart_item_digestor ||= ChartItemDigestor.new(self)
-    end
-
-    #@private
-    def country_digestor
-      @country_digestor ||= CountryDigestor.new(self)
-    end
-
-    #@private
-    def download_url_digestor
-      @download_url_digestor ||= DownloadUrlDigestor.new(self)
-    end
-
-    #@private
-    def format_digestor
-      @format_digestor ||= FormatDigestor.new(self)
-    end
-
-    #@private
-    def label_digestor
-      @label_digestor ||= LabelDigestor.new(self)
-    end
-
-    #@private
-    def locker_digestor
-      @locker_digestor ||= LockerDigestor.new(self)
-    end
-
-    #@private
-    def locker_release_digestor
-      @locker_release_digestor ||= LockerReleaseDigestor.new(self)
-    end
-
-    #@private
-    def locker_track_digestor
-      @locker_track_digestor ||= LockerTrackDigestor.new(self)
-    end
-
-    #@private
-    def list_digestor
-      @list_digestor ||= ListDigestor.new(self)
-    end
-
-    #@private
-    def list_item_digestor
-      @list_item_digestor ||= ListItemDigestor.new(self)
-    end
-
-    #@private
-    def oauth_request_token_digestor
-      @oauth_request_token_digestor ||= OAuthRequestTokenDigestor.new(self)
-    end
-
-    #@private
-    def oauth_access_token_digestor
-      @oauth_access_token_digestor ||= OAuthAccessTokenDigestor.new(self)
-    end
-
-    #@private
-    def pager_digestor
-      @pager_digestor ||= PagerDigestor.new(self)
-    end
-
-    #@private
-    def price_digestor
-      @price_digestor ||= PriceDigestor.new(self)
-    end
-
-    #@private
-    def release_digestor
-      @release_digestor ||= ReleaseDigestor.new(self)
-    end
-
-    #@private
-    def track_digestor
-      @track_digestor ||= TrackDigestor.new(self)
-    end
-
-    #@private
-    def tag_digestor
-      @tag_digestor ||= TagDigestor.new(self)
-    end
-
-    #@private
-    def user_card_digestor
-      @user_card_digestor ||= UserCardDigestor.new(self)
-    end
-
-    #@private
-    def user_digestor
-      @user_digestor ||= UserDigestor.new(self)
-    end
-
-  end
-
-end
+module Sevendigital
+
+  class Client #:nodoc:
+
+    #@private
+    def api_response_digestor
+      @api_response_digestor ||= ApiResponseDigestor.new(self)
+    end
+
+    #@private
+    def artist_digestor
+      @artist_digestor ||= ArtistDigestor.new(self)
+    end
+
+    #@private
+    def basket_digestor
+      @basket_digestor ||= BasketDigestor.new(self)
+    end
+
+    #@private
+    def basket_item_digestor
+      @basket_item_digestor ||= BasketItemDigestor.new(self)
+    end
+
+    #@private
+    def chart_item_digestor
+      @chart_item_digestor ||= ChartItemDigestor.new(self)
+    end
+
+    #@private
+    def country_digestor
+      @country_digestor ||= CountryDigestor.new(self)
+    end
+
+    #@private
+    def download_url_digestor
+      @download_url_digestor ||= DownloadUrlDigestor.new(self)
+    end
+
+    #@private
+    def format_digestor
+      @format_digestor ||= FormatDigestor.new(self)
+    end
+
+    #@private
+    def label_digestor
+      @label_digestor ||= LabelDigestor.new(self)
+    end
+
+    #@private
+    def locker_digestor
+      @locker_digestor ||= LockerDigestor.new(self)
+    end
+
+    #@private
+    def locker_release_digestor
+      @locker_release_digestor ||= LockerReleaseDigestor.new(self)
+    end
+
+    #@private
+    def locker_track_digestor
+      @locker_track_digestor ||= LockerTrackDigestor.new(self)
+    end
+
+    #@private
+    def list_digestor
+      @list_digestor ||= ListDigestor.new(self)
+    end
+
+    #@private
+    def list_item_digestor
+      @list_item_digestor ||= ListItemDigestor.new(self)
+    end
+
+    #@private
+    def oauth_request_token_digestor
+      @oauth_request_token_digestor ||= OAuthRequestTokenDigestor.new(self)
+    end
+
+    #@private
+    def oauth_access_token_digestor
+      @oauth_access_token_digestor ||= OAuthAccessTokenDigestor.new(self)
+    end
+
+    #@private
+    def pager_digestor
+      @pager_digestor ||= PagerDigestor.new(self)
+    end
+
+    #@private
+    def price_digestor
+      @price_digestor ||= PriceDigestor.new(self)
+    end
+
+    #@private
+    def release_digestor
+      @release_digestor ||= ReleaseDigestor.new(self)
+    end
+
+    #@private
+    def track_digestor
+      @track_digestor ||= TrackDigestor.new(self)
+    end
+
+    #@private
+    def tag_digestor
+      @tag_digestor ||= TagDigestor.new(self)
+    end
+
+    #@private
+    def user_card_digestor
+      @user_card_digestor ||= UserCardDigestor.new(self)
+    end
+
+    #@private
+    def user_digestor
+      @user_digestor ||= UserDigestor.new(self)
+    end
+
+  end
+
+end

data/lib/sevendigital/client_managers.rb

@@ -1,57 +1,57 @@
-module Sevendigital
-
-  class Client
-
-    #@return [ArtistManager]
-    def artist
-      @artist_manager ||= ArtistManager.new(self)
-    end
-
-    #@return [BasketManager]
-    def basket
-      @basket_manager ||= BasketManager.new(self)
-    end
-
-    #@return [CountrytManager]
-    def country
-      @country_manager ||= CountryManager.new(self)
-    end
-
-    #@return [ListManager]
-    def list
-      @list_manager ||= ListManager.new(self)
-    end
-
-    #@return [ReleaseManager]
-    def release
-      @release_manager ||= ReleaseManager.new(self)
-    end
-
-    #@return [TagManager]
-    def tag
-      @tag_manager ||= TagManager.new(self)
-    end
-    
-    #@return [TrackManager]
-    def track
-      @track_manager ||= TrackManager.new(self)
-    end
-
-    #@return [UserManager]
-    def user
-      @user_manager ||= UserManager.new(self)
-    end
-
-    #@return [UserManager]
-    def user_payment_card
-      @user_card_manager ||= UserCardManager.new(self)
-    end
-
-    #@return [OAuthManager]
-    def oauth
-      @oauth_manager ||= OAuthManager.new(self)
-    end
-
-  end
-
-end
+module Sevendigital
+
+  class Client
+
+    #@return [ArtistManager]
+    def artist
+      @artist_manager ||= ArtistManager.new(self)
+    end
+
+    #@return [BasketManager]
+    def basket
+      @basket_manager ||= BasketManager.new(self)
+    end
+
+    #@return [CountrytManager]
+    def country
+      @country_manager ||= CountryManager.new(self)
+    end
+
+    #@return [ListManager]
+    def list
+      @list_manager ||= ListManager.new(self)
+    end
+
+    #@return [ReleaseManager]
+    def release
+      @release_manager ||= ReleaseManager.new(self)
+    end
+
+    #@return [TagManager]
+    def tag
+      @tag_manager ||= TagManager.new(self)
+    end
+    
+    #@return [TrackManager]
+    def track
+      @track_manager ||= TrackManager.new(self)
+    end
+
+    #@return [UserManager]
+    def user
+      @user_manager ||= UserManager.new(self)
+    end
+
+    #@return [UserManager]
+    def user_payment_card
+      @user_card_manager ||= UserCardManager.new(self)
+    end
+
+    #@return [OAuthManager]
+    def oauth
+      @oauth_manager ||= OAuthManager.new(self)
+    end
+
+  end
+
+end