gyaazle 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd7758c9dbc613c89561a922691f28b624aef943
-  data.tar.gz: 453f8c594fa93bcfb9055cbe774734f1c219dbcf
+  metadata.gz: e9fcb4b5a8c115bc19de388ee9a16611d396208a
+  data.tar.gz: dcb1e78fdd812a5c080ec784c799c0a2bb398ed2
 SHA512:
-  metadata.gz: 341020bcb4d18d26ee6605bb4d08642314a01ecf97fd96f4a0d1dfa6fe133a61f52bc8168e4fab640e5050765c478dcdf7fa50796921a001fe4bd04b95f276be
-  data.tar.gz: 0abe5cbe6dd9ddbe15340a7d17b2ad755c8e97091c3846a86b45bb2021d7ca9ff1967cd108e32b5e31067a801d7e60b5602056dce17e0ccffa0ad6028ab16be2
+  metadata.gz: 7432d5148cbb9d3e868dc1877d777270f15007f588665a233b6b4cc215b22d16660c67718cc286b94165b29c41ca6cc6619c94c3e66d7fdb4f66123b8fa83364
+  data.tar.gz: 1d19d6a111e70dc291fbca2b8b26d6288ce39e7e4bccb0d02a053a7695c11c9cea843797a569408cc3af4f32f28274438d6bb9d32d9a1e12f09331af9cecbf2e

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+
+script:
+  - bundle exec rspec -c

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gyaazle.gemspec
 gemspec
+
+gem 'coveralls', :require => false
+gem 'json', '~> 1.7.7'
+

data/README.md

@@ -1,3 +1,6 @@
+[![Build Status](https://travis-ci.org/uu59/gyaazle.png?branch=master)](https://travis-ci.org/uu59/gyaazle)
+[![Coverage Status](https://coveralls.io/repos/uu59/gyaazle/badge.png?branch=master)](https://coveralls.io/r/uu59/gyaazle)
+
 # Gyaazle
 
 Gyazo like image uploader that upload image(s) to Google Drive.

data/gyaazle.gemspec

@@ -26,4 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "webmock"
 end

data/lib/gyaazle/cli.rb

@@ -1,5 +1,7 @@
 module Gyaazle
   class CLI
+    attr_reader :config, :client
+
     def initialize(argv)
       @argv = argv
       @opts = Trollop.options(@argv) do
@@ -35,19 +37,19 @@ TEXT
     end
 
     def upload
-      if @config.load.nil? || @config.load[:refresh_token].nil?
-        credentials = initialize_tokens
-      else
-        @client.refresh_token!
-        credentials = @client.credentials
-      end
+      check_credentials!
+
       @argv.each do |file|
-        fileobj = @client.upload(file)
-        puts "#{file}: #{fileobj[:alternateLink]}"
+        fileobj = client.upload(file)
+        puts "#{file}:"
+        puts "  * url: #{fileobj[:alternateLink]}"
+        puts "  * download: #{fileobj[:downloadUrl]}"
+        puts "  * deep link: https://drive.google.com/uc?export=view&id=#{fileobj[:id]}"
+        puts
         if @opts[:open]
           Launchy.open fileobj[:alternateLink]
         end
-        @client.set_permissions(fileobj[:id])
+        client.set_permissions(fileobj[:id])
       end
     end
 
@@ -64,21 +66,28 @@ TEXT
     end
 
     def edit_config
-      system(ENV["EDITOR"], @config.file)
-      puts "Updated!"
+      system(ENV["EDITOR"], config.file)
     end
 
-    def initialize_tokens
-      tokens = @client.get_tokens(authorize)
-      @config.save(tokens)
+    def initialize_tokens(verifier = nil)
+      tokens = client.get_tokens(verifier || authorize)
+      config.save(tokens)
       tokens
     end
 
     def authorize
       puts "Open this link by your browser, and authorize"
-      puts @client.authorize_url
+      puts client.authorize_url
       print "Paste code here: "
       STDIN.gets.strip
     end
+
+    def check_credentials!
+      if config.load.nil? || config.load[:refresh_token].nil?
+        initialize_tokens(authorize)
+      else
+        client.refresh_token!
+      end
+    end
   end
 end

data/lib/gyaazle/client.rb

@@ -1,30 +1,19 @@
 module Gyaazle
   class Client
-    attr_reader :client, :config
+    attr_reader :agent, :config
 
     def initialize(config)
       @config = config
-      @client = HTTPClient.new
-    end
-
-    def authorize(code)
-      json = client.post_content("https://accounts.google.com/o/oauth2/token", {
-        :code => code,
-        :client_id => config.id,
-        :client_secret => config.secret,
-        :redirect_uri => "urn:ietf:wg:oauth:2.0:oob",
-        :grant_type => "authorization_code",
-      })
-      MultiJson.load(json, :symbolize_keys => true)
+      @agent = HTTPClient.new
     end
 
     def authorize_url
       url = "https://accounts.google.com/o/oauth2/auth?client_id=#{config.id}&response_type=code&redirect_uri=urn:ietf:wg:oauth:2.0:oob&scope=https://www.googleapis.com/auth/drive"
-      Nokogiri::HTML.parse(client.get(url).body).at('a').attributes["href"].to_s
+      Nokogiri::HTML.parse(agent.get(url).body).at('a').attributes["href"].to_s
     end
 
     def get_tokens(verifier)
-      client.post_content("https://accounts.google.com/o/oauth2/token",{
+      agent.post_content("https://accounts.google.com/o/oauth2/token",{
         :code => verifier,
         :client_id => config.id,
         :client_secret => config.secret,
@@ -34,7 +23,7 @@ module Gyaazle
     end
 
     def refresh_token!
-      json = client.post("https://accounts.google.com/o/oauth2/token", {
+      json = agent.post("https://accounts.google.com/o/oauth2/token", {
         :refresh_token => credentials[:refresh_token],
         :client_id => config.id,
         :client_secret => config.secret,
@@ -59,11 +48,11 @@ module Gyaazle
         },
       ]
 
-      response = client.post(
+      response = agent.post(
         'https://www.googleapis.com/upload/drive/v2/files?uploadType=multipart',
         body,
         {
-          "Authorization" => "#{credentials[:token_type]} #{credentials[:access_token]}",
+          "Authorization" => authorization_header_value,
           "Content-Type" =>  "multipart/related; boundary=___#{Time.now.to_f}___",
         }
       )
@@ -81,33 +70,37 @@ module Gyaazle
           :additionalRoles => ["commenter"],
         }
       )
-      client.post_content(
+      agent.post_content(
         "https://www.googleapis.com/drive/v2/files/#{file_id}/permissions",
         json,
         {
-          "Authorization" => "#{credentials[:token_type]} #{credentials[:access_token]}",
+          "Authorization" => authorization_header_value,
           'Content-Type' => 'application/json;charset=utf-8',
         }
       )
     end
 
-    def get(file_id)
-      json = client.get(
+    def get_file_info(file_id)
+      json = agent.get(
         "https://www.googleapis.com/drive/v2/files/#{file_id}",
-        {},
+        nil,
         {
-          "Authorization" => "#{credentials[:token_type]} #{credentials[:access_token]}",
+          "Authorization" => authorization_header_value,
         }
       ).body
 
       MultiJson.load(json, :symbolize_keys => true)
     end
 
+    def authorization_header_value
+      "#{credentials[:token_type]} #{credentials[:access_token]}"
+    end
+
     def folder_id
       id = credentials[:folder_id]
       return create_folder("Gyaazle") unless id
 
-      folder = get(id)
+      folder = get_file_info(id)
       if !folder[:id] || folder[:labels][:trashed]
         create_folder("Gyaazle") 
       else
@@ -116,7 +109,7 @@ module Gyaazle
     end
 
     def create_folder(name)
-      json = client.post_content(
+      json = agent.post_content(
         "https://www.googleapis.com/drive/v2/files",
         MultiJson.dump({
           :title => name,
@@ -124,7 +117,7 @@ module Gyaazle
           :parents => [{:id => "root"}],
         }),
         {
-          "Authorization" => "#{credentials[:token_type]} #{credentials[:access_token]}",
+          "Authorization" => authorization_header_value,
           'Content-Type' => 'application/json;charset=utf-8',
         }
       )

data/lib/gyaazle/config.rb

@@ -3,15 +3,12 @@ module Gyaazle
     CLIENT_ID = "810975313441.apps.googleusercontent.com"
     CLIENT_SECRET = "0CJJ4jT2jcUsCWDrsHvXmARs"
 
-    attr_reader :id, :secret, :file
+    attr_reader :id, :secret
 
     def initialize(file = nil)
       @id = CLIENT_ID
       @secret = CLIENT_SECRET
       @file = file
-      dir = File.dirname(@file)
-      FileUtils.mkdir_p(dir) unless File.directory?(dir)
-      FileUtils.touch(file) unless File.exists?(file)
     end
 
     def save(json)
@@ -27,5 +24,12 @@ module Gyaazle
     def load
       MultiJson.load(File.read(file), :symbolize_keys => true) rescue nil
     end
+
+    def file
+      dir = File.dirname(@file)
+      FileUtils.mkdir_p(dir) unless File.directory?(dir)
+      FileUtils.touch(@file) unless File.exists?(@file)
+      @file
+    end
   end
 end

data/lib/gyaazle/version.rb

@@ -1,3 +1,3 @@
 module Gyaazle
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/gyaazle_cli_spec.rb

@@ -0,0 +1,115 @@
+# -- coding: utf-8
+
+require "spec_helper"
+
+describe Gyaazle::CLI do
+  let(:cli) { Gyaazle::CLI.new([]) }
+
+  describe "ensure oauth token" do
+    before do
+      cli.stub(:authorize).and_return("verification code")
+    end
+
+    it "invoke #check_credentials! before #upload" do
+      cli.should_receive(:check_credentials!)
+      cli.run!
+    end
+
+    context "config file does not exists" do
+      before do
+        cli.config.stub(:load).and_return(nil)
+      end
+
+      it "invoke #initialize_tokens" do
+        cli.should_receive(:initialize_tokens)
+        cli.run!
+      end
+    end
+
+    context "config file is sane" do
+      before do
+        cli.config.stub(:load).and_return(:client_id => "id", :client_secret => "secret", :refresh_token => "refresh")
+      end
+
+      it "invoke #refresh_token!" do
+        cli.client.should_receive(:refresh_token!)
+        cli.run!
+      end
+    end
+  end
+
+  describe "options" do
+    context "-e" do
+      let(:cli) { Gyaazle::CLI.new(%w!-e!) }
+      before do
+        cli.stub(:edit_config)
+      end
+
+      it "invoke #edit_config" do
+        cli.should_receive(:edit_config)
+        cli.run!
+      end
+
+      it "not invoke #upload and #check_credentials!" do
+        cli.should_not_receive(:check_credentials!)
+        cli.should_not_receive(:upload)
+        cli.run!
+      end
+    end
+
+    context "--config filepath" do
+      let(:file) { File.join("/tmp", rand.to_s) }
+      let(:cli) { Gyaazle::CLI.new(%W!--config #{file}!) }
+
+      it "set config file" do
+        cli.config.file.should == file
+        File.unlink(file) if File.exists?(file)
+      end
+    end
+
+    context "--capture" do
+      let(:cli) { Gyaazle::CLI.new(%W!--capture!) }
+      before do
+        cli.stub(:upload)
+      end
+
+      it "invoke #capture" do
+        cli.should_receive(:capture)
+        cli.run!
+      end
+    end
+  end
+
+  describe "#initialize_tokens" do
+    let(:token) { {:foo => 1, :bar => 44} }
+
+    it "save response to config file" do
+      cli.client.stub(:get_tokens).and_return(token)
+      cli.initialize_tokens("code")
+      cli.config.load.should == token
+    end
+  end
+
+  describe "#upload" do
+    let(:files) { %w!foo.jpg! }
+    let(:cli) { Gyaazle::CLI.new(files) }
+
+    before do
+      cli.stub(:check_credentials!)
+
+      @orig_stdout = $stdout
+      $stdout = File.new("/dev/null", "w")
+    end
+
+    after do
+      $stdout = @orig_stdout
+    end
+
+    it "invoke client.upload" do
+      cli.client.should_receive(:upload).with(files.first).and_return(:alternateLink => "dummy")
+      cli.client.should_receive(:set_permissions)
+      cli.upload
+    end
+  end
+end
+

data/spec/gyaazle_client_spec.rb

@@ -0,0 +1,143 @@
+# -- coding: utf-8
+
+require "spec_helper"
+
+describe Gyaazle::Client do
+  let(:file) { File.expand_path("../tmp/dummy_conf.json", __FILE__) }
+  let(:config) { Gyaazle::Config.new(file) }
+  let(:client) { Gyaazle::Client.new(config) }
+  let(:folder_id) { "ididid" }
+
+  before do
+    config.save(:foo => 1)
+  end
+
+  after do
+    File.unlink(file) if File.exists?(file)
+  end
+
+  describe "#credentials" do
+    it "return hash with symbol key" do
+      client.credentials.class.should == Hash
+      client.credentials.keys.all?{|key| key.class == Symbol}.should be_true
+    end
+  end
+
+  describe "#folder_id" do
+    context "Gyaazle folder does exists" do
+      before do
+        config.update(:folder_id => folder_id)
+        client.stub(:get_file_info).and_return({
+          :id => folder_id,
+          :labels => {
+            :trashed => false
+          }
+        })
+      end
+
+      it "invoke #create_folder" do
+        client.should_not_receive(:create_folder)
+        client.folder_id.should == folder_id
+      end
+    end
+
+    context "Gyaazle folder does not exists" do
+      before do
+        config.update(:folder_id => nil)
+      end
+
+      it "invoke #create_folder" do
+        client.should_receive(:create_folder)
+        client.folder_id
+      end
+    end
+
+    context "Gyaazle folder is in trash" do
+      before do
+        config.update(:folder_id => folder_id)
+        client.stub(:get_file_info).and_return({
+          :id => folder_id,
+          :labels => {
+            :trashed => true
+          }
+        })
+      end
+
+      it "invoke #create_folder" do
+        client.should_receive(:create_folder)
+        client.folder_id
+      end
+    end
+  end
+
+  describe "#get_file_info" do
+    let(:response) { {:folder_id => folder_id, :labels => {:trashed => false}} }
+    before do
+      @requset = stub_request(:get, "https://www.googleapis.com/drive/v2/files/#{folder_id}").with(
+        :headers => {
+          "Authorization" => client.authorization_header_value
+        }
+      ).to_return(
+        :body => MultiJson.dump(response)
+      )
+    end
+
+    it "GET www.googleapis.com with folder_id" do
+      client.get_file_info(folder_id)
+      WebMock.should have_requested(:get, "https://www.googleapis.com/drive/v2/files/#{folder_id}")
+    end
+
+    it "return response as object" do
+      client.get_file_info(folder_id).should == response
+    end
+  end
+
+  describe "#create_folder" do
+    let(:new_folder_id) { "foobardir" }
+    let(:new_folder_name) { "Gyaazle" }
+
+    before do
+      @request = stub_request(:post, "https://www.googleapis.com/drive/v2/files").with(
+        :headers => {
+          "Authorization" => client.authorization_header_value
+        }
+      ).to_return(
+        :body => MultiJson.dump(:id => new_folder_id)
+      )
+    end
+
+    it "POST www.googleapis.com with new_folder_name" do
+      client.create_folder(new_folder_name)
+      WebMock.should have_requested(:post, "https://www.googleapis.com/drive/v2/files").with{|req| req.body[new_folder_name] }
+    end
+
+    it "config[:folder_id] should update" do
+      client.create_folder(new_folder_name)
+      config.load[:folder_id].should == new_folder_id
+    end
+
+    it "return new folder_id" do
+      client.create_folder(new_folder_name).should == new_folder_id
+    end
+  end
+
+  describe "#refresh_token!" do
+    let(:access_token) { "ACCESS_TOKEN" }
+    before do
+      @request = stub_request(:post, "https://accounts.google.com/o/oauth2/token").to_return(
+        :body => MultiJson.dump(:access_token => access_token)
+      )
+    end
+
+    it "POST accounts.google.com" do
+      client.refresh_token!
+      WebMock.should have_requested(:post, "https://accounts.google.com/o/oauth2/token")
+    end
+
+    it "update access token" do
+      client.refresh_token!
+      config.load[:access_token].should == access_token
+    end
+  end
+end
+

data/spec/gyaazle_config_spec.rb

@@ -0,0 +1,57 @@
+# -- coding: utf-8
+
+require "spec_helper"
+
+describe Gyaazle::Config do
+  let(:file) { File.expand_path("../tmp/dummy_conf.json", __FILE__) }
+  let(:config) { Gyaazle::Config.new(file) }
+
+  after do
+    File.unlink(file) if File.exists?(file)
+  end
+
+  describe "#load" do
+    it "return nil if config file does not exists" do
+      File.unlink(file) if File.exists?(file)
+      config.load.should be_nil
+    end
+
+    it "return nil if config file invalid json" do
+      File.open(file, "w"){|f| f.write "invalid json here" }
+      config.load.should be_nil
+    end
+
+    it "return object with symbol keys" do
+      obj = {"foo" => 1, :bar => 2}
+      File.open(file, "w"){|f| f.write MultiJson.dump(obj) }
+      config.load.should == {:foo => 1, :bar => 2}
+    end
+  end
+
+  describe "#save" do
+    it "write string to config file" do
+      str = "str"
+      config.save(str)
+      File.read(file).should == str
+    end
+
+    it "dump object to config file" do
+      obj = {"foo" => "bar"}
+      config.save(obj)
+      File.read(file).should == MultiJson.dump(obj, :pretty => true)
+    end
+  end
+
+  describe "#update" do
+    before do
+      @obj = {:foo => 1, :bar => 2}
+      config.save(@obj)
+    end
+
+    it "save an object that merged" do
+      diff = {:foo => 66, :baz => 3}
+      config.update(diff)
+      config.load.should == {:foo => 66, :bar => 2, :baz => 3}
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,31 @@
+# -- coding: utf-8
+
+require "rubygems"
+require "bundler/setup"
+
+require "simplecov"
+require 'coveralls'
+Coveralls.wear!
+
+if ENV["COVERAGE"]
+  # Coveralls overwrite NilFomatter
+  SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+  SimpleCov.start do
+    add_filter "/spec/"
+  end
+end
+Bundler.require :default, :test
+require "rspec-expectations"
+require "rspec/matchers/built_in/be"
+require "webmock/rspec"
+
+Dir["./spec/support/**/*.rb"].each{|file| require file }
+
+
+require File.expand_path("../../lib/gyaazle.rb", __FILE__)
+
+RSpec.configure do |config|
+end
+# -- coding: utf-8
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gyaazle
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - uu59
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -122,6 +122,48 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gyazo like image uploader to Google Drive
 email:
 - k@uu59.org
@@ -131,6 +173,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -142,6 +185,10 @@ files:
 - lib/gyaazle/client.rb
 - lib/gyaazle/config.rb
 - lib/gyaazle/version.rb
+- spec/gyaazle_cli_spec.rb
+- spec/gyaazle_client_spec.rb
+- spec/gyaazle_config_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/uu59/gyaazle
 licenses:
 - MIT
@@ -166,5 +213,9 @@ rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Gyazo like image uploader to Google Drive
-test_files: []
+test_files:
+- spec/gyaazle_cli_spec.rb
+- spec/gyaazle_client_spec.rb
+- spec/gyaazle_config_spec.rb
+- spec/spec_helper.rb
 has_rdoc: