unsplash 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2529c9cda4b21c4bcf4c5df9c7537d6123158b09
-  data.tar.gz: d7c646d0b2c7c528f5f61808e09cd3215e3f26eb
+  metadata.gz: c270d06e73d9951fcb6808fa645cbd9c57266e46
+  data.tar.gz: ea1891f304977f90e205c526688cc74b793a3a4c
 SHA512:
-  metadata.gz: a46e5d46d158e489272da751a7724b40537d23089eff980c1098a74c0362500cbad9b5274604884d6477bab6dcf18d59c6814218cf02e35c9109a972a7b6b6bd
-  data.tar.gz: 0d617ec0f39af7ff46481505f0e1300ce7480bb5cea4b5c622904a993f80f96191f5df3953cbf8be808c99bb201aec3ba9ddcee68d95c4fa4ed71af416800ac2
+  metadata.gz: 72e568f428a4e6573c902f8fd76646401fa3caa4ccce7f03ac73ada9fb631683bba2c4fdcff218a35a7eec9eb9b252b106abb5e86b16151ca8464f77d946a01f
+  data.tar.gz: 069e2c2255abd6dce7892ae7ee97cfdf86e955f2f9eb3a9e0c14a524867b0eabd1a418a1775d0d4bd74203821b307ea465e86f807d349b7a1d0734c9c18db70f

data/CODE_OF_CONDUCT.md

@@ -1,13 +1,74 @@
-# Contributor Code of Conduct
+# Contributor Covenant Code of Conduct
 
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+## Our Pledge
 
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
 
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+## Our Standards
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+Examples of behavior that contributes to creating a positive environment
+include:
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at dev@unsplash.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/lib/unsplash.rb

@@ -10,6 +10,7 @@ require "unsplash/user"
 require "unsplash/photo"
 require "unsplash/category"
 require "unsplash/curated_batch"
+require "unsplash/collection"
 require "unsplash/stats"
 
 module Unsplash

data/lib/unsplash/collection.rb

@@ -0,0 +1,117 @@
+module Unsplash # :nodoc: 
+
+  # Unsplash Collection operations.
+  class Collection < Client
+
+    class << self
+
+      # Get a specific collection.
+      # @param id [Integer] The ID of the collection.
+      # @return [Unsplash::Collection] The requested collection.
+      def find(id, curated = false)
+        url = ["/collections", (curated ? "curated" : nil), id].compact.join("/")
+        Unsplash::Collection.new JSON.parse(connection.get(url).body)
+      end
+
+      # Get a list of all collections.
+      # @param page [Integer] Which page of search results to return.
+      # @param per_page [Integer] The number of search results per page.
+      # @return [Array] A single page of the +Unsplash::Collection+ list.
+      def all(page = 1, per_page = 10)
+        params = {
+          page:     page,
+          per_page: per_page
+        }
+        list = JSON.parse(connection.get("/collections/", params).body)
+        list.map { |data| Unsplash::Collection.new(data) }
+      end
+
+      # Get a list of all curated collections.
+      # @param page [Integer] Which page of search results to return.
+      # @param per_page [Integer] The number of search results per page.
+      # @return [Array] A single page of the +Unsplash::Collection+ list.
+      def curated(page = 1, per_page = 10)
+        params = {
+          page:     page,
+          per_page: per_page
+        }
+        list = JSON.parse(connection.get("/collections/curated", params).body)
+        list.map { |data| Unsplash::Collection.new(data) }
+      end
+
+      # Create a new collection on behalf of current user.
+      # @param title [String] The title of the collection.
+      # @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 = { 
+          title:       title,
+          description: description,
+          private:     private
+        }
+        Unsplash::Collection.new JSON.parse(connection.post("/collections", params).body)
+      end
+
+    end
+
+    def initialize(options = {})
+      options["user"] = Unsplash::User.new options["user"]
+      options["cover_photo"] = Unsplash::Photo.new options["cover_photo"]
+      super(options)
+    end
+
+    # Update the collection's attributes.
+    # @param title [String] The title of the collection.
+    # @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 = { 
+        title:       title,
+        description: description,
+        private:     private
+      }.select { |k,v| v }
+      updated = JSON.parse(connection.put("/collections/#{id}", params).body)
+      self.title = updated["title"]
+      self.description = updated["description"]
+      self
+    end
+
+    # Delete the collection. This does not delete the photos it contains.
+    # @return [Boolean] +true+ on success.
+    def destroy
+      response = connection.delete("/collections/#{id}")
+      response.status == 204
+    end
+
+    # Get a list of the photos contained in this collection.
+    # @return [Array] The list of +Unsplash::Photo+s in the collection.
+    def photos
+      list = JSON.parse(connection.get("/collections/#{id}/photos").body)
+      list.map { |photo| Unsplash::Photo.new photo }
+    end
+
+    # Add a photo to the collection. If the photo is already in the collection,
+    # this action has no effect.
+    # @param [Unsplash::Photo] The photo to add.
+    # @return [Hash] Collected photo metadata.
+    def add(photo)
+      response = JSON.parse(connection.post("/collections/#{id}/add", { photo_id: photo.id }).body)
+      {
+        photo_id:      response["photo"]["id"],
+        collection_id: response["collection"]["id"],
+        user_id:       response["user"]["id"],
+        created_at:    response["created_at"]
+      }
+    end
+
+    # Remove a photo from the collection. If the photo is not in the collection,
+    # this action has no effect.
+    # @param [Unsplash::Photo] The photo to remove.
+    # @return [Boolean] +true+ on success.
+    def remove(photo)
+      response = connection.delete("/collections/#{id}/remove", photo_id: photo.id)
+      response.status == 204
+    end
+
+  end
+end

data/lib/unsplash/user.rb

@@ -44,6 +44,16 @@ module Unsplash # nodoc:
         Unsplash::Photo.new photo.to_hash
       end
     end
+
+    # Get a list of photos liked by the user.
+    # @return [Array] a list of +Unsplash::Collection+ objects. 
+    def collections
+      list = JSON.parse(connection.get("/users/#{username}/collections").body)
+      list.map do |collection|
+        Unsplash::Collection.new collection.to_hash
+      end
+    end
+
   end
 
 end

data/lib/unsplash/version.rb

@@ -1,4 +1,4 @@
 module Unsplash # :nodoc:
   # :nodoc:
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/unsplash.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["aaron@crew.co"]
 
   spec.summary       = %q{Ruby wrapper for the Unsplash API.}
-  spec.homepage      = "https://github.com/CrewLabs/unsplash_rb"
+  spec.homepage      = "https://github.com/unsplash/unsplash_rb"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: unsplash
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Aaron Klaassen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.5
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.9.3
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.20.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.20.4
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -115,11 +115,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".ruby-version"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .rspec
+- .ruby-version
+- .travis.yml
+- .yardopts
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -130,6 +130,7 @@ files:
 - lib/unsplash.rb
 - lib/unsplash/category.rb
 - lib/unsplash/client.rb
+- lib/unsplash/collection.rb
 - lib/unsplash/configuration.rb
 - lib/unsplash/connection.rb
 - lib/unsplash/curated_batch.rb
@@ -139,7 +140,7 @@ files:
 - lib/unsplash/user.rb
 - lib/unsplash/version.rb
 - unsplash.gemspec
-homepage: https://github.com/CrewLabs/unsplash_rb
+homepage: https://github.com/unsplash/unsplash_rb
 licenses:
 - MIT
 metadata: {}
@@ -149,17 +150,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for the Unsplash API.