wp2hatena 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86732bb5e4fec9ae7d13f8d33e448cc30f47cd08
-  data.tar.gz: 69559f845856391727e91ddc1566d770bcffa734
+  metadata.gz: 2d08ca24e7d9d8bd4f3335290ded1984a485b119
+  data.tar.gz: 55e174d51045ec03af56cb49f30c32bc736da82e
 SHA512:
-  metadata.gz: 4e8abae7b393d30899b01bd4ca0de7c59ba75e519ba5d8507cd6132c776972597a988cf06feeebea2e432a76f14dade108fb7197a85119a5a8d0b8ef51c16899
-  data.tar.gz: 3ffbcd83a271433c689a902704bc1324cba936294c5ae5bad409a3402b5c32f446a60bff5e22eef291f1917eaffa512f267df4b82c8700c0786a823415891919
+  metadata.gz: 749f102c9b6428528a506dfde274f61337d40ce6a14f37a9f66991368062dc26d647b32435d28e84a433c1c366c21f1271d46c11fd707eab2922d317b41fd36a
+  data.tar.gz: f79abb26d9183abc834406b71a06ad26bd67de5a9b8a5531d6d0c3046230708c763c4d29bbbd23438578ad4e9879c2010fea6c6af1151441a97638b4f9060e55

data/{bin → exe}/wp2hatena

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'bundler/setup'
 require 'wp2hatena'
 
 print 'CONSUMER_KEY：'

data/exe/wp2hatena_oauth

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require 'wp2hatena/hatena/oauth/app'
+require 'io/console'
+
+print 'CONSUMER_KEY：'
+CONSUMER_KEY = gets.chomp
+print 'CONSUMER_SECRET：'
+CONSUMER_SECRET = gets.chomp
+
+Wp2hatena::Hatena::OAuth::App.run!

data/lib/wp2hatena/hatena/oauth/app.rb

@@ -0,0 +1,72 @@
+require 'sinatra/base'
+require 'oauth'
+require 'erb'
+require 'json'
+
+module Wp2hatena
+  module Hatena
+    module OAuth
+
+      class App < Sinatra::Base
+        set :sessions, true
+        enable :sessions
+
+        before do
+          @consumer = ::OAuth::Consumer.new(
+              CONSUMER_KEY,
+              CONSUMER_SECRET,
+              :site => '',
+              :request_token_path => 'https://www.hatena.com/oauth/initiate',
+              :access_token_path => 'https://www.hatena.com/oauth/token',
+              :authorize_path => 'https://www.hatena.ne.jp/oauth/authorize'
+          )
+        end
+
+        get '/' do
+          erb :index
+        end
+
+        # リクエストトークン取得から認証用URLにリダイレクトするためのアクション
+        get '/oauth' do
+          # リクエストトークンの取得
+          request_token = @consumer.get_request_token(
+              {:oauth_callback => 'http://localhost:4567/oauth_callback'},
+              :scope => 'read_public,write_public,read_private,write_private'
+          )
+
+          # セッションへリクエストトークンを保存しておく
+          session[:request_token] = request_token.token
+          session[:request_token_secret] = request_token.secret
+
+          # 認証用URLにリダイレクトする
+          redirect request_token.authorize_url
+        end
+
+        # 認証からコールバックされ、アクセストークンを取得するためのアクション
+        get '/oauth_callback' do
+          request_token = ::OAuth::RequestToken.new(
+              @consumer,
+              session[:request_token],
+              session[:request_token_secret]
+          )
+
+          # リクエストトークンとverifierを用いてアクセストークンを取得
+          access_token = request_token.get_access_token(
+              {},
+              :oauth_verifier => params[:oauth_verifier]
+          )
+
+          session[:request_token] = nil
+          session[:request_token_secret] = nil
+
+          # アクセストークンをセッションに記録しておく
+          session[:access_token] = access_token.token
+          session[:access_token_secret] = access_token.secret
+
+          erb :oauth_callback, :locals => {:access_token => access_token}
+        end
+      end
+
+    end
+  end
+end

data/lib/wp2hatena/hatena/oauth/views/index.erb

@@ -0,0 +1 @@
+<p><a href="/oauth">Hatena</a></p>

data/lib/wp2hatena/hatena/oauth/views/oauth_callback.erb

@@ -0,0 +1,12 @@
+<p>success getting access_token.</p>
+
+<p>your access token is below.</p>
+
+<dl>
+    <dt>access_token</dt>
+    <dd><%= access_token.params[:oauth_token] %></dd>
+    <dt>access_token_secret</dt>
+    <dd><%= access_token.params[:oauth_token_secret] %></dd>
+</dl>
+
+<a href="/">back to top</a>

data/lib/wp2hatena/version.rb

@@ -1,3 +1,3 @@
 module Wp2hatena
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/wp2hatena.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{convert images of wordpress to hatena blog}
   spec.homepage      = "https://github.com/utahta/wp2hatena.git"
   spec.license       = "MIT"
-  
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wp2hatena
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - utahta
@@ -69,7 +69,9 @@ dependencies:
 description: convert images of wordpress to hatena blog
 email:
 - labs.ninxit@gmail.com
-executables: []
+executables:
+- wp2hatena
+- wp2hatena_oauth
 extensions: []
 extra_rdoc_files: []
 files:
@@ -80,11 +82,14 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- bin/wp2hatena
-- bin/wp2hatena_oauth
+- exe/wp2hatena
+- exe/wp2hatena_oauth
 - lib/wp2hatena.rb
 - lib/wp2hatena/hatena/converter.rb
 - lib/wp2hatena/hatena/fotolife.rb
+- lib/wp2hatena/hatena/oauth/app.rb
+- lib/wp2hatena/hatena/oauth/views/index.erb
+- lib/wp2hatena/hatena/oauth/views/oauth_callback.erb
 - lib/wp2hatena/version.rb
 - lib/wp2hatena/wordpress/image.rb
 - wp2hatena.gemspec

data/bin/wp2hatena_oauth

@@ -1,90 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'sinatra'
-require 'oauth'
-require 'erb'
-require 'json'
-require 'io/console'
-
-print 'CONSUMER_KEY：'
-CONSUMER_KEY = gets.chomp
-print 'CONSUMER_SECRET：'
-CONSUMER_SECRET = gets.chomp
-
-set :sessions, true
-enable :sessions
-
-before do
-  @consumer = OAuth::Consumer.new(
-      CONSUMER_KEY,
-      CONSUMER_SECRET,
-      :site => '',
-      :request_token_path => 'https://www.hatena.com/oauth/initiate',
-      :access_token_path => 'https://www.hatena.com/oauth/token',
-      :authorize_path => 'https://www.hatena.ne.jp/oauth/authorize'
-  )
-end
-
-get '/' do
-  erb :index
-end
-
-# リクエストトークン取得から認証用URLにリダイレクトするためのアクション
-get '/oauth' do
-  # リクエストトークンの取得
-  request_token = @consumer.get_request_token(
-      {:oauth_callback => 'http://localhost:4567/oauth_callback'},
-      :scope => 'read_public,write_public,read_private,write_private'
-  )
-
-  # セッションへリクエストトークンを保存しておく
-  session[:request_token] = request_token.token
-  session[:request_token_secret] = request_token.secret
-
-  # 認証用URLにリダイレクトする
-  redirect request_token.authorize_url
-end
-
-# 認証からコールバックされ、アクセストークンを取得するためのアクション
-get '/oauth_callback' do
-  request_token = OAuth::RequestToken.new(
-      @consumer,
-      session[:request_token],
-      session[:request_token_secret]
-  )
-
-  # リクエストトークンとverifierを用いてアクセストークンを取得
-  access_token = request_token.get_access_token(
-      {},
-      :oauth_verifier => params[:oauth_verifier]
-  )
-
-  session[:request_token] = nil
-  session[:request_token_secret] = nil
-
-  # アクセストークンをセッションに記録しておく
-  session[:access_token] = access_token.token
-  session[:access_token_secret] = access_token.secret
-
-  erb :oauth_callback, :locals => {:access_token => access_token}
-end
-
-__END__
-
-@@ index
-<p><a href="/oauth">Hatena</a></p>
-
-@@ oauth_callback
-<p>success getting access_token.</p>
-
-<p>your access token is below.</p>
-
-<dl>
-  <dt>access_token</dt>
-  <dd><%= access_token.params[:oauth_token] %></dd>
-  <dt>access_token_secret</dt>
-  <dd><%= access_token.params[:oauth_token_secret] %></dd>
-</dl>
-
-<a href="/">back to top</a>