exvo-auth 0.7.1 → 0.7.2

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/exvo-auth.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exvo-auth}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacek Becela"]
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "exvo-auth.gemspec",
      "lib/exvo-auth.rb",
+     "lib/exvo_auth/autonomous/auth.rb",
      "lib/exvo_auth/autonomous/base.rb",
      "lib/exvo_auth/autonomous/cache.rb",
      "lib/exvo_auth/autonomous/consumer.rb",

data/lib/exvo-auth.rb

@@ -23,6 +23,7 @@ module ExvoAuth
     autoload :Consumer, 'exvo_auth/autonomous/consumer'
     autoload :Provider, 'exvo_auth/autonomous/provider'
     autoload :Cache,    'exvo_auth/autonomous/cache'
+    autoload :Auth,     'exvo_auth/autonomous/auth'
   end
   
   module OAuth2

data/lib/exvo_auth/autonomous/auth.rb

@@ -0,0 +1,6 @@
+class ExvoAuth::Autonomous::Auth
+  include HTTParty
+
+  base_uri(ExvoAuth::Config.host)
+  basic_auth(ExvoAuth::Config.client_id, ExvoAuth::Config.client_secret)
+end

data/lib/exvo_auth/autonomous/base.rb

@@ -19,7 +19,7 @@ class ExvoAuth::Autonomous::Base
   end
   
   # Makes testing easy
-  def httparty
-    HTTParty 
+  def auth
+    ExvoAuth::Autonomous::Auth
   end
 end

data/lib/exvo_auth/autonomous/consumer.rb

@@ -50,13 +50,7 @@ class ExvoAuth::Autonomous::Consumer < ExvoAuth::Autonomous::Base
   end
   
   def authorization!
-    response = httparty.get("/apps/consumer/authorizations/#{URI.escape(params[:provider_id])}.json", 
-      :base_uri   => params[:site], 
-      :basic_auth => { 
-        :username => params[:client_id],
-        :password => params[:client_secret]
-      }
-    )
+    response = auth.get("/apps/consumer/authorizations/#{URI.escape(params[:provider_id])}.json")
     
     @@cache.write(params, response["authorization"])
   end

data/lib/exvo_auth/autonomous/provider.rb

@@ -11,12 +11,7 @@ class ExvoAuth::Autonomous::Provider < ExvoAuth::Autonomous::Base
   end
   
   def scopes!
-    response = httparty.get("/apps/provider/authorizations/#{URI.escape(params[:consumer_id])}.json",
-      :base_uri   => params[:site], 
-      :basic_auth => { 
-        :username => params[:client_id],
-        :password => params[:client_secret]
-      },
+    response = auth.get("/apps/provider/authorizations/#{URI.escape(params[:consumer_id])}.json",
       :query => { :access_token => params[:access_token] }
     )
 

data/lib/exvo_auth/controllers/merb.rb

@@ -19,7 +19,7 @@ module ExvoAuth::Controllers::Merb
 
         @current_consumer_id = consumer_id
 
-        current_scopes.include?(scope)
+        current_scopes.include?(scope) && request.ssl?
       end
     end
     

data/lib/exvo_auth/controllers/rails.rb

@@ -15,7 +15,7 @@ module ExvoAuth::Controllers::Rails
         
         @current_consumer_id = consumer_id
         
-        current_scopes.include?(scope)
+        current_scopes.include?(scope) && request.ssl?
       end
     end
 

data/test/test_exvo_auth.rb

@@ -9,8 +9,8 @@ class TestExvoAuth < Test::Unit::TestCase
   test "consumer sanity" do
     c = ExvoAuth::Autonomous::Consumer.new(:provider_id => "baz")
     authorization = { "access_token" => "qux", "url" => "https://foo/api" }
-    httparty = stub(:get => { "authorization" => authorization })
-    c.expects(:httparty).returns(httparty)
+    auth = stub(:get => { "authorization" => authorization })
+    c.expects(:auth).returns(auth)
     
     assert_equal authorization, c.send(:authorization)
     assert_equal authorization, c.send(:authorization) # second time from cache, without touching httparty
@@ -18,8 +18,8 @@ class TestExvoAuth < Test::Unit::TestCase
 
   test "provider sanity" do
     p = ExvoAuth::Autonomous::Provider.new(:consumer_id => "baz", :access_token => "qux")
-    httparty = stub(:get => {"scope" => "qux quux"})
-    p.expects(:httparty).returns(httparty)
+    auth = stub(:get => {"scope" => "qux quux"})
+    p.expects(:auth).returns(auth)
     
     assert_equal ["qux", "quux"], p.scopes
     assert_equal ["qux", "quux"], p.scopes # second time from cache, without touching httparty

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Jacek Becela
@@ -90,6 +90,7 @@ files:
 - VERSION
 - exvo-auth.gemspec
 - lib/exvo-auth.rb
+- lib/exvo_auth/autonomous/auth.rb
 - lib/exvo_auth/autonomous/base.rb
 - lib/exvo_auth/autonomous/cache.rb
 - lib/exvo_auth/autonomous/consumer.rb