exvo-auth 0.9.8 → 0.9.9

data/lib/exvo_auth/autonomous/consumer.rb

@@ -3,7 +3,7 @@ class ExvoAuth::Autonomous::Consumer < ExvoAuth::Autonomous::Base
   
   def initialize(params = {})
     super
-    validate_params!(:provider_id)
+    validate_params!(:app_id)
   end
   
   def base_uri
@@ -25,12 +25,12 @@ class ExvoAuth::Autonomous::Consumer < ExvoAuth::Autonomous::Base
   end
   
   def authorization!
-    response = auth.get("/apps/consumer/authorizations/#{URI.escape(params[:provider_id])}.json")
+    response = auth.get("/apps/consumer/authorizations/#{URI.escape(params[:app_id])}.json")
     
     if response["authorization"]
       @@cache.write(params, response["authorization"])
     else
-      raise "Authorization not found. You need an auhorization to contact provider app (#{ params[:provider_id] })"
+      raise "Authorization not found. You need an auhorization to contact provider app (#{ params[:app_id] })"
     end
   end
 end

data/lib/exvo_auth/autonomous/provider.rb

@@ -1,7 +1,7 @@
 class ExvoAuth::Autonomous::Provider < ExvoAuth::Autonomous::Base
   def initialize(params = {})
     super
-    validate_params!(:consumer_id, :access_token)
+    validate_params!(:app_id, :access_token)
   end
   
   def scopes
@@ -11,7 +11,7 @@ class ExvoAuth::Autonomous::Provider < ExvoAuth::Autonomous::Base
   end
   
   def scopes!
-    response = auth.get("/apps/provider/authorizations/#{URI.escape(params[:consumer_id])}.json",
+    response = auth.get("/apps/provider/authorizations/#{URI.escape(params[:app_id])}.json",
       :query => { :access_token => params[:access_token] }
     )
 

data/lib/exvo_auth/controllers/base.rb

@@ -37,15 +37,15 @@ module ExvoAuth::Controllers::Base
   end
 
   def authenticate_app_in_scope!(scope)    
-    raise("SSL not configured. Your api needs to be exposed through https protocol.") unless request.ssl? || ExvoAuth::Config.require_ssl == false
+    raise("SSL not configured. Your api needs to be exposed using https protocol.") unless request.ssl? || ExvoAuth::Config.require_ssl == false
 
-    send(basic_authentication_method_name) do |consumer_id, access_token|
+    send(basic_authentication_method_name) do |app_id, access_token|
       current_scopes = ExvoAuth::Autonomous::Provider.new(
-        :consumer_id  => consumer_id,
+        :app_id       => app_id,
         :access_token => access_token
       ).scopes
 
-      @current_consumer_id = consumer_id
+      @current_app_id = app_id
       
       current_scopes.include?(scope.to_s)
     end
@@ -64,8 +64,8 @@ module ExvoAuth::Controllers::Base
     @current_user = session[:user_id] && find_user_by_id(session[:user_id])
   end
   
-  def current_consumer_id
-    @current_consumer_id
+  def current_app_id
+    @current_app_id
   end
 
   def signed_in?
@@ -111,5 +111,4 @@ module ExvoAuth::Controllers::Base
       end
     end
   end
-  
 end

data/lib/exvo_auth/version.rb

@@ -1,3 +1,3 @@
 module ExvoAuth
-  VERSION = "0.9.8"
+  VERSION = "0.9.9"
 end

data/test/test_exvo_auth.rb

@@ -7,7 +7,7 @@ class TestExvoAuth < Test::Unit::TestCase
   end
   
   test "consumer sanity" do
-    c = ExvoAuth::Autonomous::Consumer.new(:provider_id => "baz")
+    c = ExvoAuth::Autonomous::Consumer.new(:app_id => "baz")
     authorization = { "access_token" => "qux", "url" => "https://foo/api" }
     auth = stub(:get => { "authorization" => authorization })
     c.expects(:auth).returns(auth)
@@ -17,7 +17,7 @@ class TestExvoAuth < Test::Unit::TestCase
   end
 
   test "provider sanity" do
-    p = ExvoAuth::Autonomous::Provider.new(:consumer_id => "baz", :access_token => "qux")
+    p = ExvoAuth::Autonomous::Provider.new(:app_id => "baz", :access_token => "qux")
     auth = stub(:get => {"scope" => "qux quux"})
     p.expects(:auth).returns(auth)
     
@@ -26,7 +26,7 @@ class TestExvoAuth < Test::Unit::TestCase
   end
   
   test "integration of httparty interface with auth" do
-    c = ExvoAuth::Autonomous::Consumer.new(:provider_id => "baz")
+    c = ExvoAuth::Autonomous::Consumer.new(:app_id => "baz")
     basement = mock("basement")
     basement.expects(:base_uri)
     basement.expects(:basic_auth)
@@ -36,7 +36,7 @@ class TestExvoAuth < Test::Unit::TestCase
   end
   
   test "basement includes httparty" do
-    c = ExvoAuth::Autonomous::Consumer.new(:provider_id => "baz")
+    c = ExvoAuth::Autonomous::Consumer.new(:app_id => "baz")
     assert_true c.send(:basement).included_modules.include?(HTTParty)
   end
 end

data/test/test_integration.rb

@@ -9,7 +9,7 @@ class TestIntegration < Test::Unit::TestCase
   end
   
   test "integration with staging.auth.exvo.com" do
-    c = ExvoAuth::Autonomous::Consumer.new(:provider_id => "bar")
+    c = ExvoAuth::Autonomous::Consumer.new(:app_id => "bar")
     authorization = c.send(:authorization)
     assert_true authorization["access_token"].size > 0
     assert_equal "https://bar/api", authorization["url"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exvo-auth
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: false
   segments: 
   - 0
   - 9
-  - 8
-  version: 0.9.8
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - Jacek Becela
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +02:00
+date: 2010-10-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency