Merge 7d421f0 into 4a8ebc2

lib/unsplash.rb

@@ -12,6 +12,7 @@
 require "unsplash/curated_batch"
 require "unsplash/collection"
 require "unsplash/stats"
+require "unsplash/search"
 
 module Unsplash
   class << self

lib/unsplash/collection.rb

@@ -52,6 +52,18 @@ def create(title: "", description: "", private: false)
         Unsplash::Collection.new JSON.parse(connection.post("/collections", params).body)
       end
 
+      # Get a single page of collection results for a query.
+      # @param query [String] Keywords to search for.
+      # @param page  [Integer] Which page of search results to return.
+      # @return [Array] a list of +Unsplash::Collection+ objects. 
+      def search(query, page = 1)
+        params = {
+          query:    query,
+          page:     page
+        }
+        Unsplash::Search.search("/search/collections", self, params)
+      end
+
     end
 
     def initialize(options = {})
@@ -114,4 +126,4 @@ def remove(photo)
     end
 
   end
-end
+end

lib/unsplash/photo.rb

@@ -66,14 +66,12 @@ def random(categories: nil, collections: nil, featured: nil, user: nil, query: n
       # Search for photos by keyword.
       # @param query [String] Keywords to search for.
       # @param page  [Integer] Which page of search results to return.
-      # @param per_page [Integer] The number of search results per page.
-      def search(query, page = 1, per_page = 10)
+      def search(query, page = 1)
         params = {
           query:    query,
-          page:     page,
-          per_page: per_page
+          page:     page
         }
-        parse_list connection.get("/photos/search/", params).body
+        Unsplash::Search.search("/search/photos", self, params)
       end
 
       # Get a list of all photos.

lib/unsplash/search.rb

@@ -0,0 +1,19 @@
+module Unsplash # :nodoc:
+
+  # Unsplash Search operations
+  class Search < Client
+    class << self
+      # Helper class to facilitate search on multiple classes
+      # @param url [String] Url to be searched into
+      # @param klass [Class] Class to instantiate the contents with
+      # @param params [Hash] Params for the search
+      def search(url, klass, params)
+        list = JSON.parse(connection.get(url, params).body)
+
+        list["results"].map do |content|
+          klass.new content.to_hash
+        end
+      end
+    end
+  end
+end

lib/unsplash/user.rb

@@ -25,6 +25,18 @@ def update_current(params)
         Unsplash::User.new JSON.parse(connection.put("/me", params).body)
       end
 
+      # Get a single page of user results for a query.
+      # @param query [String] Keywords to search for.
+      # @param page  [Integer] Which page of search results to return.
+      # @return [Array] a list of +Unsplash::User+ objects. 
+      def search(query, page = 1)
+        params = {
+          query:    query,
+          page:     page
+        }
+        Unsplash::Search.search("/search/users", self, params)
+      end
+
     end
 
     # Get a list of photos uploaded by the user.
@@ -45,7 +57,7 @@ def likes
       end
     end
 
-    # Get a list of photos liked by the user.
+    # Get a list of collections created by the user.
     # @return [Array] a list of +Unsplash::Collection+ objects. 
     def collections
       list = JSON.parse(connection.get("/users/#{username}/collections").body)
@@ -56,4 +68,4 @@ def collections
 
   end
 
-end
+end