7digital 0.0.1 → 0.0.2

data/lib/sevendigital/peachy_patch.rb

@@ -0,0 +1,19 @@
+module Peachy
+  module MorphIntoArray
+    private
+
+    def array_can? method_name
+      (Array.instance_methods - Object.instance_methods).include?( version_safe_method_id(method_name))
+    end
+  end
+end
+
+if RUBY_VERSION < "1.9"
+  def version_safe_method_id(method_name)
+    method_name.to_s
+  end
+else
+  def version_safe_method_id(method_name)
+    method_name.to_sym
+  end
+end

data/lib/sevendigital/proxy_police.rb

@@ -1,24 +1,24 @@
-module Sevendigital
-  class ProxyPolice
-
-    def ProxyPolice.ensure_is_proxy(xml_or_proxy, element_name)
-      if xml_or_proxy.kind_of? Peachy::Proxy then
-          return xml_or_proxy
-      else
-          return ProxyPolice.create_release_proxy(xml_or_proxy, element_name)
-      end
-    end
-
-    def ProxyPolice.create_release_proxy(xml, element_name)
-      #TODO don't use eval
-      parent_proxy = Peachy::Proxy.new(xml)
-      if element_name
-#        parent_proxy.send(element_name)
-        eval "parent_proxy.#{element_name.to_s}"
-      else
-        parent_proxy
-      end
-    end
-
-  end
+module Sevendigital
+  class ProxyPolice
+
+    def ProxyPolice.ensure_is_proxy(xml_or_proxy, element_name)
+      if xml_or_proxy.kind_of? Peachy::Proxy then
+          return xml_or_proxy
+      else
+          return ProxyPolice.create_release_proxy(xml_or_proxy, element_name)
+      end
+    end
+
+    def ProxyPolice.create_release_proxy(xml, element_name)
+      #TODO don't use eval
+      parent_proxy = Peachy::Proxy.new(xml)
+      if element_name
+#        parent_proxy.send(element_name)
+        eval "parent_proxy.#{element_name.to_s}"
+      else
+        parent_proxy
+      end
+    end
+
+  end
 end

data/spec/api_operator_cached_spec.rb

@@ -1,47 +1,48 @@
-require "spec"
-require 'sevendigital'
-require 'ostruct'
-
-describe "ApiOperatorCached" do
-
-  before do
-    @client = stub(Sevendigital::Client)
-    @cache = stub(Hash)
-    @cached_operator = Sevendigital::ApiOperatorCached.new(@client, @cache)
-  end
-
-  it "should not make an http request if response already in cache " do
-    @cached_operator.stub(:create_request_uri).and_return("key")
-    @cache.stub!(:get).with("key").and_return(:something)
-    @cached_operator.should_not_receive(:make_http_request_and_digest)
-    @cached_operator.call_api(@stub_api_request)
-  end
-  
-  it "should make an http request if response not yet in cache and return the result " do
-    api_response = fake_api_response()
-
-    @cached_operator.stub(:create_request_uri).and_return("key")
-    @cache.stub!(:get).with("key").and_return(nil)
-    @cache.stub!(:set).and_return(nil)
-    @cached_operator.should_receive(:make_http_request_and_digest).with("key").and_return(api_response)
-    
-    response = @cached_operator.call_api(@stub_api_request)
-    response.should == api_response
-  end
-
-  it "should cache uncached api response" do
-    api_response = fake_api_response()
-
-    @cached_operator.stub(:create_request_uri).and_return("key")
-    @cache.stub!(:get).with("key").and_return(nil)
-   @cached_operator.stub!(:make_http_request_and_digest).and_return(api_response)
-
-    @cache.should_receive(:set).with("key", api_response).and_return(nil)
-    response = @cached_operator.call_api(@stub_api_request)
-  end
-
-  def fake_api_response
-    return Net::HTTP.new("1.1", 200, "response_body")
-  end
-
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+require 'ostruct'
+
+describe "ApiOperatorCached" do
+
+  before do
+    @client = stub(Sevendigital::Client)
+    @client.stub!(:verbose?).and_return(false)
+    @client.stub!(:very_verbose?).and_return(false)
+    @cache = stub(Hash)
+    @cached_operator = Sevendigital::ApiOperatorCached.new(@client, @cache)
+  end
+
+  it "should not make an http request if response already in cache " do
+    @cached_operator.stub(:create_request_uri).and_return("key")
+    @cache.stub!(:get).with("key").and_return(:something)
+    @cached_operator.should_not_receive(:make_http_request_and_digest)
+    @cached_operator.call_api(@stub_api_request)
+  end
+  
+  it "should make an http request if response not yet in cache and return the result " do
+    api_response = fake_api_response()
+
+    @cached_operator.stub(:create_request_uri).and_return("key")
+    @cache.stub!(:get).with("key").and_return(nil)
+    @cache.stub!(:set).and_return(nil)
+    @cached_operator.should_receive(:make_http_request_and_digest).with("key").and_return(api_response)
+    
+    response = @cached_operator.call_api(@stub_api_request)
+    response.should == api_response
+  end
+
+  it "should cache uncached api response" do
+    api_response = fake_api_response()
+
+    @cached_operator.stub(:create_request_uri).and_return("key")
+    @cache.stub!(:get).with("key").and_return(nil)
+   @cached_operator.stub!(:make_http_request_and_digest).and_return(api_response)
+
+    @cache.should_receive(:set).with("key", api_response).and_return(nil)
+    response = @cached_operator.call_api(@stub_api_request)
+  end
+
+  def fake_api_response
+    return Net::HTTP.new("1.1", 200, "response_body")
+  end
+
 end

data/spec/api_operator_spec.rb

@@ -1,108 +1,115 @@
-require "spec"
-require 'sevendigital'
-require 'ostruct'
-
-describe "ApiOperator" do
-
-  before do
-    response_digestor = stub(Sevendigital::ApiResponseDigestor)
-    response_digestor.stub!(:from_http_response).and_return(fake_digested_response)
-
-    stub_api_client(test_configuration, response_digestor)
-
-    Net::HTTP.stub!(:get_response).and_return(fake_api_response)
-
-    @api_operator = Sevendigital::ApiOperator.new(@client)
-
-    @stub_api_request = stub_api_request()
-
-  end
-
-  it "should create request URI based on api method and client configuration" do
-
-    api_request = Sevendigital::ApiRequest.new("api/method", {:param1 => "value", :paramTwo => 2})
-
-    uri = @api_operator.create_request_uri(api_request)
-
-    uri.kind_of?(URI).should == true
-    uri.to_s.should == "http://base.api.url/version/api/method?oauth_consumer_key=oauth_consumer_key&param1=value&paramTwo=2&country=sk"
-
-  end
-
-  it "should make sure country is set before making request" do
-    @client.stub!(:country).and_return("sk")
-
-    @stub_api_request.should_receive(:ensure_country_is_set).with("sk")
-    
-    @api_operator.call_api(@stub_api_request)
-
-  end
-
-  it "should make HTTP request and get response" do
-
-    Net::HTTP.should_receive(:get_response).with(@api_operator.create_request_uri(@stub_api_request))
-
-    @api_operator.call_api(@stub_api_request)
-
-  end
-
-  it "should digest the HTTP response and get it out" do
-
-    http_response = fake_api_response
-
-    Net::HTTP.stub!(:get_response).and_return(http_response)
-
-    @client.api_response_digestor.should_receive(:from_http_response).with(http_response).and_return(fake_digested_response)
-
-    response = @api_operator.call_api(@stub_api_request)
-
-    response.kind_of?(Peachy::Proxy).should == true
-    response.to_s.should == fake_digested_response.to_s
-
-  end
-
-  it "should throw an exception if response is not ok" do
-
-    Net::HTTP.stub(:get_response).and_return(fake_api_response)
-    failed_response = fake_digested_response(false)
-    @client.api_response_digestor.stub!(:from_http_response).and_return(failed_response)
-
-    running { @api_operator.call_api(@stub_api_request) }.should raise_error Sevendigital::SevendigitalError
-
-  end
-
-  def test_configuration
-    configuration = OpenStruct.new
-    configuration.api_url = "base.api.url"
-    configuration.api_version = "version"
-    configuration.oauth_consumer_key = "oauth_consumer_key"
-    return configuration
-  end
-
-  def fake_api_response(code = 200, body = "response_body")
-    return Net::HTTP.new("1.1", code, body)
-  end
-
-  def fake_digested_response(is_ok = true)
-    proxy =  Peachy::Proxy.new('<response status="ok"><content>test</content></response>')
-    proxy.stub!(:ok?).and_return(is_ok)
-    proxy
-  end
-
-  def stub_api_client(configuration, response_digestor)
-  @client = stub(Sevendigital::Client)
-  @client.stub!(:configuration).and_return(configuration)
-  @client.stub!(:api_response_digestor).and_return(response_digestor)
-  @client.stub!(:country).and_return("sk")
-end
-
-def stub_api_request
-  api_request = stub(Sevendigital::ApiRequest)
-
-  api_request.stub!(:parameters).and_return({})
-  api_request.stub!(:api_method).and_return("m")
-  api_request.stub!(:ensure_country_is_set)
-  return api_request
-end
-
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+require 'ostruct'
+
+describe "ApiOperator" do
+
+  before do
+    response_digestor = stub(Sevendigital::ApiResponseDigestor)
+    response_digestor.stub!(:from_http_response). and_return(fake_digested_response)
+
+    stub_api_client(test_configuration, response_digestor)
+
+    Net::HTTP.stub!(:get_response).and_return(fake_api_response)
+
+    @api_operator = Sevendigital::ApiOperator.new(@client)
+
+    @stub_api_request = stub_api_request()
+
+  end
+
+  it "should create request URI based on api method and client configuration" do
+
+    api_request = Sevendigital::ApiRequest.new("api/method", {:param1 => "value", :paramTwo => 2})
+
+    uri = @api_operator.create_request_uri(api_request)
+
+    uri.kind_of?(URI).should == true
+
+    uri.to_s.should =~ /http:\/\/base.api.url\/version\/api\/method\?oauth_consumer_key=oauth_consumer_key/
+    uri.to_s.should =~ /\&param1=value/
+    uri.to_s.should =~ /\&paramTwo=2/
+
+  end
+
+  it "should make sure country is set before making request" do
+    @client.stub!(:country).and_return("sk")
+
+    @stub_api_request.should_receive(:ensure_country_is_set).with("sk")
+    
+    @api_operator.call_api(@stub_api_request)
+
+  end
+
+  it "should make HTTP request and get response" do
+
+    Net::HTTP.should_receive(:get_response).with(@api_operator.create_request_uri(@stub_api_request))
+
+    @api_operator.call_api(@stub_api_request)
+
+  end
+
+  it "should digest the HTTP response and get it out" do
+
+    http_response = fake_api_response
+    digested_response = fake_digested_response
+
+    Net::HTTP.stub!(:get_response).and_return(http_response)
+
+    @client.api_response_digestor.should_receive(:from_http_response).with(http_response).and_return(digested_response)
+
+    response = @api_operator.call_api(@stub_api_request)
+
+    response.should == digested_response
+
+  end
+
+  it "should throw an exception if response is not ok" do
+
+    Net::HTTP.stub(:get_response).and_return(fake_api_response)
+    failed_response = fake_digested_response(false)
+    failed_response.stub!(:error_code).and_return("4000")
+    failed_response.stub!(:error_message).and_return("error")
+      @client.api_response_digestor.stub!(:from_http_response).and_return(failed_response)
+
+    running { @api_operator.call_api(@stub_api_request) }.should raise_error(Sevendigital::SevendigitalError)
+
+  end
+
+  def test_configuration
+    configuration = OpenStruct.new
+    configuration.api_url = "base.api.url"
+    configuration.api_version = "version"
+    configuration.oauth_consumer_key = "oauth_consumer_key"
+    return configuration
+  end
+
+  def fake_api_response(code = 200, body = "response_body")
+    return Net::HTTP.new("1.1", code, body)
+  end
+
+  def fake_digested_response(is_ok = true)
+    proxy =  stub(Peachy::Proxy)#.new('<response status="ok"><content>test</content></response>')
+    proxy.stub!(:ok?).and_return(is_ok)
+    proxy
+  end
+
+  def stub_api_client(configuration, response_digestor)
+  @client = stub(Sevendigital::Client)
+  @client.stub!(:configuration).and_return(configuration)
+  @client.stub!(:api_response_digestor).and_return(response_digestor)
+  @client.stub!(:country).and_return("sk")
+  @client.stub!(:verbose?).and_return(false)
+  @client.stub!(:very_verbose?).and_return(false)
+
+end
+
+def stub_api_request
+  api_request = stub(Sevendigital::ApiRequest)
+
+  api_request.stub!(:parameters).and_return({})
+  api_request.stub!(:api_method).and_return("m")
+  api_request.stub!(:ensure_country_is_set)
+  return api_request
+end
+
 end

data/spec/api_request_spec.rb

@@ -1,27 +1,26 @@
-require 'spec'
-require File.join(File.dirname(__FILE__), %w[spec_helper])
-
-describe "ApiRequest" do
-
-  it "should merge method parameters and options with parameters taking preference" do
-
-    parameters = {:trackId => 123, :releaseId => 456, :country => "CU"}
-    options = {:page => 1, :country => "US",  :trackId => "SS"}
-    request = Sevendigital::ApiRequest.new('method', parameters, options)
-    request.parameters[:trackId].should == 123
-    request.parameters[:releaseId].should == 456
-    request.parameters[:country].should == "CU"
-    request.parameters[:page].should == 1
-    request.parameters.keys.size.should == 4 # page_size == null
-
-  end
-
-  it "should provide paging parameters in 7digital API format" do
-
-    request = Sevendigital::ApiRequest.new('method', {}, {:page => 5, :per_page => 3 })
-    request.parameters[:page].should == 5
-    request.parameters[:pageSize].should == 3
-
-	end
-
-end
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+
+describe "ApiRequest" do
+
+  it "should merge method parameters and options with parameters taking preference" do
+
+    parameters = {:trackId => 123, :releaseId => 456, :country => "CU"}
+    options = {:page => 1, :country => "US",  :trackId => "SS"}
+    request = Sevendigital::ApiRequest.new('method', parameters, options)
+    request.parameters[:trackId].should == 123
+    request.parameters[:releaseId].should == 456
+    request.parameters[:country].should == "CU"
+    request.parameters[:page].should == 1
+    request.parameters.keys.size.should == 4 # page_size == null
+
+  end
+
+  it "should provide paging parameters in 7digital API format" do
+
+    request = Sevendigital::ApiRequest.new('method', {}, {:page => 5, :per_page => 3 })
+    request.parameters[:page].should == 5
+    request.parameters[:pageSize].should == 3
+
+	end
+
+end

data/spec/client_spec.rb

@@ -1,46 +1,76 @@
-require "spec"
-require File.join(File.dirname(__FILE__), %w[spec_helper])
-require 'sevendigital'
-
-describe "Client" do
-
-  it "should load default configuration" do
-    client = Sevendigital::Client.new
-    client.configuration.api_url.should == 'api.7digital.com'
-  end
-
-  it "should override default configuration with configuration hash" do
-    client = Sevendigital::Client.new(:api_url => "test-hash.7digital.com")
-    client.configuration.api_url.should == 'test-hash.7digital.com'
-  end
-
-  it "should override default configuration with configuration class" do
-    client = Sevendigital::Client.new(OpenStruct.new(:api_url => "test-openstruct.7digital.com"))
-    client.configuration.api_url.should == 'test-openstruct.7digital.com'
-  end
-
-  it "should use simple configuration file" do
-    client = Sevendigital::Client.new(File.join(File.dirname(__FILE__),"data", "configuration_override.yml"))
-    client.configuration.api_url.should == 'test-yml-simple.7digital.com'
-  end
-
-  it "should use environment specific configuration file" do
-    client = Sevendigital::Client.new(File.join(File.dirname(__FILE__),"data", "configuration_env_override.yml"))
-    client.configuration.api_url.should == 'test-yml-common.7digital.com'
-  end
-
-  it "should use environment specific configuration file with environment specific settings" do
-    Object.const_set(:RAILS_ENV, "development") 
-    client = Sevendigital::Client.new(File.join(File.dirname(__FILE__),"data", "configuration_env_override.yml"))
-    client.configuration.api_url.should == 'test-yml-development.7digital.com'
-    Object.instance_eval{ remove_const :RAILS_ENV }
-  end
-
-  it "should use rails/config/sevendigital configuration as default rails settings" do
-    Object.const_set(:RAILS_ROOT, File.join(File.dirname(__FILE__),"data"))
-    client = Sevendigital::Client.new()
-    client.configuration.api_url.should == 'test-yml-rails-common.7digital.com'
-    Object.instance_eval{ remove_const :RAILS_ROOT }
-  end
-
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+
+describe "Client" do
+
+  it "should load default configuration" do
+    client = Sevendigital::Client.new
+    client.configuration.api_url.should == 'api.7digital.com'
+  end
+
+  it "should override default configuration with configuration hash" do
+    client = Sevendigital::Client.new(:api_url => "test-hash.7digital.com")
+    client.configuration.api_url.should == 'test-hash.7digital.com'
+  end
+
+  it "should override default configuration with configuration class" do
+    client = Sevendigital::Client.new(OpenStruct.new(:api_url => "test-openstruct.7digital.com"))
+    client.configuration.api_url.should == 'test-openstruct.7digital.com'
+  end
+
+  it "should use simple configuration file" do
+    client = Sevendigital::Client.new(File.join(File.dirname(__FILE__),"data", "configuration_override.yml"))
+    client.configuration.api_url.should == 'test-yml-simple.7digital.com'
+  end
+
+  it "should use environment specific configuration file" do
+    client = Sevendigital::Client.new(File.join(File.dirname(__FILE__),"data", "configuration_env_override.yml"))
+    client.configuration.api_url.should == 'test-yml-common.7digital.com'
+  end
+
+  it "should use environment specific configuration file with environment specific settings" do
+    Object.const_set(:RAILS_ENV, "development") 
+    client = Sevendigital::Client.new(File.join(File.dirname(__FILE__),"data", "configuration_env_override.yml"))
+    client.configuration.api_url.should == 'test-yml-development.7digital.com'
+    Object.instance_eval{ remove_const :RAILS_ENV }
+  end
+
+  it "should use rails/config/sevendigital configuration as default rails settings" do
+    Object.const_set(:RAILS_ROOT, File.join(File.dirname(__FILE__),"data"))
+    client = Sevendigital::Client.new()
+    client.configuration.api_url.should == 'test-yml-rails-common.7digital.com'
+    Object.instance_eval{ remove_const :RAILS_ROOT }
+  end
+
+  it "should not be verbose if not told to so" do
+    configuration = OpenStruct.new
+    client = Sevendigital::Client.new(configuration)
+    client.verbose?.should == false
+    client.very_verbose?.should == false
+  end
+
+  it "should be verbose if told to be verbose in configuration" do
+    configuration = OpenStruct.new
+    configuration.verbose = true
+    client = Sevendigital::Client.new(configuration)
+    client.verbose?.should == true
+    client.very_verbose?.should == false
+  end
+
+  it "should be very verbose if told to be very verbose in configruation" do
+    configuration = OpenStruct.new
+    configuration.verbose = :very_verbose
+    client = Sevendigital::Client.new(configuration)
+    client.verbose?.should == true
+    client.very_verbose?.should == true
+  end
+
+    it "should be verbose if told so" do
+    configuration = OpenStruct.new
+    configuration.verbose = false
+    client = Sevendigital::Client.new(configuration)
+    client.verbose = true
+    client.verbose?.should == true
+    client.very_verbose?.should == false
+  end
+
 end