oa-core 0.2.0.beta2 → 0.2.0.beta3

data/lib/omniauth/core.rb

@@ -26,6 +26,7 @@ module OmniAuth
       end,
       :form_css => Form::DEFAULT_CSS,
       :test_mode => false,
+      :allowed_request_methods => [:get, :post],
       :mock_auth => {
         :default => {
           'uid' => '1234',
@@ -55,7 +56,7 @@ module OmniAuth
     end
 
     attr_writer :on_failure
-    attr_accessor :path_prefix, :form_css, :test_mode, :mock_auth, :full_host
+    attr_accessor :path_prefix, :allowed_request_methods, :form_css, :test_mode, :mock_auth, :full_host
   end
   
   def self.config

data/lib/omniauth/strategies/password.rb

@@ -7,9 +7,8 @@ module OmniAuth
       include OmniAuth::Strategy
       
       def initialize(app, secret = 'changethisappsecret', options = {}, &block)
-        @options = options
         @secret = secret
-        super(app, :password, &block)
+        super(app, :password, options, &block)
       end
 
       attr_reader :secret

data/lib/omniauth/strategy.rb

@@ -26,12 +26,12 @@ module OmniAuth
     def call!(env)
       @env = env
       return mock_call!(env) if OmniAuth.config.test_mode
-
-      if request.path == request_path
+      
+      if current_path == request_path && OmniAuth.config.allowed_request_methods.include?(request.request_method.downcase.to_sym)
         status, headers, body = *call_app!
         @response = Rack::Response.new(body, status, headers)
         request_phase
-      elsif request.path == callback_path
+      elsif current_path == callback_path
         callback_phase
       else
         if respond_to?(:other_phase)
@@ -43,9 +43,11 @@ module OmniAuth
     end
 
     def mock_call!(env)
-      if request.path == request_path
+      if current_path == request_path
+        status, headers, body = *call_app!
+        @response = Rack::Response.new(body, status, headers)
         redirect callback_path
-      elsif request.path == callback_path
+      elsif current_path == callback_path
         @env['omniauth.auth'] = OmniAuth.mock_auth_for(name.to_sym)
         call_app!
       else
@@ -75,6 +77,10 @@ module OmniAuth
       options[:callback_path] || "#{path_prefix}/#{name}/callback"
     end
 
+    def current_path
+      request.path.sub(/\/$/,'')
+    end
+
     def query_string
       request.query_string.empty? ? "" : "?#{request.query_string}"
     end

data/lib/omniauth/test/strategy_macros.rb

@@ -22,6 +22,11 @@ module OmniAuth
         end
       end
       
+      def sets_user_info_to(user_info)
+        it "should set the user_info to #{user_info}" do
+          (last_request.env['omniauth.auth'] || {})['user_info'].should == user_info
+        end
+      end
     end
     
   end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: oa-core
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 2
-  - 0
-  - beta2
-  version: 0.2.0.beta2
+  prerelease: 6
+  version: 0.2.0.beta3
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 -06:00
+date: 2011-02-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,9 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
         version: "1.1"
   type: :runtime
   prerelease: false
@@ -39,8 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -52,10 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 8
         version: 0.0.8
   type: :development
   prerelease: false
@@ -67,10 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
   type: :development
   prerelease: false
@@ -82,10 +64,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 4
         version: 1.3.4
   type: :development
   prerelease: false
@@ -97,10 +75,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 4
         version: 0.5.4
   type: :development
   prerelease: false
@@ -112,10 +86,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 3
         version: 1.4.3
   type: :development
   prerelease: false
@@ -153,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3598036848001495885
+      hash: -4575558600340992300
       segments: 
       - 0
       version: "0"
@@ -162,15 +132,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: HTTP Basic strategies for OmniAuth.