ruby-imgur 0.01 → 0.02

data/Gemfile.lock

@@ -4,7 +4,6 @@ PATH
     ruby-imgur (0.01)
       addressable
       cistern (~> 0.1.3)
-      excon
       launchy
       multi_json
       rest-client
@@ -17,7 +16,6 @@ GEM
     cistern (0.1.4)
     coderay (1.0.8)
     diff-lcs (1.1.3)
-    excon (0.16.10)
     launchy (2.1.2)
       addressable (~> 2.3)
     method_source (0.8.1)

data/imgur.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "multi_json"
   gem.add_dependency "cistern", "~> 0.1.3"
   gem.add_dependency "addressable"
-  gem.add_dependency "excon"
   gem.add_dependency "launchy"
   gem.add_dependency "rest-client"
 end

data/lib/imgur.rb

@@ -1,7 +1,6 @@
 require 'imgur/version'
 require 'cistern'
 require 'logger'
-require 'excon'
 require 'launchy'
 require 'yaml'
 require 'rest-client'

data/lib/imgur/client.rb

@@ -5,10 +5,16 @@ class Imgur::Client < Cistern::Service
 
   model :image
   collection :images
+  request :get_image
   request :get_images
 
+  model :album
+  collection :albums
+  request :get_album
+  request :get_albums
+
   class Real
-    attr_accessor :url, :path, :connection, :parser, :logger, :config, :authorize_path, :token_path
+    attr_accessor :url, :path, :parser, :logger, :config, :authorize_path, :token_path
 
     def initialize(options={})
       @config                          = options[:config] || YAML.load_file(File.expand_path("~/.imgurrc")) || YAML.load_file("config/config.yml")
@@ -17,9 +23,11 @@ class Imgur::Client < Cistern::Service
       @url                             = URI.parse(options[:url]  || "https://api.imgur.com")
       @logger                          = options[:logger]         || Logger.new(nil)
       @parser                          = begin; require 'json'; JSON; end
+    end
 
-      Excon.defaults[:ssl_verify_peer] = false
-      @connection                      = Excon.new(@url.to_s)
+    def reset!
+      @config     = nil
+      @config     = YAML.load_file(File.expand_path("~/.imgurrc"))
     end
 
     def refresh_token
@@ -34,12 +42,13 @@ class Imgur::Client < Cistern::Service
       @config[:access_token] = new_params["access_token"]
       @config[:refresh_token] = new_params["refresh_token"]
       File.open(File.expand_path("~/.imgurrc"), "w") { |f| YAML.dump(@config, f) }
+      self.reset!
       return true
     end
 
     def request(options={})
       method  = (options[:method] || :get).to_s.downcase
-      path    = "/3#{options[:path]}" || "/3"
+      path    =  @url.to_s + ("/3#{options[:path]}" || "/3")
       query   = options[:query] || {}
       unless @config[:access_token]
         Launchy.open(@url.to_s + @authorize_path + "?client_id=#{@config[:client_id]}&response_type=token")
@@ -66,14 +75,12 @@ class Imgur::Client < Cistern::Service
                      end
       request_body ||= options[:params] || {}
       path           = "#{path}?#{query.map{|k,v| "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}"}.join("&")}" unless query.empty?
-      options        = {:method => method, :path => path, :headers => headers}
-      response       = @connection.request(options)
-      response       = if response.status == 403
-                         self.refresh_token
-                         @connection.request(options).body
-                       else
-                         response.body
-                       end
+      begin
+        response = RestClient.send(method, path, headers)
+      rescue RestClient::Forbidden
+        self.refresh_token
+        retry
+      end
       parsed_body    = response.strip.empty? ? {} : parser.load(response)
       status         = parsed_body.delete("status")
       Imgur::Response.new(status, {}, parsed_body).raise!

data/lib/imgur/models/account.rb

@@ -0,0 +1,12 @@
+class Imgur::Client::Account < Imgur::Model
+  identity :id
+
+  attribute :url
+  attribute :bio
+  attribute :reputation, type: :float
+  attribute :created,    type: :integer
+
+  def open_in_browser
+    Launchy.open(link)
+  end
+end

data/lib/imgur/models/album.rb

@@ -0,0 +1,18 @@
+class Imgur::Client::Album < Imgur::Model
+  identity :id
+
+  attribute :title
+  attribute :link
+  attribute :datetime,   type: :integer
+  attribute :description
+  attribute :privacy
+  attribute :cover
+  attribute :order,      type: :integer
+  attribute :layout
+
+  def images
+    url  = "/album/#{id}/images"
+    data = connection.get_images(path: url).body["data"]
+    connection.images.load(data)
+  end
+end

data/lib/imgur/models/albums.rb

@@ -0,0 +1,16 @@
+class Imgur::Client::Albums < Cistern::Collection
+  include Imgur::PagedCollection
+  include Imgur::Collection
+
+  model Imgur::Client::Album
+
+  model_root "data"
+  model_request :get_album
+
+  collection_root "data"
+  collection_request :get_albums
+
+  def get(id)
+    connection.albums.new(connection.get_album(id).body["data"])
+  end
+end

data/lib/imgur/models/comment.rb

@@ -0,0 +1,17 @@
+class Imgur::Client::Comment < Imgur::Model
+  identity :id
+
+  attribute :image_id
+  attribute :caption
+  attribute :author
+  attribute :author_id, type: :integer
+  attribute :on_album,  type: :boolean
+  attribute :album_cover
+  attribute :ups,       type: :integer
+  attribute :downs,     type: :integer
+  attribute :points,    type: :float
+  attribute :datetime,  type: :integer
+  attribute :parent_id, type: :integer
+  attribute :deleted,   type: :boolean
+  attribute :children,  type: :array
+end

data/lib/imgur/models/images.rb

@@ -9,4 +9,19 @@ class Imgur::Client::Images < Cistern::Collection
 
   collection_root "data"
   collection_request :get_images
+
+  def all(options={})
+    path = ""
+    path = path + "/#{options[:resource] || "gallery"}"
+    if options[:section]
+      path = path + "/#{options[:section]}"
+    elsif options[:subreddit]
+      path = path + "/r/#{options[:subreddit]}"
+    end
+    path = path + "/#{options[:sort]}" if options[:sort]
+    path = path + "/#{options[:page] || 0}.json"
+
+    data = connection.get_images(path: path).body["data"]
+    connection.images.load(data)
+  end
 end

data/lib/imgur/requests/get_album.rb

@@ -0,0 +1,12 @@
+class Imgur::Client
+  class Real
+    def get_album(id)
+      path = "/album/#{id}"
+
+      request(
+        :method => :get,
+        :path   => path,
+      )
+    end
+  end
+end

data/lib/imgur/requests/get_albums.rb

@@ -0,0 +1,6 @@
+class Imgur::Client
+  class Real
+    def get_albums(params={})
+    end
+  end
+end

data/lib/imgur/requests/get_image.rb

@@ -0,0 +1,12 @@
+class Imgur::Client
+  class Real
+    def get_image(id)
+      path = "/#{id}"
+
+      request(
+        :method => :get,
+        :path   => path,
+      )
+    end
+  end
+end

data/lib/imgur/requests/get_images.rb

@@ -1,16 +1,7 @@
 class Imgur::Client
   class Real
     def get_images(params={})
-      path = ""
-      path = path + "/#{params[:resource] || "gallery"}"
-      if params[:section]
-        path = path + "/#{params[:section]}"
-      elsif params[:subreddit]
-        path = path + "/r/#{params[:subreddit]}"
-      end
-      path = path + "/#{params[:sort]}" if params[:sort]
-      path = path + "/#{params[:page] || 0}.json"
-
+      path = params[:path]
       request(
         :method => :get,
         :path   => path,

data/lib/imgur/version.rb

@@ -1,3 +1,3 @@
 module Imgur
-  VERSION = "0.01"
+  VERSION = "0.02"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-imgur
 version: !ruby/object:Gem::Version
-  version: '0.01'
+  version: '0.02'
   prerelease: 
 platform: ruby
 authors:
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: excon
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -127,9 +111,16 @@ files:
 - lib/imgur/collection.rb
 - lib/imgur/logger.rb
 - lib/imgur/model.rb
+- lib/imgur/models/account.rb
+- lib/imgur/models/album.rb
+- lib/imgur/models/albums.rb
+- lib/imgur/models/comment.rb
 - lib/imgur/models/image.rb
 - lib/imgur/models/images.rb
 - lib/imgur/paged_collection.rb
+- lib/imgur/requests/get_album.rb
+- lib/imgur/requests/get_albums.rb
+- lib/imgur/requests/get_image.rb
 - lib/imgur/requests/get_images.rb
 - lib/imgur/response.rb
 - lib/imgur/version.rb