discogs-wrapper 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4654ad8d85f69444831ce09b6c2960ba2e598fed
-  data.tar.gz: fa37e9987c31c5763df41d822c0b3c08929b29e6
+  metadata.gz: 91031cf38db39dcbff5554e7640a13be2e4d5e63
+  data.tar.gz: 21a92fbc0118bbac04c4dbf101dc0e2763d1ec94
 SHA512:
-  metadata.gz: 9b54ec185f2dcf2415721a7b88008f5a8a1c20860e8af6e456614ccb246855618cea55ca332744266bd14ccdb96cdd4c7aa5eadf9204d4c41bb8f8c979c12215
-  data.tar.gz: b1d6c9e76a7f988429386fae10ae74ee7c8140555058c2c0c9c5beee4c734fbfff42dd03425cbb2493da7506e2c09bfa7f9816381ec297777f2bc273f34b3abe
+  metadata.gz: 27b9662b5746ec7f045adaf9d669b9dd948dd3d1c18eed9ef7e78e9e9dbecd0c9b5bed58df5f1706ab9974b31b551c1f073f20b74f275d12e867c6971d32641e
+  data.tar.gz: 73b068fbff4032a6543e1031aa3e2c000281de36548c9dc6e976dd2475c540f8738b09ed9f537390ae2039a0e8c2accf289c8ab7e91131992e77e74cb8e9b633

data/README.markdown

@@ -29,9 +29,12 @@ ABOUT
   * Pagination / Sorting
 
 
+DOCUMENTATION
+------------
+  You can read the documentation at [this projects RDoc page](http://rdoc.info/github/buntine/discogs/master/frames).
+
   The Discogs API is [documented here](http://www.discogs.com/developers/index.html).
 
-  You can see all implemented methods on [this projects RDoc page](http://rdoc.info/github/buntine/discogs/master/frames).
 
 INSTALLATION
 ------------
@@ -43,6 +46,7 @@ INSTALLATION
 
     gem "discogs-wrapper"
 
+
 USAGE
 -----
   To use this library, you must supply the name of your application. For example:
@@ -96,6 +100,19 @@ search.results.first.id              # => 691078
 
   You can see all implemented methods on [this projects RDoc page](http://rdoc.info/github/buntine/discogs/master/frames).
 
+
+SANITIZATION
+------------
+  The Discogs.com API uses the name "count" in several places, which is sanitized to "total" in this gem in order to prevent overriding the `count` attribute of `Hash`.
+
+  For example:
+
+```ruby
+release.rating.count # => Returns number of keys in "rating" Hash.
+release.rating.total # => Returns total number of ratings as per Discogs API response.
+```
+
+
 AUTHENTICATION
 --------------
   Many of the API endpoints require the user to be authenticated via oAuth. The library provides support for this.
@@ -145,6 +162,7 @@ def another_action
 end
 ```
 
+
 PAGINATION
 ----------
   All API endpoints that accept pagination, sorting or other parameters are supported.
@@ -161,10 +179,12 @@ wrapper.get_artist_releases(345211, :page => 2, :per_page => 10)
 wrapper.get_user_inventory("username", :page => 3, :sort => "price", :sort_order => "asc")
 ```
 
+
 LICENSE
 -----
   See the LICENCE file. Copyright (c) Andrew Buntine
 
+
 CONTRIBUTORS
 ------------
   [Thank you for the support](https://github.com/buntine/discogs/graphs/contributors)

data/lib/wrapper/wrapper.rb

@@ -746,7 +746,7 @@ class Discogs::Wrapper
     raise_unknown_resource(path) if response.code == "404"
     raise_authentication_error(path) if response.code == "401"
     raise_internal_server_error if response.code == "500"
-    
+
     # Unzip the response data, or just read it in directly
     # if the API responds without gzipping.
     response_body = nil
@@ -764,21 +764,30 @@ class Discogs::Wrapper
   def make_request(path, params, method, body)
     full_params   = params.merge(auth_params)
     uri           = build_uri(path, full_params)
-    formatted     = "#{uri.path}?#{uri.query}" 
+    formatted     = "#{uri.path}?#{uri.query}"
     output_format = full_params.fetch(:f, "json")
     headers       = {"Accept"          => "application/#{output_format}",
                      "Accept-Encoding" => "gzip,deflate",
                      "User-Agent"      => @app_name}
 
-    if authenticated? and user_facing?
+    if any_authentication?
       if [:post, :put].include?(method)
-        headers["Content-Type"] = "application/json"
-        @access_token.send(method, formatted, JSON(body), headers)
+        headers["Content-Type"] = headers["Accept"]
+
+        if user_facing?
+          @access_token.send(method, formatted, JSON(body), headers)
+        else
+          HTTParty.send(method, uri, {headers: headers, body: JSON(body)})
+        end
       else
-        @access_token.send(method, formatted, headers)
+        if user_facing?
+          @access_token.send(method, formatted, headers)
+        else
+          HTTParty.send(method, uri, headers: headers)
+        end
       end
     else
-     # All non-authenticated endpoints are GET.
+      # All non-authenticated endpoints are GET.
       HTTParty.get(uri, headers: headers)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discogs-wrapper
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Andrew Buntine
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -176,56 +176,56 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Discogs::Wrapper is a full wrapper for the http://www.discogs.com API V2
 test_files:
-- spec/wrapper_spec.rb
-- spec/wrapper_methods/get_order_messages_spec.rb
-- spec/wrapper_methods/edit_user_spec.rb
+- spec/spec_helper.rb
 - spec/wrapper_methods/get_identity_spec.rb
-- spec/wrapper_methods/get_user_wantlist_spec.rb
+- spec/wrapper_methods/get_master_release_versions_spec.rb
 - spec/wrapper_methods/search_spec.rb
-- spec/wrapper_methods/get_order_spec.rb
-- spec/wrapper_methods/get_artist_spec.rb
-- spec/wrapper_methods/get_release_spec.rb
 - spec/wrapper_methods/get_user_folders_spec.rb
-- spec/wrapper_methods/get_master_release_spec.rb
-- spec/wrapper_methods/add_release_to_user_wantlist_spec.rb
-- spec/wrapper_methods/get_user_spec.rb
-- spec/wrapper_methods/get_master_release_versions_spec.rb
-- spec/wrapper_methods/get_price_suggestions_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_folder_spec.rb
+- spec/wrapper_methods/get_artist_spec.rb
+- spec/wrapper_methods/get_user_spec.rb
+- spec/wrapper_methods/edit_user_spec.rb
+- spec/wrapper_methods/get_master_release_spec.rb
 - spec/wrapper_methods/edit_release_in_user_wantlist_spec.rb
-- spec/wrapper_methods/get_user_collection_spec.rb
-- spec/wrapper_methods/get_label_spec.rb
 - spec/wrapper_methods/get_artist_releases_spec.rb
-- spec/wrapper_methods/get_user_folder_spec.rb
-- spec/spec_helper.rb
+- spec/wrapper_methods/get_order_spec.rb
+- spec/wrapper_methods/get_label_spec.rb
+- spec/wrapper_methods/get_user_wantlist_spec.rb
+- spec/wrapper_methods/get_label_releases_spec.rb
+- spec/wrapper_methods/add_release_to_user_wantlist_spec.rb
+- spec/wrapper_methods/get_release_spec.rb
+- spec/wrapper_methods/get_order_messages_spec.rb
+- spec/wrapper_methods/get_user_collection_spec.rb
+- spec/wrapper_methods/get_price_suggestions_spec.rb
+- spec/samples/valid_user_profile.json
+- spec/samples/valid_user_wantlist.json
+- spec/samples/valid_master_release.json
 - spec/samples/valid_artist_releases.json
-- spec/samples/valid_master_release_versions.json
-- spec/samples/valid_user.json
+- spec/samples/valid_artist.json
+- spec/samples/valid_label.json
+- spec/samples/valid_user_folder.json
 - spec/samples/valid_user_collection.json
-- spec/samples/valid_identity.json
-- spec/samples/valid_folder.json
-- spec/samples/valid_user_wantlist.json
-- spec/samples/valid_release.json
-- spec/samples/valid_search_results.json
-- spec/samples/valid_order.json
 - spec/samples/valid_wantlist_release.json
+- spec/samples/valid_fields.json
 - spec/samples/valid_order_messages.json
+- spec/samples/valid_user_inventory.json
 - spec/samples/valid_orders.json
+- spec/samples/valid_listing.json
+- spec/samples/valid_release.json
+- spec/samples/valid_user_folders.json
+- spec/samples/valid_master_release_versions.json
 - spec/samples/valid_price_suggestions.json
-- spec/samples/valid_artist.json
-- spec/samples/valid_label.json
-- spec/samples/valid_user_folder.json
+- spec/samples/valid_order.json
+- spec/samples/valid_user.json
+- spec/samples/valid_search_results.json
+- spec/samples/valid_folder.json
+- spec/samples/valid_identity.json
 - spec/samples/valid_label_releases.json
-- spec/samples/valid_user_profile.json
-- spec/samples/valid_master_release.json
-- spec/samples/valid_user_folders.json
-- spec/samples/valid_user_inventory.json
-- spec/samples/valid_fields.json
-- spec/samples/valid_listing.json
+- spec/wrapper_spec.rb