twitter-jruby 0.9.5.2010052501 → 0.9.7.2010061001

data/History

@@ -1,4 +1,9 @@
-0.9.5 - April, 21, 2010
+0.9.7 - May 25, 2010
+  * Added api_endpoint option for Search
+0.9.6 - May 25, 2010
+  * Deprecated Basic Auth
+  * Added api_endpoint option for OAuth
+0.9.5 - April 21, 2010
   * Saved searches (@zmoazeni)
   * Patch to handle nil in .each in Search.fetch (@sferik)
   * Added report_spam - Christopher Bailey

data/Rakefile

@@ -19,6 +19,7 @@ Jeweler::Tasks.new do |gem|
   gem.add_development_dependency("jnunemaker-matchy", "~> 0.4.0")
   gem.add_development_dependency("mocha", "~> 0.9.0")
   gem.add_development_dependency("fakeweb", "~> 1.2.0")
+  gem.add_development_dependency("redgreen", "~> 1.2.2")
 end
 
 Jeweler::GemcutterTasks.new

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 9
-:patch: 5
-:build: 2010052501
+:build: 2010061001
+:patch: 7
 :major: 0

data/lib/twitter/httpauth.rb

@@ -7,6 +7,8 @@ module Twitter
     attr_reader :username, :password, :options
 
     def initialize(username, password, options={})
+      warn "[DEPRECATION] Baic auth is deprecated as Twitter is ending support in June 2010. Please migrate to OAuth."
+      
       @username, @password = username, password
       @options = {:ssl => false}.merge(options)
       options[:api_endpoint] ||= "api.twitter.com"
@@ -14,18 +16,26 @@ module Twitter
     end
 
     def get(uri, headers={})
+      warn "[DEPRECATION] Baic auth is deprecated as Twitter is ending support in June 2010. Please migrate to OAuth."
+      
       self.class.get(uri, :headers => headers, :basic_auth => basic_auth)
     end
 
     def post(uri, body={}, headers={})
+      warn "[DEPRECATION] Baic auth is deprecated as Twitter is ending support in June 2010. Please migrate to OAuth."
+      
       self.class.post(uri, :body => body, :headers => headers, :basic_auth => basic_auth)
     end
 
     def put(uri, body={}, headers={})
+      warn "[DEPRECATION] Baic auth is deprecated as Twitter is ending support in June 2010. Please migrate to OAuth."
+      
       self.class.put(uri, :body => body, :headers => headers, :basic_auth => basic_auth)
     end
 
     def delete(uri, body={}, headers={})
+      warn "[DEPRECATION] Baic auth is deprecated as Twitter is ending support in June 2010. Please migrate to OAuth."
+      
       self.class.delete(uri, :body => body, :headers => headers, :basic_auth => basic_auth)
     end
 

data/lib/twitter/oauth.rb

@@ -4,20 +4,26 @@ module Twitter
 
     def_delegators :access_token, :get, :post, :put, :delete
 
-    attr_reader :ctoken, :csecret, :consumer_options
+    attr_reader :ctoken, :csecret, :consumer_options, :api_endpoint, :signing_endpoint
 
     # Options
     #   :sign_in => true to just sign in with twitter instead of doing oauth authorization
     #               (http://apiwiki.twitter.com/Sign-in-with-Twitter)
     def initialize(ctoken, csecret, options={})
       @ctoken, @csecret, @consumer_options = ctoken, csecret, {}
+      @api_endpoint = options[:api_endpoint] || 'http://api.twitter.com'
+      @signing_endpoint = options[:signing_endpoint] || 'http://api.twitter.com'
       if options[:sign_in]
         @consumer_options[:authorize_path] =  '/oauth/authenticate'
       end
     end
 
     def consumer
-      @consumer ||= ::OAuth::Consumer.new(@ctoken, @csecret, {:site => 'http://api.twitter.com'}.merge(consumer_options))
+      @consumer ||= ::OAuth::Consumer.new(@ctoken, @csecret, {:site => api_endpoint}.merge(consumer_options))
+    end
+    
+    def signing_consumer
+      @signing_consumer ||= ::OAuth::Consumer.new(@ctoken, @csecret, {:site => signing_endpoint}.merge(consumer_options))
     end
 
     def set_callback_url(url)
@@ -29,13 +35,13 @@ module Twitter
     # Options:
     #   :oauth_callback => String, url that twitter should redirect to
     def request_token(options={})
-      @request_token ||= consumer.get_request_token(options)
+      @request_token ||= signing_consumer.get_request_token(options)
     end
 
     # For web apps use params[:oauth_verifier], for desktop apps,
     # use the verifier is the pin that twitter gives users.
     def authorize_from_request(rtoken, rsecret, verifier_or_pin)
-      request_token = ::OAuth::RequestToken.new(consumer, rtoken, rsecret)
+      request_token = ::OAuth::RequestToken.new(signing_consumer, rtoken, rsecret)
       access_token = request_token.get_access_token(:oauth_verifier => verifier_or_pin)
       @atoken, @asecret = access_token.token, access_token.secret
     end

data/lib/twitter/search.rb

@@ -11,6 +11,7 @@ module Twitter
       @options = options
       clear
       containing(q) if q && q.strip != ""
+      self.class.base_uri(options[:api_endpoint]) if options[:api_endpoint]
     end
 
     def user_agent

data/test/test_helper.rb

@@ -4,6 +4,7 @@ require "shoulda"
 require "matchy"
 require "mocha"
 require "fakeweb"
+require "redgreen"
 
 FakeWeb.allow_net_connect = false
 

data/test/twitter/oauth_test.rb

@@ -59,7 +59,7 @@ class OAuthTest < Test::Unit::TestCase
   should "be able to create access token from request token, request secret and verifier" do
     twitter = Twitter::OAuth.new('token', 'secret')
     consumer = OAuth::Consumer.new('token', 'secret', {:site => 'http://api.twitter.com'})
-    twitter.stubs(:consumer).returns(consumer)
+    twitter.stubs(:signing_consumer).returns(consumer)
 
     access_token  = mock('access token', :token => 'atoken', :secret => 'asecret')
     request_token = mock('request token')

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 9
-    - 5
-    - 2010052501
-  version: 0.9.5.2010052501
+    - 7
+    - 2010061001
+  version: 0.9.7.2010061001
 platform: ruby
 authors: 
   - John Nunemaker
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 +09:00
+date: 2010-06-10 00:00:00 +09:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -142,6 +142,20 @@ dependencies:
             version: 1.2.0
     type: :development
     version_requirements: *id009
+  - !ruby/object:Gem::Dependency 
+    name: redgreen
+    prerelease: false
+    requirement: &id010 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 2
+              - 2
+            version: 1.2.2
+    type: :development
+    version_requirements: *id010
 description: 
 email: fujibee@gmail.com
 executables: []