szimek-twitter_rails 0.0.4 → 0.0.5

data/Rakefile

@@ -9,8 +9,8 @@ begin
     gem.email = "szymon.nowak@u2i.com"
     gem.homepage = "http://github.com/szimek/twitter_rails"
     gem.authors = ["Szymon Nowak"]
-
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    
+    gem.add_dependency('jnunemaker-twitter', '>= 0.6.6')
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 4
+:patch: 5

data/lib/twitter_rails/oauth.rb

@@ -0,0 +1,5 @@
+Twitter::OAuth.class_eval do
+  def consumer
+    @consumer ||= ::OAuth::Consumer.new(@ctoken, @csecret, {:site => 'https://twitter.com', :authorize_path => '/oauth/authenticate'})
+  end
+end

data/lib/{twitter → twitter_rails}/rails/controller.rb

@@ -31,6 +31,8 @@ module Twitter
       end
 
       def clear_twitter_session_information
+        session[:twitter_rtoken] = nil
+        session[:twitter_rsecret] = nil
         session[:twitter_atoken] = nil
         session[:twitter_asecret] = nil
       end
@@ -44,11 +46,13 @@ module Twitter
         begin
           oauth = self.twitter_oauth
           oauth.authorize_from_request(session[:twitter_rtoken], session[:twitter_rsecret])
-
-          session[:twitter_atoken] = oauth.access_token.token
-          session[:twitter_asecret] = oauth.access_token.secret
+          @access_token = oauth.access_token
+          session[:twitter_atoken] = @access_token.token
+          session[:twitter_asecret] = @access_token.secret
         rescue ::OAuth::Unauthorized
         ensure
+          # The request token has been invalidated
+          # so we nullify it in the session.
           session[:twitter_rtoken] = nil
           session[:twitter_rsecret] = nil
         end

data/lib/{twitter → twitter_rails}/rails/initializer.rb

@@ -8,6 +8,8 @@ module Twitter
           twitter_config = YAML.load(File.read(twitter_yaml_file))[RAILS_ENV]
           ENV['TWITTER_CONSUMER_TOKEN'] = twitter_config['token']
           ENV['TWITTER_CONSUMER_SECRET'] = twitter_config['secret']
+        else
+          raise "Twitter config file not present."
         end
       end
     end

data/lib/twitter_rails.rb

@@ -1,6 +1,5 @@
 if defined? Rails
-  require 'twitter/base'
-  require 'twitter/rails/controller'
-  require 'twitter/rails/helpers'
-  require 'twitter/rails/initializer'
+  %w(base oauth rails/controller rails/helpers rails/initializer).each do |file|
+    require File.join(File.dirname(__FILE__), "twitter_rails", file)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: szimek-twitter_rails
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Szymon Nowak
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-22 00:00:00 -07:00
+date: 2009-05-04 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: jnunemaker-twitter
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.6
+    version: 
 description: 
 email: szymon.nowak@u2i.com
 executables: []
@@ -27,11 +36,12 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION.yml
-- lib/twitter/base.rb
-- lib/twitter/rails/controller.rb
-- lib/twitter/rails/helpers.rb
-- lib/twitter/rails/initializer.rb
 - lib/twitter_rails.rb
+- lib/twitter_rails/base.rb
+- lib/twitter_rails/oauth.rb
+- lib/twitter_rails/rails/controller.rb
+- lib/twitter_rails/rails/helpers.rb
+- lib/twitter_rails/rails/initializer.rb
 - test/test_helper.rb
 - test/twitter_rails_test.rb
 has_rdoc: true