discogs-wrapper 1.1.4 → 2.0.0

data/spec/wrapper_spec.rb

@@ -25,10 +25,12 @@ describe Discogs::Wrapper do
   before do
     @app_name = "some_app"
     @wrapper = Discogs::Wrapper.new(@app_name)
-    @release_id = "666666"
-    @artist_name = "Dark"
-    @label_name = "Monitor"
+    @release_id = "1"
+    @artist_id = 313929
+    @master_id = 5331
+    @label_id = 1000
     @search_term = "barry"
+    @username = "abuntine"
   end
 
   it "should have an user agent" do
@@ -41,66 +43,139 @@ describe Discogs::Wrapper do
     end
 
     it "should generate the correct release URL to parse" do
-      mock_http_with_response "200", valid_release_xml
-      URI.should_receive(:parse).with("http://api.discogs.com/release/666666?f=xml").and_return(@uri)
+      mock_http_with_response "200", read_sample("release")
+      URI.should_receive(:parse).with("http://api.discogs.com/releases/1?f=json").and_return(@uri)
 
       @wrapper.get_release(@release_id)
     end
 
     it "should generate the correct artist URL to parse" do
-      mock_http_with_response "200", valid_artist_xml
-      URI.should_receive(:parse).with("http://api.discogs.com/artist/Dark?f=xml&releases=1").and_return(@uri)
+      mock_http_with_response "200", read_sample("artist")
+      URI.should_receive(:parse).with("http://api.discogs.com/artists/313929?f=json").and_return(@uri)
 
-      @wrapper.get_artist(@artist_name)
+      @wrapper.get_artist(@artist_id)
     end
 
+    it "should generate the correct paginated artist releases URL to parse" do
+      mock_http_with_response "200", read_sample("artist_releases")
+      URI.should_receive(:parse).with("http://api.discogs.com/artists/313929/releases?f=json&page=2&per_page=100").and_return(@uri)
+
+      @wrapper.get_artist_releases(@artist_id, :page => 2, :per_page => 100)
+    end
+ 
     it "should generate the correct label URL to parse" do
-      mock_http_with_response "200", valid_label_xml
-      URI.should_receive(:parse).with("http://api.discogs.com/label/Monitor?f=xml&releases=1").and_return(@uri)
+      mock_http_with_response "200", read_sample("label")
+      URI.should_receive(:parse).with("http://api.discogs.com/labels/1000?f=json").and_return(@uri)
+
+      @wrapper.get_label(@label_id)
+    end
+
+    it "should generate the correct paginated label releases URL to parse" do
+      mock_http_with_response "200", read_sample("label_releases")
+      URI.should_receive(:parse).with("http://api.discogs.com/labels/1000/releases?f=json&page=2&per_page=100").and_return(@uri)
 
-      @wrapper.get_label(@label_name)
+      @wrapper.get_label_releases(@label_id, :page => 2, :per_page => 100)
     end
 
     it "should generate the correct default search URL to parse" do
-      mock_http_with_response "200", valid_search_xml
-      URI.should_receive(:parse).with("http://api.discogs.com/search?f=xml&page=1&q=barry&type=all").and_return(@uri)
+      mock_http_with_response "200", read_sample("search_results")
+      URI.should_receive(:parse).with("http://api.discogs.com/database/search?f=json&q=barry").and_return(@uri)
 
       @wrapper.search(@search_term)
     end
 
-    it "should generate the correct second-page search URL to parse" do
-      mock_http_with_response "200", valid_search_xml
-      URI.should_receive(:parse).with("http://api.discogs.com/search?f=xml&page=2&q=barry&type=all").and_return(@uri)
+    it "should generate the correct paginated search URL to parse" do
+      mock_http_with_response "200", read_sample("search_results")
+      URI.should_receive(:parse).with("http://api.discogs.com/database/search?f=json&page=2&per_page=100&q=barry").and_return(@uri)
 
-      @wrapper.search(@search_term, :page => 2)
+      @wrapper.search(@search_term, :page => 2, :per_page => 100)
     end
 
-    it "should generate the correct second-page artist search URL to parse" do
-      mock_http_with_response "200", valid_search_xml
-      URI.should_receive(:parse).with("http://api.discogs.com/search?f=xml&page=2&q=barry&type=artist").and_return(@uri)
+    it "should generate another correct paginated search URL to parse" do
+      mock_http_with_response "200", read_sample("search_results")
+      URI.should_receive(:parse).with("http://api.discogs.com/database/search?f=json&page=2&q=barry").and_return(@uri)
 
-      @wrapper.search(@search_term, :page => 2, :type => :artist)
+      @wrapper.search(@search_term, :page => 2)
     end
 
     it "should sanitize the path correctly" do
-      mock_http_with_response "200", valid_artist_xml
-      URI.should_receive(:parse).with("http://api.discogs.com/artist/A+very+long+band+name?f=xml&releases=1").and_return(@uri)
+      mock_http_with_response "200", read_sample("search_results")
+      URI.should_receive(:parse).with("http://api.discogs.com/database/search?f=json&q=Two+Words").and_return(@uri)
 
-      @wrapper.get_artist("A very long band name")
-    end 
+      @wrapper.search("Two Words")
+    end
+
+    it "should generate the correct default user inventory URL to parse" do
+      mock_http_with_response "200", read_sample("user_inventory")
+      URI.should_receive(:parse).with("http://api.discogs.com/users/abuntine/inventory?f=json").and_return(@uri)
+
+      @wrapper.get_user_inventory(@username)
+    end
+
+    it "should generate the correct paginated user inventory URL to parse" do
+      mock_http_with_response "200", read_sample("user_inventory")
+      URI.should_receive(:parse).with("http://api.discogs.com/users/abuntine/inventory?f=json&page=2&status=For+Sale").and_return(@uri)
+
+      @wrapper.get_user_inventory(@username, :page => 2, :status => "For Sale")
+    end
+
+    it "should generate the correct sorted and paginated user inventory URL to parse" do
+      mock_http_with_response "200", read_sample("user_inventory")
+      URI.should_receive(:parse).with("http://api.discogs.com/users/abuntine/inventory?f=json&page=2&sort=price&sort_order=asc&status=For+Sale").and_return(@uri)
+
+      @wrapper.get_user_inventory(@username, :page => 2, :status => "For Sale", :sort => :price, :sort_order => :asc)
+    end
+
+    it "should generate the correct URL to parse when given raw URL" do
+      @search_uri = mock("uri", :host => "api.discogs.com", :query => "q=Sombre+Records&per_page=50&type=release&page=11", :path => "database/search")
+
+      mock_http_with_response "200", read_sample("search_results")
+      URI.should_receive(:parse).with("http://api.discogs.com/database/search?q=Sombre+Records&per_page=50&type=release&page=11").and_return(@search_uri)
+      URI.should_receive(:parse).with("http://api.discogs.com/database/search?f=json&page=11&per_page=50&q=Sombre+Records&type=release").and_return(@uri)
+
+      @wrapper.raw("http://api.discogs.com/database/search?q=Sombre+Records&per_page=50&type=release&page=11")
+    end
+
+    it "should generate the correct URL to parse when given raw URL with no query" do
+      @artist_uri = mock("uri", :host => "api.discogs.com", :query => "", :path => "artists/1000")
+
+      mock_http_with_response "200", read_sample("artist")
+      URI.should_receive(:parse).with("http://api.discogs.com/artists/1000").and_return(@artist_uri)
+      URI.should_receive(:parse).with("http://api.discogs.com/artists/1000?f=json").and_return(@uri)
+
+      @wrapper.raw("http://api.discogs.com/artists/1000")
+    end
 
   end
 
   ## NOTE: See ./spec/wrapper_methods/*.rb for indepth tests on valid API requests.
 
-  describe "when requesting a release" do
+  describe "when requesting authentication identity" do
 
-    it "should successfully return a Discogs::Release object" do
-      mock_http_with_response "200", valid_release_xml
- 
-      @wrapper.get_release(@release_id).should be_instance_of(Discogs::Release)
+    it "should raise an exception if the session is not authenticated" do
+      lambda { @wrapper.get_identity }.should raise_error(Discogs::AuthenticationError)
+    end
+
+  end
+
+  describe "when editing a user" do
+
+    it "should raise an exception if the session is not authenticated" do
+      lambda { @wrapper.edit_user("abuntine") }.should raise_error(Discogs::AuthenticationError)
     end
 
+  end
+
+  describe "when removing a release from a wantlist" do
+
+    it "should raise an exception if the session is not authenticated" do
+      lambda { @wrapper.delete_release_from_user_wantlist("abuntine", 12341234) }.should raise_error(Discogs::AuthenticationError)
+    end
+
+  end
+
+  describe "when requesting a release" do
+
     it "should raise an exception if the release does not exist" do
       mock_http_with_response "404"
 
@@ -117,44 +192,48 @@ describe Discogs::Wrapper do
 
   describe "when requesting an artist" do
 
-    it "should successfully return a Discogs::Artist object" do
-      mock_http_with_response "200", valid_artist_xml
- 
-      @wrapper.get_artist(@artist_name).should be_instance_of(Discogs::Artist)
-    end
-
     it "should raise an exception if the artist does not exist" do
       mock_http_with_response "404"
 
-      lambda { @wrapper.get_artist(@artist_name) }.should raise_error(Discogs::UnknownResource)
+      lambda { @wrapper.get_artist(@artist_id) }.should raise_error(Discogs::UnknownResource)
     end
 
     it "should raise an exception if the server dies a horrible death" do
       mock_http_with_response "500"
 
-      lambda { @wrapper.get_artist(@artist_name) }.should raise_error(Discogs::InternalServerError)
+      lambda { @wrapper.get_artist(@artist_id) }.should raise_error(Discogs::InternalServerError)
     end
 
   end
 
   describe "when requesting a label" do
 
-    it "should successfully return a Discogs::Label object" do
-      mock_http_with_response "200", valid_label_xml
- 
-      @wrapper.get_label(@label_name).should be_instance_of(Discogs::Label)
+    it "should raise an exception if the label does not exist" do
+      mock_http_with_response "404"
+
+      lambda { @wrapper.get_label(@label_id) }.should raise_error(Discogs::UnknownResource)
     end
 
-    it "should raise an exception if the label does not exist" do
+    it "should raise an exception if the server dies a horrible death" do
+      mock_http_with_response "500"
+
+      lambda { @wrapper.get_label(@label_id) }.should raise_error(Discogs::InternalServerError)
+    end
+
+  end
+
+  describe "when requesting a master" do
+
+    it "should raise an exception if the master does not exist" do
       mock_http_with_response "404"
 
-      lambda { @wrapper.get_label(@label_name) }.should raise_error(Discogs::UnknownResource)
+      lambda { @wrapper.get_master(@master_id) }.should raise_error(Discogs::UnknownResource)
     end
 
     it "should raise an exception if the server dies a horrible death" do
       mock_http_with_response "500"
 
-      lambda { @wrapper.get_label(@label_name) }.should raise_error(Discogs::InternalServerError)
+      lambda { @wrapper.get_master(@master_id) }.should raise_error(Discogs::InternalServerError)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discogs-wrapper
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -44,61 +76,99 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.7
 description: Discogs::Wrapper is a full wrapper for the http://www.discogs.com API
-  V2
+  V2. Supports authentication, pagination, JSON.
 email: info@andrewbuntine.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/wrapper/resource_mappings.rb
-- lib/wrapper/wrapper.rb
-- lib/wrapper/resource.rb
-- lib/wrapper/resources/format.rb
-- lib/wrapper/resources/search.rb
-- lib/wrapper/resources/label_release.rb
-- lib/wrapper/resources/artist.rb
-- lib/wrapper/resources/release_artist.rb
-- lib/wrapper/resources/artist_release.rb
-- lib/wrapper/resources/release_label.rb
-- lib/wrapper/resources/generic_list.rb
-- lib/wrapper/resources/search_result.rb
-- lib/wrapper/resources/label.rb
-- lib/wrapper/resources/image.rb
-- lib/wrapper/resources/track.rb
-- lib/wrapper/resources/release.rb
-- lib/wrapper/resources/master_release.rb
-- lib/wrapper/resources/master_release_version.rb
-- lib/wrapper/resources/video.rb
-- ./lib/wrapper/resources/user.rb
 - lib/discogs.rb
-- Rakefile
+- lib/discogs-wrapper.rb
+- lib/wrapper/wrapper.rb
+- lib/wrapper/authentication.rb
+- LICENSE
 - README.markdown
-- discogs.gemspec
+- spec/spec_helper.rb
+- spec/samples/valid_search_results.json
+- spec/samples/valid_master_release.json
+- spec/samples/valid_user_folder.json
+- spec/samples/valid_orders.json
+- spec/samples/valid_folder.json
+- spec/samples/valid_user_folders.json
+- spec/samples/valid_wantlist_release.json
+- spec/samples/valid_master_release_versions.json
+- spec/samples/valid_order_messages.json
+- spec/samples/valid_order.json
+- spec/samples/valid_price_suggestions.json
+- spec/samples/valid_fields.json
+- spec/samples/valid_identity.json
+- spec/samples/valid_listing.json
+- spec/samples/valid_artist.json
+- spec/samples/valid_user_collection.json
+- spec/samples/valid_user.json
+- spec/samples/valid_artist_releases.json
+- spec/samples/valid_release.json
+- spec/samples/valid_label.json
+- spec/samples/valid_user_inventory.json
+- spec/samples/valid_user_profile.json
+- spec/samples/valid_label_releases.json
+- spec/samples/valid_user_wantlist.json
+- spec/wrapper_spec.rb
 - spec/wrapper_methods/get_release_spec.rb
-- spec/wrapper_methods/get_master_release_spec.rb
-- spec/wrapper_methods/search_spec.rb
+- spec/wrapper_methods/edit_release_in_user_wantlist_spec.rb
+- spec/wrapper_methods/get_order_messages_spec.rb
 - spec/wrapper_methods/get_artist_spec.rb
+- spec/wrapper_methods/get_master_release_versions_spec.rb
+- spec/wrapper_methods/get_user_spec.rb
+- spec/wrapper_methods/get_order_spec.rb
+- spec/wrapper_methods/get_user_wantlist_spec.rb
+- spec/wrapper_methods/get_user_folders_spec.rb
+- spec/wrapper_methods/edit_user_spec.rb
+- spec/wrapper_methods/get_user_inventory_spec.rb
+- spec/wrapper_methods/get_listing_spec.rb
+- spec/wrapper_methods/get_label_releases_spec.rb
+- spec/wrapper_methods/get_user_collection_spec.rb
+- spec/wrapper_methods/add_release_to_user_wantlist_spec.rb
 - spec/wrapper_methods/get_label_spec.rb
-- spec/resource_spec.rb
-- spec/resources/label_spec.rb
-- spec/resources/generic_list_spec.rb
-- spec/resources/artist_release_spec.rb
-- spec/resources/artist_spec.rb
-- spec/resources/release_artist_spec.rb
-- spec/resources/search_spec.rb
-- spec/resources/label_release_spec.rb
-- spec/resources/release_label_spec.rb
-- spec/resources/release_spec.rb
-- spec/resources/master_release_spec.rb
-- spec/resources/master_release_version_spec.rb
-- spec/resources/video_spec.rb
-- spec/resources/search_result_spec.rb
-- spec/resources/image_spec.rb
-- spec/resources/track_spec.rb
-- spec/resources/format_spec.rb
-- spec/wrapper_spec.rb
-- spec/spec_helper.rb
+- spec/wrapper_methods/get_price_suggestions_spec.rb
+- spec/wrapper_methods/get_user_folder_spec.rb
+- spec/wrapper_methods/get_master_release_spec.rb
+- spec/wrapper_methods/get_identity_spec.rb
+- spec/wrapper_methods/get_artist_releases_spec.rb
+- spec/wrapper_methods/search_spec.rb
 homepage: http://www.github.com/buntine/discogs
 licenses: []
 post_install_message: 
@@ -124,27 +194,52 @@ signing_key:
 specification_version: 3
 summary: Discogs::Wrapper is a full wrapper for the http://www.discogs.com API V2
 test_files:
+- spec/spec_helper.rb
+- spec/samples/valid_search_results.json
+- spec/samples/valid_master_release.json
+- spec/samples/valid_user_folder.json
+- spec/samples/valid_orders.json
+- spec/samples/valid_folder.json
+- spec/samples/valid_user_folders.json
+- spec/samples/valid_wantlist_release.json
+- spec/samples/valid_master_release_versions.json
+- spec/samples/valid_order_messages.json
+- spec/samples/valid_order.json
+- spec/samples/valid_price_suggestions.json
+- spec/samples/valid_fields.json
+- spec/samples/valid_identity.json
+- spec/samples/valid_listing.json
+- spec/samples/valid_artist.json
+- spec/samples/valid_user_collection.json
+- spec/samples/valid_user.json
+- spec/samples/valid_artist_releases.json
+- spec/samples/valid_release.json
+- spec/samples/valid_label.json
+- spec/samples/valid_user_inventory.json
+- spec/samples/valid_user_profile.json
+- spec/samples/valid_label_releases.json
+- spec/samples/valid_user_wantlist.json
+- spec/wrapper_spec.rb
 - spec/wrapper_methods/get_release_spec.rb
-- spec/wrapper_methods/get_master_release_spec.rb
-- spec/wrapper_methods/search_spec.rb
+- spec/wrapper_methods/edit_release_in_user_wantlist_spec.rb
+- spec/wrapper_methods/get_order_messages_spec.rb
 - spec/wrapper_methods/get_artist_spec.rb
+- spec/wrapper_methods/get_master_release_versions_spec.rb
+- spec/wrapper_methods/get_user_spec.rb
+- spec/wrapper_methods/get_order_spec.rb
+- spec/wrapper_methods/get_user_wantlist_spec.rb
+- spec/wrapper_methods/get_user_folders_spec.rb
+- spec/wrapper_methods/edit_user_spec.rb
+- spec/wrapper_methods/get_user_inventory_spec.rb
+- spec/wrapper_methods/get_listing_spec.rb
+- spec/wrapper_methods/get_label_releases_spec.rb
+- spec/wrapper_methods/get_user_collection_spec.rb
+- spec/wrapper_methods/add_release_to_user_wantlist_spec.rb
 - spec/wrapper_methods/get_label_spec.rb
-- spec/resource_spec.rb
-- spec/resources/label_spec.rb
-- spec/resources/generic_list_spec.rb
-- spec/resources/artist_release_spec.rb
-- spec/resources/artist_spec.rb
-- spec/resources/release_artist_spec.rb
-- spec/resources/search_spec.rb
-- spec/resources/label_release_spec.rb
-- spec/resources/release_label_spec.rb
-- spec/resources/release_spec.rb
-- spec/resources/master_release_spec.rb
-- spec/resources/master_release_version_spec.rb
-- spec/resources/video_spec.rb
-- spec/resources/search_result_spec.rb
-- spec/resources/image_spec.rb
-- spec/resources/track_spec.rb
-- spec/resources/format_spec.rb
-- spec/wrapper_spec.rb
-- spec/spec_helper.rb
+- spec/wrapper_methods/get_price_suggestions_spec.rb
+- spec/wrapper_methods/get_user_folder_spec.rb
+- spec/wrapper_methods/get_master_release_spec.rb
+- spec/wrapper_methods/get_identity_spec.rb
+- spec/wrapper_methods/get_artist_releases_spec.rb
+- spec/wrapper_methods/search_spec.rb
+has_rdoc: