omniauth-force 0.0.1 → 0.0.2

data/Gemfile

@@ -6,3 +6,4 @@ gemspec
 gem 'activesupport'
 gem 'i18n'
 gem 'rack-test', :require => 'rack/test'
+gem 'mocha'

data/lib/omniauth_force/version.rb

@@ -1,3 +1,3 @@
 module OmniauthForce
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/omniauth-force.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency  'oa-oauth',   '~> 0.1.6'
-  s.add_dependency  'multi_json', '~> 0.0.2'
-  s.add_dependency  'oauth2',     '~> 0.1.1'
+  s.add_dependency  'omniauth',   '~> 0.2'
+  s.add_dependency  'multi_json'
+  s.add_dependency  'oauth2',     '~> 0.1'
 end

data/test/force_test.rb

@@ -4,11 +4,15 @@ class ForceTest < ActiveSupport::TestCase
   include Rack::Test::Methods
 
   def dummy_app
-    @dummy_app ||= lambda { |env| [200, {}, ["Dummy app"]] }
+    @dummy_app ||= lambda { |env| [404, {}, ["Dummy app doesn't handle any request"]] }
+  end
+
+  def force_middleware
+    @force_middleware ||= OmniAuth::Strategies::Force.new(dummy_app, 'force-api-key', 'force-api-secret')
   end
 
   def app
-    @app ||= OmniAuth::Strategies::Force.new(dummy_app, 'force-api-key', 'force-api-secret')
+    @app ||= Rack::Session::Cookie.new(force_middleware)
   end
 
   test "request phase should redirect to force login page with correct params" do
@@ -27,7 +31,7 @@ class ForceTest < ActiveSupport::TestCase
     assert_equal params['type'], ['web_server']
   end
 
-  test "callback phase should " do
+  test "callback phase should get access token and set omniauth.auth into env" do
     sf_token = {
       'instance_url' => 'http://instance',
       'id' => 'http://instance/id/123',
@@ -48,15 +52,15 @@ class ForceTest < ActiveSupport::TestCase
       [200, {}, ["Dummy app"]]
     end
 
-    connection = Faraday.new do |builder|
+    connection = Faraday.new('https://login.salesforce.com') do |builder|
       builder.adapter :test do |stub|
         stub.post('/services/oauth2/token') {[ 200, {}, MultiJson.encode(sf_token) ]}
         stub.get('/id/123?oauth_token=token123') {[ 200, {}, MultiJson.encode(sf_user_data) ]}
       end
     end
 
-
-    app.client.connection = connection
+    OAuth2::Client.any_instance.stubs(:connection => connection)
+    force_middleware.client.connection = connection
     get '/auth/force/callback?code=code123'
 
     assert_equal({

metadata

@@ -2,7 +2,7 @@
 name: omniauth-force
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jacob Dam
@@ -10,18 +10,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 +07:00
+date: 2011-03-25 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: oa-oauth
+  name: omniauth
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.6
+        version: "0.2"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -30,9 +30,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.2
+        version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: "0.1"
   type: :runtime
   version_requirements: *id003
 description: Force.com strategies for OmniAuth.
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Force.com strategies for OmniAuth.