exvo-auth 0.6.2 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.7.0

data/exvo-auth.gemspec

@@ -5,24 +5,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exvo-auth}
-  s.version = "0.6.2"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacek Becela"]
-  s.date = %q{2010-07-20}
+  s.date = %q{2010-07-21}
   s.description = %q{Sign in with Exvo account}
   s.email = %q{jacek.becela@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README",
-     "TODO"
+     "README"
   ]
   s.files = [
     ".gitignore",
      "LICENSE",
      "README",
      "Rakefile",
-     "TODO",
      "VERSION",
      "exvo-auth.gemspec",
      "lib/exvo-auth.rb",

data/lib/exvo_auth/autonomous/base.rb

@@ -1,20 +1,20 @@
 class ExvoAuth::Autonomous::Base
-  attr_reader :options
+  attr_reader :params
   @@cache = ExvoAuth::Autonomous::Cache.new
   
-  def initialize(options = {})
-    options[:site]          ||= ExvoAuth::Config.host
-    options[:client_id]     ||= ExvoAuth::Config.client_id
-    options[:client_secret] ||= ExvoAuth::Config.client_secret
-    @options = options
+  def initialize(params = {})
+    params[:site]          ||= ExvoAuth::Config.host
+    params[:client_id]     ||= ExvoAuth::Config.client_id
+    params[:client_secret] ||= ExvoAuth::Config.client_secret
+    @params = params
     
-    validate_options!(:site, :client_id, :client_secret)
+    validate_params!(:site, :client_id, :client_secret)
   end
   
   protected
   
-  def validate_options!(*keys)
-    missing = keys - options.keys
+  def validate_params!(*keys)
+    missing = keys - params.keys
     raise(ArgumentError, "Please configure following keys: #{missing.join(", ")}") if missing.any?
   end
   

data/lib/exvo_auth/autonomous/consumer.rb

@@ -1,24 +1,63 @@
 class ExvoAuth::Autonomous::Consumer < ExvoAuth::Autonomous::Base
-  def initialize(options = {})
+  def initialize(params = {})
     super
-    validate_options!(:provider_id)
+    validate_params!(:provider_id)
+  end
+
+  def get(*args)
+    http.get(*args)
+  end
+
+  def post(*args)
+    http.post(*args)
+  end
+
+  def put(*args)
+    http.put(*args)
+  end
+
+  def delete(*args)
+    http.delete(*args)
+  end
+
+  def head(*args)
+    http.head(*args)
+  end
+
+  def options(*args)
+    http.options(*args)
+  end
+  
+  protected
+  
+  # Url and Token set on each request so expired authorization will cause re-authorization.
+  def http
+    basement.base_uri(authorization["url"])
+    basement.basic_auth(params[:client_id], authorization["access_token"])
+    basement
+  end
+  
+  def basement
+    @basement ||= Class.new do
+      include HTTParty
+    end
   end
   
-  def access_token
-    @@cache.fetch(options) do
-      access_token!
+  def authorization
+    @@cache.fetch(params) do
+      authorization!
     end
   end
   
-  def access_token!
-    response = httparty.get("/apps/consumer/authorizations/#{options[:provider_id]}.json", 
-      :base_uri   => options[:site], 
+  def authorization!
+    response = httparty.get("/apps/consumer/authorizations/#{params[:provider_id]}.json", 
+      :base_uri   => params[:site], 
       :basic_auth => { 
-        :username => options[:client_id],
-        :password => options[:client_secret]
+        :username => params[:client_id],
+        :password => params[:client_secret]
       }
     )
     
-    @@cache.write(options, response["access_token"])
+    @@cache.write(params, response["authorization"])
   end
 end

data/lib/exvo_auth/autonomous/provider.rb

@@ -1,27 +1,29 @@
 class ExvoAuth::Autonomous::Provider < ExvoAuth::Autonomous::Base
-  def initialize(options = {})
+  def initialize(params = {})
     super
-    validate_options!(:consumer_id, :access_token)
+    validate_params!(:consumer_id, :access_token)
   end
   
   def scopes
-    @@cache.fetch(options) do
+    @@cache.fetch(params) do
       scopes!
     end
   end
   
   def scopes!
-    response = httparty.get("/apps/provider/authorizations/#{options[:consumer_id]}.json",
-      :base_uri   => options[:site], 
+    response = httparty.get("/apps/provider/authorizations/#{params[:consumer_id]}.json",
+      :base_uri   => params[:site], 
       :basic_auth => { 
-        :username => options[:client_id],
-        :password => options[:client_secret]
+        :username => params[:client_id],
+        :password => params[:client_secret]
       },
-      :query => { :access_token => options[:access_token] }
+      :query => { :access_token => params[:access_token] }
     )
 
     if scope = response["scope"] # only cache positive responses
-      @@cache.write(options, scope.split)
+      @@cache.write(params, scope.split)
+    else
+      []
     end
   end
 end

data/test/test_exvo_auth.rb

@@ -8,19 +8,35 @@ class TestExvoAuth < Test::Unit::TestCase
   
   test "consumer sanity" do
     c = ExvoAuth::Autonomous::Consumer.new(:provider_id => "baz")
-    httparty = stub(:get => {"access_token" => "qux"})
+    authorization = { "access_token" => "qux", "url" => "https://foo/api" }
+    httparty = stub(:get => { "authorization" => authorization })
     c.expects(:httparty).returns(httparty)
     
-    assert_equal "qux", c.access_token
-    assert_equal "qux", c.access_token # second time from cache, without touching httparty
+    assert_equal authorization, c.send(:authorization)
+    assert_equal authorization, c.send(:authorization) # second time from cache, without touching httparty
   end
 
   test "provider sanity" do
-    c = ExvoAuth::Autonomous::Provider.new(:consumer_id => "baz", :access_token => "qux")
+    p = ExvoAuth::Autonomous::Provider.new(:consumer_id => "baz", :access_token => "qux")
     httparty = stub(:get => {"scope" => "qux quux"})
-    c.expects(:httparty).returns(httparty)
+    p.expects(:httparty).returns(httparty)
     
-    assert_equal ["qux", "quux"], c.scopes
-    assert_equal ["qux", "quux"], c.scopes # second time from cache, without touching httparty
+    assert_equal ["qux", "quux"], p.scopes
+    assert_equal ["qux", "quux"], p.scopes # second time from cache, without touching httparty
+  end
+  
+  test "integration of httparty interface with auth" do
+    c = ExvoAuth::Autonomous::Consumer.new(:provider_id => "baz")
+    basement = mock("basement")
+    basement.expects(:base_uri)
+    basement.expects(:basic_auth)
+    basement.expects(:get).with("/bar").returns(true)
+    c.expects(:basement).at_least_once.returns(basement)
+    assert_true c.get("/bar")
+  end
+  
+  test "basement includes httparty" do
+    c = ExvoAuth::Autonomous::Consumer.new(:provider_id => "baz")
+    assert_true c.send(:basement).included_modules.include?(HTTParty)
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 2
-  version: 0.6.2
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Jacek Becela
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 +02:00
+date: 2010-07-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,13 +82,11 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README
-- TODO
 files: 
 - .gitignore
 - LICENSE
 - README
 - Rakefile
-- TODO
 - VERSION
 - exvo-auth.gemspec
 - lib/exvo-auth.rb

data/TODO

@@ -1,3 +0,0 @@
-* Add a way for apps to talk to each other: ssl + basic auth with client_id and client_secret. An app would confirm
-creds (of the connecting app) with Auth app using a speedy HEAD request. 
-* Benchmark the above to measure RTT footprint