gyazo 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: ad0060be9db7f626014c7d30193e256b9c714ee9
-  data.tar.gz: d29d9ae532e354117389fce9dbe728ff8851caf9
-SHA512: 
-  metadata.gz: d9190285cc2003325353014fac914d99657492f3e715062355f4a9a7b62dc462f28d90000dfc261a5fd143a91aac55b97eb9b939415276cd3c6cbc1193ebee27
-  data.tar.gz: b7277aea5c3f1c3b0f853ad538589ff757554a1d6d7db926ee15e719751c8233048b4657362bb3cb5af6b660c4c0cbe3cdde3f86945670e0989f2098c7ee97d1
+---
+SHA1:
+  metadata.gz: e65dd6e3ffb8646a0c6581c36a9f98a8da2633bc
+  data.tar.gz: 15812ea2cd6b802a72f872c7d80523fe9d1debab
+SHA512:
+  metadata.gz: ae89aeaf000a410af3db162e4f457c182aaa1788bd1547ee106765c8222c439261e15697b85c798455d8acb3d992975d6d1263bef3599f1afce0f9dd2af0864a
+  data.tar.gz: fe2488f428a5cacb59547d56752bfbb75b66308a7c53ab049c12c4f41e4dde91b58bebf2508fb05b20a5db664cccd8a46b6737bfb1a010f93ef9a544909cf46e

data/.gitignore

@@ -3,3 +3,4 @@
 .DS_Store
 pkg
 tmp
+.ruby-version

data/README.md

@@ -1,6 +1,6 @@
 Gyazo
 =====
-Upload an image to http://gyazo.com
+[Gyazo API](https://gyazo.com/api/docs) wrapper for Ruby
 
 - http://github.com/masui/gyazo-ruby
 - https://rubygems.org/gems/gyazo
@@ -15,36 +15,44 @@ Installation
 Usage
 -----
 
+Register new application and get [ACCESS TOKEN](https://gyazo.com/oauth/applications), then
+
 ### Upload
 
 ```ruby
 require 'gyazo'
 
-g = Gyazo::Client.new
-g.upload 'my_image.png'  #=> "http://gyazo.com/a1b2cdef345"
+gyazo = Gyazo::Client.new 'your-access-token'
+res = gyazo.upload 'my_image.png'
+puts res['permalink_url']  # => "http://gyazo.com/a1b2cdef345"
 ```
 
 ### List
 
 ```ruby
-g.list.each do |image|
-   image['image_id']
+gyazo.list.each do |image|
+  image['image_id']
 end
 ```
 
+### Delete
 
-### Upload to http://your-private-gyazo.com
 ```ruby
-g = Gyazo::Client.new
-g.host = 'http://your-private-gyazo.com'
-g.upload 'my_image.png'
+gyazo.delete image_id
 ```
 
+
 Test
 ----
 
+setup
+
     % gem install bundler
     % bundle install
+    % export GYAZO_TOKEN=a1b2cdef3456   ## set your API Token
+
+run test
+
     % bundle exec rake test
 
 

data/gyazo.gemspec

@@ -6,9 +6,9 @@ require 'gyazo/version'
 Gem::Specification.new do |spec|
   spec.name          = "gyazo"
   spec.version       = Gyazo::VERSION
-  spec.authors       = ["Toshiyuki Masui"]
+  spec.authors       = ["Toshiyuki Masui", "Sho Hashimoto"]
   spec.email         = ["masui@pitecan.com"]
-  spec.description   = %q{Upload an image to Gyazo.com}
+  spec.description   = %q{Gyazo.com API Wrapper}
   spec.summary       = spec.description
   spec.homepage      = "http://github.com/masui/gyazo-ruby"
   spec.license       = "MIT"
@@ -18,12 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   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 "launchy"
 end

data/lib/gyazo.rb

@@ -2,6 +2,7 @@ require 'gyazo/version'
 require 'gyazo/error'
 require 'gyazo/client'
 
+require 'erb'  # for httparty bug
 require 'httparty'
 require 'httmultiparty'
 require 'json'

data/lib/gyazo/client.rb

@@ -4,78 +4,48 @@ module Gyazo
 
     attr_accessor :id, :user_id, :user_agent, :host
 
-    def initialize(user_id=nil)
-      @user_id = user_id
-      @user = ENV['USER']
-      @idfile = "#{ENV['HOME']}/Library/Gyazo/id"
-      @id = nil
-      @id = File.read(@idfile).strip if File.exist? @idfile
+    def initialize(access_token = null)
+      @access_token = access_token
       @user_agent = "GyazoRubyGem/#{Gyazo::VERSION}"
-      @host = 'http://gyazo.com'
     end
 
-    def info(image_id)
-      res = HTTParty.get "#{@host}/api/image/get", {
+    def upload(imagefile)
+      url = "https://upload.gyazo.com/api/upload"
+      res = HTTMultiParty.post url, {
         :query => {
-          :image_id => image_id
+          :access_token => @access_token,
+          :imagedata => File.open(imagefile)
         },
         :header => {
           'User-Agent' => @user_agent
         }
       }
-
-      raise Gyazz::Error, res.body unless res.code == 200
-      JSON.parse(res.body)
+      raise Gyazo::Error, res.body unless res.code == 200
+      return JSON.parse res.body
     end
 
-    def list(page=1, count=100)
-      url = "#{@host}/api/image/list"
-      query = {:page => page, :count => count}
-      if @user_id
-        query[:user_id] = @user_id
-      else
-        query[:device_id] = @id
-      end
-
-      res = HTTParty.get "#{@host}/api/image/list", {
+    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
         }
       }
-
-      raise Gyazz::Error, res.body unless res.code == 200
-      JSON.parse(res.body)['images']
+      raise Gyazo::Error, res.body unless res.code == 200
+      return JSON.parse res.body
     end
 
-    DEFAULT_UPLOAD_OPTS = {:time => nil, :raw => false}
-    def upload(imagefile, opts={})
-      DEFAULT_UPLOAD_OPTS.each do |k,v|
-        opts[k] = v unless opts.include? k
-      end
-
-      unless opts[:raw]
-        tmpfile = "/tmp/gyazo_upload_#{Time.now.to_i}_#{Time.now.usec}.png"
-        if File.exist? imagefile
-          system "sips -s format png \"#{imagefile}\" --out \"#{tmpfile}\" > /dev/null"
-        end
-      end
-
-      res = HTTMultiParty.post "#{@host}/upload.cgi", {
+    def delete(image_id)
+      url = "https://api.gyazo.com/api/images/#{image_id}"
+      res = HTTParty.delete url, {
         :query => {
-          :id => @id,
-          :imagedata => File.new(imagefile)
-        },
-        :header => {
-          'User-Agent' => @user_agent
+          :access_token => @access_token
         }
       }
-
-      File.delete(tmpfile) if tmpfile and File.exists? tmpfile
-
       raise Gyazo::Error, res.body unless res.code == 200
-      res.body
+      return JSON.parse res.body
     end
-
   end
 end

data/lib/gyazo/version.rb

@@ -1,3 +1,3 @@
 module Gyazo
-  VERSION = '1.0.0'
+  VERSION = '2.0.0'
 end

data/samples/list.rb

@@ -0,0 +1,10 @@
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+
+require 'gyazo'
+
+gyazo = Gyazo::Client.new(ENV['GYAZO_TOKEN'])
+
+res = gyazo.list(:page => 1, :per_page => 50)
+
+puts res[0]
+puts res[0]['url']

data/samples/upload.rb

@@ -0,0 +1,10 @@
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+
+require 'gyazo'
+
+gyazo = Gyazo::Client.new(ENV['GYAZO_TOKEN'])
+
+img_path = ARGV.shift
+
+res = gyazo.upload(img_path)
+puts res['url']

data/test/test_gyazo.rb

@@ -3,30 +3,23 @@ require File.expand_path 'test_helper', File.dirname(__FILE__)
 class TestGyazo < MiniTest::Test
 
   def setup
-    @gyazo = Gyazo::Client.new
+    @gyazo = Gyazo::Client.new ENV['GYAZO_TOKEN']
     @imagefile = File.expand_path 'test.png', File.dirname(__FILE__)
-    @image_id = "a2a2a8154340bd33e9cd5eeea1efd832"
   end
 
   def test_upload
-    url = @gyazo.upload @imagefile
-    assert_equal url, "#{@gyazo.host}/#{@image_id}"
-  end
-
-  def test_id
-    @gyazo = Gyazo::Client.new
-    assert @gyazo.id =~ /^[0-9a-f]+$/
-    @gyazo.id = '12345'
-    assert_equal @gyazo.id, '12345'
+    res = @gyazo.upload @imagefile
+    assert res['permalink_url'].match /^https?:\/\/gyazo.com\/[a-z\d]{32}$/i
   end
 
   def test_list
     assert_equal @gyazo.list.class, Array
   end
 
-  def test_info
-    info = @gyazo.info @image_id
-    assert_equal info.class, Hash
+  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']
   end
 
 end

metadata

@@ -1,126 +1,148 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gyazo
-version: !ruby/object:Gem::Version 
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 2.0.0
 platform: ruby
-authors: 
+authors:
 - Toshiyuki Masui
+- Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-05-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id003 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: httparty
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: httmultiparty
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: httmultiparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
-  type: :runtime
-  version_requirements: *id008
-description: Upload an image to Gyazo.com
-email: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Gyazo.com API Wrapper
+email:
 - masui@pitecan.com
-executables: 
-- gyazo
+executables: []
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
 - Makefile
 - README.md
 - Rakefile
-- bin/gyazo
 - gyazo.gemspec
 - lib/gyazo.rb
 - lib/gyazo/client.rb
 - lib/gyazo/error.rb
 - lib/gyazo/version.rb
+- samples/list.rb
+- samples/upload.rb
 - test/test.png
 - test/test_gyazo.rb
 - test/test_helper.rb
 homepage: http://github.com/masui/gyazo-ruby
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Upload an image to Gyazo.com
-test_files: 
+summary: Gyazo.com API Wrapper
+test_files:
 - test/test.png
 - test/test_gyazo.rb
 - test/test_helper.rb

data/bin/gyazo

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
-
-require 'rubygems'
-require 'gyazo'
-require 'launchy'
-
-raw = ARGV.include? "-raw"
-upload_files = ARGV.reject{|arg| arg =~ /^\-+raw$/ }
-
-if upload_files.empty?
-  STDERR.puts "gyazo [file1, file2 ...]"
-  STDERR.puts "gyazo -raw [file1, file2 ...]  # raw upload"
-  exit 1
-end
-
-g = Gyazo::Client.new
-
-
-upload_files.each do |file|
-  next unless File.exists? file
-  url = g.upload file, :raw => raw
-  puts url
-  Launchy.open url
-  sleep 1
-end