ruby_imgur 0.2.0 → 1.0.0

data/lib/imgur-old.rb

@@ -0,0 +1,85 @@
+require 'open-uri'
+require 'net/http'
+require 'json'
+require 'base64'
+
+class Imgur
+  
+  IMAGE_SIZES = { :small => :s, :large => :l }
+  
+  # add an API key to use for uploads
+  def self.api_key=( api_key )
+    @@api_key = api_key.to_s.chomp
+  end
+  
+  def self.upload( options = {} )
+    data = options[:data] ||
+      options[:url] ||
+      Base64.encode64 open(options[:filename]).read
+    post_data = { :key => api_key, :image => data }
+    post_url = generate_url :method => :upload
+    post_uri = URI.parse post_url
+    response = JSON (Net::HTTP.post_form post_uri, post_data).body
+    { :hash => response["upload"]["image"]["hash"],
+      :delete_hash => response["upload"]["image"]["deletehash"],
+      :filetype => response["upload"]["image"]["type"].gsub("image\/","") }
+  end
+  
+  def self.copy( url )
+    upload :url => url
+  end
+  
+  def self.upload_file( filename )
+    upload :filename => filename
+  end
+  
+  def self.get( hash, options = {} )
+    open url_for hash, options
+  end
+  
+  def self.stats
+    json_get :method => :stats
+  end
+  
+  def self.delete( delete_hash )
+    json_get( :hash => delete_hash, :method => :delete )["delete"]["message"] == "Success"
+  end
+  
+  def self.album( hash, options = {} )
+    json_get :hash => hash, :method => :album
+  end
+  
+  def self.url_for( hash, options = {} )
+    size = IMAGE_SIZES[options[:size]]
+    filetype = options[:filetype] || :png
+    if filetype == :detect
+      filetype = json_get( :hash => hash, :method => :image )["image"]["image"]["type"].gsub "image\/", ""
+    end
+    "http://i.imgur.com/#{hash}#{size}.#{filetype}"
+  end
+  
+  class << self
+    alias_method :[], :url_for
+  end
+  
+  private
+  
+  def self.api_key
+    @@api_key
+  end
+  
+  def self.json_get( options = {} )
+    JSON open(generate_url options).read
+  end
+  
+  def self.generate_url( options = {} )
+    hash = options[:hash]
+    method = options[:method]
+    url = "http://api.imgur.com/2/"
+    url += method.to_s
+    url += "/" + hash.to_s if hash
+    url += ".json"
+    url
+  end
+  
+end

data/lib/imgur.rb

@@ -1,26 +1,32 @@
-require 'open-uri'
-require 'net/http'
+require 'httpclient'
 require 'json'
 require 'base64'
 
 class Imgur
   
-  # add an API key to use for uploads
-  def self.api_key=( api_key )
-    @@api_key = api_key.to_s.chomp
+  ImgurException = Class.new Exception
+  
+  IMAGE_SIZES = { :small => :s, :medium => :m, :large => :l }
+  
+  def self.client_id=( client_id )
+    @@client_id = client_id
   end
   
   def self.upload( options = {} )
     data = options[:data] ||
       options[:url] ||
       Base64.encode64(open(options[:filename]).read)
-    post_data = { :key => @@api_key, :image => data }
+    post_data = { :image => data }
     post_url = generate_url :method => :upload
-    post_uri = URI.parse post_url
-    response = JSON (Net::HTTP.post_form post_uri, post_data).body
-    { :hash => response["upload"]["image"]["hash"],
-      :delete_hash => response["upload"]["image"]["deletehash"],
-      :filetype => response["upload"]["image"]["type"].gsub("image\/","") }
+    response = JSON http.post(post_url, post_data, header).body
+    raise ImgurException.new response["data"]["error"] if response["data"]["error"]
+    { :hash => response["data"]["id"],
+      :delete_hash => response["data"]["deletehash"],
+      :filetype => response["data"]["link"].match(/\.(\w*)\Z/)[1] }
+  end
+  
+  def self.copy( url )
+    upload :url => url
   end
   
   def self.upload_file( filename )
@@ -28,59 +34,48 @@ class Imgur
   end
   
   def self.get( hash, options = {} )
-    open url_for hash, options
-  end
-  
-  def self.stats
-    json_get :method => :stats
+    http.get_content url_for hash, options
   end
   
   def self.delete( delete_hash )
-    json_get( :hash => delete_hash, :method => :delete )["delete"]["message"] == "Success"
-  end
-  
-  def self.album( hash, options = {} )
-    json_get :hash => hash, :method => :album
+    url = generate_url :hash => delete_hash, :method => :image 
+    response = JSON http.delete( url, {}, header ).body
+    response["success"] == true
   end
   
   def self.url_for( hash, options = {} )
-    sizes = {
-      :small => :s,
-      :large => :l }
-    if options[:filetype] == :detect
-      # fix this it's ugly
-      options[:filetype] = json_get( :hash => hash, :method => :image )["image"]["image"]["type"].gsub("image\/","")
+    size = IMAGE_SIZES[options[:size].to_sym] if options[:size]
+    filetype = options[:filetype] || :png
+    if filetype == :detect
+      filetype = json_get( :hash => hash, :method => :image )["data"]["link"].match(/\.(\w*)\Z/)[1]
     end
-    "http://i.imgur.com/#{hash}#{sizes[options[:size]]}.#{options[:filetype] || :png}"
-  end
-  
-  def self.debug=( debug_setting )
-    @debug = debug_setting
-  end
-  
-  class << self
-    alias_method :[], :url_for
+    "http://i.imgur.com/#{hash}#{size}.#{filetype}"
   end
   
   private
   
-  def debug( thing_to_debug, message = "" )
-    puts message + thing_to_debug.to_s
-    thing_to_debug
+  def self.header
+    { "Authorization" => "Client-ID #{@@client_id}" }
   end
   
   def self.json_get( options = {} )
-    JSON open(generate_url options).read
+    response = JSON http.get_content generate_url(options), {}, header
+    raise ImgurException.new response["data"]["error"] if response["data"]["error"]
   end
   
   def self.generate_url( options = {} )
     hash = options[:hash]
     method = options[:method]
-    url = "http://api.imgur.com/2/"
+    url = "https://api.imgur.com/3/"
     url += method.to_s
     url += "/" + hash.to_s if hash
     url += ".json"
-    url
+  end
+  
+  def self.http
+    @@http ||= HTTPClient.new
+    @@http.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    @@http
   end
   
 end

data/lib/imgur_rails.rb

@@ -23,13 +23,13 @@ module ImgurRails
   module InstanceMethods
   
     def url
-      filetype = ( self.respond_to? :filetype ? self.filetype : :any )
-      Imgur.url_for self.image_hash, :filetype => filetype
+      type = ( self.respond_to? :filetype ) ? self.filetype : :detect
+      Imgur.url_for self.image_hash, :filetype => type
     end
     
     def thumbnail( size = :small )
-      filetype = ( self.respond_to? :filetype ? self.filetype : :any )
-      Imgur.url_for self.image_hash, :filetype => filetype, :size => size
+      type = { :small => :jpeg, :medium => :jpg }[size]
+      Imgur.url_for self.image_hash, :filetype => type, :size => size
     end
   
     def is_image?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_imgur
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-03 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: fraser.m.murray@gmail.com
@@ -20,6 +20,7 @@ files:
 - lib/imgur_rails.rb
 - lib/test
 - lib/imgur.rb
+- lib/imgur-old.rb
 homepage: ''
 licenses: []
 post_install_message: