rubytter 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/rubytter/oauth.rb

@@ -0,0 +1,26 @@
+class Rubytter
+  class OAuth
+    def initialize(key, secret, ca_file = nil)
+      @key = key
+      @secret = secret
+      @ca_file = ca_file
+    end
+
+    def get_access_token_with_xauth(login, password)
+      if @ca_file
+        consumer = ::OAuth::Consumer.new(@key, @secret,
+          :site => 'https://api.twitter.com', :ca_file => @ca_file)
+      else
+        consumer = ::OAuth::Consumer.new(@key, @secret,
+          :site => 'https://api.twitter.com')
+        consumer.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      consumer.get_access_token(nil, {}, {
+        :x_auth_mode => "client_auth",
+        :x_auth_username => login,
+        :x_auth_password => password
+      })
+    end
+  end
+end

data/lib/rubytter.rb

@@ -7,8 +7,8 @@ require 'cgi'
 require 'oauth'
 require 'rubytter/core_ext'
 require 'rubytter/connection'
+require 'rubytter/oauth'
 require 'rubytter/oauth_rubytter'
-require 'rubytter/xauth_rubytter'
 
 class Rubytter
   VERSION = File.read(File.join(File.dirname(__FILE__), '../VERSION')).strip

data/spec/rubytter/oauth_spec.rb

@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+class Rubytter::OAuth
+  describe Rubytter::OAuth do
+    context 'ca_file is specified' do 
+      before do
+        @oauth = Rubytter::OAuth.new('key', 'secret', 'ca_file')
+      end
+
+      it 'should get_access_token_with_xauth' do
+        consumer = Object.new
+        ::OAuth::Consumer.should_receive(:new).
+          with(
+            'key',
+            'secret',
+            :site    => 'https://api.twitter.com',
+            :ca_file => 'ca_file'
+          ).
+          and_return(consumer)
+        consumer.should_receive(:get_access_token).
+          with(
+            nil,
+            {},
+            :x_auth_mode     => "client_auth",
+            :x_auth_username => 'login',
+            :x_auth_password => 'password'
+          ).
+          and_return('token')
+        token = @oauth.get_access_token_with_xauth('login', 'password')
+        token.should == 'token'
+      end
+    end
+
+    context 'ca_file is not specified' do 
+      before do
+        @oauth = Rubytter::OAuth.new('key', 'secret')
+      end
+
+      it 'should get_access_token_with_xauth' do
+        consumer = Object.new
+        http = Object.new
+        consumer.should_receive(:http).and_return(http)
+        http.should_receive(:"verify_mode=").with(OpenSSL::SSL::VERIFY_NONE)
+        ::OAuth::Consumer.should_receive(:new).
+          with(
+            'key',
+            'secret',
+            :site    => 'https://api.twitter.com'
+          ).
+          and_return(consumer)
+        consumer.should_receive(:get_access_token).
+          with(
+            nil,
+            {},
+            :x_auth_mode     => "client_auth",
+            :x_auth_username => 'login',
+            :x_auth_password => 'password'
+          ).
+          and_return('token')
+        token = @oauth.get_access_token_with_xauth('login', 'password')
+        token.should == 'token'
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubytter
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - jugyo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 +09:00
+date: 2010-03-13 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,9 +61,9 @@ files:
 - lib/rubytter.rb
 - lib/rubytter/connection.rb
 - lib/rubytter/core_ext.rb
+- lib/rubytter/oauth.rb
 - lib/rubytter/oauth_rubytter.rb
-- lib/rubytter/xauth_rubytter.rb
-- spec/rubytter/xauth_rubytter_spec.rb
+- spec/rubytter/oauth_spec.rb
 - spec/rubytter_spec.rb
 - spec/search.json
 - spec/spec_helper.rb
@@ -96,7 +96,7 @@ signing_key:
 specification_version: 3
 summary: Simple twitter client.
 test_files: 
-- spec/rubytter/xauth_rubytter_spec.rb
+- spec/rubytter/oauth_spec.rb
 - spec/rubytter_spec.rb
 - spec/spec_helper.rb
 - examples/direct_message.rb

data/lib/rubytter/xauth_rubytter.rb

@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-class XAuthRubytter < OAuthRubytter
-  def self.init(config)
-    @@key = config[:key]
-    @@secret = config[:secret]
-    @@ca_file = config[:ca_file]
-  end
-
-  attr_reader :access_token
-
-  def initialize(login, password, options = {})
-    setup(options)
-    @access_token = get_access_token(login, password)
-  end
-
-  def get_access_token(login, password)
-    if @@ca_file
-      consumer = OAuth::Consumer.new(@@key, @@secret,
-        :site => 'https://api.twitter.com', :ca_file => @@ca_file)
-    else
-      consumer = OAuth::Consumer.new(@@key, @@secret,
-        :site => 'https://api.twitter.com')
-      consumer.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    end
-
-    consumer.get_access_token(nil, {}, {
-      :x_auth_mode => "client_auth",
-      :x_auth_username => login,
-      :x_auth_password => password,
-    })
-  end
-end

data/spec/rubytter/xauth_rubytter_spec.rb

@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require File.dirname(__FILE__) + '/../spec_helper'
-
-class XAuthRubytter
-  describe XAuthRubytter do
-    it 'should set key and secret' do
-      XAuthRubytter.init(:key => 'foo', :secret => 'bar')
-      XAuthRubytter.class_eval{ @@key }.should == 'foo'
-      XAuthRubytter.class_eval{ @@secret }.should == 'bar'
-    end
-  end
-end