gyazo 2.1.2 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 73172604e611a854e2191a013b9e4e3367a72ec7
-  data.tar.gz: 055ea0cca4ad119bd3c65163c39179f5f200ef93
+SHA256:
+  metadata.gz: 26d22e358a2f7ad15e819b689f39ceb3399a2b1b1071b61dff3975943cc5b94b
+  data.tar.gz: 4f43bafa5994680a5ce030e48d041d2b8bbaa1abd8e15ca3fc2c21f680173d9a
 SHA512:
-  metadata.gz: a6d592e7a2155d0421a5e1279a4caa85f1764b456702ef8f8d943f4d46de0e45e1aa5708951a26df747cfe97f1912222ec91675078d01c7c83b86a72bddd1675
-  data.tar.gz: c7cdc51eca52d3ec370cc8cca78b8c6c8e59c1228a3ea5d07281ffa573e4ddc8562a78b896195c0a6ff8b6182efdfbba5440c00144c942ec9d8e1c439e5b411b
+  metadata.gz: 9b461bc154522c72909a14addfc49ac5ab9c6accb5c8d0836a55141895eae3985ebb97cdf5c0e2762555e326335b0b6d4832c52f3e83cf2821675b40515e540a
+  data.tar.gz: d93f554481d7744d054d452fab529c2d5d7bfe0977d5cfc89b65ffb913ffba849272c63dae58ca182b14e273cd716885fe635c4734b61bf12a3b0ab513cbd372

data/.travis.yml

@@ -1,5 +1,8 @@
+sudo: false
 language: ruby
 rvm:
-- 2.1.2
+- 2.2.3
 env:
   secure: SKTPKUXfgOehDNdgdMxKykef1m7XswYKA72qANyqHQ3/P/9c7RcRfTSVD86wj4riT8BX5YTbNhKKQFa79HozioezF7tT5A6xF5qiJOt1sjjtMfhc0d3zqN3RVJNRpx+1+hgNpv9OQ6RrTdw3At1TjzvgdMAiJI4X8lqZ904Gu60=
+install: bundle install
+script: bundle exec rake test

data/README.md

@@ -2,59 +2,69 @@ Gyazo
 =====
 [Gyazo API](https://gyazo.com/api/docs) wrapper for Ruby
 
-[![Build Status](https://travis-ci.org/masui/gyazo-ruby.svg?branch=master)](https://travis-ci.org/masui/gyazo-ruby)
-
-- http://github.com/masui/gyazo-ruby
+- http://github.com/gyazo/gyazo-ruby
 - https://rubygems.org/gems/gyazo
 
 
 # Install
 
-
     % gem install gyazo
 
-
 # Usage
 
 Register new application and get [ACCESS TOKEN](https://gyazo.com/oauth/applications), then
 
-### Upload
+## Upload
 
 ```ruby
 require 'gyazo'
-
-gyazo = Gyazo::Client.new 'your-access-token'
-res = gyazo.upload 'my_image.png'
-puts res['permalink_url']  # => "http://gyazo.com/a1b2cdef345"
+gyazo = Gyazo::Client.new access_token: 'your-access-token'
+res = gyazo.upload imagefile: 'my_image.png'
+puts res #=> {:type=>"png", :thumb_url=>"https://thumb.gyazo.com/thumb/...", :created_at=>"2019-05-03T11:57:35+0000", :image_id=>"...", :permalink_url=>"https://gyazo.com/...", :url=>"https://i.gyazo.com/....png"}
 ```
-#### Upload with metadata
+
+### passing filename
+if you give io for `imagefile:`, you need `filename:`.
 
 ```ruby
-require 'gyazo'
+gyazo.upload imagefile: File.open(image), filename: 'image.png'
+```
 
-gyazo = Gyazo::Client.new 'your-access-token'
-res = gyazo.upload 'my_image.png',
-  { :time => Time.now, :url => 'http://example.com/' }
-puts res['permalink_url']
+### Upload with metadata
+Following attributes can be set
+
+* created_at(default: `Time.now`)
+* referer_url(default: '')
+* title(default: '')
+* desc(default: '')
+* collection_id(default: '')
+
+```ruby
+res = gyazo.upload imagefile: 'my_image.png', created_at: Time.now, referer_url: 'https://example.com/'
 ```
 
-### List
+## List
 
 ```ruby
-gyazo.list.each do |image|
-  puts image['url']
+gyazo.list[:images].each do |image|
+  puts image[:url]
 end
 ```
 
-### Delete
+## image detail
+
+```ruby
+gyazo.image image_id: image_id
+```
+
+## Delete
 
 ```ruby
-gyazo.delete image_id
+gyazo.delete image_id: image_id
 ```
 
 
-Test
-----
+# Test
 
 setup
 

data/gyazo.gemspec

@@ -6,11 +6,11 @@ require 'gyazo/version'
 Gem::Specification.new do |spec|
   spec.name          = "gyazo"
   spec.version       = Gyazo::VERSION
-  spec.authors       = ["Toshiyuki Masui", "Sho Hashimoto"]
+  spec.authors       = ["Toshiyuki Masui", "Sho Hashimoto", "Nana Kugayama"]
   spec.email         = ["masui@pitecan.com"]
   spec.description   = %q{Gyazo.com API Wrapper}
   spec.summary       = spec.description
-  spec.homepage      = "http://github.com/masui/gyazo-ruby"
+  spec.homepage      = "http://github.com/gyazo/gyazo-ruby"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/).reject{|i| i=="Gemfile.lock" }
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
 
-  spec.add_dependency "json"
-  spec.add_dependency "httparty"
-  spec.add_dependency "httmultiparty"
+  spec.add_dependency "faraday", '< 2.0.0'
+  spec.add_dependency "multipart-post"
+  spec.add_dependency "mime-types"
 end

data/lib/gyazo/client.rb

@@ -1,57 +1,98 @@
 # coding: utf-8
-module Gyazo
+require 'json'
+require 'faraday'
+require 'mime/types'
 
+module Gyazo
   class Client
+    UploadURI = 'https://upload.gyazo.com/api/upload'
+    APIHost = 'https://api.gyazo.com'
+    attr_accessor :access_token, :user_agent
 
-    attr_accessor :id, :user_id, :user_agent, :host
-
-    def initialize(access_token = nil)
+    def initialize(access_token:, user_agent: nil)
       @access_token = access_token
-      @user_agent = "GyazoRubyGem/#{Gyazo::VERSION}"
+      @user_agent = user_agent || "GyazoRubyGem/#{Gyazo::VERSION}"
+      @conn = ::Faraday.new(url: APIHost) do |f|
+        f.request :url_encoded
+        f.adapter ::Faraday.default_adapter
+      end
     end
-    
-    def upload(imagefile,params={})
-      url = "https://upload.gyazo.com/api/upload"
-      time = params[:time] || params[:created_at] || Time.now
-      res = HTTMultiParty.post url, {
-        :query => {
-          :access_token => @access_token,
-          :imagedata => File.open(imagefile),
-          :created_at => time.to_i,
-          :referer_url => params[:referer_url] || params[:url] || '',
-          :title =>  params[:title] || '',
-          :desc =>  params[:desc] || ''
-        },
-        :header => {
-          'User-Agent' => @user_agent
+
+    def upload(imagefile:, filename: nil, created_at: ::Time.now, referer_url: '', title: '', desc: '', collection_id: '')
+      ensure_io_or_file_exists imagefile, filename
+
+      conn = ::Faraday.new do |f|
+        f.request :multipart
+        f.request :url_encoded
+        f.adapter ::Faraday.default_adapter
+      end
+      type = ::MIME::Types.type_for(filename || imagefile)[0].to_s
+      res = conn.post UploadURI do |req|
+        req.body = {
+          access_token: @access_token,
+          imagedata: ::Faraday::UploadIO.new(imagefile, type, filename),
+          created_at: created_at.to_i,
+          referer_url: referer_url.to_s,
+          title: title.to_s,
+          desc: desc.to_s,
+          collection_id: collection_id.to_s,
         }
-      }
-      raise Gyazo::Error, res.body unless res.code == 200
-      return JSON.parse res.body
+        req.headers['User-Agent'] = @user_agent
+      end
+      raise Gyazo::Error, res.body unless res.status == 200
+      return ::JSON.parse res.body, symbolize_names: true
     end
 
-    def list(query = {})
-      url = "https://api.gyazo.com/api/images"
-      query[:access_token] = @access_token
-      res = HTTParty.get url, {
-        :query => query,
-        :header => {
-          'User-Agent' => @user_agent
-        }
+    def list(page: 1, per_page: 20)
+      path = '/api/images'
+      res = @conn.get path do |req|
+        req.params[:access_token] = @access_token
+        req.params[:page] = page
+        req.params[:per_page] = per_page
+        req.headers['User-Agent'] = @user_agent
+      end
+      raise Gyazo::Error, res.body unless res.status == 200
+      json = ::JSON.parse res.body, symbolize_names: true
+      {
+        total_count: res.headers['X-Total-Count'],
+        current_page: res.headers['X-Current-Page'],
+        per_page: res.headers['X-Per-Page'],
+        user_type: res.headers['X-User-Type'],
+        images: json
       }
-      raise Gyazo::Error, res.body unless res.code == 200
-      return JSON.parse res.body
     end
 
-    def delete(image_id)
-      url = "https://api.gyazo.com/api/images/#{image_id}"
-      res = HTTParty.delete url, {
-        :query => {
-          :access_token => @access_token
-        }
-      }
-      raise Gyazo::Error, res.body unless res.code == 200
-      return JSON.parse res.body
+    def image(image_id:)
+      path = "/api/images/#{image_id}"
+      res = @conn.get path do |req|
+        req.params[:access_token] = @access_token
+        req.headers['User-Agent'] = @user_agent
+      end
+      raise Gyazo::Error, res.body unless res.status == 200
+      return ::JSON.parse res.body, symbolize_names: true
+    end
+
+    def delete(image_id:)
+      path = "/api/images/#{image_id}"
+      res = @conn.delete path do |req|
+        req.params[:access_token] = @access_token
+        req.headers['User-Agent'] = @user_agent
+      end
+      raise Gyazo::Error, res.body unless res.status == 200
+      return ::JSON.parse res.body, symbolize_names: true
+    end
+
+    private
+
+    def ensure_io_or_file_exists(file, name)
+      if file.respond_to?(:read) && file.respond_to?(:rewind)
+        if name.nil?
+          raise ArgumentError, "need filename: when file is io"
+        end
+        return
+      end
+      return if ::File.file? file
+      raise ArgumentError, "cannot find file #{file}"
     end
   end
 end

data/lib/gyazo/version.rb

@@ -1,3 +1,3 @@
 module Gyazo
-  VERSION = '2.1.2'
+  VERSION = '3.1.1'
 end

data/lib/gyazo.rb

@@ -1,8 +1,3 @@
 require 'gyazo/version'
 require 'gyazo/error'
 require 'gyazo/client'
-
-require 'httparty'
-require 'httmultiparty'
-require 'json'
-require 'kconv'

data/test/test_gyazo.rb

@@ -1,30 +1,43 @@
 require File.expand_path 'test_helper', File.dirname(__FILE__)
 
 class TestGyazo < MiniTest::Test
+  GYAZO_REGEXP = %r{^https://gyazo\.com/[a-z\d]{32}$}
 
   def setup
-    @gyazo = Gyazo::Client.new ENV['GYAZO_TOKEN']
+    @gyazo = Gyazo::Client.new access_token: ENV['GYAZO_TOKEN']
     @imagefile = File.expand_path 'test.png', File.dirname(__FILE__)
   end
 
   def test_upload_filepath
-    res = @gyazo.upload @imagefile
-    assert res['permalink_url'].match /^https?:\/\/gyazo.com\/[a-z\d]{32}$/i
+    res = @gyazo.upload imagefile: @imagefile
+    assert res[:permalink_url].match GYAZO_REGEXP
   end
 
   def test_upload_file
-    res = @gyazo.upload File.open(@imagefile)
-    assert res['permalink_url'].match /^https?:\/\/gyazo.com\/[a-z\d]{32}$/i
+    res = @gyazo.upload imagefile: File.open(@imagefile), filename: 'test.png'
+    assert res[:permalink_url].match GYAZO_REGEXP
+  end
+
+  def test_upload_with_collection_id
+    res = @gyazo.upload imagefile: @imagefile, collection_id: ENV['GYAZO_COLLECTION_ID']
+    assert res[:permalink_url].match GYAZO_REGEXP
   end
 
   def test_list
-    assert_equal @gyazo.list.class, Array
+    list = @gyazo.list
+    assert_instance_of Hash, list
+    assert_instance_of Array, list[:images]
   end
 
   def test_delete
-    res_up = @gyazo.upload @imagefile
-    res_del = @gyazo.delete res_up['image_id']
-    assert_equal res_del['image_id'], res_up['image_id']
+    res_up = @gyazo.upload imagefile: @imagefile
+    res_del = @gyazo.delete image_id: res_up[:image_id]
+    assert_equal res_del[:image_id], res_up[:image_id]
   end
 
+  def test_image
+    res_up = @gyazo.upload imagefile: @imagefile
+    res = @gyazo.image image_id: res_up[:image_id]
+    assert_equal res[:image_id], res_up[:image_id]
+  end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: gyazo
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.1.1
 platform: ruby
 authors:
 - Toshiyuki Masui
 - Sho Hashimoto
-autorequire: 
+- Nana Kugayama
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,21 +55,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +83,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httmultiparty
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -119,11 +120,11 @@ files:
 - test/test.png
 - test/test_gyazo.rb
 - test/test_helper.rb
-homepage: http://github.com/masui/gyazo-ruby
+homepage: http://github.com/gyazo/gyazo-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,9 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Gyazo.com API Wrapper
 test_files: