7digital 0.0.1 → 0.0.2

data/README.rdoc

@@ -1,7 +1,9 @@
-Ruby wrapper for 7digital API 
-
-Example usage:
-	sevendigital_client = Sevendigital::Client.new(:oauth_consumer_key => "YOUR_KEY_HERE", :country => "GB")
-	artist = sevendigital_client.artist.get_details(1)
-	puts artist.name
-
+Ruby wrapper for 7digital API 
+
+Example usage:
+	require "sevendigital"
+
+	sevendigital_client = Sevendigital::Client.new(:oauth_consumer_key => "YOUR_KEY_HERE", :country => "GB")
+	artist = sevendigital_client.artist.get_details(1)
+	puts artist.name
+

data/lib/sevendigital.rb

@@ -1,53 +1,54 @@
-
-module Sevendigital
-
-  # :stopdoc:
-  VERSION = '0.0.1'
-  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
-  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
-  # :startdoc:
-
-  # Returns the version string for the library.
-  #
-  def self.version
-    VERSION
-  end
-
-  # Returns the library path for the module. If any arguments are given,
-  # they will be joined to the end of the libray path using
-  # <tt>File.join</tt>.
-  #
-  def self.libpath( *args )
-    args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
-  end
-
-  # Returns the lpath for the module. If any arguments are given,
-  # they will be joined to the end of the path using
-  # <tt>File.join</tt>.
-  #
-  def self.path( *args )
-    args.empty? ? PATH : ::File.join(PATH, args.flatten)
-  end
-
-  # Utility method used to require all files ending in .rb that lie in the
-  # directory below this file that has the same name as the filename passed
-  # in. Optionally, a specific _directory_ name can be passed in such that
-  # the _filename_ does not have to be equivalent to the directory.
-  #
-  def self.require_all_libs_relative_to( fname, dir = nil )
-    dir ||= ::File.basename(fname, '.*')
-    search_me = ::File.expand_path(
-        ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
-
-    Dir.glob(search_me).sort.each {|rb| require rb }
-  end
-
-end  # module 7digital
-
-require 'peachy'
-require File.join( File.dirname( File.expand_path(__FILE__)), 'peachy_patchy')
-require File.join( File.dirname( File.expand_path(__FILE__)), 'sevendigital', 'management', 'manager')
-require File.join( File.dirname( File.expand_path(__FILE__)), 'sevendigital', 'digestion_tract', 'digestor')
-require File.join( File.dirname( File.expand_path(__FILE__)), 'sevendigital', 'model', 'sevendigital_object')
-Sevendigital.require_all_libs_relative_to(__FILE__)
-
+
+module Sevendigital
+
+  # :stopdoc:
+  VERSION = '0.0.1'
+  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
+  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
+  # :startdoc:
+
+  # Returns the version string for the library.
+  #
+  def self.version
+    VERSION
+  end
+
+  # Returns the library path for the module. If any arguments are given,
+  # they will be joined to the end of the libray path using
+  # <tt>File.join</tt>.
+  #
+  def self.libpath( *args )
+    args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
+  end
+
+  # Returns the lpath for the module. If any arguments are given,
+  # they will be joined to the end of the path using
+  # <tt>File.join</tt>.
+  #
+  def self.path( *args )
+    args.empty? ? PATH : ::File.join(PATH, args.flatten)
+  end
+
+  # Utility method used to require all files ending in .rb that lie in the
+  # directory below this file that has the same name as the filename passed
+  # in. Optionally, a specific _directory_ name can be passed in such that
+  # the _filename_ does not have to be equivalent to the directory.
+  #
+  def self.require_all_libs_relative_to( fname, dir = nil )
+    dir ||= ::File.basename(fname, '.*')
+    search_me = ::File.expand_path(
+        ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
+
+    Dir.glob(search_me).sort.each {|rb| require rb }
+  end
+
+end  # module 7digital
+
+require 'peachy'
+require File.join( File.dirname( File.expand_path(__FILE__)), 'sevendigital', 'peachy_patch')
+Peachy.be_quiet
+require File.join( File.dirname( File.expand_path(__FILE__)), 'sevendigital', 'management', 'manager')
+require File.join( File.dirname( File.expand_path(__FILE__)), 'sevendigital', 'digestion_tract', 'digestor')
+require File.join( File.dirname( File.expand_path(__FILE__)), 'sevendigital', 'model', 'sevendigital_object')
+Sevendigital.require_all_libs_relative_to(__FILE__)
+

data/lib/sevendigital/api_operator.rb

@@ -1,31 +1,34 @@
-module Sevendigital
-
-  require 'net/http'
-  
-  class ApiOperator
-
-  def initialize(client)
-    @client = client
-  end
-
-  def call_api(api_request)
-    make_http_request_and_digest(create_request_uri(api_request))
-  end
-
-  def make_http_request_and_digest(uri)
-    http_response = Net::HTTP.get_response(uri)
-    api_response = @client.api_response_digestor.from_http_response(http_response)
-    raise Sevendigital::SevendigitalError, "#{api_response.error_code} - #{api_response.error_message}" if !api_response.ok?
-    api_response
-  end
-
-  def create_request_uri(api_request)
-    api_request.ensure_country_is_set(@client.country)
-    params = api_request.parameters.collect{ |a,v| "&#{a}=#{v}" }.join
-    URI.parse("http://#{@client.configuration.api_url}/#{@client.configuration.api_version}/#{api_request.api_method}"+
-              "?oauth_consumer_key=#{@client.configuration.oauth_consumer_key}#{params}")
-  end
-
-end
-
+module Sevendigital
+
+  require 'net/http'
+  
+  class ApiOperator
+
+  def initialize(client)
+    @client = client
+  end
+
+  def call_api(api_request)
+    api_response = make_http_request_and_digest(create_request_uri(api_request))
+    puts api_response if @client.very_verbose?
+    api_response
+  end
+
+  def make_http_request_and_digest(uri)
+    puts "ApiOperator: Calling #{uri}" if @client.verbose?
+    http_response = Net::HTTP.get_response(uri)
+    api_response = @client.api_response_digestor.from_http_response(http_response)
+    raise Sevendigital::SevendigitalError, "#{api_response.error_code} - #{api_response.error_message}" if !api_response.ok?
+    api_response
+  end
+
+  def create_request_uri(api_request)
+    api_request.ensure_country_is_set(@client.country)
+    params = api_request.parameters.collect{ |a,v| "&#{a}=#{v}" }.join
+    URI.parse("http://#{@client.configuration.api_url}/#{@client.configuration.api_version}/#{api_request.api_method}"+
+              "?oauth_consumer_key=#{@client.configuration.oauth_consumer_key}#{params}")
+  end
+
+end
+
 end

data/lib/sevendigital/api_operator_cached.rb

@@ -1,23 +1,23 @@
-module Sevendigital
-
-class ApiOperatorCached < ApiOperator
-
-  def initialize(client, cache)
-    @cache = cache
-    super(client)
-  end
-
-  def call_api(api_request)
-    uri = create_request_uri(api_request)
-    api_response = @cache.get(uri.to_s)
-    #puts "got from cache #{uri}" if api_response
-    if (!api_response) then
-      #puts "calling #{uri}"
-      api_response = make_http_request_and_digest(uri)
-      @cache.set(uri.to_s, api_response)
-    end
-    api_response
-  end
-end
-
-end
+module Sevendigital
+
+class ApiOperatorCached < ApiOperator
+
+  def initialize(client, cache)
+    @cache = cache
+    super(client)
+  end
+
+  def call_api(api_request)
+    uri = create_request_uri(api_request)
+    api_response = @cache.get(uri.to_s)
+    puts "ApiOperatorCached: Got from cache #{uri}" if api_response if @client.verbose?
+    if (!api_response) then
+      api_response = make_http_request_and_digest(uri)
+      @cache.set(uri.to_s, api_response)
+    end
+    puts api_response if @client.very_verbose?    
+    api_response
+  end
+end
+
+end

data/lib/sevendigital/api_request.rb

@@ -1,24 +1,24 @@
-module Sevendigital
-
-class ApiRequest
-
-  attr_reader :api_method, :parameters
-
-  def initialize(api_method, parameters, options = {})
-    @api_method = api_method
-    @parameters = comb_parameters(options.merge(parameters))
-  end
-
-  def comb_parameters(parameters)
-    page_size = parameters[:page_size] || parameters[:per_page]
-    parameters[:pageSize] ||= page_size if page_size
-    return parameters
-  end
-
-  def ensure_country_is_set(country)
-    @parameters[:country] ||= country
-  end
-
-end
-
+module Sevendigital
+
+class ApiRequest
+
+  attr_reader :api_method, :parameters
+
+  def initialize(api_method, parameters, options = {})
+    @api_method = api_method
+    @parameters = comb_parameters(options.merge(parameters))
+  end
+
+  def comb_parameters(parameters)
+    page_size = parameters[:page_size] || parameters[:per_page]
+    parameters[:pageSize] ||= page_size if page_size
+    return parameters
+  end
+
+  def ensure_country_is_set(country)
+    @parameters[:country] ||= country
+  end
+
+end
+
 end

data/lib/sevendigital/client.rb

@@ -1,124 +1,136 @@
-require 'ostruct'
-require 'yaml'
-
-
-module Sevendigital
-
-  DEFAULT_CONFIGURATION = {
-      :api_url =>  "api.7digital.com",
-      :api_version => "1.2"
-    }
-
-  class Client
-
-  def load_configuration_from_yml(file_name, environment=nil)
-    plain_settings = YAML.load_file(file_name)
-    if (plain_settings["common"] || (environment && plain_settings[environment])) then
-      environment_settings = plain_settings["common"] || {}
-      environment_settings.update(plain_settings[environment]) if environment
-      environment_settings
-    else
-      plain_settings
-    end
-  end
-
-  def load_configurations(configuration)
-    
-    default_settings = Sevendigital::DEFAULT_CONFIGURATION
-
-    if (configuration.kind_of? String) then
-      yml_configuration_file = configuration
-    else
-      yml_configuration_file ="#{RAILS_ROOT}/config/sevendigital.yml" if defined?(RAILS_ROOT)
-      explicit_settings = configuration if configuration.kind_of? Hash
-      explicit_settings = configuration.marshal_dump if configuration.kind_of? OpenStruct
-    end
-
-    environment = defined?(RAILS_ENV) ? RAILS_ENV  : nil
-    yml_settings = load_configuration_from_yml(yml_configuration_file, environment) if yml_configuration_file
-  
-    settings = default_settings
-    settings.update(yml_settings) if yml_settings
-    settings.update(explicit_settings) if explicit_settings
-
-    return OpenStruct.new(settings)
-  end
-
-  #Code here
-
-    def initialize(configuration=nil, api_operator=nil)
-      @configuration = load_configurations(configuration)
-      @api_operator = api_operator || hire_api_operator
-    end
-  
-    def hire_api_operator
-       @configuration.cache ? ApiOperatorCached.new(self, @configuration.cache) : ApiOperator.new(self)
-    end
-
-    def artist
-      @artist_manager ||= ArtistManager.new(self) 
-    end
-
-    def artist_digestor
-      @artist_digestor ||= ArtistDigestor.new(self)
-    end
-    
-    def release
-      @release_manager ||= ReleaseManager.new(self)
-    end
-
-    def release_digestor
-      @release_digestor ||= ReleaseDigestor.new(self)
-    end
-
-    def label_digestor
-      @label_digestor ||= LabelDigestor.new(self)
-    end
-
-    def format_digestor
-      @format_digestor ||= FormatDigestor.new(self)
-    end
-    
-    def price_digestor
-      @price_digestor ||= PriceDigestor.new(self)
-    end
-
-    def pager_digestor
-      @pager_digestor ||= PagerDigestor.new(self)
-    end
-
-    def track
-      @track_manager ||= TrackManager.new(self)
-    end
-
-    def track_digestor
-      @track_digestor ||= TrackDigestor.new(self)
-    end
-
-    def api_response_digestor
-      @api_response_digestor ||= ApiResponseDigestor.new(self)
-    end
-    
-    def chart_item_digestor
-      @chart_item_digestor ||= ChartItemDigestor.new(self)
-    end
-    
-    def configuration
-      return @configuration
-    end
-
-    def operator
-      @api_operator
-    end
-
-    def country
-      @country || @configuration.country
-    end
-
-    def country=(country_code)
-      @country = country_code
-    end
-
-  end
-
-end
+require 'ostruct'
+require 'yaml'
+
+
+module Sevendigital
+
+  DEFAULT_CONFIGURATION = {
+      :api_url =>  "api.7digital.com",
+      :api_version => "1.2"
+    }
+
+  class Client
+
+  def load_configuration_from_yml(file_name, environment=nil)
+    plain_settings = YAML.load_file(file_name)
+    if (plain_settings["common"] || (environment && plain_settings[environment])) then
+      environment_settings = plain_settings["common"] || {}
+      environment_settings.update(plain_settings[environment]) if environment
+      environment_settings
+    else
+      plain_settings
+    end
+  end
+
+  def load_configurations(configuration)
+    
+    default_settings = Sevendigital::DEFAULT_CONFIGURATION
+
+    if (configuration.kind_of? String) then
+      yml_configuration_file = configuration
+    else
+      yml_configuration_file ="#{RAILS_ROOT}/config/sevendigital.yml" if defined?(RAILS_ROOT)
+      explicit_settings = configuration if configuration.kind_of? Hash
+      explicit_settings = configuration.marshal_dump if configuration.kind_of? OpenStruct
+    end
+
+    environment = defined?(RAILS_ENV) ? RAILS_ENV  : nil
+    yml_settings = load_configuration_from_yml(yml_configuration_file, environment) if yml_configuration_file
+  
+    settings = default_settings
+    settings.update(yml_settings) if yml_settings
+    settings.update(explicit_settings) if explicit_settings
+
+    return OpenStruct.new(settings)
+  end
+
+  #Code here
+
+    def initialize(configuration=nil, api_operator=nil)
+      @configuration = load_configurations(configuration)
+      @api_operator = api_operator || hire_api_operator
+    end
+  
+    def hire_api_operator
+       @configuration.cache ? ApiOperatorCached.new(self, @configuration.cache) : ApiOperator.new(self)
+    end
+
+    def artist
+      @artist_manager ||= ArtistManager.new(self) 
+    end
+
+    def artist_digestor
+      @artist_digestor ||= ArtistDigestor.new(self)
+    end
+    
+    def release
+      @release_manager ||= ReleaseManager.new(self)
+    end
+
+    def release_digestor
+      @release_digestor ||= ReleaseDigestor.new(self)
+    end
+
+    def label_digestor
+      @label_digestor ||= LabelDigestor.new(self)
+    end
+
+    def format_digestor
+      @format_digestor ||= FormatDigestor.new(self)
+    end
+    
+    def price_digestor
+      @price_digestor ||= PriceDigestor.new(self)
+    end
+
+    def pager_digestor
+      @pager_digestor ||= PagerDigestor.new(self)
+    end
+
+    def track
+      @track_manager ||= TrackManager.new(self)
+    end
+
+    def track_digestor
+      @track_digestor ||= TrackDigestor.new(self)
+    end
+
+    def api_response_digestor
+      @api_response_digestor ||= ApiResponseDigestor.new(self)
+    end
+    
+    def chart_item_digestor
+      @chart_item_digestor ||= ChartItemDigestor.new(self)
+    end
+    
+    def configuration
+      return @configuration
+    end
+
+    def operator
+      @api_operator
+    end
+
+    def country
+      @country || @configuration.country
+    end
+
+    def country=(country_code)
+      @country = country_code
+    end
+
+    def verbose?
+      !(@verbose || @configuration.verbose).nil?
+    end
+
+    def very_verbose?
+      verbose? && (@verbose || @configuration.verbose).to_s == "very_verbose"
+    end
+
+    def verbose=(verbosity)
+      @verbose = verbosity
+    end
+
+  end
+
+end