pexels 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e749787cf73bb5029e528f9d0232d2ce6c638dc81d13c12c7e91346b8962b2be
-  data.tar.gz: a531ae402dc483373295381e4fe613e0a169b813081a3964692b81d5af9bbaa4
+  metadata.gz: 640a858dfa54cf40bfa1b9130913504974db246d4725330534f1a332eb8031b5
+  data.tar.gz: c45f2aedd96b3a9cdee7b61fb284be1de7bb3f7210fab6673eedb5260e7ee507
 SHA512:
-  metadata.gz: ad853babd229b319f25253cf036d8fd97b7c9262de26566d36d7fec7ddd4d7a2240038b200f4fca0551e30608038c4de6cc6844594cc3c8720368d26dd49a7e6
-  data.tar.gz: aeda8080d6ad67c5aa1175081481337a2be0e7f1ed46619f2e5ccbee2944297b83aa7d3e4bae0df8949a04d80356a2e01f325dc539b874d6fa29e9b64f9e8906
+  metadata.gz: a118ea1244d6232d6737ec4fcfc9e7dbe342042bad0ffd1319a1174a920837c6a499c7f62f0138c6b29e494c49873cd503ca0722eecc218f27ec8c8db7964751
+  data.tar.gz: 8a75b15f26dde2b2146877c5b55471798985ea3caba5db14d5702e6fe14410366af2da7d808eecf26136f878627f8a156b54e41e5dcf64eed81256fa42c43b43

data/lib/pexels/client/collections.rb

@@ -3,35 +3,47 @@ class Pexels::Client::Collections
     @client = client
   end
 
-  def all(per_page: 15, page: 1)
+  def all(per_page: 15, page: 1, timeout: { open: nil, read: nil })
     response = @client.request(
       "#{Pexels.api_version}/collections",
       params: {
         per_page: per_page,
         page: page
+      },
+      options: {
+        open_timeout: timeout[:open],
+        read_timeout: timeout[:read]
       })
 
     Pexels::CollectionSet.new(response)
   end
 
-  def featured(per_page: 15, page: 1)
+  def featured(per_page: 15, page: 1, timeout: { open: nil, read: nil })
     response = @client.request(
       "#{Pexels.api_version}/collections/featured",
       params: {
         per_page: per_page,
         page: page
+      },
+      options: {
+        open_timeout: timeout[:open],
+        read_timeout: timeout[:read]
       })
 
     Pexels::CollectionSet.new(response)
   end
 
-  def [](id, type: nil, per_page: 15, page: 1)
+  def [](id, type: nil, per_page: 15, page: 1, timeout: { open: nil, read: nil })
     response = @client.request(
       "#{Pexels.api_version}/collections/#{id}",
       params: {
         per_page: per_page,
         page: page,
         type: type
+      },
+      options: {
+        open_timeout: timeout[:open],
+        read_timeout: timeout[:read]
       })
 
     Pexels::CollectionMediaSet.new(response)

data/lib/pexels/client/photos.rb

@@ -7,13 +7,16 @@ module Pexels
         @client = client
       end
 
-      def [](id)
-        response = @client.request("#{Pexels.api_version}/photos/#{id}")
+      def [](id, timeout: { open: nil, read: nil })
+        response = @client.request(
+          "#{Pexels.api_version}/photos/#{id}",
+          options: { open_timeout: timeout[:open], read_timeout: timeout[:read] }
+        )
         Pexels::Photo.new(response.body)
       end
       alias_method :find, :[]
 
-      def search(query, per_page: 15, page: 1, locale: 'en-US', orientation: nil, size: nil, color: nil)
+      def search(query, per_page: 15, page: 1, locale: 'en-US', orientation: nil, size: nil, color: nil, timeout: { open: nil, read: nil })
         validate_search_params(orientation, size, color)
 
         response = @client.request(
@@ -26,18 +29,26 @@ module Pexels
             orientation: orientation,
             size: size,
             color: color
-          }.compact
+          }.compact,
+          options: {
+            open_timeout: timeout[:open],
+            read_timeout: timeout[:read]
+          }
         )
 
         Pexels::PhotoSet.new(response)
       end
 
-      def curated(per_page: 15, page: 1)
+      def curated(per_page: 15, page: 1, timeout: { open: nil, read: nil })
         response = @client.request(
           "#{Pexels.api_version}/curated",
           params: {
             per_page: per_page,
             page: page
+          },
+          options: {
+            open_timeout: timeout[:open],
+            read_timeout: timeout[:read]
           }
         )
 

data/lib/pexels/client/request.rb

@@ -3,13 +3,14 @@ require 'requests'
 module Pexels
   class Client
     class Request
-      attr_reader :api_key, :path, :method, :params
+      attr_reader :api_key, :path, :method, :params, :options
 
-      def initialize(api_key, path, method, params)
+      def initialize(api_key, path, method, params, options)
         @api_key = api_key
         @path = path
         @method = method
         @params = params
+        @options = options
       end
 
       def call
@@ -28,7 +29,8 @@ module Pexels
           method,
           url,
           params: params,
-          headers: headers
+          headers: headers,
+          options: options
         )
       end
 

data/lib/pexels/client/videos.rb

@@ -7,13 +7,19 @@ module Pexels
         @client = client
       end
 
-      def [](id)
-        response = @client.request("/videos/videos/#{id}")
+      def [](id, timeout: { open: nil, read: nil })
+        response = @client.request(
+          "/videos/videos/#{id}",
+          options: {
+            open_timeout: timeout[:open],
+            read_timeout: timeout[:read]
+          }
+        )
         Pexels::Video.new(response.body)
       end
       alias_method :find, :[]
 
-      def search(query, per_page: 15, page: 1, orientation: nil, size: nil)
+      def search(query, per_page: 15, page: 1, orientation: nil, size: nil, timeout: { open: nil, read: nil })
         validate_search_params(orientation, size)
 
         response = @client.request(
@@ -24,18 +30,26 @@ module Pexels
             page: page,
             orientation: orientation,
             size: size
-          }.compact
+          }.compact,
+          options: {
+            open_timeout: timeout[:open],
+            read_timeout: timeout[:read]
+          }
         )
 
         Pexels::VideoSet.new(response)
       end
 
-      def popular(per_page: 15, page: 1)
+      def popular(per_page: 15, page: 1, timeout: { open: nil, read: nil })
         response = @client.request(
           '/videos/popular',
           params: {
             per_page: per_page,
-            page: page,
+            page: page
+          },
+          options: {
+            open_timeout: timeout[:open],
+            read_timeout: timeout[:read]
           }
         )
 

data/lib/pexels/client.rb

@@ -19,8 +19,8 @@ module Pexels
       @collections ||= Pexels::Client::Collections.new(self)
     end
 
-    def request(path, method: 'GET', params: {})
-      request = Request.new(api_key, path, method, params)
+    def request(path, method: 'GET', params: {}, options: {})
+      request = Request.new(api_key, path, method, params, options)
       request.call.tap do |response|
         @ratelimit_remaining = response.ratelimit_remaining
       end

data/lib/pexels/version.rb

@@ -1,3 +1,3 @@
 module Pexels
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/test/collection_test.rb

@@ -98,4 +98,52 @@ class TestCollections < Minitest::Test
     end
     assert error.message, 'Not Found'
   end
+
+  def test_get_collection_open_timeout
+    error = assert_raises Pexels::APIError do
+      @client.collections[@collection.id, timeout: { open: 0.0000001 }]
+    end
+
+    assert_equal 'execution expired', error.message
+  end
+
+  def test_get_collection_read_timeout
+    error = assert_raises Pexels::APIError do
+      @client.collections[@collection.id, timeout: { read: 0.0000001 }]
+    end
+
+    assert_equal 'Net::ReadTimeout', error.message
+  end
+
+  def test_all_open_timeout
+    error = assert_raises Pexels::APIError do
+      @client.collections.all(timeout: { open: 0.0000001 })
+    end
+
+    assert_equal 'execution expired', error.message
+  end
+
+  def test_all_read_timeout
+    error = assert_raises Pexels::APIError do
+      @client.collections.all(timeout: { read: 0.0000001 })
+    end
+
+    assert_equal 'Net::ReadTimeout', error.message
+  end
+
+  def test_featured_open_timeout
+    error = assert_raises Pexels::APIError do
+      @client.collections.featured(timeout: { open: 0.0000001 })
+    end
+
+    assert_equal 'execution expired', error.message
+  end
+
+  def test_featured_read_timeout
+    error = assert_raises Pexels::APIError do
+      @client.collections.featured(timeout: { read: 0.0000001 })
+    end
+
+    assert_equal 'Net::ReadTimeout', error.message
+  end
 end

data/test/photo_test.rb

@@ -107,4 +107,52 @@ class TestPhoto < Minitest::Test
     assert_kind_of Pexels::PhotoSet, search_result
     assert search_result.photos.any?
   end
+
+  def test_get_photo_open_timeout
+    error = assert_raises Pexels::APIError do
+      @client.photos[@photo.id, timeout: { open: 0.0000001 }]
+    end
+
+    assert_equal 'execution expired', error.message
+  end
+
+  def test_get_photo_read_timeout
+    error = assert_raises Pexels::APIError do
+      @client.photos[@photo.id, timeout: { read: 0.0000001 }]
+    end
+
+    assert_equal 'Net::ReadTimeout', error.message
+  end
+
+  def test_search_open_timeout
+    error = assert_raises Pexels::APIError do
+      @client.photos.search('test', timeout: { open: 0.0000001 })
+    end
+
+    assert_equal 'execution expired', error.message
+  end
+
+  def test_search_read_timeout
+    error = assert_raises Pexels::APIError do
+      @client.photos.search('test', timeout: { read: 0.0000001 })
+    end
+
+    assert_equal 'Net::ReadTimeout', error.message
+  end
+
+  def test_curated_open_timeout
+    error = assert_raises Pexels::APIError do
+      @client.photos.curated(timeout: { open: 0.0000001 })
+    end
+
+    assert_equal 'execution expired', error.message
+  end
+
+  def test_curated_read_timeout
+    error = assert_raises Pexels::APIError do
+      @client.photos.curated(timeout: { read: 0.0000001 })
+    end
+
+    assert_equal 'Net::ReadTimeout', error.message
+  end
 end

data/test/video_test.rb

@@ -99,4 +99,52 @@ class TestVideo < Minitest::Test
     assert_kind_of Pexels::VideoSet, search_result
     assert search_result.videos.any?
   end
+
+  def test_get_video_open_timeout
+    error = assert_raises Pexels::APIError do
+      @client.videos[@video.id, timeout: { open: 0.0000001 }]
+    end
+
+    assert_equal 'execution expired', error.message
+  end
+
+  def test_get_video_read_timeout
+    error = assert_raises Pexels::APIError do
+      @client.videos[@video.id, timeout: { read: 0.0000001 }]
+    end
+
+    assert_equal 'Net::ReadTimeout', error.message
+  end
+
+  def test_search_open_timeout
+    error = assert_raises Pexels::APIError do
+      @client.videos.search('cat', timeout: { open: 0.0000001 })
+    end
+
+    assert_equal 'execution expired', error.message
+  end
+
+  def test_search_read_timeout
+    error = assert_raises Pexels::APIError do
+      @client.videos.search('cat', timeout: { read: 0.0000001 })
+    end
+
+    assert_equal 'Net::ReadTimeout', error.message
+  end
+
+  def test_featured_open_timeout
+    error = assert_raises Pexels::APIError do
+      @client.videos.popular(timeout: { open: 0.0000001 })
+    end
+
+    assert_equal 'execution expired', error.message
+  end
+
+  def test_featured_read_timeout
+    error = assert_raises Pexels::APIError do
+      @client.videos.popular(timeout: { read: 0.0000001 })
+    end
+
+    assert_equal 'Net::ReadTimeout', error.message
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pexels
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Pexels dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2022-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: requests
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A simple Ruby wrapper for the Pexels API