filiptepper-oauth-plugin 0.3.11 → 0.3.12

data/CHANGELOG

@@ -1,3 +1,6 @@
+9/26/2009
+  0.3.11
+  - Moved twitter tokens dependency back to regular twitter gem
 7/29/2009
   0.3.10
   - Closed blocks in erb template (jcrosby) while pelle is hiding under his desk

data/README.rdoc

@@ -330,7 +330,7 @@ Before creating the FireEagleToken model the plugin checks if a class already ex
 Currently we provide the following semi tested tokens wrappers:
 
 * FireEagle
-* Twitter (requires Paul Singh's version of twitter gem until main gem is updated to 0.3.5 - sudo gem install paulsingh-twitter)
+* Twitter
 * Agree2
 
 These can be found in lib/oauth/models/consulers/services. Contributions will be warmly accepted for your favorite OAuth service.

data/Rakefile

@@ -24,15 +24,16 @@ end
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "oauth-plugin"
+    gemspec.name = "filiptepper-oauth-plugin"
     gemspec.summary = "Ruby on Rails Plugin for OAuth Provider and Consumer"
     gemspec.description = "Rails plugin for implementing an OAuth Provider or Consumer"
     gemspec.email = "oauth-ruby@googlegroups.com"
-    gemspec.homepage = "http://github.com/pelle/oauth-plugin/tree/master"
-    gemspec.authors = ["Pelle Braendgaard"]
+    gemspec.homepage = "http://github.com/filiptepper/oauth-plugin/tree/master"
+    gemspec.authors = ["Pelle Braendgaard", "Filip Tepper"]
     gemspec.add_dependency('oauth', '>= 0.3.5')
     gemspec.rubyforge_project = 'oauth'
   end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.12

data/lib/oauth/controllers/provider_controller.rb

@@ -53,10 +53,12 @@ module OAuth
               end
               
               if @redirect_url
+                redirect_params_glue = @redirect_url.index("?").nil? ? "?" : "&"
+                
                 if @token.oauth10?
-                  redirect_to "#{@redirect_url}?oauth_token=#{@token.token}"
+                  redirect_to "#{@redirect_url}#{redirect_params_glue}oauth_token=#{@token.token}"
                 else
-                  redirect_to "#{@redirect_url}?oauth_token=#{@token.token}&oauth_verifier=#{@token.verifier}"
+                  redirect_to "#{@redirect_url}#{redirect_params_glue}oauth_token=#{@token.token}&oauth_verifier=#{@token.verifier}"
                 end
               else
                 render :action => "authorize_success"

data/lib/oauth/models/consumers/services/twitter_token.rb

@@ -1,4 +1,3 @@
-gem 'paulsingh-twitter' # go back to regular twitter gem when it is bumped to oauth 0.3.5
 require 'twitter'
 class TwitterToken < ConsumerToken
   TWITTER_SETTINGS={:site=>"http://twitter.com"}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: filiptepper-oauth-plugin
 version: !ruby/object:Gem::Version 
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 -07:00
+date: 2009-09-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,13 +101,13 @@ files:
 - lib/oauth/models/consumers/services/fireeagle_token.rb
 - lib/oauth/models/consumers/services/twitter_token.rb
 - lib/oauth/models/consumers/token.rb
-- oauth-plugin.gemspec
 - rails/init.rb
 - tasks/oauth_tasks.rake
 - uninstall.rb
-has_rdoc: false
-homepage: http://github.com/pelle/oauth-plugin/tree/master
-licenses: 
+has_rdoc: true
+homepage: http://github.com/filiptepper/oauth-plugin/tree/master
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8

data/oauth-plugin.gemspec

@@ -1,112 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{oauth-plugin}
-  s.version = "0.3.11"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Pelle Braendgaard", "Filip Tepper"]
-  s.date = %q{2009-09-21}
-  s.description = %q{Rails plugin for implementing an OAuth Provider or Consumer}
-  s.email = %q{oauth-ruby@googlegroups.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "CHANGELOG",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "generators/oauth_consumer/USAGE",
-     "generators/oauth_consumer/oauth_consumer_generator.rb",
-     "generators/oauth_consumer/templates/consumer_token.rb",
-     "generators/oauth_consumer/templates/controller.rb",
-     "generators/oauth_consumer/templates/index.html.erb",
-     "generators/oauth_consumer/templates/index.html.haml",
-     "generators/oauth_consumer/templates/migration.rb",
-     "generators/oauth_consumer/templates/oauth_config.rb",
-     "generators/oauth_consumer/templates/show.html.erb",
-     "generators/oauth_consumer/templates/show.html.haml",
-     "generators/oauth_provider/USAGE",
-     "generators/oauth_provider/lib/insert_routes.rb",
-     "generators/oauth_provider/oauth_provider_generator.rb",
-     "generators/oauth_provider/templates/_form.html.erb",
-     "generators/oauth_provider/templates/_form.html.haml",
-     "generators/oauth_provider/templates/access_token.rb",
-     "generators/oauth_provider/templates/authorize.html.erb",
-     "generators/oauth_provider/templates/authorize.html.haml",
-     "generators/oauth_provider/templates/authorize_failure.html.erb",
-     "generators/oauth_provider/templates/authorize_failure.html.haml",
-     "generators/oauth_provider/templates/authorize_success.html.erb",
-     "generators/oauth_provider/templates/authorize_success.html.haml",
-     "generators/oauth_provider/templates/client_application.rb",
-     "generators/oauth_provider/templates/client_application_spec.rb",
-     "generators/oauth_provider/templates/client_application_test.rb",
-     "generators/oauth_provider/templates/client_applications.yml",
-     "generators/oauth_provider/templates/clients_controller.rb",
-     "generators/oauth_provider/templates/clients_controller_spec.rb",
-     "generators/oauth_provider/templates/clients_controller_test.rb",
-     "generators/oauth_provider/templates/controller.rb",
-     "generators/oauth_provider/templates/controller_spec.rb",
-     "generators/oauth_provider/templates/controller_spec_helper.rb",
-     "generators/oauth_provider/templates/controller_test.rb",
-     "generators/oauth_provider/templates/controller_test_helper.rb",
-     "generators/oauth_provider/templates/edit.html.erb",
-     "generators/oauth_provider/templates/edit.html.haml",
-     "generators/oauth_provider/templates/index.html.erb",
-     "generators/oauth_provider/templates/index.html.haml",
-     "generators/oauth_provider/templates/migration.rb",
-     "generators/oauth_provider/templates/new.html.erb",
-     "generators/oauth_provider/templates/new.html.haml",
-     "generators/oauth_provider/templates/oauth_nonce.rb",
-     "generators/oauth_provider/templates/oauth_nonce_spec.rb",
-     "generators/oauth_provider/templates/oauth_nonce_test.rb",
-     "generators/oauth_provider/templates/oauth_nonces.yml",
-     "generators/oauth_provider/templates/oauth_token.rb",
-     "generators/oauth_provider/templates/oauth_token_spec.rb",
-     "generators/oauth_provider/templates/oauth_token_test.rb",
-     "generators/oauth_provider/templates/oauth_tokens.yml",
-     "generators/oauth_provider/templates/request_token.rb",
-     "generators/oauth_provider/templates/show.html.erb",
-     "generators/oauth_provider/templates/show.html.haml",
-     "init.rb",
-     "install.rb",
-     "lib/oauth-plugin.rb",
-     "lib/oauth/controllers/application_controller_methods.rb",
-     "lib/oauth/controllers/consumer_controller.rb",
-     "lib/oauth/controllers/provider_controller.rb",
-     "lib/oauth/models/consumers/service_loader.rb",
-     "lib/oauth/models/consumers/services/agree2_token.rb",
-     "lib/oauth/models/consumers/services/fireeagle_token.rb",
-     "lib/oauth/models/consumers/services/twitter_token.rb",
-     "lib/oauth/models/consumers/token.rb",
-     "oauth-plugin.gemspec",
-     "rails/init.rb",
-     "tasks/oauth_tasks.rake",
-     "uninstall.rb"
-  ]
-  s.homepage = %q{http://github.com/pelle/oauth-plugin/tree/master}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{oauth}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Ruby on Rails Plugin for OAuth Provider and Consumer}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<oauth>, [">= 0.3.5"])
-    else
-      s.add_dependency(%q<oauth>, [">= 0.3.5"])
-    end
-  else
-    s.add_dependency(%q<oauth>, [">= 0.3.5"])
-  end
-end