rubytter 1.2.0 → 1.2.2

data/Rakefile

@@ -13,6 +13,7 @@ begin
     gem.authors = ["jugyo"]
     gem.files = FileList['lib/**/*.rb', 'VERSION', 'README.rdoc', 'History.txt', 'Rakefile', 'spec/**/*.rb', 'spec/**/*.json', 'examples/**/*.rb']
     gem.add_dependency("json", ">= 1.1.3")
+    gem.add_dependency("oauth", ">= 0.3.6")
     gem.add_development_dependency "rspec"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.2

data/examples/use_oauth.rb

@@ -5,9 +5,9 @@ require 'rubytter'
 key = ""
 secret = ""
 
-consumer = OAuth::Consumer.new(key, secret, :site => "http://twitter.com")
+oauth = Rubytter::OAuth.new(key, secret)
 
-request_token = consumer.get_request_token
+request_token = oauth.get_request_token
 system('open', request_token.authorize_url) || puts("Access here: #{request_token.authorize_url}\nand...")
 
 print "Enter PIN: "

data/examples/use_xauth.rb

@@ -2,22 +2,15 @@ $:.unshift File.join(File.dirname(__FILE__), '../lib')
 require 'rubygems'
 require 'rubytter'
 
-XAuthRubytter.init(
-  :key => 'CONSUMER-KEY',
-  :secret => 'CONSUMER-SECRET'
-)
+key = ''
+secret = ''
+login = ''
+password = ''
 
-# # OR
-# XAuthRubytter.init(
-#   :key => 'CONSUMER-KEY',
-#   :secret => 'CONSUMER-SECRET',
-#   :ca_file => 'PATH-TO-CA_FILE'
-# )
-
-client = XAuthRubytter.new('LOGIN', 'PASSWORD')
-p client.access_token.token
-p client.access_token.secret
+oauth = Rubytter::OAuth.new(key, secret)
+access_token = oauth.get_access_token_with_xauth(login, password)
 
+client = OAuthRubytter.new(access_token)
 client.friends_timeline.each do |status|
   puts "#{status.user.screen_name}: #{status.text}"
 end

data/lib/rubytter/oauth.rb

@@ -7,6 +7,19 @@ class Rubytter
     end
 
     def get_access_token_with_xauth(login, password)
+      consumer = create_consumer
+      consumer.get_access_token(nil, {}, {
+        :x_auth_mode => "client_auth",
+        :x_auth_username => login,
+        :x_auth_password => password
+      })
+    end
+
+    def get_request_token
+      create_consumer.get_request_token
+    end
+
+    def create_consumer
       if @ca_file
         consumer = ::OAuth::Consumer.new(@key, @secret,
           :site => 'https://api.twitter.com', :ca_file => @ca_file)
@@ -15,12 +28,7 @@ class Rubytter
           :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
-      })
+      consumer
     end
   end
 end

data/spec/rubytter/oauth_spec.rb

@@ -9,16 +9,17 @@ class Rubytter::OAuth
         @oauth = Rubytter::OAuth.new('key', 'secret', 'ca_file')
       end
 
+      it 'should get_request_token' do
+        consumer = Object.new
+        @oauth.should_receive(:create_consumer).and_return(consumer)
+        consumer.should_receive(:get_request_token).and_return('request_token')
+        request_token = @oauth.get_request_token
+        request_token.should == 'request_token'
+      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)
+        @oauth.should_receive(:create_consumer).and_return(consumer)
         consumer.should_receive(:get_access_token).
           with(
             nil,
@@ -31,6 +32,19 @@ class Rubytter::OAuth
         token = @oauth.get_access_token_with_xauth('login', 'password')
         token.should == 'token'
       end
+
+      it 'should create_consumer' do
+        consumer = Object.new
+        ::OAuth::Consumer.should_receive(:new).
+          with(
+            'key',
+            'secret',
+            :site    => 'https://api.twitter.com',
+            :ca_file => 'ca_file'
+          ).
+          and_return(consumer)
+        @oauth.create_consumer
+      end
     end
 
     context 'ca_file is not specified' do 
@@ -38,7 +52,7 @@ class Rubytter::OAuth
         @oauth = Rubytter::OAuth.new('key', 'secret')
       end
 
-      it 'should get_access_token_with_xauth' do
+      it 'should create_consumer' do
         consumer = Object.new
         http = Object.new
         consumer.should_receive(:http).and_return(http)
@@ -50,17 +64,7 @@ class Rubytter::OAuth
             :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'
+        @oauth.create_consumer
       end
     end
   end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rubytter
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - jugyo
@@ -14,24 +19,44 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 3
         version: 1.1.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: oauth
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 6
+        version: 0.3.6
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: Rubytter is a simple twitter client.
 email: jugyo.org@gmail.com
 executables: []
@@ -80,18 +105,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rubytter
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple twitter client.