deviantart 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0499ac49ed032c1497d0d60dfbd659f71aef9d2b'
-  data.tar.gz: 5dc456abe5fbab5a9dc470b9f44de697b75822da
+  metadata.gz: 9b417c7a84e1d6a06c309dafed01a763304870eb
+  data.tar.gz: e56e1c571d2436e9ab43243f1c3151f61db65276
 SHA512:
-  metadata.gz: 2eb9a19cafdec3e4ca2f72d11c90d81021b86e1175277a15535bdf15a704e6b75eab918d63757229f444833201a74b4e29bea549e33118e99c475f1fc5b332b3
-  data.tar.gz: 85f33e7b9d7a68b1a7fe88b0fa05e44321634f9ce0a70f93b928080183cfdafcc522a5f94164ca9aa37653047f50c00f118c28136ecfa8b3d3ec3fcf34f40a78
+  metadata.gz: b5bd80817e80c7711edf5d78f2de4a2e7703483deb49c904f893fef74f488d3a45f84bccc450e930d3e811b099ee5c6eb37409d947ed197dc07f65ba45ddb38b
+  data.tar.gz: 47b28e9db28828f374d3de0eaffd2b1eab30a09f892a4718c74a42da9e15a9701321433a47389a96c4062e4969c53a459f2a16a3f69da4c07db5f1e1ffacba34

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/.ruby-version
 /Gemfile.lock
 /_yardoc/
 /coverage/

data/.jrubyrc

@@ -0,0 +1 @@
+compat.version=2.0

data/.travis.yml

@@ -1,4 +1,9 @@
 ---
 language: ruby
-rvm: 2.3.3
+rvm:
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
+  - jruby-1.7.26
+  - jruby-9.1.7.0
 script: bundle exec rake test

data/README.md

@@ -10,8 +10,8 @@
 da = DeviantArt::Client.new do |config|
   config.client_id = 9999
   config.client_secret = 'LMNOPQRSTUVWXYZZZZZZZZ9999999999'
-  # auto refresh access_token with Client Credentials Grant when expired
   config.grant_type = :client_credentials
+  # auto refresh access_token with Client Credentials Grant when expired
   config.access_token_auto_refresh = true
 end
 
@@ -90,4 +90,5 @@ The gem is available as open source under the terms of the [MIT License](http://
 
 ## Badges
 
-[![Build Status](https://travis-ci.org/aycabta/deviantart.svg)](https://travis-ci.org/aycabta/deviantart)
+- [![Build Status](https://travis-ci.org/aycabta/deviantart.svg)](https://travis-ci.org/aycabta/deviantart)
+- [![Build Status](https://ci.appveyor.com/api/projects/status/github/aycabta/deviantart?branch=master&svg=true)](https://ci.appveyor.com/project/aycabta/deviantart)

data/appveyor.yml

@@ -0,0 +1,15 @@
+---
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - gem install bundler --no-document
+  - bundle install
+build: off
+test_script:
+  - bundle exec rake test
+deploy: off
+environment:
+  matrix:
+    - ruby_version: "22"
+    - ruby_version: "22-x64"
+    - ruby_version: "23"
+    - ruby_version: "23-x64"

data/deviantart.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["aycabta@gmail.com"]
 
   spec.summary       = %q{deviantART API library}
-  spec.description   = %q{deviantART API library}
+  spec.description   = %Q{deviantART API library\n}
   spec.homepage      = "https://github.com/aycabta/deviantart"
   spec.license       = "MIT"
 
@@ -19,7 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 11.2"
-  spec.add_development_dependency "minitest", "~> 5.9"
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.2.6')
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest", "~> 5.10"
 end

data/lib/deviantart.rb

@@ -6,9 +6,4 @@ require 'deviantart/user'
 require 'deviantart/status'
 
 module DeviantArt
-  # Bypass args and block to DeviantArt::Client
-  # ...for backward compatibility
-  def self.new(*args, &block)
-    DeviantArt::Client.new(*args, &block)
-  end
 end

data/lib/deviantart/authorization_code.rb

@@ -4,4 +4,3 @@ module DeviantArt
   class AuthorizationCode
   end
 end
-

data/lib/deviantart/base.rb

@@ -21,7 +21,13 @@ module DeviantArt
       end
     end
 
-    private
+    def inspect
+      self.class.name
+    end
+
+    def to_s
+      inspect
+    end
 
     def define_hash_attrs(receiver, attrs, point)
       attrs.each_pair do |key, value|
@@ -30,6 +36,7 @@ module DeviantArt
       end
       receiver
     end
+    private :define_hash_attrs
 
     def attr_accessor_with_receiver(receiver, name)
       receiver.instance_eval do
@@ -40,10 +47,11 @@ module DeviantArt
           define_singleton_method(reader_name, proc { |dummy=nil| instance_variable_get(variable_name) })
         end
         if !receiver.respond_to?(writer_name)
-          define_singleton_method(writer_name, method(:instance_variable_set).curry.(variable_name))
+          define_singleton_method(writer_name, method(:instance_variable_set).to_proc.curry.(variable_name))
         end
       end
     end
+    private :attr_accessor_with_receiver
 
     def define_array_attrs(array, attrs, point)
       attrs.each do |value|
@@ -51,6 +59,7 @@ module DeviantArt
       end
       array
     end
+    private :define_array_attrs
 
     def nested_value(value, point)
       if self.class.points_class_mapping.include?(point)
@@ -66,6 +75,7 @@ module DeviantArt
         end
       end
     end
+    private :nested_value
   end
 
   class Deviation < Base; end

data/lib/deviantart/client.rb

@@ -140,14 +140,16 @@ module DeviantArt
       end
     end
 
-  private
-
     def request(method, path, params = {})
       uri = URI.parse("https://#{@host}#{path}")
       if params.any?{ |key, value| value.is_a?(Enumerable) }
         converted_params = []
         params.each do |key, value|
-          if value.is_a?(Enumerable)
+          if value.is_a?(Hash)
+            value.each_pair do |k, v|
+              converted_params << ["#{key}[#{k}]", v]
+            end
+          elsif value.is_a?(Enumerable)
             value.each_index do |i|
               converted_params << ["#{key}[#{i}]", value[i]]
             end
@@ -175,13 +177,14 @@ module DeviantArt
       end
       response = @http.request(request)
       if response.code == '403'
-        # You must send User-Agent and use HTTP compression in request
+        # need to send User-Agent and use HTTP compression in request
         response.json = JSON.parse('{}')
       else
         response.json = JSON.parse(response.body)
       end
       response
     end
+    private :request
 
     def refresh_client_credentials
       response = request(
@@ -202,6 +205,7 @@ module DeviantArt
         DeviantArt::Error.new(response.json, status_code)
       end
     end
+    private :refresh_client_credentials
 
     def refresh_authorization_code
       response = request(
@@ -227,5 +231,6 @@ module DeviantArt
         DeviantArt::Error.new(response.json, status_code)
       end
     end
+    private :refresh_authorization_code
   end
 end

data/lib/deviantart/client/collections.rb

@@ -1,5 +1,9 @@
 require 'deviantart/collections'
 require 'deviantart/collections/folders'
+require 'deviantart/collections/fave'
+require 'deviantart/collections/unfave'
+require 'deviantart/collections/folders/create'
+require 'deviantart/collections/folders/remove'
 
 module DeviantArt
   class Client
@@ -24,7 +28,31 @@ module DeviantArt
         perform(DeviantArt::Collections, :get, "/api/v1/oauth2/collections/#{folderid}", params)
       end
 
-      # TODO: fave, folders/create, folders/remove/{folderid}, unfav
+      # Add deviation to favourites
+      def fave(deviationid, folderid: nil)
+        params = { deviationid: deviationid }
+        params['folderid'] = folderid unless folderid.nil?
+        perform(DeviantArt::Collections::Fave, :post, '/api/v1/oauth2/collections/fave', params)
+      end
+
+      # Remove deviation from favourites
+      def unfave(deviationid, folderid: nil)
+        params = { deviationid: deviationid }
+        params['folderid'] = folderid unless folderid.nil?
+        perform(DeviantArt::Collections::Unfave, :post, '/api/v1/oauth2/collections/unfave', params)
+      end
+
+      # Create new collection folder
+      def create_collection_folder(name)
+        params = {}
+        params['folder'] = name unless name.nil?
+        perform(DeviantArt::Collections::Folders::Create, :post, '/api/v1/oauth2/collections/folders/create', params)
+      end
+
+      # Delete collection folder
+      def remove_collection_folder(folderid)
+        perform(DeviantArt::Collections::Folders::Remove, :get, "/api/v1/oauth2/collections/folders/remove/#{folderid}")
+      end
     end
   end
 end

data/lib/deviantart/client/feed.rb

@@ -1,18 +1,26 @@
 require 'deviantart/feed'
 require 'deviantart/feed/home'
+require 'deviantart/feed/profile'
 
 module DeviantArt
   class Client
     module Feed
       # Fetch Watch Feed
-      def get_feed(mature_content: false, cursor: nil)
+      def feed_home(mature_content: false, cursor: nil)
         params = {}
         params['cursor'] = cursor unless cursor.nil?
         params['mature_content'] = mature_content
         perform(DeviantArt::Feed::Home, :get, '/api/v1/oauth2/feed/home', params)
       end
 
-      # TODO: home/{bucketid}, notifications, profile, settings, settings/update
+      # Fetch Profile Feed
+      def feed_profile(cursor: nil)
+        params = {}
+        params['cursor'] = cursor unless cursor.nil?
+        perform(DeviantArt::Feed::Profile, :get, '/api/v1/oauth2/feed/profile', params)
+      end
+
+      # TODO: home/{bucketid}, notifications, settings, settings/update
     end
   end
 end

data/lib/deviantart/client/gallery.rb

@@ -1,6 +1,8 @@
 require 'deviantart/gallery'
 require 'deviantart/gallery/all'
 require 'deviantart/gallery/folders'
+require 'deviantart/gallery/folders/create'
+require 'deviantart/gallery/folders/remove'
 
 module DeviantArt
   class Client
@@ -40,7 +42,17 @@ module DeviantArt
         perform(DeviantArt::Gallery, :get, path, params)
       end
 
-      # TODO: create, remove/{folderid}
+      # Create new gallery folders.
+      def create_gallery_folder(foldername)
+        params = {}
+        params['folder'] = foldername unless foldername.nil?
+        perform(DeviantArt::Gallery::Folders::Create, :post, '/api/v1/oauth2/gallery/folders/create', params)
+      end
+
+      # Delete gallery folder
+      def remove_gallery_folder(folderid)
+        perform(DeviantArt::Gallery::Folders::Remove, :get, "/api/v1/oauth2/gallery/folders/remove/#{folderid}")
+      end
     end
   end
 end

data/lib/deviantart/client/user.rb

@@ -5,6 +5,10 @@ require 'deviantart/user/friends/search'
 require 'deviantart/user/whois'
 require 'deviantart/user/statuses'
 require 'deviantart/user/watchers'
+require 'deviantart/user/friends/watching'
+require 'deviantart/user/friends/watch'
+require 'deviantart/user/friends/unwatch'
+require 'deviantart/user/damn_token'
 
 module DeviantArt
   class Client
@@ -69,7 +73,36 @@ module DeviantArt
         perform(DeviantArt::User::Watchers, :get, "/api/v1/oauth2/user/watchers/#{username.nil? ? '' : username}", params)
       end
 
-      # TODO: damntoken, friends/unwatch/{username}, friends/watch/{username}, friends/watching/{username}, profile/update, statuses/post
+      # Check if user is being watched by the given user
+      def watch_status(username)
+        perform(DeviantArt::User::Friends::Watching, :get, "/api/v1/oauth2/user/friends/watching/#{username.nil? ? '' : username}")
+      end
+
+      # Watch a user
+      def watch(username, watch = {})
+        watch_params = {}
+        %w(friend deviations journals forum_threads critiques scraps activity collections).each do |p|
+          if watch[p]
+            watch_params[p] = true
+          else
+            watch_params[p] = false
+          end
+        end
+        params = { watch: watch_params }
+        perform(DeviantArt::User::Friends::Watch, :post, "/api/v1/oauth2/user/friends/watch/#{username.nil? ? '' : username}", params)
+      end
+
+      # Unwatch a user
+      def unwatch(username)
+        perform(DeviantArt::User::Friends::Unwatch, :get, "/api/v1/oauth2/user/friends/unwatch/#{username.nil? ? '' : username}")
+      end
+
+      # Retrieve the dAmn auth token required to connect to the dAmn servers
+      def damntoken
+        perform(DeviantArt::User::DamnToken, :get, '/api/v1/oauth2/user/damntoken?')
+      end
+
+      # TODO: profile/update, statuses/post
     end
   end
 end

data/lib/deviantart/client_credentials/access_token.rb

@@ -5,4 +5,3 @@ module DeviantArt
     attr_accessor :expires_in, :status, :access_token, :token_type
   end
 end
-

data/lib/deviantart/collections/fave.rb

@@ -0,0 +1,7 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Collections::Fave < Base
+    attr_accessor :success, :favourites
+  end
+end

data/lib/deviantart/collections/folders/create.rb

@@ -0,0 +1,7 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Collections::Folders::Create < Base
+    attr_accessor :folderid, :name
+  end
+end

data/lib/deviantart/collections/folders/remove.rb

@@ -0,0 +1,7 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Collections::Folders::Remove < Base
+    attr_accessor :success
+  end
+end

data/lib/deviantart/collections/unfave.rb

@@ -0,0 +1,7 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Collections::Unfave < Base
+    attr_accessor :success, :favourites
+  end
+end

data/lib/deviantart/deviation.rb

@@ -8,5 +8,13 @@ module DeviantArt
     point_to_class [:author], DeviantArt::User
     point_to_class [:daily_deviation, :giver], DeviantArt::User
     point_to_class [:daily_deviation, :suggester], DeviantArt::User
+
+    def inspect
+      "#{self.class.name}: #{@title} by #{@author.username} #{@deviationid}"
+    end
+
+    def to_s
+      inspect
+    end
   end
 end

data/lib/deviantart/feed/profile.rb

@@ -0,0 +1,14 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Feed::Profile < Base
+    attr_accessor :cursor, :has_more, :items
+    point_to_class [:items, :[], :by_user], DeviantArt::User
+    point_to_class [:items, :[], :status], DeviantArt::Status
+    point_to_class [:items, :[], :deviations, :[]], DeviantArt::Deviation
+    #point_to_class [:items, :[], :comment], DeviantArt::Comment
+    #point_to_class [:items, :[], :comment_parent], DeviantArt::Comment
+    point_to_class [:items, :[], :comment_deviation], DeviantArt::Deviation
+    point_to_class [:items, :[], :comment_profile], DeviantArt::User
+  end
+end

data/lib/deviantart/gallery/folders/create.rb

@@ -0,0 +1,7 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Gallery::Folders::Create < Base
+    attr_accessor :folderid, :name
+  end
+end

data/lib/deviantart/gallery/folders/remove.rb

@@ -0,0 +1,7 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Gallery::Folders::Remove < Base
+    attr_accessor :success
+  end
+end

data/lib/deviantart/status.rb

@@ -6,5 +6,13 @@ module DeviantArt
     point_to_class [:author], DeviantArt::User
     point_to_class [:items, :[], :status], DeviantArt::Status
     point_to_class [:items, :[], :deviation], DeviantArt::Deviation
+
+    def inspect
+      "#{self.class.name}: #{@body} by #{@author.username} #{@statusid}"
+    end
+
+    def to_s
+      inspect
+    end
   end
 end

data/lib/deviantart/user.rb

@@ -4,5 +4,13 @@ module DeviantArt
   class User < Base
     attr_accessor :userid, :username, :usericon, :type, :is_watching, :details, :geo, :profile, :stats
     point_to_class [:profile, :profile_pic], DeviantArt::Deviation
+
+    def inspect
+      "#{self.class.name}: #{@username} #{@userid}"
+    end
+
+    def to_s
+      inspect
+    end
   end
 end

data/lib/deviantart/user/damn_token.rb

@@ -0,0 +1,7 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class User::DamnToken < Base
+    attr_accessor :damntoken
+  end
+end

data/lib/deviantart/user/friends/unwatch.rb

@@ -0,0 +1,7 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class User::Friends::Unwatch < Base
+    attr_accessor :success
+  end
+end

data/lib/deviantart/user/friends/watch.rb

@@ -0,0 +1,7 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class User::Friends::Watch < Base
+    attr_accessor :success
+  end
+end

data/lib/deviantart/user/friends/watching.rb

@@ -0,0 +1,7 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class User::Friends::Watching < Base
+    attr_accessor :watching
+  end
+end

data/lib/deviantart/version.rb

@@ -1,3 +1,3 @@
 module DeviantArt
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,58 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: deviantart
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Code Ass
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
-description: deviantART API library
+        version: '5.10'
+description: 'deviantART API library
+
+'
 email:
 - aycabta@gmail.com
 executables: []
@@ -60,11 +62,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".jrubyrc"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- appveyor.yml
 - bin/console
 - bin/setup
 - deviantart.gemspec
@@ -83,7 +87,11 @@ files:
 - lib/deviantart/client_credentials.rb
 - lib/deviantart/client_credentials/access_token.rb
 - lib/deviantart/collections.rb
+- lib/deviantart/collections/fave.rb
 - lib/deviantart/collections/folders.rb
+- lib/deviantart/collections/folders/create.rb
+- lib/deviantart/collections/folders/remove.rb
+- lib/deviantart/collections/unfave.rb
 - lib/deviantart/data.rb
 - lib/deviantart/data/countries.rb
 - lib/deviantart/data/privacy.rb
@@ -98,13 +106,20 @@ files:
 - lib/deviantart/error.rb
 - lib/deviantart/feed.rb
 - lib/deviantart/feed/home.rb
+- lib/deviantart/feed/profile.rb
 - lib/deviantart/gallery.rb
 - lib/deviantart/gallery/all.rb
 - lib/deviantart/gallery/folders.rb
+- lib/deviantart/gallery/folders/create.rb
+- lib/deviantart/gallery/folders/remove.rb
 - lib/deviantart/status.rb
 - lib/deviantart/user.rb
+- lib/deviantart/user/damn_token.rb
 - lib/deviantart/user/friends.rb
 - lib/deviantart/user/friends/search.rb
+- lib/deviantart/user/friends/unwatch.rb
+- lib/deviantart/user/friends/watch.rb
+- lib/deviantart/user/friends/watching.rb
 - lib/deviantart/user/profile.rb
 - lib/deviantart/user/statuses.rb
 - lib/deviantart/user/watchers.rb
@@ -122,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -130,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: deviantART API library