ruby-imgur 0.03 → 0.04

data/lib/imgur/client.rb

@@ -20,6 +20,11 @@ class Imgur::Client < Cistern::Service
   request :get_accounts
   request :get_account
 
+  model :comment
+  collection :comments
+  request :get_comments
+  request :get_comment
+
   model :basic_response
   collection :basic_responses
 
@@ -110,8 +115,94 @@ class Imgur::Client < Cistern::Service
   end
 
   class Mock
+    def self.random_id
+      characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+      selection  = ''
+      7.times do
+        position = rand(characters.length)
+        selection << characters[position..position]
+      end
+      selection
+    end
+
+    def self.random_number
+      characters = '1234567890'
+      selection  = ''
+      7.times do
+        position = rand(characters.length)
+        selection << characters[position..position]
+      end
+      selection.to_i
+    end
+
     def self.data
-      @data ||= {}
+      @data ||= begin
+                  image_id     = random_id
+                  account_id   = random_number
+                  account_name = random_id
+                  album_id     = random_id
+                  comment_id   = random_id
+
+                  account = {
+                    "id"         => account_id,
+                    "url"        => "#{account_name}.imgur.com",
+                    "bio"        => nil,
+                    "reputation" => 435.5,
+                    "created"    => 1349051610,
+                  }
+
+                  image = {
+                    "id"         => image_id,
+                    "title"      => "test image",
+                    "datetime"   => 1349051625,
+                    "type"       => "image/jpeg",
+                    "animated"   => false,
+                    "width"      => 2490,
+                    "height"     => 3025,
+                    "size"       => 618969,
+                    "views"      => 625622,
+                    "bandwidth"  => 387240623718,
+                    "ups"        => 1889,
+                    "downs"      => 58,
+                    "score"      => 18935622,
+                    "account_id" => account_id,
+                  }
+
+                  album = {
+                    "id"          => album_id,
+                    "title"       => "test album",
+                    "description" => nil,
+                    "privacy"     => "public",
+                    "cover"       => image_id,
+                    "order"       => 0,
+                    "layout"      => "blog",
+                    "datetime"    => 1347058832,
+                    "link"        => "https://imgur.com/a/#{album_id}",
+                    "account_id"  => account_id,
+                  }
+
+                  comment = {
+                    "id"        => comment_id,
+                    "image_id"  => image_id,
+                    "author"    => account_name,
+                    "author_id" => account_id,
+                    "on_album"  => false,
+                    "ups"       => 10,
+                    "downs"     => 2,
+                    "points"    => 23.4,
+                    "datetime"  => 1349051670,
+                    "parent_id" => 2,
+                    "deleted"   => false,
+                    "children"  => [],
+                  }
+
+                  {
+                    :images   => {image_id   => image},
+                    :accounts => {account_id => account},
+                    :albums   => {album_id   => album},
+                    :comments => {comment_id => comment},
+                  }
+                end
     end
 
     def self.reset!
@@ -122,40 +213,16 @@ class Imgur::Client < Cistern::Service
       self.class.data
     end
 
-    def initalize(options={})
-      @url = options[:url] || "https://api.imgur.com"
+    def random_id
+      self.class.random_id
     end
 
-    def page(params, collection, object_rool, options={})
-      if params["url"]
-        uri = URI.parse(params["url"])
-        params = uri.query.split("&").inject({}) { |r,e| k,v = e.qplit("="); r.merge(k => v) }
-      end
-
-      resources   = options[:resources] || self.data[collection]
-      page_size   = (params["per_page"] || 20).to_i
-      page_index  = (params["page"] || 1).to_i
-      total_pages = (resources.size.to_f / page_size.to_f).round
-      offset      = (page_index - 1) * page_size
-      links       = []
-
-      resource_page = resources.values.reverse.slice(offset, page_size)
-
-      if page_index < total_pages
-        links << url_for_page(collection, page_index - 1, page_size, 'next')
-      end
-
-      if page_index - 1 > 0
-        links << url_for_page(collection, page_index - 1, page_size, 'prev')
-      end
-
-      links << url_for_page(collection, total_pages, page_size, 'last')
-
-      [links.join(", "), resource_page]
+    def credits
+      "980/1000"
     end
 
-    def url_for_page(collection, page_index, page_size, rel)
-      "<#{File.join(@url, collection.to_s)}?page=#{page_index}&per_page=#{page_size}>; rel=\"#{rel}\""
+    def initialize(options={})
+      @url = options[:url] || "https://api.imgur.com"
     end
 
     def response(options={})
@@ -167,13 +234,5 @@ class Imgur::Client < Cistern::Service
 
       Imgur::Response.new(status, headers, body).raise!
     end
-
-    def url_for(path)
-      File.join(@url, path)
-    end
-
-    def stringify_keys(hash)
-      hash.inject({}) { |r,(k,v)| r.merge(k.to_s => v) }
-    end
   end
 end

data/lib/imgur/models/image.rb

@@ -26,4 +26,10 @@ class Imgur::Client::Image < Imgur::Model
     data = connection.delete_image(deletehash).body
     connection.basic_responses.new(data)
   end
+
+  def comments
+    type = is_album ? "album" : "image"
+    data = connection.get_comments(type: type, id: id).body["data"]
+    connection.comments.load(data)
+  end
 end

data/lib/imgur/requests/delete_image.rb

@@ -9,4 +9,22 @@ class Imgur::Client
       )
     end
   end
+
+  class Mock
+    def delete_image(deletehash)
+      image = self.data[:images].values.detect { |i| i["deletehash"] == deletehash }
+
+      self.data[:images].delete_if do |id, image|
+        image["deletehash"] == deletehash
+      end
+
+      basic_response = {
+        "data"    => true,
+        "status"  => 200,
+        "success" => true,
+      }
+
+      response(body: basic_response)
+    end
+  end
 end

data/lib/imgur/requests/get_accounts.rb

@@ -8,4 +8,11 @@ class Imgur::Client
       )
     end
   end
+
+  class Mock
+    def get_accounts(params={})
+      accounts = self.data[:accounts].values.first
+      response(body: {"data" => accounts})
+    end
+  end
 end

data/lib/imgur/requests/get_albums.rb

@@ -8,4 +8,17 @@ class Imgur::Client
       )
     end
   end
+
+  class Mock
+    def get_albums(params={})
+      albums = self.data[:albums].values
+      albums = if params[:path] =~ /^\/account/
+                 {"data" => albums.select { |a| !a["account_id"].nil? } }
+               else
+                 {"data" => albums}
+               end
+
+      response(body: albums)
+    end
+  end
 end

data/lib/imgur/requests/get_image.rb

@@ -9,4 +9,12 @@ class Imgur::Client
       )
     end
   end
+
+  class Mock
+    def get_image(id)
+      image = self.data[:images][id["id"]]
+
+      response(:body => {"data" => image})
+    end
+  end
 end

data/lib/imgur/requests/get_images.rb

@@ -8,4 +8,17 @@ class Imgur::Client
       )
     end
   end
+
+  class Mock
+    def get_images(params={})
+      images = self.data[:images].values
+      images = if params[:path] =~ /^\/account/
+                 {"data" => images.select { |i| !i["account_id"].nil? } }
+               else
+                 {"data" => images}
+               end
+
+      response(body: images)
+    end
+  end
 end

data/lib/imgur/requests/upload_image.rb

@@ -1,6 +1,6 @@
 class Imgur::Client
   class Real
-    def upload_image(options)
+    def upload_image(options={})
       path = "/upload"
 
       request(
@@ -10,4 +10,33 @@ class Imgur::Client
       )
     end
   end
+
+  class Mock
+    def upload_image(options={})
+      images     = self.data[:images]
+      image_id   = self.random_id
+      account_id = self.data[:accounts].values.first["id"]
+
+      image = {
+        "id"         => image_id,
+        "title"      => options[:title],
+        "datetime"   => 1349051625,
+        "type"       => "image/jpeg",
+        "animated"   => false,
+        "width"      => 2490,
+        "height"     => 3025,
+        "size"       => 618969,
+        "views"      => 625622,
+        "bandwidth"  => 387240623718,
+        "ups"        => 1889,
+        "downs"      => 58,
+        "score"      => 18935622,
+        "deletehash" => self.random_id,
+      }
+
+      images[image_id] = image
+
+      response(:body => {"data" => image})
+    end
+  end
 end

data/lib/imgur/version.rb

@@ -1,3 +1,3 @@
 module Imgur
-  VERSION = "0.03"
+  VERSION = "0.04"
 end

data/spec/images_spec.rb

@@ -9,10 +9,19 @@ describe "images" do
     images.first.should be_a_kind_of(Imgur::Client::Image)
   end
 
+  it "should have comments" do
+    image = client.images.all.first
+    image.comments.should_not be_empty
+    image.comments.first.should be_a_kind_of(Imgur::Client::Comment)
+  end
+
   it "should upload an image from filesystem" do
     image = File.expand_path("spec/support/ruby_logo.jpg")
-    response = client.images.upload(image: image, title: "ruby_logo_jpg")
+    title = "ruby_logo_jpg"
+    response = client.images.upload(image: image, title: title)
     response.should be_a_kind_of(Imgur::Client::Image)
+    image = client.images.get(response.id)
+    image.title.should == title
 
     response = response.delete
     response.should be_a_kind_of(Imgur::Client::BasicResponse)
@@ -20,8 +29,11 @@ describe "images" do
 
   it "should upload an image from the internet" do
     image = "http://www.ruby-lang.org/images/logo.gif"
-    response = client.images.upload(image: image, title: "ruby_logo_gif")
+    title = "ruby_logo_gif"
+    response = client.images.upload(image: image, title: title)
     response.should be_a_kind_of(Imgur::Client::Image)
+    image = client.images.get(response.id)
+    image.title.should == title
 
     response = response.delete
     response.should be_a_kind_of(Imgur::Client::BasicResponse)

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+ENV["IMGUR_MOCK"] ||= 'false'
+
 Bundler.require(:test)
 Bundler.require(:darwin) if RUBY_PLATFORM.match(/darwin/)
 require File.expand_path("../../lib/imgur", __FILE__)
@@ -5,6 +7,11 @@ Dir[File.expand_path("../{shared,support}/*.rb", __FILE__)].each{|f| require(f)}
 
 Cistern.formatter = Cistern::Formatter::AwesomePrint
 
+if ENV["IMGUR_MOCK"] == 'true'
+  Cistern.timeout = 0
+  Imgur::Client.mock!
+end
+
 RSpec.configure do |config|
   config.before(:all) do
     Imgur::Client.reset! if Imgur::Client.mocking?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-imgur
 version: !ruby/object:Gem::Version
-  version: '0.03'
+  version: '0.04'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json