unsplash 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a89f4db0c073875c05c83221e2ff912ff8b414c316b55e6166fb33fb552b84da
-  data.tar.gz: cf552d1afd53ff88378bbdacdfc4ec58af9fb006587360c2f02e759408393660
+  metadata.gz: 1670b64a1e1eca437b55de57e5442ff0ef0ed7500f229e41697353ea80548179
+  data.tar.gz: 98e2b13105ed4c143c1174608ae9c29ac9c54102869271e446c5e7c5e7c3799e
 SHA512:
-  metadata.gz: dea3bf58a7a162fe55b1fb169da19c3efc365ca1f0eff1157589f0e3a63cf28c4240fb83ab2e0734d598c6d76abb2fd045bf6f65a9cd9b4d70391347d8432380
-  data.tar.gz: 602969d85b3584fc6fc0b9422b8e7240665c71cd2cddeaaa566015a6faf13d2909d0070e6dc470ae1f17b22468d0ec3da776c350e60d95470fee81407c91b891
+  metadata.gz: 70bfc60287b19221bc0a55a9ef52c61c07f9b34834c01951ab98f670a2b406b674d564375cd09f9191004abe1f0f1f5308b2209a27488cc96973ee191732a789
+  data.tar.gz: 70a8ea544b238f1e48afc9b23b5a2c51f837b4d4036fb2017aff2f79da9576e2a0de9615ace3926945c52db0c6718864ba79cc36ff6fe9439c5c9587c2cece1b

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.3
+3.1.2

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.4
-  - 2.6.2
+  - 2.7.6
+  - 3.0.4
+  - 3.1.2
 before_install: gem install bundler

data/lib/unsplash/client.rb

@@ -7,6 +7,7 @@ module Unsplash # :nodoc:
     # @param attrs [Hash]
     def initialize(attrs = {})
       @attributes = OpenStruct.new(attrs)
+      add_utm_to_links
     end
 
     # (Re)load full object details from Unsplash.
@@ -39,6 +40,25 @@ module Unsplash # :nodoc:
       self.class.connection
     end
 
+    # @private
+    def add_utm_params(url)
+      uri = URI.parse(url)
+
+      qs = Rack::Utils.parse_nested_query(uri.query)
+      qs.merge!(connection.utm_params)
+
+      uri.query = Rack::Utils.build_query(qs)
+
+      uri.to_s
+    end
+
+    # @private
+    def add_utm_to_links
+      (@attributes["links"] || {}).each do |key, url|
+        @attributes["links"][key] = add_utm_params(url)
+      end
+    end
+
     class << self
       # The connection object being used to communicate with Unsplash.
       # @return [Unsplash::Connection] the connection

data/lib/unsplash/connection.rb

@@ -1,3 +1,5 @@
+require 'faraday/multipart'
+
 module Unsplash #:nodoc:
 
   # HTTP connection to and communication with the Unsplash API.
@@ -23,7 +25,6 @@ module Unsplash #:nodoc:
       @api_version        = version
       @api_base_uri       = api_base_uri
 
-      oauth_base_uri = oauth_base_uri
       @oauth = ::OAuth2::Client.new(@application_access_key, @application_secret, site: oauth_base_uri) do |http|
         http.request :multipart
         http.request :url_encoded
@@ -94,6 +95,14 @@ module Unsplash #:nodoc:
       request :delete, path, params
     end
 
+    def utm_params
+      {
+        "utm_source"   => Unsplash.configuration.utm_source || "api_app",
+        "utm_medium"   => "referral",
+        "utm_campaign" => "api-credit"
+      }
+    end
+
     private
 
     def request(verb, path, params = {})
@@ -102,7 +111,7 @@ module Unsplash #:nodoc:
       params.merge!(utm_params)
 
       if !Unsplash.configuration.utm_source
-        url = "https://community.unsplash.com/developersblog/unsplash-api-guidelines"
+        url = "https://help.unsplash.com/api-guidelines/unsplash-api-guidelines"
         Unsplash.configuration.logger.warn "utm_source is required as part of API Terms: #{url}"
       end
 
@@ -121,7 +130,7 @@ module Unsplash #:nodoc:
           self.class.public_send verb, path, query: params, headers: public_auth_header
         end
       rescue OAuth2::Error => e
-        OpenStruct.new(headers: {}, status: 403, body: e.error_message(e.response.body))
+        OpenStruct.new(headers: {}, status: 403, body: e.message)
       end
 
       if response.headers["Warning"]
@@ -150,14 +159,6 @@ module Unsplash #:nodoc:
       { "Authorization" => "Client-ID #{@application_access_key}" }
     end
 
-    def utm_params
-      {
-        utm_source:   Unsplash.configuration.utm_source || "api_app",
-        utm_medium:   "referral",
-        utm_campaign: "api-credit"
-      }
-    end
-
     def refresh_token!
       return if !@oauth_token.expired?
 

data/lib/unsplash/photo.rb

@@ -3,6 +3,11 @@ module Unsplash # :nodoc:
   # Unsplash Photo operations.
   class Photo < Client
 
+    def initialize(attrs)
+      super
+      add_utm_to_urls
+    end
+
     # Like a photo for the current user.
     # @return [Boolean] True if successful. Will raise on error.
     def like!
@@ -23,6 +28,12 @@ module Unsplash # :nodoc:
       connection.get(links.download_location)["url"]
     end
 
+    def add_utm_to_urls
+      (@attributes["urls"] || {}).each do |key, url|
+        @attributes["urls"][key] = add_utm_params(url)
+      end
+    end
+
     class << self
 
       # Get a photo. Can be cropped or resized using the optional parameters.
@@ -35,7 +46,7 @@ module Unsplash # :nodoc:
       end
 
       # Get a random photo or set of photos. The photo selection pool can be narrowed using
-      # a combination of optional parameters. Can also optionally specify a custom image size.
+      # a combination of optional parameters.
       # @param count [Integer] Number of photos required. Default=1, Max=30
       # @param featured [Boolean] Limit selection to featured photos.
       # @param user [String] Limit selection to given User's ID.
@@ -44,6 +55,8 @@ module Unsplash # :nodoc:
       # @return [Unsplash::Photo] An Unsplash Photo if count parameter is omitted
       # @return [Array] An array of Unsplash Photos if the count parameter is specified. An array is returned even if count is 1
       def random(count: nil, collections: nil, featured: nil, user: nil, query: nil, orientation: nil)
+        Unsplash.configuration.logger.warn "You cannot combine 'collections' and 'query' parameters. 'query' will be ignored." if collections && query
+
         params = {
           collections: (collections && collections.join(",")),
           featured: featured,
@@ -100,7 +113,6 @@ module Unsplash # :nodoc:
       def parse_list(json)
         JSON.parse(json).map { |photo| new photo }
       end
-
     end
   end
 end

data/lib/unsplash/user.rb

@@ -88,6 +88,5 @@ module Unsplash # :nodoc:
         Unsplash::Collection.new collection.to_hash
       end
     end
-
   end
 end

data/lib/unsplash/version.rb

@@ -1,4 +1,4 @@
 module Unsplash # :nodoc:
   # :nodoc:
-  VERSION = "2.0.1"
+  VERSION = "3.0.0"
 end

data/unsplash.gemspec

@@ -18,17 +18,18 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.3.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
-  spec.add_dependency "httparty", "~> 0.16"
-  spec.add_dependency "oauth2",   "~> 1"
+  spec.add_dependency "httparty", "~> 0.20"
+  spec.add_dependency "oauth2",   ">= 2.0.8"
+  spec.add_dependency "faraday-multipart", "~> 1.0.4"
 
   spec.add_development_dependency "rake",    "~> 12.3.2"
   spec.add_development_dependency "rspec",   "~> 3.8.0"
-  spec.add_development_dependency "vcr",     "~> 3.0.0"
-  spec.add_development_dependency "webmock", "~> 3.5.1"
+  spec.add_development_dependency "vcr",     "~> 6.1.0"
+  spec.add_development_dependency "webmock", "~> 3.18.1"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "coveralls_reborn", "~> 0.25.0"
   spec.add_development_dependency "dotenv"
   spec.add_development_dependency "rb-readline"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unsplash
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Aaron Klaassen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2022-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: oauth2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.8
+- !ruby/object:Gem::Dependency
+  name: faraday-multipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 6.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.18.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.18.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.25.0
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +164,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - aaron@unsplash.com
 executables: []
@@ -189,7 +203,7 @@ homepage: https://github.com/unsplash/unsplash_rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -197,15 +211,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Ruby wrapper for the Unsplash API.
 test_files: []