discogs-wrapper 2.1.4 → 2.2.0

data/spec/wrapper_methods/get_label_spec.rb

@@ -10,12 +10,7 @@ describe Discogs::Wrapper do
   describe "when asking for label information" do
 
     before do
-      @http_request = mock(Net::HTTP)
-      @http_response = mock(Net::HTTPResponse, :code => "200", :body => read_sample("label"))
-      @http_response_as_file = mock(StringIO, :read => read_sample("label"))
-      Zlib::GzipReader.should_receive(:new).and_return(@http_response_as_file)
-      @http_request.should_receive(:start).and_return(@http_response)
-      Net::HTTP.should_receive(:new).and_return(@http_request)
+      mock_httparty("label")
 
       @label = @wrapper.get_label(@label_id)
     end
@@ -23,25 +18,25 @@ describe Discogs::Wrapper do
     describe "when calling simple label attributes" do
 
       it "should have a name attribute" do
-        @label.name.should == "Warner Bros. Records"
+        expect(@label.name).to eq("Warner Bros. Records")
       end
   
       it "should have a releases_url attribute" do
-        @label.releases_url.should =~ /labels\/1000\/releases/
+        expect(@label.releases_url).to match(/labels\/1000\/releases/)
       end
   
       it "should have a profile attribute" do
-        @label.profile.should =~ /Founded in 1958/
+        expect(@label.profile).to match(/Founded in 1958/)
       end
   
       it "should have a parent label attribute" do
-        @label.parent_label.name.should == "Warner Music Group"
+        expect(@label.parent_label.name).to eq("Warner Music Group")
       end
 
       it "should have one or more URLs" do
-        @label.urls.should be_instance_of(Array)
-        @label.urls[0].should == "http://www.warnerbrosrecords.com/"
-        @label.urls[1].should == "http://www.facebook.com/WarnerBrosRecords"
+        expect(@label.urls).to be_instance_of(Hashie::Array)
+        expect(@label.urls[0]).to eq("http://www.warnerbrosrecords.com/")
+        expect(@label.urls[1]).to eq("http://www.facebook.com/WarnerBrosRecords")
       end
   
     end
@@ -49,12 +44,12 @@ describe Discogs::Wrapper do
     describe "when calling complex artist attributes" do
  
       it "should have a traversible list of images" do
-        @label.images.should be_instance_of(Array)
+        expect(@label.images).to be_instance_of(Hashie::Array)
       end
 
       it "should have a traversible list of sub-labels" do
-        @label.sublabels.should be_instance_of(Array)
-        @label.sublabels[0].name.should == "1017 Brick Squad Records"
+        expect(@label.sublabels).to be_instance_of(Hashie::Array)
+        expect(@label.sublabels[0].name).to eq("1017 Brick Squad Records")
       end
  
       it "should have specifications for each image" do
@@ -63,9 +58,9 @@ describe Discogs::Wrapper do
                   [ 500, 493, 'secondary' ] ]
 
         @label.images.each_with_index do |image, index|
-          image.width.should == specs[index][0]
-          image.height.should == specs[index][1]
-          image.type.should == specs[index][2]
+          expect(image.width).to eq(specs[index][0])
+          expect(image.height).to eq(specs[index][1])
+          expect(image.type).to eq(specs[index][2])
         end
       end
 

data/spec/wrapper_methods/get_listing_spec.rb

@@ -3,18 +3,25 @@ require 'spec_helper'
 describe Discogs::Wrapper do
 
   before do
-    @oauth_access_token = mock(OAuth::AccessToken)
-    @wrapper = Discogs::Wrapper.new("some_user_agent", @oauth_access_token)
+    @oauth_access_token = double(OAuth::AccessToken)
+    @wrapper = Discogs::Wrapper.new("some_user_agent", :access_token => @oauth_access_token)
+
     @listing_id = 41578240
   end
 
   describe ".get_listing" do
 
     before do
-      @oauth_response = mock(OAuth::AccessToken, :code => "200", :body => read_sample("listing"))
-      @oauth_response_as_file = mock(StringIO, :read => read_sample("listing"))
-      Zlib::GzipReader.should_receive(:new).and_return(@oauth_response_as_file)
-      @oauth_access_token.should_receive(:get).and_return(@oauth_response)
+      @oauth_response = double(OAuth::AccessToken)
+      
+      allow(@oauth_response).to receive_messages(:code => "200", :body => read_sample("listing"))
+
+      @oauth_response_as_file = double(StringIO)
+      
+      allow(@oauth_response_as_file).to receive_messages(:read => read_sample("listing"))
+
+      expect(Zlib::GzipReader).to receive(:new).and_return(@oauth_response_as_file)
+      expect(@oauth_access_token).to receive(:get).and_return(@oauth_response)
 
       @listing = @wrapper.get_listing(@listing_id)
     end
@@ -22,15 +29,15 @@ describe Discogs::Wrapper do
     describe "when calling simple listing attributes" do
 
       it "should have a username" do
-        @listing.status.should == "For Sale"
+        expect(@listing.status).to eq("For Sale")
       end
 
       it "should have a weight" do
-        @listing.weight.should == 239.0
+        expect(@listing.weight).to eq(239.0)
       end
 
       it "should have a seller" do
-        @listing.seller.username.should == "EmpireDVDs"
+        expect(@listing.seller.username).to eq("EmpireDVDs")
       end
 
     end

data/spec/wrapper_methods/get_master_release_spec.rb

@@ -11,12 +11,7 @@ describe Discogs::Wrapper do
   describe ".get_master_release" do
 
     before do
-      @http_request = mock(Net::HTTP)
-      @http_response = mock(Net::HTTPResponse, :code => "200", :body => read_sample("master_release"))
-      @http_response_as_file = mock(StringIO, :read => read_sample("master_release"))
-      Zlib::GzipReader.should_receive(:new).and_return(@http_response_as_file)
-      @http_request.should_receive(:start).and_return(@http_response)
-      Net::HTTP.should_receive(:new).and_return(@http_request)
+      mock_httparty("master_release")
 
       @master_release = @wrapper.get_master_release(@master_release_id)
     end
@@ -24,29 +19,29 @@ describe Discogs::Wrapper do
     describe "when calling simple master release attributes" do
 
       it "should have an ID attribute" do
-        @master_release.id.should == 9800
+        expect(@master_release.id).to eq(9800)
       end
 
       it "should have a main_release attribute" do
-        @master_release.main_release.should == 5160870
+        expect(@master_release.main_release).to eq(5160870)
       end
 
       it "should have one or more tracks" do
-        @master_release.tracklist.should be_instance_of(Array)
-        @master_release.tracklist[0].duration.should == "2:56"
+        expect(@master_release.tracklist).to be_instance_of(Hashie::Array)
+        expect(@master_release.tracklist[0].duration).to eq("2:56")
       end
  
       it "should have one or more genres" do
-        @master_release.genres.should be_instance_of(Array)
-        @master_release.genres[0].should == "Rock"
+        expect(@master_release.genres).to be_instance_of(Hashie::Array)
+        expect(@master_release.genres[0]).to eq("Rock")
       end
 
       it "should have a versions_url" do
-        @master_release.versions_url.should =~ /masters\/9800\/versions/
+        expect(@master_release.versions_url).to match(/masters\/9800\/versions/)
       end
 
       it "should have one or more images" do
-        @master_release.images.should be_instance_of(Array)
+        expect(@master_release.images).to be_instance_of(Hashie::Array)
       end
 
     end
@@ -56,20 +51,20 @@ describe Discogs::Wrapper do
       it "should have specifications for each image" do
         specs = [ [ 600, 607, 'primary' ], [ 600, 604, 'secondary' ], [ 600, 598, 'secondary' ], [ 600, 601, 'secondary' ] ]
         @master_release.images.each_with_index do |image, index|
-          image.width.should == specs[index][0]
-          image.height.should == specs[index][1]
-          image.type.should == specs[index][2]
+          expect(image.width).to eq(specs[index][0])
+          expect(image.height).to eq(specs[index][1])
+          expect(image.type).to eq(specs[index][2])
         end
       end
 
       it "should have a traversible list of styles" do
-        @master_release.styles.should be_instance_of(Array)
-        @master_release.styles[0].should == "Prog Rock"
+        expect(@master_release.styles).to be_instance_of(Hashie::Array)
+        expect(@master_release.styles[0]).to eq("Prog Rock")
       end
 
       it "should have an extra artist associated to the second track" do
-        @master_release.tracklist[1].extraartists.should be_instance_of(Array)
-        @master_release.tracklist[1].extraartists[0].role.should == "Lead Vocals"
+        expect(@master_release.tracklist[1].extraartists).to be_instance_of(Hashie::Array)
+        expect(@master_release.tracklist[1].extraartists[0].role).to eq("Lead Vocals")
       end
 
     end

data/spec/wrapper_methods/get_master_release_versions_spec.rb

@@ -10,12 +10,7 @@ describe Discogs::Wrapper do
   describe ".get_master_release_versions" do
 
     before do
-      @http_request = mock(Net::HTTP)
-      @http_response = mock(Net::HTTPResponse, :code => "200", :body => read_sample("master_release_versions"))
-      @http_response_as_file = mock(StringIO, :read => read_sample("master_release_versions"))
-      Zlib::GzipReader.should_receive(:new).and_return(@http_response_as_file)
-      @http_request.should_receive(:start).and_return(@http_response)
-      Net::HTTP.should_receive(:new).and_return(@http_request)
+      mock_httparty("master_release_versions")
 
       @master_versions = @wrapper.get_master_release_versions(@master_id)
     end
@@ -23,23 +18,23 @@ describe Discogs::Wrapper do
     describe "when calling simple master release versions attributes" do
 
       it "should have 3 versions per page" do
-        @master_versions.versions.length.should == 3
+        expect(@master_versions.versions.length).to eq(3)
       end
 
       it "should have 3 versions total" do
-        @master_versions.pagination.items.should == 3
+        expect(@master_versions.pagination.items).to eq(3)
       end
 
       it "should have a first version with a label" do
-        @master_versions.versions.first.label.should == "Panton"
+        expect(@master_versions.versions.first.label).to eq("Panton")
       end
 
       it "should have a first release with a released field" do
-        @master_versions.versions.first.released.should == "1982"
+        expect(@master_versions.versions.first.released).to eq("1982")
       end
 
       it "should not have a bogus attribute" do
-      	@master_versions.bogus_attribute.should be_nil
+        expect(@master_versions.bogus_attribute).to be_nil
       end
 
     end

data/spec/wrapper_methods/get_order_messages_spec.rb

@@ -3,18 +3,25 @@ require 'spec_helper'
 describe Discogs::Wrapper do
 
   before do
-    @oauth_access_token = mock(OAuth::AccessToken)
-    @wrapper = Discogs::Wrapper.new("some_user_agent", @oauth_access_token)
+    @oauth_access_token = double(OAuth::AccessToken)
+    @wrapper = Discogs::Wrapper.new("some_user_agent", :access_token => @oauth_access_token)
+
     @order_id = "1-1"
   end
 
   describe ".get_order_messages" do
 
     before do
-      @oauth_response = mock(OAuth::AccessToken, :code => "200", :body => read_sample("order_messages"))
-      @oauth_response_as_file = mock(StringIO, :read => read_sample("order_messages"))
-      Zlib::GzipReader.should_receive(:new).and_return(@oauth_response_as_file)
-      @oauth_access_token.should_receive(:get).and_return(@oauth_response)
+      @oauth_response = double(OAuth::AccessToken)
+      
+      allow(@oauth_response).to receive_messages(:code => "200", :body => read_sample("order_messages"))
+
+      @oauth_response_as_file = double(StringIO)
+      
+      allow(@oauth_response_as_file).to receive_messages(:read => read_sample("order_messages"))
+
+      expect(Zlib::GzipReader).to receive(:new).and_return(@oauth_response_as_file)
+      expect(@oauth_access_token).to receive(:get).and_return(@oauth_response)
 
       @order_messages = @wrapper.get_order_messages(@order_id)
     end
@@ -22,11 +29,11 @@ describe Discogs::Wrapper do
     describe "when calling simple order messages attributes" do
 
       it "should have an array of messages" do
-        @order_messages.messages.should be_instance_of(Array)
+        expect(@order_messages.messages).to be_instance_of(Hashie::Array)
       end
 
       it "should have a username for the first message" do
-        @order_messages.messages[0].from.username.should == "example_seller"
+        expect(@order_messages.messages[0].from.username).to eq("example_seller")
       end
 
     end

data/spec/wrapper_methods/get_order_spec.rb

@@ -3,18 +3,25 @@ require 'spec_helper'
 describe Discogs::Wrapper do
 
   before do
-    @oauth_access_token = mock(OAuth::AccessToken)
-    @wrapper = Discogs::Wrapper.new("some_user_agent", @oauth_access_token)
+    @oauth_access_token = double(OAuth::AccessToken)
+    @wrapper = Discogs::Wrapper.new("some_user_agent", :access_token => @oauth_access_token)
+
     @order_id = "1-1"
   end
 
   describe ".get_order" do
 
     before do
-      @oauth_response = mock(OAuth::AccessToken, :code => "200", :body => read_sample("order"))
-      @oauth_response_as_file = mock(StringIO, :read => read_sample("order"))
-      Zlib::GzipReader.should_receive(:new).and_return(@oauth_response_as_file)
-      @oauth_access_token.should_receive(:get).and_return(@oauth_response)
+      @oauth_response = double(OAuth::AccessToken)
+      
+      allow(@oauth_response).to receive_messages(:code => "200", :body => read_sample("order"))
+
+      @oauth_response_as_file = double(StringIO)
+      
+      allow(@oauth_response_as_file).to receive_messages(:read => read_sample("order"))
+
+      expect(Zlib::GzipReader).to receive(:new).and_return(@oauth_response_as_file)
+      expect(@oauth_access_token).to receive(:get).and_return(@oauth_response)
 
       @order = @wrapper.get_order(@order_id)
     end
@@ -22,11 +29,11 @@ describe Discogs::Wrapper do
     describe "when calling simple order attributes" do
 
       it "should have a status" do
-        @order.status.should == "New Order"
+        expect(@order.status).to eq("New Order")
       end
 
       it "should have a fee" do
-        @order.fee.value.should == 2.52
+        expect(@order.fee.value).to eq(2.52)
       end
 
     end

data/spec/wrapper_methods/get_price_suggestions_spec.rb

@@ -3,18 +3,25 @@ require 'spec_helper'
 describe Discogs::Wrapper do
 
   before do
-    @oauth_access_token = mock(OAuth::AccessToken)
-    @wrapper = Discogs::Wrapper.new("some_user_agent", @oauth_access_token)
+    @oauth_access_token = double(OAuth::AccessToken)
+    @wrapper = Discogs::Wrapper.new("some_user_agent", :access_token => @oauth_access_token)
+
     @release_id = "1"
   end
 
   describe ".get_price_suggestions" do
 
     before do
-      @oauth_response = mock(OAuth::AccessToken, :code => "200", :body => read_sample("price_suggestions"))
-      @oauth_response_as_file = mock(StringIO, :read => read_sample("price_suggestions"))
-      Zlib::GzipReader.should_receive(:new).and_return(@oauth_response_as_file)
-      @oauth_access_token.should_receive(:get).and_return(@oauth_response)
+      @oauth_response = double(OAuth::AccessToken)
+      
+      allow(@oauth_response).to receive_messages(:code => "200", :body => read_sample("price_suggestions"))
+
+      @oauth_response_as_file = double(StringIO)
+      
+      allow(@oauth_response_as_file).to receive_messages(:read => read_sample("price_suggestions"))
+
+      expect(Zlib::GzipReader).to receive(:new).and_return(@oauth_response_as_file)
+      expect(@oauth_access_token).to receive(:get).and_return(@oauth_response)
 
       @price_suggestions = @wrapper.get_price_suggestions(@release_id)
     end
@@ -22,11 +29,11 @@ describe Discogs::Wrapper do
     describe "when calling simple price suggestion attributes" do
 
       it "should have a block for Near Mint" do
-        @price_suggestions["Near Mint (NM or M-)"].should_not be_nil
+        expect(@price_suggestions["Near Mint (NM or M-)"]).to_not be_nil
       end
 
       it "should have a price for Mint" do
-        @price_suggestions["Mint (M)"].value.should == 14.319139100000001
+        expect(@price_suggestions["Mint (M)"].value).to eq(14.319139100000001)
       end
 
     end

data/spec/wrapper_methods/get_release_spec.rb

@@ -11,12 +11,7 @@ describe Discogs::Wrapper do
   describe ".get_release" do
 
     before do
-      @http_request = mock(Net::HTTP)
-      @http_response = mock(Net::HTTPResponse, :code => "200", :body => read_sample("release"))
-      @http_response_as_file = mock(StringIO, :read => read_sample("release"))
-      Zlib::GzipReader.should_receive(:new).and_return(@http_response_as_file)
-      @http_request.should_receive(:start).and_return(@http_response)
-      Net::HTTP.should_receive(:new).and_return(@http_request)
+      mock_httparty("release")
 
       @release = @wrapper.get_release(@release_id)
     end
@@ -24,40 +19,40 @@ describe Discogs::Wrapper do
     describe "when calling simple release attributes" do
 
       it "should have a title attribute" do
-        @release.title.should == "Stockholm"
+        expect(@release.title).to eq("Stockholm")
       end
-  
+
       it "should have an ID attribute" do
-        @release.id.should == 1
+        expect(@release.id).to eq(1)
       end
 
       it "should have a master_id attribute" do
-        @release.master_id.should == 5427
+        expect(@release.master_id).to eq(5427)
       end
 
       it "should have one or more extra artists" do
-        @release.extraartists.should be_instance_of(Array)
-        @release.extraartists[0].id.should == 239
+        expect(@release.extraartists).to be_instance_of(Hashie::Array)
+        expect(@release.extraartists[0].id).to eq(239)
       end
 
       it "should have one or more tracks" do
-        @release.tracklist.should be_instance_of(Array)
-        @release.tracklist[0].position.should == "A"
+        expect(@release.tracklist).to be_instance_of(Hashie::Array)
+        expect(@release.tracklist[0].position).to eq("A")
       end
- 
+
       it "should have one or more genres" do
-        @release.genres.should be_instance_of(Array)
-        @release.genres[0].should == "Electronic"
+        expect(@release.genres).to be_instance_of(Hashie::Array)
+        expect(@release.genres[0]).to eq("Electronic")
       end
 
       it "should have one or more formats" do
-        @release.formats.should be_instance_of(Array)
-        @release.formats[0].name.should == "Vinyl"
+        expect(@release.formats).to be_instance_of(Hashie::Array)
+        expect(@release.formats[0].name).to eq("Vinyl")
       end
 
       it "should have one or more images" do
-        @release.images.should be_instance_of(Array)
-        @release.images[0].type.should == "primary"
+        expect(@release.images).to be_instance_of(Hashie::Array)
+        expect(@release.images[0].type).to eq("primary")
       end
 
     end
@@ -67,9 +62,9 @@ describe Discogs::Wrapper do
       it "should have specifications for each image" do
         specs = [ [ 600, 600, 'primary' ], [ 600, 600, 'secondary' ], [ 600, 600, 'secondary' ], [ 600, 600, 'secondary' ] ]
         @release.images.each_with_index do |image, index|
-          image.width.should == specs[index][0]
-          image.height.should == specs[index][1]
-          image.type.should == specs[index][2]
+          expect(image.width).to eq(specs[index][0])
+          expect(image.height).to eq(specs[index][1])
+          expect(image.type).to eq(specs[index][2])
         end
       end
 
@@ -78,39 +73,39 @@ describe Discogs::Wrapper do
                   [ 290, true, 'http://www.youtube.com/watch?v=AHuQWcylaU4' ], [ 175, true, 'http://www.youtube.com/watch?v=sLZvvJVir5g' ],
                   [ 324, true, 'http://www.youtube.com/watch?v=js_g1qtPmL0' ], [ 289, true, 'http://www.youtube.com/watch?v=hy47qgyJeG0' ] ]
         @release.videos.each_with_index do |video, index|
-          video.duration.should == specs[index][0]
-          video.embed.should == specs[index][1]
-          video.uri.should == specs[index][2]
+          expect(video.duration).to eq(specs[index][0])
+          expect(video.embed).to eq(specs[index][1])
+          expect(video.uri).to eq(specs[index][2])
         end
       end
 
       it "should have a traversible list of styles" do
-        @release.styles.should be_instance_of(Array)
-        @release.styles[0].should == "Deep House"
+        expect(@release.styles).to be_instance_of(Hashie::Array)
+        expect(@release.styles[0]).to eq("Deep House")
       end
 
       it "should have a traversible list of labels" do
-        @release.styles.should be_instance_of(Array)
-        @release.labels[0].catno.should == "SK032"
-        @release.labels[0].name.should == "Svek"
+        expect(@release.styles).to be_instance_of(Hashie::Array)
+        expect(@release.labels[0].catno).to eq("SK032")
+        expect(@release.labels[0].name).to eq("Svek")
       end
 
       it "should have a name and quantity for the first format" do
-        @release.formats.should be_instance_of(Array)
-        @release.formats[0].name.should == "Vinyl"
-        @release.formats[0].qty.should == "2"
+        expect(@release.formats).to be_instance_of(Hashie::Array)
+        expect(@release.formats[0].name).to eq("Vinyl")
+        expect(@release.formats[0].qty).to eq("2")
       end
 
       it "should have a role associated to the first extra artist" do
-        @release.extraartists[0].role.should == "Music By [All Tracks By]"
+        expect(@release.extraartists[0].role).to eq("Music By [All Tracks By]")
       end
 
       it "should have no artist associated to the third track" do
-        @release.tracklist[2].artists.should be_nil
+        expect(@release.tracklist[2].artists).to be_nil
       end
 
     end
 
   end
 
-end 
+end