unsplash 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e38d0698ca01b7ff19c93da8ee6485081268d23
-  data.tar.gz: 6ee07125feb0c023259edc2fccb028f182ea1f7c
+  metadata.gz: fddaa858d2caa8978e2114873406405b6f176e3c
+  data.tar.gz: 85e9830ea66bcc617b5feda502f01a316a4c6a5a
 SHA512:
-  metadata.gz: 50b9cc311c3268802f4c04e873efeee092aec52419427d300b654dc4e8b8534c4fdc93c7719914e4733e48f4aa8d0d2b28ddb437f1d1a166bfa8a360da88230e
-  data.tar.gz: f2c9cca9709aba66789c67a40ef8eb37f61d315e7c8b857b04844775c987dc9c3bc65bd5e3b55bfb21ff201c9621fdae0215fd7f3cf8a477c8fda8afb0734a42
+  metadata.gz: dc7ca8088cea2e1c701f21b2e94e9f61c300d13b8a0b24828ae78a661dcfead1bd3b666f5181b4afecbbac07f85ca2a0fa44f7f5cb17295e4b604f2008190210
+  data.tar.gz: d6db9727af1da4f57373187c52c3a22b21fd52314aa7b539900c30b5e488ea55f56e98d9df3dd50538f2e07a513bc52a4cdc8370d98ed3ca0393afe823809c73

data/lib/unsplash.rb

@@ -1,5 +1,6 @@
 require "oauth2"
 require "httparty"
+require "delegate"
 
 require "unsplash/version"
 require "unsplash/configuration"

data/lib/unsplash/collection.rb

@@ -1,4 +1,4 @@
-module Unsplash # :nodoc: 
+module Unsplash # :nodoc:
 
   # Unsplash Collection operations.
   class Collection < Client
@@ -30,7 +30,7 @@ module Unsplash # :nodoc:
       # Get a list of all featured collections.
       # @param page [Integer] Which page of results to return.
       # @param per_page [Integer] The number of results per page. (default: 10, maximum: 30)
-      # @return [Array] A single page of the +Unsplash::Collection+ list.      
+      # @return [Array] A single page of the +Unsplash::Collection+ list.
       def featured(page = 1, per_page = 10)
         params = {
           page:     page,
@@ -58,7 +58,7 @@ module Unsplash # :nodoc:
       # @param description [String] The collection's description. (optional)
       # @param private [Boolean] Whether to make the collection private. (optional, default +false+)
       def create(title: "", description: "", private: false)
-        params = { 
+        params = {
           title:       title,
           description: description,
           private:     private
@@ -70,7 +70,7 @@ module Unsplash # :nodoc:
       # @param query [String] Keywords to search for.
       # @param page  [Integer] Which page of search results to return.
       # @param per_page [Integer] The number of collections search result per page. (default: 10, maximum: 30)
-      # @return [Array] a list of +Unsplash::Collection+ objects. 
+      # @return [SearchResult] a list of +Unsplash::Collection+ objects.
       def search(query, page = 1, per_page = 10)
         params = {
           query:    query,
@@ -93,7 +93,7 @@ module Unsplash # :nodoc:
     # @param description [String] The collection's description. (optional)
     # @param private [Boolean] Whether to make the collection private. (optional)
     def update(title: nil, description: nil, private: nil)
-      params = { 
+      params = {
         title:       title,
         description: description,
         private:     private

data/lib/unsplash/photo.rb

@@ -77,7 +77,7 @@ module Unsplash # :nodoc:
       # @param query [String] Keywords to search for.
       # @param page  [Integer] Which page of search results to return.
       # @param per_page [Integer] The number of users search result per page. (default: 10, maximum: 30)
-      # @return [Array] a list of +Unsplash::Photo+ objects.
+      # @return [SearchResult] a list of +Unsplash::Photo+ objects.
       def search(query, page = 1, per_page = 10)
         params = {
           query:    query,

data/lib/unsplash/search.rb

@@ -1,5 +1,21 @@
 module Unsplash # :nodoc:
 
+  # Decorates Array of klass-type objects with total and total_pages attributes
+  class SearchResult < SimpleDelegator
+    attr_reader :total, :total_pages
+
+    def initialize(decorated, klass)
+      @total = decorated["total"]
+      @total_pages = decorated["total_pages"]
+
+      list = decorated["results"].map do |content|
+        klass.new content.to_hash
+      end
+
+      super(list)
+    end
+  end
+
   # Unsplash Search operations
   class Search < Client
 
@@ -8,12 +24,10 @@ module Unsplash # :nodoc:
       # @param url [String] Url to be searched into
       # @param klass [Class] Class to instantiate the contents with
       # @param params [Hash] Params for the search
+      # @return [SearchResult] Decorated Array of klass-type objects
       def search(url, klass, params)
         list = JSON.parse(connection.get(url, params).body)
-
-        list["results"].map do |content|
-          klass.new content.to_hash
-        end
+        SearchResult.new(list, klass)
       end
     end
   end

data/lib/unsplash/version.rb

@@ -1,4 +1,4 @@
 module Unsplash # :nodoc:
   # :nodoc:
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unsplash
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Aaron Klaassen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty