deviantart 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ca81525691db52ba0941c72234faf3c5067466f
-  data.tar.gz: 14339469bd87431a08a7cc5fc88db0c78ddcd91e
+  metadata.gz: 162d1fde53c7eccf7687ae2392536e3b0bd0540a
+  data.tar.gz: 13ac6cbf255db8fd66ec059dbc2828b495990168
 SHA512:
-  metadata.gz: 36bfe4f6b74e23e4e4a59fea897882bc1f6fe083555f0c9fc47418a912f7f2578d54902e08cb1fa2d1fb16572f5f43eb8db90c398eac074bfc034caa8bc6750a
-  data.tar.gz: 096e49d7687efb0abba6d068a80d6c0e7f99a4dca9216ef1f79e99fe495e10508b81621bdfffe8881a7bc8d40645ae2c11acf23cdab24e79e6d3f6b208c2c811
+  metadata.gz: f39a3cfe0373bebd317ed7c22a7dfaf6356af1ddf641c0e62c15012edd0055d744b6c4a7165c3bbedb49ed45bdf418bb7532b3a0531394bd436092f1cd903123
+  data.tar.gz: 024e4b0350e98ad6d0a314733989c0167cd89bd209dcdabd1a940dc101a7d7e10e2a4bc6d9f019c07b57ba699212b3a965d330b12c6c0fbbbd01d1c3f1c4ad8f

data/.travis.yml

@@ -1,4 +1,4 @@
 ---
 language: ruby
-rvm: 2.3.1
-script: REAL='' bundle exec rake test
+rvm: 2.3.3
+script: bundle exec rake test

data/README.md

@@ -34,7 +34,7 @@ And you will run test with stub APIs:
 $ bundle exec rake test
 ```
 
-If you want to use *real* API in test, run this one:
+If you want to use **real** API in test, run this one:
 
 ```bash
 $ bundle exec rake real

data/Rakefile

@@ -1,6 +1,11 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-require "readline"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+require 'readline'
+require 'net/http'
+
+BROWSER_COMMAND_FILE = 'test/browser_command'
+AUTHORIZATION_CODE_FILE = 'test/fixtures/authorization_code.json'
+OUTPUT_PIPE = 'test/output_pipe'
 
 test_pettern = FileList['test/**/*_test.rb']
 
@@ -11,20 +16,40 @@ Rake::TestTask.new(:test) do |t|
 end
 
 def get_browser_command
-  browser_command_file = 'test/browser_command'
-  if !File.exists?(browser_command_file)
-    browser_command = Readline.readline('Input your browser command> ')
-    open(browser_command_file, 'w') do |f|
-      f.write(browser_command)
-    end
-    puts "Wrote \"#{browser_command}\" to #{browser_command_file}"
-    browser_command
-  else
-    open(browser_command_file, 'r').read
+  open(BROWSER_COMMAND_FILE, 'r').read
+end
+
+file BROWSER_COMMAND_FILE do
+  browser_command = Readline.readline('Input your browser command> ')
+  open(BROWSER_COMMAND_FILE, 'w') do |f|
+    f.write(browser_command)
+  end
+  puts "Wrote \"#{browser_command}\" to #{BROWSER_COMMAND_FILE}"
+end
+
+def wait_oauth_consumer_booting
+  http = Net::HTTP.new('localhost', 4567)
+  http.open_timeout = 1
+  begin
+    http.start
+  rescue Errno::ECONNREFUSED
+    sleep 1
+    retry
+  rescue Net::OpenTimeout
+    retry
+  rescue => e
+    puts e.class.name
+  end
+  while http.head('/').code != '200'
+    sleep 1
   end
 end
 
-def get_access_token
+file AUTHORIZATION_CODE_FILE => BROWSER_COMMAND_FILE do
+  if File.exists?(OUTPUT_PIPE)
+    File.unlink(OUTPUT_PIPE)
+  end
+  File.mkfifo(OUTPUT_PIPE)
   cv = ConditionVariable.new
   mutex = Mutex.new
   is_pinged = false
@@ -34,6 +59,7 @@ def get_access_token
       system('bundle exec ruby test/oauth_consumer.rb > /dev/null 2>&1 &')
       open(OUTPUT_PIPE).read # block to get 'ping'
       is_pinged = true
+      wait_oauth_consumer_booting
       cv.signal
     }
   }
@@ -60,20 +86,10 @@ def get_access_token
   open(AUTHORIZATION_CODE_FILE, 'w') do |f|
     f.write(result)
   end
+  File.unlink(OUTPUT_PIPE)
 end
 
-task :access_token do
-  AUTHORIZATION_CODE_FILE = 'test/fixtures/authorization_code.json'
-  if !File.exists?(AUTHORIZATION_CODE_FILE)
-    OUTPUT_PIPE = 'test/output_pipe'
-    if File.exists?(OUTPUT_PIPE)
-      File.unlink(OUTPUT_PIPE)
-    end
-    File.mkfifo(OUTPUT_PIPE)
-    get_access_token
-    File.unlink(OUTPUT_PIPE)
-  end
-end
+task :access_token => AUTHORIZATION_CODE_FILE
 
 Rake::TestTask.new(:real) do |t|
   t.deps << :access_token

data/deviantart.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/aycabta/deviantart"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

data/lib/deviantart.rb

@@ -1,5 +1,9 @@
-require "deviantart/version"
-require "deviantart/client"
+require 'deviantart/version'
+require 'deviantart/client'
+require 'deviantart/base'
+require 'deviantart/deviation'
+require 'deviantart/user'
+require 'deviantart/status'
 
 module DeviantArt
   # Bypass args and block to DeviantArt::Client

data/lib/deviantart/base.rb

@@ -0,0 +1,74 @@
+module DeviantArt
+  class Base
+    attr_reader :attrs
+    @points_class_mapping = {}
+
+    def initialize(attrs)
+      @attrs = attrs
+      define_hash_attrs(self, @attrs, [])
+    end
+
+    class << self
+      def points_class_mapping
+        @points_class_mapping ||= {}
+      end
+      def points_class_mapping=(v)
+        @points_class_mapping = v
+      end
+
+      def point_to_class(point, klass)
+        self.points_class_mapping[point] = klass
+      end
+    end
+
+    private
+
+    def define_hash_attrs(receiver, attrs, point)
+      attrs.each_pair do |key, value|
+        attr_accessor_with_receiver(receiver, key)
+        receiver.instance_variable_set(:"@#{key}", nested_value(value, point + [key.to_sym]))
+      end
+      receiver
+    end
+
+    def attr_accessor_with_receiver(receiver, name)
+      receiver.instance_eval do
+        reader_name = name.to_sym
+        writer_name = :"#{name}="
+        variable_name = :"@#{name}"
+        if !receiver.respond_to?(reader_name)
+          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))
+        end
+      end
+    end
+
+    def define_array_attrs(array, attrs, point)
+      attrs.each do |value|
+        array << nested_value(value, point)
+      end
+      array
+    end
+
+    def nested_value(value, point)
+      if self.class.points_class_mapping.include?(point)
+        self.class.points_class_mapping[point].new(value)
+      else
+        case value
+        when Array
+          define_array_attrs(Array.new, value, point + [:[]])
+        when Hash
+          define_hash_attrs(Object.new, value, point)
+        else
+          value
+        end
+      end
+    end
+  end
+
+  class Deviation < Base; end
+  class User < Base; end
+  class Status < Base; end
+end

data/lib/deviantart/client.rb

@@ -1,10 +1,11 @@
-require 'deviantart/deviation'
-require 'deviantart/gallery'
-require 'deviantart/collections'
-require 'deviantart/user'
-require 'deviantart/data'
-require 'deviantart/feed'
+require 'deviantart/client/deviation'
+require 'deviantart/client/gallery'
+require 'deviantart/client/collections'
+require 'deviantart/client/user'
+require 'deviantart/client/data'
+require 'deviantart/client/feed'
 # TODO: comments, cured, messages, notes, stash, util
+require 'deviantart/error'
 require 'net/http'
 require 'uri'
 require 'json'
@@ -15,13 +16,13 @@ end
 
 module DeviantArt
   class Client
-    include DeviantArt::Deviation
-    include DeviantArt::Gallery
-    include DeviantArt::Collections
-    include DeviantArt::User
-    include DeviantArt::Data
-    include DeviantArt::Feed
-    attr_accessor :access_token, :client_id, :client_secret, :code, :redirect_uri, :grant_type, :access_token_auto_refresh, :refresh_token, :host
+    include DeviantArt::Client::Deviation
+    include DeviantArt::Client::Gallery
+    include DeviantArt::Client::Collections
+    include DeviantArt::Client::User
+    include DeviantArt::Client::Data
+    include DeviantArt::Client::Feed
+    attr_accessor :access_token, :client_id, :client_secret, :code, :redirect_uri, :grant_type, :access_token_auto_refresh, :refresh_token, :host, :headers
     attr_writer :user_agent
     @@default_host = 'www.deviantart.com'
 
@@ -42,6 +43,7 @@ module DeviantArt
     # [#redirect_uri] URL what is exactly match the value in authorization step.
     # [#code] Authorization step returns this.
     # [#refresh_token] Refresh token for +:authorization_code+.
+    # [#headers] Add custom headers for request.
     #
     # For refresh token with +:client_credentials+
     #
@@ -52,6 +54,9 @@ module DeviantArt
       @host = @@default_host
       @on_refresh_access_token = nil
       @on_refresh_authorization_code = nil
+      @access_token_auto_refresh = true
+      @grant_type = nil
+      @headers = {}
       options.each do |key, value|
         instance_variable_set("@#{key}", value)
       end
@@ -72,11 +77,11 @@ module DeviantArt
 
     # Auto refresh access token flag
     def access_token_auto_refresh?
-      @access_token_auto_refresh
+      @access_token_auto_refresh && !@grant_type.nil?
     end
 
     # Access API with params by method
-    def perform(method, path, params = {})
+    def perform(klass, method, path, params = {})
       if @access_token.nil? && access_token_auto_refresh?
         refresh_access_token
       end
@@ -85,7 +90,29 @@ module DeviantArt
         refresh_access_token
         response = request(method, path, params)
       end
-      response.json
+      case response.code
+      when '200'
+        klass.new(response.json)
+      when '400'
+        # Request failed due to client error,
+        # e.g. validation failed or User not found
+        DeviantArt::Error.new(response.json, response.code.to_i)
+      when '401'
+        # Invalid token
+        DeviantArt::Error.new(response.json, response.code.to_i)
+      when '429'
+        # Rate limit reached or service overloaded
+        DeviantArt::Error.new(response.json, response.code.to_i)
+      when '500'
+        # Our servers encountered an internal error, try again
+        DeviantArt::Error.new(response.json, response.code.to_i)
+      when '503'
+        # Our servers are currently unavailable, try again later.
+        # This is normally due to planned or emergency maintenance.
+        DeviantArt::Error.new(response.json, response.code.to_i)
+      else
+        DeviantArt::Error.new(response.json, response.code.to_i)
+      end
     end
 
     # Call given block when authorization code is refreshed
@@ -129,8 +156,16 @@ module DeviantArt
       if not @access_token.nil?
         request["Authorization"] = "Bearer #{@access_token}"
       end
+      @headers.each_pair do |key, value|
+        request[key] = value
+      end
       response = @http.request(request)
-      response.json = JSON.parse(response.body)
+      if response.code == '403'
+        # You must send User-Agent and use HTTP compression in request
+        response.json = JSON.parse('{}')
+      else
+        response.json = JSON.parse(response.body)
+      end
       response
     end
 
@@ -171,4 +206,3 @@ module DeviantArt
     end
   end
 end
-

data/lib/deviantart/client/collections.rb

@@ -0,0 +1,30 @@
+require 'deviantart/collections'
+require 'deviantart/collections/folders'
+
+module DeviantArt
+  class Client
+    module Collections
+      # Fetch collection folders
+      def get_collections_folders(username: nil, calculate_size: false, ext_preload: false, offset: 0, limit: 10)
+        params = {}
+        params['username'] = username unless username.nil?
+        params['calculate_size'] = calculate_size if calculate_size
+        params['ext_preload'] = ext_preload if ext_preload
+        params['offset'] = offset if offset != 0
+        params['limit'] = limit if limit != 10
+        perform(DeviantArt::Collections::Folders, :get, '/api/v1/oauth2/collections/folders', params)
+      end
+
+      # Fetch collection folder contents
+      def get_collections(folderid, username: nil, offset: 0, limit: 10)
+        params = {}
+        params['username'] = username unless username.nil?
+        params['offset'] = offset if offset != 0
+        params['limit'] = limit if limit != 10
+        perform(DeviantArt::Collections, :get, "/api/v1/oauth2/collections/#{folderid}", params)
+      end
+
+      # TODO: fave, folders/create, folders/remove/{folderid}, unfav
+    end
+  end
+end

data/lib/deviantart/client/data.rb

@@ -0,0 +1,31 @@
+require 'deviantart/data'
+require 'deviantart/data/countries'
+require 'deviantart/data/privacy'
+require 'deviantart/data/submission'
+require 'deviantart/data/tos'
+
+module DeviantArt
+  class Client
+    module Data
+      # Get a list of countries
+      def get_countries
+        perform(DeviantArt::Data::Countries, :get, '/api/v1/oauth2/data/countries')
+      end
+
+      # Returns the DeviantArt Privacy Policy
+      def get_privacy
+        perform(DeviantArt::Data::Privacy, :get, '/api/v1/oauth2/data/privacy')
+      end
+
+      # Returns the DeviantArt Submission Policy
+      def get_submission
+        perform(DeviantArt::Data::Submission, :get, '/api/v1/oauth2/data/submission')
+      end
+
+      # Returns the DeviantArt Terms of Service
+      def get_tos
+        perform(DeviantArt::Data::TOS, :get, '/api/v1/oauth2/data/tos')
+      end
+    end
+  end
+end

data/lib/deviantart/client/deviation.rb

@@ -0,0 +1,36 @@
+require 'deviantart/deviation'
+require 'deviantart/deviation/content'
+require 'deviantart/deviation/whofaved'
+require 'deviantart/deviation/download'
+
+module DeviantArt
+  class Client
+    module Deviation
+      # Fetch a deviation details
+      def get_deviation(deviationid)
+        perform(DeviantArt::Deviation, :get, "/api/v1/oauth2/deviation/#{deviationid}")
+      end
+
+      # Fetch full data that is not included in the main devaition details
+      def get_deviation_content(deviationid)
+        perform(DeviantArt::Deviation::Content, :get, '/api/v1/oauth2/deviation/content', { deviationid: deviationid })
+      end
+
+      # Fetch a list of users who faved the deviation
+      def get_deviation_whofaved(deviationid, offset: 0, limit: 10)
+        params = {}
+        params['deviationid'] = deviationid
+        params['offset'] = offset if offset != 0
+        params['limit'] = limit if limit != 10
+        perform(DeviantArt::Deviation::WhoFaved, :get, '/api/v1/oauth2/deviation/whofaved', params)
+      end
+
+      # Get the original file download (if allowed)
+      def download_deviation(deviationid)
+        perform(DeviantArt::Deviation::Download, :get, "/api/v1/oauth2/deviation/download/#{deviationid}")
+      end
+
+      # TODO: embeddedcontent, metadata
+    end
+  end
+end

data/lib/deviantart/client/feed.rb

@@ -0,0 +1,18 @@
+require 'deviantart/feed'
+require 'deviantart/feed/home'
+
+module DeviantArt
+  class Client
+    module Feed
+      # Fetch Watch Feed
+      def get_feed(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
+    end
+  end
+end

data/lib/deviantart/client/gallery.rb

@@ -0,0 +1,46 @@
+require 'deviantart/gallery'
+require 'deviantart/gallery/all'
+require 'deviantart/gallery/folders'
+
+module DeviantArt
+  class Client
+    module Gallery
+      # Get the "all" view of a users gallery
+      def get_gallery_all(username: nil, offset: 0, limit: 10)
+        params = {}
+        params['username'] = username unless username.nil?
+        params['offset'] = offset if offset != 0
+        params['limit'] = limit if limit != 10
+        perform(DeviantArt::Gallery::All, :get, '/api/v1/oauth2/gallery/all', params)
+      end
+
+      # Fetch gallery folders
+      def get_gallery_folders(username: nil, calculate_size: false, ext_preload: false, offset: 0, limit: 10)
+        params = {}
+        params['username'] = username unless username.nil?
+        params['calculate_size'] = calculate_size if calculate_size
+        params['ext_preload'] = ext_preload if ext_preload
+        params['offset'] = offset if offset != 0
+        params['limit'] = limit if limit != 10
+        perform(DeviantArt::Gallery::Folders, :get, '/api/v1/oauth2/gallery/folders', params)
+      end
+
+      # Fetch gallery folder contents
+      def get_gallery(username: nil, folderid: nil, mode: nil, offset: 0, limit: 10)
+        params = {}
+        params['username'] = username unless username.nil?
+        params['mode'] = mode unless mode.nil?
+        params['offset'] = offset if offset != 0
+        params['limit'] = limit if limit != 10
+        unless folderid.nil?
+          path = "/api/v1/oauth2/gallery/#{folderid}"
+        else
+          path = '/api/v1/oauth2/gallery/'
+        end
+        perform(DeviantArt::Gallery, :get, path, params)
+      end
+
+      # TODO: create, remove/{folderid}
+    end
+  end
+end

data/lib/deviantart/client/user.rb

@@ -0,0 +1,75 @@
+require 'deviantart/user'
+require 'deviantart/user/profile'
+require 'deviantart/user/friends'
+require 'deviantart/user/friends/search'
+require 'deviantart/user/whois'
+require 'deviantart/user/statuses'
+require 'deviantart/user/watchers'
+
+module DeviantArt
+  class Client
+    module User
+      # Get user profile information
+      def get_profile(username, ext_collections: false, ext_galleries: false)
+        params = {}
+        params['ext_collections'] = ext_collections if ext_collections
+        params['ext_galleries'] = ext_galleries if ext_galleries
+        perform(DeviantArt::User::Profile, :get, "/api/v1/oauth2/user/profile/#{username.nil? ? '' : username}", params)
+      end
+
+      # Get the users list of friends
+      def get_friends(username, offset: 0, limit: 10)
+        params = {}
+        params['offset'] = offset if offset != 0
+        params['limit'] = limit if limit != 10
+        perform(DeviantArt::User::Friends, :get, "/api/v1/oauth2/user/friends/#{username.nil? ? '' : username}", params)
+      end
+
+      # Fetch user info for given usernames
+      def whois(users)
+        params = { usernames: users.is_a?(Enumerable) ? users : [users] }
+        perform(DeviantArt::User::Whois, :post, '/api/v1/oauth2/user/whois', params)
+      end
+
+      # Fetch user info of authenticated user
+      def whoami
+        perform(DeviantArt::User, :get, '/api/v1/oauth2/user/whoami?')
+      end
+
+      # Search friends by username
+      def search_friends(query, username: nil)
+        params = {}
+        params['query'] = query
+        params['username'] = username unless username.nil?
+        perform(DeviantArt::User::Friends::Search, :get, '/api/v1/oauth2/user/friends/search', params)
+      end
+
+      # User Statuses
+      def get_statuses(username, offset: 0, limit: 10, mature_content: true)
+        params = {}
+        params['username'] = username
+        params['mature_content'] = mature_content
+        params['offset'] = offset if offset != 0
+        params['limit'] = limit if limit != 10
+        perform(DeviantArt::User::Statuses, :get, '/api/v1/oauth2/user/statuses/', params)
+      end
+
+      # Fetch the status
+      def get_status(statusid, mature_content: true)
+        params = {}
+        params['mature_content'] = mature_content
+        perform(DeviantArt::Status, :get, "/api/v1/oauth2/user/statuses/#{statusid}", params)
+      end
+
+      # Get the user's list of watchers
+      def get_watchers(username: nil, offset: 0, limit: 10)
+        params = {}
+        params['offset'] = offset if offset != 0
+        params['limit'] = limit if limit != 10
+        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
+    end
+  end
+end

data/lib/deviantart/collections.rb

@@ -1,26 +1,8 @@
-module DeviantArt
-  module Collections
-    # Fetch collection folders
-    def get_collections_folders(username: nil, calculate_size: false, ext_preload: false, offset: 0, limit: 10)
-      params = {}
-      params['username'] = username unless username.nil?
-      params['calculate_size'] = calculate_size if calculate_size
-      params['ext_preload'] = ext_preload if ext_preload
-      params['offset'] = offset if offset != 0
-      params['limit'] = limit if limit != 10
-      perform(:get, '/api/v1/oauth2/collections/folders', params)
-    end
-
-    # Fetch collection folder contents
-    def get_collections(folderid, username: nil, offset: 0, limit: 10)
-      params = {}
-      params['username'] = username unless username.nil?
-      params['offset'] = offset if offset != 0
-      params['limit'] = limit if limit != 10
-      perform(:get, "/api/v1/oauth2/collections/#{folderid}", params)
-    end
+require 'deviantart/base'
 
-    # TODO: fave, folders/create, folders/remove/{folderid}, unfav
+module DeviantArt
+  class Collections < Base
+    attr_accessor :has_more, :next_offset, :name, :results
+    point_to_class [:results, :[]], DeviantArt::Deviation
   end
 end
-

data/lib/deviantart/collections/folders.rb

@@ -0,0 +1,8 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Collections::Folders < Base
+    attr_accessor :has_more, :next_offset, :results
+    point_to_class [:results, :[], :deviations, :[]], DeviantArt::Deviation
+  end
+end

data/lib/deviantart/data.rb

@@ -1,24 +1,6 @@
-module DeviantArt
-  module Data
-    # Get a list of countries
-    def get_countries
-      perform(:get, '/api/v1/oauth2/data/countries')
-    end
-
-    # Returns the DeviantArt Privacy Policy
-    def get_privacy
-      perform(:get, '/api/v1/oauth2/data/privacy')
-    end
-
-    # Returns the DeviantArt Submission Policy
-    def get_submission
-      perform(:get, '/api/v1/oauth2/data/submission')
-    end
+require 'deviantart/base'
 
-    # Returns the DeviantArt Terms of Service
-    def get_tos
-      perform(:get, '/api/v1/oauth2/data/tos')
-    end
+module DeviantArt
+  class Data < Base
   end
 end
-

data/lib/deviantart/data/countries.rb

@@ -0,0 +1,7 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Data::Countries < Base
+    attr_accessor :results
+  end
+end

data/lib/deviantart/data/privacy.rb

@@ -0,0 +1,7 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Data::Privacy < Base
+    attr_accessor :text
+  end
+end

data/lib/deviantart/data/submission.rb

@@ -0,0 +1,7 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Data::Submission < Base
+    attr_accessor :text
+  end
+end

data/lib/deviantart/data/tos.rb

@@ -0,0 +1,7 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Data::TOS < Base
+    attr_accessor :text
+  end
+end

data/lib/deviantart/deviation.rb

@@ -1,30 +1,12 @@
-module DeviantArt
-  module Deviation
-    # Fetch a deviation details
-    def get_deviation(deviationid)
-      perform(:get, "/api/v1/oauth2/deviation/#{deviationid}")
-    end
-
-    # Fetch full data that is not included in the main devaition details
-    def get_deviation_content(deviationid)
-      perform(:get, '/api/v1/oauth2/deviation/content', { deviationid: deviationid })
-    end
-
-    # Fetch a list of users who faved the deviation
-    def get_deviation_whofaved(deviationid, offset: 0, limit: 10)
-      params = {}
-      params['deviationid'] = deviationid
-      params['offset'] = offset if offset != 0
-      params['limit'] = limit if limit != 10
-      perform(:get, '/api/v1/oauth2/deviation/whofaved', params)
-    end
+require 'deviantart/base'
 
-    # Get the original file download (if allowed)
-    def download_deviation(deviationid)
-      perform(:get, "/api/v1/oauth2/deviation/download/#{deviationid}")
-    end
-
-    # TODO: embeddedcontent, metadata
+module DeviantArt
+  class Deviation < Base
+    attr_accessor :deviationid, :printid, :url, :title, :category, :category_path, :is_favourited, :is_deleted, :author, :stats
+    attr_accessor :published_time, :allows_comments, :preview, :content, :thumbs, :videos, :flash, :daily_deviation
+    attr_accessor :excerpt, :is_mature, :is_downloadable, :download_filesize, :challenge, :challenge_entry, :motion_book
+    point_to_class [:author], DeviantArt::User
+    point_to_class [:daily_deviation, :giver], DeviantArt::User
+    point_to_class [:daily_deviation, :suggester], DeviantArt::User
   end
 end
-

data/lib/deviantart/deviation/content.rb

@@ -0,0 +1,6 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Deviation::Content < Base
+  end
+end

data/lib/deviantart/deviation/download.rb

@@ -0,0 +1,6 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Deviation::Download < Base
+  end
+end

data/lib/deviantart/deviation/whofaved.rb

@@ -0,0 +1,7 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Deviation::WhoFaved < Base
+    point_to_class [:results, :[], :user], DeviantArt::User
+  end
+end

data/lib/deviantart/error.rb

@@ -0,0 +1,12 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Error < Base
+    attr_accessor :error, :error_description, :error_details, :error_code, :status_code
+
+    def initialize(json, status_code)
+      super(json)
+      @status_code = status_code
+    end
+  end
+end

data/lib/deviantart/feed.rb

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

data/lib/deviantart/feed/home.rb

@@ -0,0 +1,14 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Feed::Home < Base
+    attr_accessor :cursor, :has_more, :items
+    point_to_class [:items, :[], :by_user], DeviantArt::User
+    point_to_class [:items, :[], :deviations, :[]], DeviantArt::Deviation
+    point_to_class [:items, :[], :status], DeviantArt::Status
+    #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.rb

@@ -1,41 +1,8 @@
-module DeviantArt
-  module Gallery
-    # Get the "all" view of a users gallery
-    def get_gallery_all(username: nil, offset: 0, limit: 10)
-      params = {}
-      params['username'] = username unless username.nil?
-      params['offset'] = offset if offset != 0
-      params['limit'] = limit if limit != 10
-      perform(:get, '/api/v1/oauth2/gallery/all', params)
-    end
-
-    # Fetch gallery folders
-    def get_gallery_folders(username: nil, calculate_size: false, ext_preload: false, offset: 0, limit: 10)
-      params = {}
-      params['username'] = username unless username.nil?
-      params['calculate_size'] = calculate_size if calculate_size
-      params['ext_preload'] = ext_preload if ext_preload
-      params['offset'] = offset if offset != 0
-      params['limit'] = limit if limit != 10
-      perform(:get, '/api/v1/oauth2/gallery/folders', params)
-    end
-
-    # Fetch gallery folder contents
-    def get_gallery(username: nil, folderid: nil, mode: nil, offset: 0, limit: 10)
-      params = {}
-      params['username'] = username unless username.nil?
-      params['mode'] = mode unless mode.nil?
-      params['offset'] = offset if offset != 0
-      params['limit'] = limit if limit != 10
-      unless folderid.nil?
-        path = "/api/v1/oauth2/gallery/#{folderid}"
-      else
-        path = '/api/v1/oauth2/gallery/'
-      end
-      perform(:get, path, params)
-    end
+require 'deviantart/base'
 
-    # TODO: create, remove/{folderid}
+module DeviantArt
+  class Gallery < Base
+    attr_accessor :has_more, :next_offset, :name, :results
+    point_to_class [:results, :[]], DeviantArt::Deviation
   end
 end
-

data/lib/deviantart/gallery/all.rb

@@ -0,0 +1,8 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Gallery::All < Base
+    attr_accessor :has_more, :next_offset, :results
+    point_to_class [:results, :[]], DeviantArt::Deviation
+  end
+end

data/lib/deviantart/gallery/folders.rb

@@ -0,0 +1,8 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Gallery::Folders < Base
+    attr_accessor :has_more, :next_offset, :results
+    point_to_class [:results, :[], :deviations, :[]], DeviantArt::Deviation
+  end
+end

data/lib/deviantart/status.rb

@@ -0,0 +1,10 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class Status < Base
+    attr_accessor :statusid, :body, :ts, :url, :comments_count, :is_share, :is_deleted, :author, :items
+    point_to_class [:author], DeviantArt::User
+    point_to_class [:items, :[], :status], DeviantArt::Status
+    point_to_class [:items, :[], :deviation], DeviantArt::Deviation
+  end
+end

data/lib/deviantart/user.rb

@@ -1,56 +1,8 @@
-module DeviantArt
-  module User
-    # Get user profile information
-    def get_profile(username, ext_collections: false, ext_galleries: false)
-      params = {}
-      params['ext_collections'] = ext_collections if ext_collections
-      params['ext_galleries'] = ext_galleries if ext_galleries
-      perform(:get, "/api/v1/oauth2/user/profile/#{username.nil? ? '' : username}", params)
-    end
-
-    # Get the users list of friends
-    def get_friends(username, offset: 0, limit: 10)
-      params = {}
-      params['offset'] = offset if offset != 0
-      params['limit'] = limit if limit != 10
-      perform(:get, "/api/v1/oauth2/user/friends/#{username.nil? ? '' : username}", params)
-    end
-
-    # Fetch user info for given usernames
-    def whois(users)
-      params = { usernames: users.is_a?(Enumerable) ? users : [users] }
-      perform(:post, '/api/v1/oauth2/user/whois', params)
-    end
-
-    # Fetch user info of authenticated user
-    def whoami
-      perform(:get, '/api/v1/oauth2/user/whoami?')
-    end
-
-    # Search friends by username
-    def search_friends(query, username: nil)
-      params = {}
-      params['query'] = query
-      params['username'] = username unless username.nil?
-      perform(:get, '/api/v1/oauth2/user/friends/search', params)
-    end
+require 'deviantart/base'
 
-    def get_statuses(username, offset: 0, limit: 10, mature_content: true)
-      params = {}
-      params['username'] = username
-      params['mature_content'] = mature_content
-      params['offset'] = offset if offset != 0
-      params['limit'] = limit if limit != 10
-      perform(:get, '/api/v1/oauth2/user/statuses/', params)
-    end
-
-    def get_status(statusid, mature_content: true)
-      params = {}
-      params['mature_content'] = mature_content
-      perform(:get, "/api/v1/oauth2/user/statuses/#{statusid}", params)
-    end
-
-    # TODO: damntoken, friends/unwatch/{username}, friends/watch/{username}, friends/watching/{username}, profile/update, statuses/post, watchers/{username}
+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
   end
 end
-

data/lib/deviantart/user/friends.rb

@@ -0,0 +1,8 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class User::Friends < Base
+    attr_accessor :has_more, :next_offset, :results
+    point_to_class [:results, :[], :user], DeviantArt::User
+  end
+end

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

@@ -0,0 +1,8 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class User::Friends::Search < Base
+    attr_accessor :results
+    point_to_class [:results, :[]], DeviantArt::User
+  end
+end

data/lib/deviantart/user/profile.rb

@@ -0,0 +1,11 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class User::Profile < Base
+    attr_accessor :user, :is_watching, :profile_url, :user_is_artist, :artist_level, :artist_specialty, :real_name, :tagline
+    attr_accessor :countryid, :country, :website, :bio, :cover_photo, :profile_pic, :last_status, :stats, :collections, :galleries
+    point_to_class [:user], DeviantArt::User
+    point_to_class [:profile_pic], DeviantArt::Deviation
+    point_to_class [:last_status], DeviantArt::Status
+  end
+end

data/lib/deviantart/user/statuses.rb

@@ -0,0 +1,8 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class User::Statuses < Base
+    attr_accessor :has_more, :next_offset, :results
+    point_to_class [:results, :[]], DeviantArt::Status
+  end
+end

data/lib/deviantart/user/watchers.rb

@@ -0,0 +1,8 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class User::Watchers < Base
+    attr_accessor :has_more, :next_offset, :results
+    point_to_class [:results, :[], :user], DeviantArt::User
+  end
+end

data/lib/deviantart/user/whois.rb

@@ -0,0 +1,8 @@
+require 'deviantart/base'
+
+module DeviantArt
+  class User::Whois < Base
+    attr_accessor :results
+    point_to_class [:results, :[]], DeviantArt::User
+  end
+end

data/lib/deviantart/version.rb

@@ -1,3 +1,3 @@
 module DeviantArt
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deviantart
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Code Ass
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-22 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,13 +69,39 @@ files:
 - bin/setup
 - deviantart.gemspec
 - lib/deviantart.rb
+- lib/deviantart/base.rb
 - lib/deviantart/client.rb
+- lib/deviantart/client/collections.rb
+- lib/deviantart/client/data.rb
+- lib/deviantart/client/deviation.rb
+- lib/deviantart/client/feed.rb
+- lib/deviantart/client/gallery.rb
+- lib/deviantart/client/user.rb
 - lib/deviantart/collections.rb
+- lib/deviantart/collections/folders.rb
 - lib/deviantart/data.rb
+- lib/deviantart/data/countries.rb
+- lib/deviantart/data/privacy.rb
+- lib/deviantart/data/submission.rb
+- lib/deviantart/data/tos.rb
 - lib/deviantart/deviation.rb
+- lib/deviantart/deviation/content.rb
+- lib/deviantart/deviation/download.rb
+- lib/deviantart/deviation/whofaved.rb
+- lib/deviantart/error.rb
 - lib/deviantart/feed.rb
+- lib/deviantart/feed/home.rb
 - lib/deviantart/gallery.rb
+- lib/deviantart/gallery/all.rb
+- lib/deviantart/gallery/folders.rb
+- lib/deviantart/status.rb
 - lib/deviantart/user.rb
+- lib/deviantart/user/friends.rb
+- lib/deviantart/user/friends/search.rb
+- lib/deviantart/user/profile.rb
+- lib/deviantart/user/statuses.rb
+- lib/deviantart/user/watchers.rb
+- lib/deviantart/user/whois.rb
 - lib/deviantart/version.rb
 homepage: https://github.com/aycabta/deviantart
 licenses:
@@ -97,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: deviantART API library