pexels 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c35b5ede38be050f349b46e1acfa441306af1ccf5acdf89ec9e442d4474a960d
-  data.tar.gz: ea3bb7174df2b5c135fa272bba90a4a5a42133078d7f52e2944ccf663f800518
+  metadata.gz: 1affa62d97e31e4dbc5e93aa0aebbfd4305362f24c8a4b0d3a3b8c2b9f672cf1
+  data.tar.gz: f9dc3eaf6a21abb49deaa5d722cf557f3da4fc9de50434297a3c9484343e7a08
 SHA512:
-  metadata.gz: b18c77442467ef348fde20120245d4ba880f8dd4417a2d60aabce80c3b44c876a385c413c925d5348b703984a703c98ac0f5c86e97a6a47ea25fcbedd256c62f
-  data.tar.gz: f7e2e10664aca352d80b7479309e638d6e447b9dd59347eedcbb38ae79626852e7a7463ba9ebb396911d922c9732b4d233322d871e59bfc85f8dfe00c986b93e
+  metadata.gz: 8c31177b1a17cf653580e84ee859f535c573627eb0ec7ca5d3ab3a67e96137aa79a4ce45dd7b050c819fd54ebc68dfd18b24d875be3937f2c449168ccda6ab69
+  data.tar.gz: 5a6af1b335e3f723587cb716949e83417ec495730617946dc9eb3389f7cd8c3fee1e861ab5d2a29ffb448b86d857a190c4724e8f8e57a7291727391bc032bb70

data/README.md

@@ -15,6 +15,18 @@ Or add it to your `Gemfile` and run `bundle install`.
 See the API docs [here](https://www.pexels.com/api/documentation/?language=js)
 
 
+## Basic usage
+
+```ruby
+client = Pexels::Client.new('your-access-key') #=> If you don't specify one, the environment variable PEXELS_API_KEY is used by default
+
+client.photos.search('Cloud')
+client.photos.curated
+
+client.videos.search('waves')
+client.videos.popular
+```
+
 ## Running the test suite
 
 You'll need your own API key to run the test suite, you can get one on the [Pexels API Key management page](https://www.pexels.com/api/new/)

data/lib/pexels/client/photos.rb

@@ -5,12 +5,12 @@ class Pexels::Client::Photos
   end
 
   def get(id)
-    results = @client.request("/v1/photos/#{id}")
-    Pexels::Photo.new(results)
+    response = @client.request("/v1/photos/#{id}")
+    Pexels::Photo.new(response)
   end
 
   def search(query, per_page: 15, page: 1, locale: 'en-US')
-    results = @client.request(
+    response = @client.request(
       '/v1/search',
       params: {
         query: query,
@@ -20,11 +20,11 @@ class Pexels::Client::Photos
       }
     )
 
-    Pexels::SearchResult.new(results)
+    Pexels::Response.new(response)
   end
 
   def curated(per_page: 15, page: 1)
-    results = @client.request(
+    response = @client.request(
       '/v1/curated',
       params: {
         per_page: per_page,
@@ -32,6 +32,6 @@ class Pexels::Client::Photos
       }
     )
 
-    Pexels::SearchResult.new(results)
+    Pexels::Response.new(response)
   end
 end

data/lib/pexels/client/videos.rb

@@ -5,12 +5,12 @@ class Pexels::Client::Videos
   end
 
   def get(id)
-    results = @client.request("/videos/videos/#{id}")
-    Pexels::Video.new(results)
+    response = @client.request("/videos/videos/#{id}")
+    Pexels::Video.new(response)
   end
 
   def search(query, per_page: 15, page: 1)
-    results = @client.request(
+    response = @client.request(
       '/videos/search',
       params: {
         query: query,
@@ -19,11 +19,11 @@ class Pexels::Client::Videos
       }
     )
 
-    Pexels::SearchResult.new(results)
+    Pexels::Response.new(response)
   end
 
   def popular(per_page: 15, page: 1)
-    results = @client.request(
+    response = @client.request(
       '/videos/popular',
       params: {
         per_page: per_page,
@@ -31,6 +31,6 @@ class Pexels::Client::Videos
       }
     )
 
-    Pexels::SearchResult.new(results)
+    Pexels::Response.new(response)
   end
 end

data/lib/pexels/{search_result.rb → response.rb}

@@ -1,4 +1,4 @@
-class Pexels::SearchResult
+class Pexels::Response
   attr_reader :photos,
               :videos,
               :total_results,

data/lib/pexels/version.rb

@@ -1,3 +1,3 @@
 module Pexels
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/pexels/video/file.rb

@@ -0,0 +1,17 @@
+class Pexels::Video::File
+  attr_reader :id,
+              :quality,
+              :file_type,
+              :width,
+              :height,
+              :link
+
+  def initialize(attrs)
+    @id = attrs.fetch('id')
+    @quality = attrs.fetch('quality')
+    @file_type = attrs.fetch('file_type')
+    @width = attrs.fetch('width')
+    @height = attrs.fetch('height')
+    @link = attrs.fetch('link')
+  end
+end

data/lib/pexels/video/picture.rb

@@ -0,0 +1,11 @@
+class Pexels::Video::Picture
+  attr_reader :id,
+              :picture
+              :nr
+
+  def initialize(attrs)
+    @id = attrs.fetch('id')
+    @picture = attrs.fetch('picture')
+    @nr = attrs.fetch('nr')
+  end
+end

data/lib/pexels/video.rb

@@ -6,8 +6,8 @@ class Pexels::Video
               :image,
               :duration,
               :user,
-              :video_files,
-              :video_pictures
+              :files,
+              :pictures
 
 
   def initialize(attrs)
@@ -23,6 +23,11 @@ class Pexels::Video
       url: attrs.fetch('user').fetch('url')
     )
 
+    @files = attrs.fetch('video_files', []).map { |vf| Pexels::Video::File.new(vf) }
+
+    @pictures = attrs.fetch('video_pictures', []).map { |vp| Pexels::Video::Picture.new(vp) }
+
+
   rescue KeyError => exception
     raise Pexels::MalformedAPIResponseError.new(exception)
   end

data/lib/pexels.rb

@@ -13,6 +13,7 @@ require_relative 'pexels/version'
 require_relative 'pexels/errors'
 require_relative 'pexels/photo'
 require_relative 'pexels/video'
+require_relative 'pexels/video/file'
+require_relative 'pexels/video/picture'
 require_relative 'pexels/user'
-require_relative 'pexels/search_result'
-require_relative 'pexels/curated_result'
+require_relative 'pexels/response'

data/test/photo_test.rb

@@ -11,7 +11,7 @@ class TestPhoto < Minitest::Test
   def test_successful_searches
     search_result = @client.photos.search('test')
 
-    assert search_result.is_a? Pexels::SearchResult
+    assert search_result.is_a? Pexels::Response
     assert search_result.next_page.is_a? String
     assert search_result.total_results.is_a? Integer
     assert_equal search_result.per_page, 15
@@ -30,7 +30,7 @@ class TestPhoto < Minitest::Test
   def test_curated_photos
     search_result = @client.photos.curated
 
-    assert search_result.is_a? Pexels::SearchResult
+    assert search_result.is_a? Pexels::Response
     assert search_result.next_page.is_a? String
     assert_equal search_result.per_page, 15
     assert_equal search_result.page, 1

data/test/video_test.rb

@@ -11,7 +11,7 @@ class TestVideo < Minitest::Test
   def test_successful_searches
     search_result = @client.videos.search('test')
 
-    assert search_result.is_a? Pexels::SearchResult
+    assert search_result.is_a? Pexels::Response
     assert search_result.total_results.is_a? Integer
     assert_equal search_result.per_page, 15
     assert_equal search_result.page, 1
@@ -29,7 +29,7 @@ class TestVideo < Minitest::Test
   def test_popular_videos
     search_result = @client.videos.popular
 
-    assert search_result.is_a? Pexels::SearchResult
+    assert search_result.is_a? Pexels::Response
     assert_equal search_result.per_page, 15
     assert_equal search_result.page, 1
 
@@ -57,6 +57,12 @@ class TestVideo < Minitest::Test
     assert_equal video.user.name, @video.user.name
     assert_equal video.user.url, @video.user.url
     assert_equal video.user.id, @video.user.id
+
+    assert video.files.is_a?(Array)
+    assert video.files.first.is_a?(Pexels::Video::File)
+
+    assert video.pictures.is_a?(Array)
+    assert video.pictures.first.is_a?(Pexels::Video::Picture)
   end
 
   def test_invalid_get_video

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pexels
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Pexels dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: requests
@@ -41,13 +41,14 @@ files:
 - lib/pexels/client.rb
 - lib/pexels/client/photos.rb
 - lib/pexels/client/videos.rb
-- lib/pexels/curated_result.rb
 - lib/pexels/errors.rb
 - lib/pexels/photo.rb
-- lib/pexels/search_result.rb
+- lib/pexels/response.rb
 - lib/pexels/user.rb
 - lib/pexels/version.rb
 - lib/pexels/video.rb
+- lib/pexels/video/file.rb
+- lib/pexels/video/picture.rb
 - pexels.gemspec
 - test/client_test.rb
 - test/photo_test.rb

data/lib/pexels/curated_result.rb

@@ -1,15 +0,0 @@
-class Pexels::CuratedResult
-  attr_reader :photos,
-              :page,
-              :per_page,
-              :next_page
-
-  def initialize(attrs)
-    @page = attrs.fetch('page')
-    @per_page = attrs.fetch('per_page')
-    @next_page = attrs.fetch('next_page')
-    @photos = attrs.fetch('photos').map { |attrs| Pexels::Photo.new(attrs) }
-
-    return self
-  end
-end