twimock 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98d87b06d405b5e1b62b1e556b0364db89fd791f
-  data.tar.gz: 51a1cc2ac6c7bf7bc616330947265a52f3736462
+  metadata.gz: 5309fdefb9500a7240260529d4059c8582224540
+  data.tar.gz: 9317dc0fe012b4fa78217a63bd57d387de84553c
 SHA512:
-  metadata.gz: 1bada1bcbe144100f5d8358303b6e9214cface5cd33052e5f5f4f0f8154a06ac45b24b606b658dc09f2bc38748ef4f808b186d5b6c8242e37a11e7b562568d29
-  data.tar.gz: 46af02913e36302f7eb310e1eda72711fa7857bedd0dc7cce99f72e5dc9e3a2c0038ac101d96975272ea588f562b17910645393a5da4871d14533eb813904fd6
+  metadata.gz: bbe6f91f69f875e7ccb370972f09954043a1336cf86248ad25ff3ccc8ad4f7771b9fd00a431d4b70a18d577d37ed5ea596ba1ffde53506e50d39b72d2b30b3a3
+  data.tar.gz: a7d786545527bf373a9742bab18d6cca9e0cbdf84dd6bb11777e33627e34d928a79ab096cad952fdf596100827350e8e4e1a6a5dc0a8d78a5d170a4e3406fdc5

data/lib/twimock/api/intent/sessions.rb

@@ -24,6 +24,8 @@ module Twimock
 
             if !validate_request_token(@oauth_token)
               raise Twimock::Errors::InvalidRequestToken.new
+            elsif body.cancel
+              raise Twimock::Errors::OAuthCancelled.new
             elsif !(user = Twimock::User.find_by_tiwtter_id_or_email(@username_or_email))
               raise Twimock::Errors::InvalidUsernameOrEmail.new 
             elsif @password.blank? || @password != user.password
@@ -43,6 +45,12 @@ module Twimock
             header = { "Content-Length" => body.bytesize.to_s,
                        "Location" => callback_url }
             [ status, header, [ body ] ]
+          rescue Twimock::Errors::OAuthCancelled
+            status = 303
+            body   = ""
+            header = { "Content-Length" => body.bytesize.to_s,
+                       "Location" => "/oauth/authorize?oauth_token=#{@oauth_token}&cancel=true" }
+            [ status, header, [ body ] ]
           rescue Twimock::Errors::InvalidUsernameOrEmail, Twimock::Errors::InvalidPassword => @error
             response = unauthorized
             response[0] = 302

data/lib/twimock/api/oauth.rb

@@ -1,6 +1,8 @@
 require 'twimock/api/oauth/access_token'
 require 'twimock/api/oauth/request_token'
 require 'twimock/api/oauth/authenticate'
+require 'twimock/api/oauth/authorize'
+require 'twimock/api/oauth/cancelled'
 require 'twimock/api/intent/sessions'
 require 'twimock/api/account/verify_credentials'
 require 'twimock/errors'

data/lib/twimock/api/oauth/authorize.rb

@@ -0,0 +1,50 @@
+require 'uri'
+require 'erb'
+
+module Twimock
+  module API
+    # 認証キャンセル後の画面を返すAPI
+    # POST http://api.twimock.com/oauth/authorize
+    class OAuth
+      class Authorize < OAuth
+        METHOD = "GET"
+        PATH   = "/oauth/authorize"
+
+        def call(env)
+          return super unless called?(env)
+          begin
+            request = Rack::Request.new(env)
+            @oauth_token = request.params["oauth_token"]
+            @cancel      = request.params["cancel"]
+
+            if !validate_request_token(@oauth_token)
+              raise Twimock::Errors::InvalidRequestToken.new
+            elsif @cancel == "true"
+              raise Twimock::Errors::OAuthCancelled.new
+            end
+
+            status = 200
+            body = ""
+            header = { "Content-Length" => body.bytesize.to_s }
+            [ status, header, [ body ] ]
+          rescue Twimock::Errors::InvalidRequestToken => @error
+            unauthorized
+          rescue Twimock::Errors::OAuthCancelled => @error
+            oauth_cancelled
+          rescue => @error
+            internal_server_error
+          end
+        end
+
+        private
+
+        def oauth_cancelled
+          status = 200
+          body   = Twimock::API::OAuth::Cancelled.view(@oauth_token)
+          header = { "Content-Length" => body.bytesize.to_s }
+          [ status, header, [ body ] ]
+        end
+      end
+    end
+  end
+end

data/lib/twimock/api/oauth/cancelled.rb

@@ -0,0 +1,24 @@
+module Twimock
+  module API
+    # OAuthでブラウザ認証するAPI
+    # GET http://api.twimock.com/authenticate?oauth_token=xxx
+    class OAuth
+      class Cancelled
+        VIEW_DIRECTORY = File.expand_path("../../../../../view", __FILE__)
+        VIEW_FILE_NAME = "oauth_cancelled.html.erb"
+
+        def self.view(oauth_token)
+          @oauth_token = oauth_token
+          erb = ERB.new(File.read(filepath))
+          erb.result(binding)
+        end
+
+        private
+
+        def self.filepath
+          File.join(VIEW_DIRECTORY, VIEW_FILE_NAME)
+        end
+      end
+    end
+  end
+end

data/lib/twimock/errors.rb

@@ -9,5 +9,7 @@ module Twimock
     class InvalidUsernameOrEmail < Error; end
     class InvalidPassword < Error; end
     class ApplicationNotFound < Error; end
+    class OAuthCancelled < Error; end
+    class InternalServerError < Error; end
   end
 end

data/lib/twimock/version.rb

@@ -1,3 +1,3 @@
 module Twimock
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/twimock/api/intent/sessions_spec.rb

@@ -161,6 +161,24 @@ describe Twimock::API::Intent::Sessions do
       it_behaves_like 'API 302 Redircted Callback URL'
     end
 
+    context 'with authenticate canceled' do
+      before do
+        application   = Twimock::Application.new
+        application.save!
+        @request_token = Twimock::RequestToken.new(application_id: application.id)
+        @request_token.save!
+        @body = { oauth_token: @request_token.string, cancel: 'true' }
+        post path, @body, header
+      end
+
+      it 'should return 303 Temporary Redirect /oauth/authorize' do
+        expect(last_response.status).to eq 303
+        location = Twimock::API::OAuth::Authorize::PATH + "?oauth_token=#{@request_token.string}&cancel=true"
+        expect(last_response.header['Location']).to eq location
+        expect(last_response.body).to be_blank
+      end
+    end
+
     context 'raise error that is not catched' do
       before do
         allow_any_instance_of(Twimock::API::Intent::Sessions).to receive(:query_string_to_hash) do

data/spec/twimock/api/oauth/authorize_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+require 'rack/test'
+
+describe Twimock::API::OAuth::Authorize do
+  include TestApplicationHelper
+  include APISpecHelper
+  include Rack::Test::Methods
+
+  let(:method)   { 'GET' }
+  let(:path)     { '/oauth/authorize' }
+  let(:body)     { "" }
+  let(:header)   { {} }
+  let(:test_app) { TestApplicationHelper::TestRackApplication.new }
+  let(:app)      { Twimock::API::OAuth::Authorize.new(test_app) }
+
+  describe '::METHOD' do
+    subject { Twimock::API::OAuth::Authorize::METHOD }
+    it { is_expected.to eq method }
+  end
+
+  describe '::PATH' do
+    subject { Twimock::API::OAuth::Authorize::PATH }
+    it { is_expected.to eq path }
+  end
+
+  describe "POST '/oauth/authorize'" do
+    before { stub_const("Twimock::Database::DEFAULT_DB_NAME", db_name) }
+    after  { database.drop }
+
+    let(:db_name)  { ".test" }
+    let(:database) { Twimock::Database.new }
+
+    context 'with invalid oauth token' do
+      before do
+        @request_token = Twimock::RequestToken.new
+        get path + "?oauth_token=#{@request_token.string}", body, header
+      end
+      it_behaves_like 'API 401 UnAuthorized'
+    end
+
+    context 'with only valid oauth token' do
+      before do
+        application   = Twimock::Application.new
+        application.save!
+        @request_token = Twimock::RequestToken.new(application_id: application.id)
+        @request_token.save!
+        get path + "?oauth_token=#{@request_token.string}", body, header
+      end
+
+      it 'should return 200 OK' do
+        expect(last_response.status).to eq 200
+        expect(last_response.header['Content-Length']).to eq last_response.body.bytesize.to_s
+        expect(last_response.body).to be_blank
+      end
+    end
+
+    context 'with valid oauth token and cancel' do
+      before do
+        application   = Twimock::Application.new
+        application.save!
+        @request_token = Twimock::RequestToken.new(application_id: application.id)
+        @request_token.save!
+        get path + "?oauth_token=#{@request_token.string}&cancel=true", body, header
+      end
+
+      it 'should return 200 OK with Cancelled view' do
+        view = Twimock::API::OAuth::Cancelled.view(@request_token.string)
+        expect(last_response.status).to eq 200
+        expect(last_response.header['Content-Length']).to eq last_response.body.bytesize.to_s
+        expect(last_response.body).to eq view
+      end
+    end
+
+    context 'when raise unexpected error anywhere' do
+      before do
+        allow_any_instance_of(Rack::Request).to receive(:params) { raise }
+        application   = Twimock::Application.new
+        application.save!
+        @request_token = Twimock::RequestToken.new(application_id: application.id)
+        @request_token.save!
+        get path + "?oauth_token=#{@request_token.string}", body, header
+      end
+      it_behaves_like 'API 500 InternalServerError'
+    end
+  end
+
+  describe "get '/test'" do
+    before { get '/test' }
+    it_behaves_like 'TestRackApplication 200 OK'
+  end
+
+  describe "POST '/oauth/authorize'" do
+    before { post '/oauth/authorize' }
+    it_behaves_like 'TestRackApplication 200 OK'
+  end
+
+  describe "POST '/oauth/authorization'" do
+    before { get '/oauth/authorization' }
+    it_behaves_like 'TestRackApplication 200 OK'
+  end
+end

data/spec/twimock/api/oauth/cancelled_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Twimock::API::OAuth::Cancelled do
+  let(:view_directory) { File.expand_path("../../../../../view", __FILE__) }
+  let(:view_file_name) { "oauth_cancelled.html.erb" }
+
+  describe '::VIEW_DIRECTORY' do
+    subject { Twimock::API::OAuth::Cancelled::VIEW_DIRECTORY }
+    it { is_expected.to eq view_directory }
+  end
+
+  describe '::VIEW_FILE_NAME' do
+    subject { Twimock::API::OAuth::Cancelled::VIEW_FILE_NAME }
+    it { is_expected.to eq view_file_name }
+  end
+
+  describe '.view' do
+    context 'without oauth_token' do
+      subject { lambda { Twimock::API::OAuth::Cancelled.view } }
+      it { is_expected.to raise_error ArgumentError }
+    end
+
+    context 'with oauth token' do
+      before { @oauth_token = Twimock::RequestToken.new.string }
+      subject { Twimock::API::OAuth::Cancelled.view(@oauth_token) }
+      it { is_expected.to be_include "<!DOCTYPE html>" }
+      it { is_expected.to be_include 'body class="oauth cancelled' }
+      it { is_expected.to be_include @oauth_token }
+    end
+  end
+end

data/spec/twimock_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Twimock do
-  let(:version) { '0.0.1' }
+  let(:version) { '0.0.2' }
   let(:db_name) { '.test' }
   let(:provider) { 'twitter' }
 

data/view/authenticate.html.erb

@@ -16,6 +16,7 @@
           <input type="hidden" name="remember_me" value="1">
           <input type="hidden" name="oauth_token" value="<%= @oauth_token %>">
           <input type="submit" value="login" class="submit button selected" id="allow">
+          <input type="submit" value="cancel" class="submit button" id="cancel" name="cancel">
         </form>
       </div>
     </div>

data/view/oauth_cancelled.html.erb

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="ja" dir="ltr" class="">
+  <head>
+    <meta charset="utf-8">
+    <title>Authorize Twimock Application</title>
+  </head>
+
+  <body class="oauth cancelled tfw ja logged-out noloki">
+    <div id="bd" role="main">
+      <div class="auth">
+        <h1>You have not signed in</h1>
+        <p class="cancel-callback">
+          <a href="<%= Twimock::Config.callback_url %>?denied=<%= @oauth_token %>">Return to App</a>
+        </p>
+      </div>
+    </div>
+  </body>
+</html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twimock
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - ogawatti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -258,6 +258,8 @@ files:
 - lib/twimock/api/oauth.rb
 - lib/twimock/api/oauth/access_token.rb
 - lib/twimock/api/oauth/authenticate.rb
+- lib/twimock/api/oauth/authorize.rb
+- lib/twimock/api/oauth/cancelled.rb
 - lib/twimock/api/oauth/request_token.rb
 - lib/twimock/application.rb
 - lib/twimock/auth_hash.rb
@@ -281,6 +283,8 @@ files:
 - spec/twimock/api/intent/sessions_spec.rb
 - spec/twimock/api/oauth/access_token_spec.rb
 - spec/twimock/api/oauth/authenticate_spec.rb
+- spec/twimock/api/oauth/authorize_spec.rb
+- spec/twimock/api/oauth/cancelled_spec.rb
 - spec/twimock/api/oauth/request_token_spec.rb
 - spec/twimock/api_spec.rb
 - spec/twimock/application_spec.rb
@@ -294,6 +298,7 @@ files:
 - spec/twimock_spec.rb
 - twimock.gemspec
 - view/authenticate.html.erb
+- view/oauth_cancelled.html.erb
 homepage: https://github.com/ogawatti/twimock
 licenses:
 - MIT
@@ -330,6 +335,8 @@ test_files:
 - spec/twimock/api/intent/sessions_spec.rb
 - spec/twimock/api/oauth/access_token_spec.rb
 - spec/twimock/api/oauth/authenticate_spec.rb
+- spec/twimock/api/oauth/authorize_spec.rb
+- spec/twimock/api/oauth/cancelled_spec.rb
 - spec/twimock/api/oauth/request_token_spec.rb
 - spec/twimock/api_spec.rb
 - spec/twimock/application_spec.rb