dribbble 1.0.1 → 2.0.0

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/dribbble.gemspec

@@ -1,4 +1,6 @@
-require File.expand_path('../lib/dribbble/version', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('lib/dribbble/version', __dir__)
 
 Gem::Specification.new do |s|
   s.name         = 'dribbble'
@@ -14,12 +16,12 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  s.required_ruby_version = '>= 2.0.0'
-  s.add_runtime_dependency 'rest-client', '~> 1.7'
+  s.required_ruby_version = ['>= 2.5.0', '< 3.0']
+  s.add_runtime_dependency 'rest-client', '~> 2.0'
 
-  s.add_development_dependency 'rake', '~> 10.3'
-  s.add_development_dependency 'rspec', '~> 2.14'
-  s.add_development_dependency 'guard-rspec', '~> 4.3'
-  s.add_development_dependency 'sinatra', '~> 1.4'
-  s.add_development_dependency 'webmock', '~> 1.17'
+  s.add_development_dependency 'guard-rspec', '~> 4.7'
+  s.add_development_dependency 'rake', '~> 12.3.3'
+  s.add_development_dependency 'rspec', '~> 3.10'
+  s.add_development_dependency 'sinatra', '~> 2.1'
+  s.add_development_dependency 'webmock', '~> 3.13'
 end

data/lib/dribbble.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Dribbble
-  API_URI = 'https://api.dribbble.com/v1'
+  API_URI = ENV.fetch('DRIBBBLE_API_URI', 'https://api.dribbble.com/v2')
 end
 
 require 'dribbble/client'

data/lib/dribbble/attachment.rb

@@ -1,7 +1,15 @@
+# frozen_string_literal: true
+
+require 'dribbble/utils/creatable'
+require 'dribbble/utils/deletable'
+
 module Dribbble
   class Attachment < Dribbble::Base
+    include Dribbble::Utils::Creatable
+    include Dribbble::Utils::Deletable
+
     def self.available_fields
-      %i(file)
+      %i[file]
     end
   end
 end

data/lib/dribbble/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dribbble/utils'
 require 'dribbble/utils/has_children'
 
@@ -17,7 +19,7 @@ module Dribbble
       @dribbble_url = build_dribbble_url(@raw['id'].to_s, dribbble_url)
 
       @raw.each do |k, _v|
-        define_singleton_method(k) { @raw[k] } unless self.respond_to?(k)
+        define_singleton_method(k) { @raw[k] } unless respond_to?(k)
       end
     end
 

data/lib/dribbble/client.rb

@@ -1,9 +1,9 @@
+# frozen_string_literal: true
+
 require 'dribbble/base'
+require 'dribbble/shot'
 require 'dribbble/user'
-require 'dribbble/bucket'
 require 'dribbble/project'
-require 'dribbble/shot'
-require 'dribbble/team'
 require 'dribbble/errors'
 
 require 'rest_client'
@@ -16,22 +16,8 @@ module Dribbble
     def initialize(token = nil)
       token = token.is_a?(Hash) ? token[:token] : token
       @token = token
-      fail Dribbble::Error::MissingToken if @token.nil?
-    end
-
-    # Get authenticated user's buckets
-    def buckets(attrs = {})
-      Dribbble::Bucket.batch_new token, html_get('/user/buckets', attrs)
-    end
-
-    # Get authenticated user's followers
-    def followers(attrs = {})
-      Dribbble::User.batch_new token, html_get('/user/followers', attrs)
-    end
-
-    # Get authenticated user's likes
-    def likes(attrs = {})
-      Dribbble::Shot.batch_new token, html_get('/user/likes', attrs), 'shot'
+      super(token, {})
+      raise Dribbble::Error::MissingToken if @token.nil?
     end
 
     # Get authenticated user's followers
@@ -44,17 +30,6 @@ module Dribbble
       Dribbble::Shot.batch_new token, html_get('/user/shots', attrs)
     end
 
-    # Get authenticated user's followees shots
-    # Limited to first 600 shots regardless of the pagination
-    def following_shots(attrs = {})
-      Dribbble::Shot.batch_new token, html_get('/user/following/shots', attrs)
-    end
-
-    # Get authenticated user's teams
-    def teams(attrs = {})
-      Dribbble::Team.batch_new token, html_get('/user/teams', attrs)
-    end
-
     # Get a single User or the authenticated one
     def user
       Dribbble::User.new @token, html_get('/user')

data/lib/dribbble/errors.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
 module Dribbble
   module Error
-    ISSUES_URL = 'https://github.com/Calyhre/dribbble/issues/new'
-
     # Standard error we will inherit
     class Standard < StandardError
       def initialize(message = nil)
-        if message && message.response
+        if message&.response
           super message.response
         else
           super(message || self.message)

data/lib/dribbble/project.rb

@@ -1,11 +1,19 @@
+# frozen_string_literal: true
+
 require 'dribbble/utils/findable'
+require 'dribbble/utils/creatable'
+require 'dribbble/utils/updatable'
+require 'dribbble/utils/deletable'
 
 module Dribbble
   class Project < Dribbble::Base
     include Dribbble::Utils::Findable
+    include Dribbble::Utils::Creatable
+    include Dribbble::Utils::Updatable
+    include Dribbble::Utils::Deletable
 
-    def shots(attrs = {})
-      Dribbble::Shot.batch_new token, html_get("/projects/#{id}/shots", attrs)
+    def self.available_fields
+      %i[name description]
     end
   end
 end

data/lib/dribbble/shot.rb

@@ -1,10 +1,9 @@
+# frozen_string_literal: true
+
 require 'dribbble/utils/findable'
 require 'dribbble/utils/creatable'
 require 'dribbble/utils/updatable'
 require 'dribbble/utils/deletable'
-require 'dribbble/attachment'
-require 'dribbble/comment'
-require 'dribbble/like'
 
 module Dribbble
   class Shot < Dribbble::Base
@@ -13,41 +12,12 @@ module Dribbble
     include Dribbble::Utils::Updatable
     include Dribbble::Utils::Deletable
 
-    has_many :attachments, :buckets, :comments, :likes, :projects
-    has_many :rebounds, as: Dribbble::Shot
-
-    def self.all(token, attrs = {})
-      @token = token
-      batch_new token, html_get('/shots', attrs)
-    end
-
     def self.available_fields
-      %i(title image description tags team_id rebound_source_id)
+      %i[image title description low_profile rebound_source_id scheduled_for tags team_id]
     end
 
     def self.after_create(res)
       res.code == 202 ? res.headers[:location].split('/').last : false
     end
-
-    def like?
-      html_get "/shots/#{id}/like"
-      true
-    rescue RestClient::ResourceNotFound
-      false
-    end
-
-    def like!
-      res = html_post "/shots/#{id}/like"
-      res.code == 201 ? true : false
-    end
-
-    def unlike!
-      res = html_delete "/shots/#{id}/like"
-      res.code == 204 ? true : false
-    end
-
-    def rebounds(attrs = {})
-      Dribbble::Shot.batch_new token, html_get("/shots/#{id}/rebounds", attrs)
-    end
   end
 end

data/lib/dribbble/user.rb

@@ -1,56 +1,6 @@
-require 'dribbble/utils/findable'
+# frozen_string_literal: true
 
 module Dribbble
   class User < Dribbble::Base
-    include Dribbble::Utils::Findable
-
-    def buckets(attrs = {})
-      Dribbble::Bucket.batch_new token, html_get("/users/#{id}/buckets", attrs)
-    end
-
-    def followers(attrs = {})
-      Dribbble::User.batch_new token, html_get("/users/#{id}/followers", attrs)
-    end
-
-    def following(attrs = {})
-      Dribbble::User.batch_new token, html_get("/users/#{id}/following", attrs), 'followee'
-    end
-
-    def following?(other_user_id = nil)
-      if other_user_id
-        html_get "/users/#{id}/following/#{other_user_id}"
-      else
-        html_get "/user/following/#{id}"
-      end
-      true
-    rescue RestClient::ResourceNotFound
-      false
-    end
-
-    def follow!
-      res = html_put "/users/#{id}/follow"
-      res.code == 204 ? true : false
-    end
-
-    def unfollow!
-      res = html_delete "/users/#{id}/follow"
-      res.code == 204 ? true : false
-    end
-
-    def likes(attrs = {})
-      Dribbble::Shot.batch_new token, html_get("/users/#{id}/likes", attrs), 'shot'
-    end
-
-    def projects(attrs = {})
-      Dribbble::Project.batch_new token, html_get("/users/#{id}/projects", attrs)
-    end
-
-    def shots(attrs = {})
-      Dribbble::Shot.batch_new token, html_get("/users/#{id}/shots", attrs)
-    end
-
-    def teams(attrs = {})
-      Dribbble::Team.batch_new token, html_get("/users/#{id}/teams", attrs)
-    end
   end
 end

data/lib/dribbble/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module Dribbble
@@ -5,14 +7,14 @@ module Dribbble
     DEFAULT_ATTRIBUTES = {
       page: 1,
       per_page: 100
-    }
+    }.freeze
 
     def class_name
-      @_class_name ||= self.is_a?(Class) ? name.split('::').last.downcase : self.class.name.split('::').last.downcase
+      @class_name ||= is_a?(Class) ? name.split('::').last.downcase : self.class.name.split('::').last.downcase
     end
 
     def pluralized_class_name
-      @_pluralized_class_name ||= "#{class_name}s"
+      @pluralized_class_name ||= "#{class_name}s"
     end
 
     def full_url(path, attrs = {})

data/lib/dribbble/utils/creatable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dribbble
   module Utils
     module Creatable
@@ -17,7 +19,7 @@ module Dribbble
 
         # Need to be redeclared in the model
         def available_fields
-          fail "You need to redeclare this methods in your model"
+          raise 'You need to redeclare this methods in your model'
         end
 
         def after_create(res)

data/lib/dribbble/utils/deletable.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Dribbble
   module Utils
     module Deletable
       def delete
         res = html_delete "/#{self.class.api_endpoint}/#{id}"
-        res.code == 204 ? true : false
+        res.code == 204 || res.code == 200
       end
 
       module ClassMethods

data/lib/dribbble/utils/findable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dribbble
   module Utils
     module Findable

data/lib/dribbble/utils/has_children.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Dribbble
   module Utils
     module HasChildren
       module ClassMethods
-        def has_many(*fields)
+        def has_many(*fields) # rubocop:disable Naming/PredicateName
           if fields[1].is_a? Hash
-            generate_methods fields[0], fields[1][:as]
+            generate_methods fields[0], fields[1][:as], fields[1][:key]
           else
             fields.each do |field|
               generate_methods field
@@ -12,27 +14,28 @@ module Dribbble
           end
         end
 
-        def generate_methods(field, klass = nil)
+        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+        def generate_methods(field, klass = nil, key = nil)
           singularized_field = field[0...-1]
 
           define_method field do |attrs = {}|
-            klass ||= Object.const_get "Dribbble::#{__method__[0...-1].capitalize}"
+            klass ||= Object.const_get "Dribbble::#{singularized_field.capitalize}"
             url = "/#{pluralized_class_name}/#{id}/#{field}"
-            klass.batch_new token, html_get(url, attrs), nil, url
+            klass.batch_new token, html_get(url, attrs), key, url
           end
 
           define_method "find_#{singularized_field}" do |child_id|
-            klass ||= Object.const_get "Dribbble::#{__method__[0...-1].capitalize}"
+            klass ||= Object.const_get "Dribbble::#{singularized_field.capitalize}"
             url = "/#{pluralized_class_name}/#{id}/#{field}/#{child_id}"
             klass.new token, html_get(url), url
           end
 
           define_method "create_#{singularized_field}" do |attrs = {}|
-            klass ||= Object.const_get "Dribbble::#{__method__[0...-1].capitalize}"
+            klass ||= Object.const_get "Dribbble::#{singularized_field.capitalize}"
             url = "/#{pluralized_class_name}/#{id}/#{field}"
             res = html_post url do |payload|
-              klass.available_fields.each do |field|
-                payload[field] = attrs[field]
+              klass.available_fields.each do |available_field|
+                payload[available_field] = attrs[available_field]
               end
             end
             case res.code
@@ -49,8 +52,8 @@ module Dribbble
             klass ||= Object.const_get "Dribbble::#{__method__[0...-1].capitalize}"
             url = "/#{pluralized_class_name}/#{id}/#{klass.pluralized_class_name}/#{child_id}"
             res = html_put url do |payload|
-              klass.available_fields.each do |field|
-                payload[field] = attrs[field]
+              klass.available_fields.each do |available_field|
+                payload[available_field] = attrs[available_field]
               end
             end
             klass.new token, res, url
@@ -59,10 +62,11 @@ module Dribbble
           define_method "delete_#{singularized_field}" do |child_id|
             klass ||= Object.const_get "Dribbble::#{__method__[0...-1].capitalize}"
             res = html_delete "/#{pluralized_class_name}/#{id}/#{klass.pluralized_class_name}/#{child_id}"
-            res.code == 204 ? true : false
+            res.code == 204
           end
         end
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
       def self.included(base)
         base.extend(ClassMethods)

data/lib/dribbble/utils/updatable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dribbble
   module Utils
     module Updatable

data/lib/dribbble/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 # Dribbble Version
 module Dribbble
-  VERSION = '1.0.1'
+  VERSION = '2.0.0'
 end

data/spec/lib/dribbble/base_spec.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-describe Dribbble::Client do
-  before :all do
-    @base = Dribbble::Base.new 'valid_token', {}
+describe Dribbble::Base do
+  before do
+    @base = described_class.new 'valid_token', {}
   end
 
   describe 'on #full_url_with_default_params' do
@@ -10,7 +12,7 @@ describe Dribbble::Client do
       subject { @base.full_url_with_default_params '/shots' }
 
       it 'return a valid url' do
-        expect(subject).to eq('https://api.dribbble.com/v1/shots?page=1&per_page=100')
+        expect(subject).to eq('https://api.dribbble.com/v2/shots?page=1&per_page=100')
       end
     end
 
@@ -18,7 +20,7 @@ describe Dribbble::Client do
       subject { @base.full_url_with_default_params '/shots', page: 2, per_page: 10 }
 
       it 'return a valid url' do
-        expect(subject).to eq('https://api.dribbble.com/v1/shots?page=2&per_page=10')
+        expect(subject).to eq('https://api.dribbble.com/v2/shots?page=2&per_page=10')
       end
     end
 
@@ -26,7 +28,7 @@ describe Dribbble::Client do
       subject { @base.full_url_with_default_params '/shots', params1: 'custom' }
 
       it 'return a valid url' do
-        expect(subject).to eq('https://api.dribbble.com/v1/shots?page=1&per_page=100&params1=custom')
+        expect(subject).to eq('https://api.dribbble.com/v2/shots?page=1&per_page=100&params1=custom')
       end
     end
   end
@@ -36,7 +38,7 @@ describe Dribbble::Client do
       subject { @base.full_url '/shots' }
 
       it 'return a valid url' do
-        expect(subject).to eq('https://api.dribbble.com/v1/shots?')
+        expect(subject).to eq('https://api.dribbble.com/v2/shots?')
       end
     end
 
@@ -44,7 +46,7 @@ describe Dribbble::Client do
       subject { @base.full_url '/shots', custom: 1 }
 
       it 'return a valid url' do
-        expect(subject).to eq('https://api.dribbble.com/v1/shots?custom=1')
+        expect(subject).to eq('https://api.dribbble.com/v2/shots?custom=1')
       end
     end
   end