7digital 0.0.7 → 0.1.0

data/spec/model/api_response_spec.rb

@@ -30,8 +30,8 @@ describe "ApiResponse" do
   end
 
   it "should be serializable" do
-    original_response = Sevendigital::ApiResponseDigestor.new(@client).from_xml\
-      ("<response status='ok'><testElement id='123'>value</testElement></response>")
+    original_response = Sevendigital::ApiResponse.new
+    original_response.content = "<response status='ok'><testElement id='123'>value</testElement></response>"
     original_response.error_code = 99
     original_response.headers = {"header" => "value"}
 
@@ -41,7 +41,7 @@ describe "ApiResponse" do
 
     restored_response.error_code.should == original_response.error_code
     restored_response.content.to_s.should == original_response.content.to_s
-    restored_response.content.test_element.value.should == "value"
+    restored_response.item_xml("response").to_s == "value"
     restored_response.headers.should == original_response.headers
 
   end

data/spec/model/artist_spec.rb

@@ -21,7 +21,7 @@ describe "Artist" do
       (options.keys & expected_options.keys).should == expected_options.keys
       fresh_artist
     }
-    @artist.get_details(expected_options)
+    @artist.get_details(expected_options).should == fresh_artist
     
     @artist.sort_name.should == fresh_artist.sort_name
     @artist.image.should == fresh_artist.image
@@ -151,5 +151,5 @@ describe "Artist" do
     artist.image = "image"
     artist.url = "url"
     artist
-end
+  end
 end

data/spec/model/sevendigital_object_spec.rb

@@ -5,11 +5,11 @@ describe "SevendigitalObject" do
 
   before do
 
-    @configuration = stub(Sevendigital::ClientConfiguration)
-    @configuration.stub!(:lazy_load).and_return(true)
+    @configuration = test_configuration
+    @configuration.lazy_load = true
+
+    stub_api_client(@configuration)
 
-    @client = stub(Sevendigital::Client)
-    @client.stub!(:configuration).and_return(@configuration)
     @client.stub!(:verbose?).and_return(true)
     @test_object = Sevendigital::SevendigitalObject.new(@client)
   end

data/spec/model/user_spec.rb

@@ -13,6 +13,21 @@ describe "User" do
     @user = Sevendigital::User.new(@client)
   end
 
+  it "get_details should get user's basic details from manager" do
+    @user.oauth_access_token = OAuth::AccessToken.new(nil, "TOKEN", "SECRET")
+    fresh_user = fake_user_with_details
+    expected_options = {:page => 2}
+
+    @user_manager.should_receive(:get_details) { |token, options|
+      token.should == @user.oauth_access_token
+      (options.keys & expected_options.keys).should == expected_options.keys
+      fresh_user
+    }
+    @user.get_details(expected_options).should == fresh_user
+    @user.email_address.should == fresh_user.email_address
+
+  end
+
   it "should not be authorised if does not have access_token" do
     @user.oauth_access_token = nil
     @user.authenticated?.should == false
@@ -158,4 +173,10 @@ describe "User" do
     running {@user.get_locker}.should raise_error(Sevendigital::SevendigitalError)
   end
 
+  def fake_user_with_details
+    user = Sevendigital::User.new(@client)
+    user.email_address = "user@7digital.com"
+    user
+  end
+
 end

data/spec/spec_helper.rb

@@ -2,26 +2,19 @@
 #$: << 'spec'
 
 =begin
-
 require 'simplecov'
-
 SimpleCov.start do
   add_group 'Management', 'lib/sevendigital/management'
   add_group 'Digestion', 'lib/sevendigital/digestion_tract'
   add_group 'Model', 'lib/sevendigital/model'
 end
-
 =end
 
-require 'spec'
+require 'rspec'
 require File.expand_path(
     File.join(File.dirname(__FILE__), %w[.. lib sevendigital]))
 
-require "peachy_spec_helper_patch"
-
-Peachy.whine
-
-Spec::Runner.configure do |config|
+Rspec.configure do |config|
   # == Mock Framework 
   #
   # RSpec uses it's own mocking framework by default. If you prefer to
@@ -34,6 +27,8 @@ end
 
   alias running lambda
 
+  VALID_7DIGITAL_URL = /http\:\/\/.+7digital\..+partner=[\d]+/
+
   def load_sample_method_xml(method_name)
     method_name = "test-xml/methods/" + method_name + ".xml"
       IO.read( File.join(File.dirname(__FILE__), method_name.split('/')))
@@ -45,11 +40,15 @@ end
   end
 
   def fake_api_response(method_name)
-    Sevendigital::ApiResponseDigestor.new(nil).from_xml(load_sample_method_xml(method_name))
+    response = Sevendigital::ApiResponse.new
+    response.content = load_sample_method_xml(method_name)
+    response.stub(:ok?).and_return true
+#    Sevendigital::ApiResponseDigestor.new(nil).from_xml_string(load_sample_method_xml(method_name))
+  response
   end
 
   def fake_api_error_response(code)
-    Sevendigital::ApiResponseDigestor.new(nil).from_xml("<response status=\"error\"><error code=\"#{code}\"></error></response>")
+    Sevendigital::ApiResponseDigestor.new(nil).from_xml_string("<response status=\"error\"><error code=\"#{code}\"></error></response>")
   end
 
   def mock_client_digestor(client, digestor_class)
@@ -62,3 +61,24 @@ end
     str.split('_').map {|w| w.capitalize}.join
   end
 
+  def stub_api_client(configuration, response_digestor=nil)
+    @client = stub(Sevendigital::Client)
+    @client.stub!(:configuration).and_return(configuration)
+    @client.stub!(:oauth_consumer).and_return(OAuth::Consumer.new( configuration.oauth_consumer_key, configuration.oauth_consumer_secret))
+    @client.stub!(:api_response_digestor).and_return(response_digestor)
+    @client.stub!(:default_parameters).and_return({:country => 'sk'})
+    @client.stub!(:user_agent_info).and_return("7digital")
+    @client.stub!(:verbose?).and_return(false)
+    @client.stub!(:very_verbose?).and_return(false)
+    @client.stub!(:api_host_and_version).and_return(["base.api.url","version"])
+    @client.stub!(:log).and_yield()
+    @client
+  end
+
+  def test_configuration
+    configuration = OpenStruct.new
+    configuration.oauth_consumer_key = "oauth_consumer_key"
+    configuration
+  end
+
+

data/spec/test-xml/methods/country/resolve.xml

@@ -0,0 +1,7 @@
+<response status="ok" version="1.2" xsi:noNamespaceSchemaLocation="http://api.7digital.com/1.2/static/7digitalAPI.xsd"
+          xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <GeoIpLookup>
+    <ipaddress>1.2.3.4</ipaddress>
+    <countryCode>AU</countryCode>
+  </GeoIpLookup>
+</response>

data/spec/test-xml/methods/editorial/list.xml

@@ -0,0 +1,171 @@
+<response status="ok" version="1.2" xsi:noNamespaceSchemaLocation="http://api.7digital.com/1.2/static/7digitalAPI.xsd"
+          xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <list id="3202">
+    <key>featured_albums</key>
+    <listItems>
+      <listItem id="1889735">
+        <type>release</type>
+        <release id="1889735">
+          <title>Battle Born</title>
+          <version/>
+          <type>Album</type>
+          <barcode>00602537147700</barcode>
+          <year>2009</year>
+          <explicitContent>false</explicitContent>
+          <artist id="616">
+            <name>The Killers</name>
+            <appearsAs>The Killers</appearsAs>
+            <url>http://www.7digital.com/artists/the-killers/?partner=1401</url>
+          </artist>
+          <url>http://www.7digital.com/artists/the-killers/battle-born-2/?partner=1401</url>
+          <image>http://cdn.7static.com/static/img/sleeveart/00/018/897/0001889735_50.jpg</image>
+          <releaseDate>2012-09-17T00:00:00+01:00</releaseDate>
+          <price>
+            <currency code="GBP"/>
+            <value>5</value>
+            <formattedPrice>£5.00</formattedPrice>
+            <rrp>7.99</rrp>
+            <formattedRrp>£7.99</formattedRrp>
+            <onSale>true</onSale>
+          </price>
+          <formats availableDrmFree="true">
+            <format id="17">
+              <fileFormat>MP3</fileFormat>
+              <bitRate>320</bitRate>
+              <drmFree>true</drmFree>
+            </format>
+          </formats>
+          <label id="133987">
+            <name>Digital Distribution Turkey</name>
+          </label>
+        </release>
+      </listItem>
+      <listItem id="1863720">
+        <type>release</type>
+        <release id="1863720">
+          <title>Shields</title>
+          <version/>
+          <type>Album</type>
+          <barcode>0801061022938</barcode>
+          <year>2012</year>
+          <explicitContent>false</explicitContent>
+          <artist id="171648">
+            <name>Grizzly Bear</name>
+            <appearsAs>Grizzly Bear</appearsAs>
+            <url>http://www.7digital.com/artists/grizzly-bear/?partner=1401</url>
+          </artist>
+          <url>http://www.7digital.com/artists/grizzly-bear/shields/?partner=1401</url>
+          <image>http://cdn.7static.com/static/img/sleeveart/00/018/637/0001863720_50.jpg</image>
+          <releaseDate>2012-09-16T00:00:00+01:00</releaseDate>
+          <price>
+            <currency code="GBP"/>
+            <value>5</value>
+            <formattedPrice>£5.00</formattedPrice>
+            <rrp>7.99</rrp>
+            <formattedRrp>£7.99</formattedRrp>
+            <onSale>true</onSale>
+          </price>
+          <formats availableDrmFree="true">
+            <format id="17">
+              <fileFormat>MP3</fileFormat>
+              <bitRate>320</bitRate>
+              <drmFree>true</drmFree>
+            </format>
+            <format id="33">
+              <fileFormat>M4A</fileFormat>
+              <bitRate>320</bitRate>
+              <drmFree>true</drmFree>
+            </format>
+          </formats>
+          <label id="811">
+            <name>Warp Records</name>
+          </label>
+        </release>
+      </listItem>
+      <listItem id="1848275">
+        <type>release</type>
+        <release id="1848275">
+          <title>Total Loss</title>
+          <version/>
+          <type>Album</type>
+          <barcode>5055453701450</barcode>
+          <year>2012</year>
+          <explicitContent>false</explicitContent>
+          <artist id="766646">
+            <name>How To Dress Well</name>
+            <appearsAs>How To Dress Well</appearsAs>
+            <url>http://www.7digital.com/artists/how-to-dress-well/?partner=1401</url>
+          </artist>
+          <url>http://www.7digital.com/artists/how-to-dress-well/total-loss/?partner=1401</url>
+          <image>http://cdn.7static.com/static/img/sleeveart/00/018/482/0001848275_50.jpg</image>
+          <releaseDate>2012-09-17T00:00:00+01:00</releaseDate>
+          <price>
+            <currency code="GBP"/>
+            <value>5</value>
+            <formattedPrice>£5.00</formattedPrice>
+            <rrp>7.99</rrp>
+            <formattedRrp>£7.99</formattedRrp>
+            <onSale>true</onSale>
+          </price>
+          <formats availableDrmFree="true">
+            <format id="17">
+              <fileFormat>MP3</fileFormat>
+              <bitRate>320</bitRate>
+              <drmFree>true</drmFree>
+            </format>
+            <format id="33">
+              <fileFormat>M4A</fileFormat>
+              <bitRate>320</bitRate>
+              <drmFree>true</drmFree>
+            </format>
+          </formats>
+          <label id="74276">
+            <name>Weird World</name>
+          </label>
+        </release>
+      </listItem>
+      <listItem id="1896829">
+        <type>release</type>
+        <release id="1896829">
+          <title>Maybe Today, Maybe Tomorrow</title>
+          <version/>
+          <type>Album</type>
+          <barcode>5060246123500</barcode>
+          <year>2012</year>
+          <explicitContent>false</explicitContent>
+          <artist id="479133">
+            <name>We Are The Ocean</name>
+            <appearsAs>We Are The Ocean</appearsAs>
+            <url>http://www.7digital.com/artists/we-are-the-ocean/?partner=1401</url>
+          </artist>
+          <url>http://www.7digital.com/artists/we-are-the-ocean/maybe-today-maybe-tomorrow-2/?partner=1401</url>
+          <image>http://cdn.7static.com/static/img/sleeveart/00/018/968/0001896829_50.jpg</image>
+          <releaseDate>2012-09-17T00:00:00+01:00</releaseDate>
+          <price>
+            <currency code="GBP"/>
+            <value>5</value>
+            <formattedPrice>£5.00</formattedPrice>
+            <rrp>7.99</rrp>
+            <formattedRrp>£7.99</formattedRrp>
+            <onSale>true</onSale>
+          </price>
+          <formats availableDrmFree="true">
+            <format id="17">
+              <fileFormat>MP3</fileFormat>
+              <bitRate>320</bitRate>
+              <drmFree>true</drmFree>
+            </format>
+            <format id="33">
+              <fileFormat>M4A</fileFormat>
+              <bitRate>320</bitRate>
+              <drmFree>true</drmFree>
+            </format>
+          </formats>
+          <label id="838">
+            <name>Hassle Records</name>
+          </label>
+        </release>
+      </listItem>
+    </listItems>
+  </list>
+</response>

data/spec/test-xml/methods/user/details.xml

@@ -0,0 +1,5 @@
+<response status="ok" version="1.2">
+	<user>
+		<emailAddress>user@example.com</emailAddress>
+	</user>
+</response>

data/spec/test-xml/objects/artist.xml

@@ -4,4 +4,5 @@
 	<appearsAs>The E.A.</appearsAs>
 	<image>http://somewhere.com/tea.jpg</image>
 	<url>http://7digital.com/artists/tea?partner=1</url>
+    <popularity>0.55</popularity>
 </artist>

data/spec/test-xml/objects/list.xml

@@ -0,0 +1,89 @@
+  <list id="3202">
+    <key>featured_albums</key>
+    <listItems>
+      <listItem id="1879539">
+        <type>release</type>
+        <release id="1879539">
+          <title>Coexist</title>
+          <version/>
+          <type>Album</type>
+          <barcode>634904608057</barcode>
+          <year>2012</year>
+          <explicitContent>false</explicitContent>
+          <artist id="382774">
+            <name>The xx</name>
+            <appearsAs>The xx</appearsAs>
+            <url>http://www.7digital.com/artists/the-xx/?partner=1401</url>
+          </artist>
+          <url>http://www.7digital.com/artists/the-xx/coexist/?partner=1401</url>
+          <image>http://cdn.7static.com/static/img/sleeveart/00/018/795/0001879539_50.jpg</image>
+          <releaseDate>2012-09-10T00:00:00+01:00</releaseDate>
+          <price>
+            <currency code="GBP"/>
+            <value>5</value>
+            <formattedPrice>£5.00</formattedPrice>
+            <rrp>7.99</rrp>
+            <formattedRrp>£7.99</formattedRrp>
+            <onSale>true</onSale>
+          </price>
+          <formats availableDrmFree="true">
+            <format id="17">
+              <fileFormat>MP3</fileFormat>
+              <bitRate>320</bitRate>
+              <drmFree>true</drmFree>
+            </format>
+            <format id="33">
+              <fileFormat>M4A</fileFormat>
+              <bitRate>320</bitRate>
+              <drmFree>true</drmFree>
+            </format>
+          </formats>
+          <label id="10983">
+            <name>Young Turks</name>
+          </label>
+        </release>
+      </listItem>
+      <listItem id="1879543">
+        <type>release</type>
+        <release id="1879543">
+          <title>Love This Giant</title>
+          <version/>
+          <type>Album</type>
+          <barcode>652637323160</barcode>
+          <year>2012</year>
+          <explicitContent>false</explicitContent>
+          <artist id="2640">
+            <name>David Byrne</name>
+            <appearsAs>David Byrne &amp; St. Vincent</appearsAs>
+            <url>http://www.7digital.com/artists/david-byrne/?partner=1401</url>
+          </artist>
+          <url>http://www.7digital.com/artists/david-byrne/love-this-giant/?partner=1401</url>
+          <image>http://cdn.7static.com/static/img/sleeveart/00/018/795/0001879543_50.jpg</image>
+          <releaseDate>2012-09-10T00:00:00+01:00</releaseDate>
+          <price>
+            <currency code="GBP"/>
+            <value>5</value>
+            <formattedPrice>£5.00</formattedPrice>
+            <rrp>7.99</rrp>
+            <formattedRrp>£7.99</formattedRrp>
+            <onSale>true</onSale>
+          </price>
+          <formats availableDrmFree="true">
+            <format id="17">
+              <fileFormat>MP3</fileFormat>
+              <bitRate>320</bitRate>
+              <drmFree>true</drmFree>
+            </format>
+            <format id="33">
+              <fileFormat>M4A</fileFormat>
+              <bitRate>320</bitRate>
+              <drmFree>true</drmFree>
+            </format>
+          </formats>
+          <label id="905">
+            <name>4AD</name>
+          </label>
+        </release>
+      </listItem>
+    </listItems>
+  </list>