exvo-auth 0.6.1 → 0.6.2

data/Rakefile

@@ -10,7 +10,9 @@ begin
     gem.homepage = "http://github.com/Exvo/Auth"
     gem.authors = ["Jacek Becela"]
     gem.add_dependency "oa-oauth", "0.0.1"
-    gem.add_dependency "httparty", "0.6.1"
+    gem.add_dependency "httparty", ">= 0.6.1"
+    gem.add_development_dependency "mocha", ">= 0.9.8"
+    gem.add_development_dependency "test-unit", ">= 2.1.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/exvo-auth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exvo-auth}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacek Becela"]
-  s.date = %q{2010-07-19}
+  s.date = %q{2010-07-20}
   s.description = %q{Sign in with Exvo account}
   s.email = %q{jacek.becela@gmail.com}
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "exvo-auth.gemspec",
      "lib/exvo-auth.rb",
+     "lib/exvo_auth/autonomous/base.rb",
      "lib/exvo_auth/autonomous/cache.rb",
      "lib/exvo_auth/autonomous/consumer.rb",
      "lib/exvo_auth/autonomous/provider.rb",
@@ -56,14 +57,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<oa-oauth>, ["= 0.0.1"])
-      s.add_runtime_dependency(%q<httparty>, ["= 0.6.1"])
+      s.add_runtime_dependency(%q<httparty>, [">= 0.6.1"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_development_dependency(%q<test-unit>, [">= 2.1.0"])
     else
       s.add_dependency(%q<oa-oauth>, ["= 0.0.1"])
-      s.add_dependency(%q<httparty>, ["= 0.6.1"])
+      s.add_dependency(%q<httparty>, [">= 0.6.1"])
+      s.add_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_dependency(%q<test-unit>, [">= 2.1.0"])
     end
   else
     s.add_dependency(%q<oa-oauth>, ["= 0.0.1"])
-    s.add_dependency(%q<httparty>, ["= 0.6.1"])
+    s.add_dependency(%q<httparty>, [">= 0.6.1"])
+    s.add_dependency(%q<mocha>, [">= 0.9.8"])
+    s.add_dependency(%q<test-unit>, [">= 2.1.0"])
   end
 end
 

data/lib/exvo-auth.rb

@@ -18,6 +18,7 @@ module ExvoAuth
   end
   
   module Autonomous
+    autoload :Base,     'exvo_auth/autonomous/base'
     autoload :Consumer, 'exvo_auth/autonomous/consumer'
     autoload :Provider, 'exvo_auth/autonomous/provider'
     autoload :Cache,    'exvo_auth/autonomous/cache'

data/lib/exvo_auth/autonomous/base.rb

@@ -0,0 +1,25 @@
+class ExvoAuth::Autonomous::Base
+  attr_reader :options
+  @@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
+    
+    validate_options!(:site, :client_id, :client_secret)
+  end
+  
+  protected
+  
+  def validate_options!(*keys)
+    missing = keys - options.keys
+    raise(ArgumentError, "Please configure following keys: #{missing.join(", ")}") if missing.any?
+  end
+  
+  # Makes testing easy
+  def httparty
+    HTTParty 
+  end
+end

data/lib/exvo_auth/autonomous/cache.rb

@@ -4,11 +4,17 @@ class ExvoAuth::Autonomous::Cache
   end
   
   def read(key)
-    @data[key]
+    o = @data[key]
+    o[:value] if o && (now - o[:timestamp]) < 3600 # cache for one hour
   end
   
   def write(key, value)
-    @data[key] = value
+    @data[key] = {
+      :value     => value,
+      :timestamp => now
+    }
+    
+    value
   end
   
   def fetch(key)
@@ -18,4 +24,10 @@ class ExvoAuth::Autonomous::Cache
       read(key)
     end
   end
+  
+  private
+  
+  def now
+    Time.now
+  end
 end

data/lib/exvo_auth/autonomous/consumer.rb

@@ -1,17 +1,7 @@
-class ExvoAuth::Autonomous::Consumer
-  attr_reader :options
-  @@cache = ExvoAuth::Autonomous::Cache.new
-  
+class ExvoAuth::Autonomous::Consumer < ExvoAuth::Autonomous::Base
   def initialize(options = {})
-    options[:site]          ||= ExvoAuth::Config.host
-    options[:client_id]     ||= ExvoAuth::Config.client_id
-    options[:client_secret] ||= ExvoAuth::Config.client_secret
-    
-    if options[:site].nil? || options[:client_id].nil? || options[:client_secret].nil? || options[:provider_id].nil?
-      raise(ArgumentError, "Please configure site, client_id, client_secret and provider_id")
-    end
-
-    @options = options
+    super
+    validate_options!(:provider_id)
   end
   
   def access_token
@@ -21,7 +11,7 @@ class ExvoAuth::Autonomous::Consumer
   end
   
   def access_token!
-    response = HTTParty.get("/apps/consumer/authorizations/#{options[:provider_id]}.json", 
+    response = httparty.get("/apps/consumer/authorizations/#{options[:provider_id]}.json", 
       :base_uri   => options[:site], 
       :basic_auth => { 
         :username => options[:client_id],

data/lib/exvo_auth/autonomous/provider.rb

@@ -1,17 +1,7 @@
-class ExvoAuth::Autonomous::Provider
-  attr_reader :options
-  @@cache = ExvoAuth::Autonomous::Cache.new
-  
+class ExvoAuth::Autonomous::Provider < ExvoAuth::Autonomous::Base
   def initialize(options = {})
-    options[:site]          ||= ExvoAuth::Config.host
-    options[:client_id]     ||= ExvoAuth::Config.client_id
-    options[:client_secret] ||= ExvoAuth::Config.client_secret
-
-    if options[:site].nil? || options[:client_id].nil? || options[:client_secret].nil? || options[:consumer_id].nil? || options[:access_token].nil?
-      raise(ArgumentError, "Please configure site, client_id, client_secret, consumer_id and access_token")
-    end
-
-    @options = options
+    super
+    validate_options!(:consumer_id, :access_token)
   end
   
   def scopes
@@ -21,7 +11,7 @@ class ExvoAuth::Autonomous::Provider
   end
   
   def scopes!
-    response = HTTParty.get("/apps/provider/authorizations/#{options[:consumer_id]}.json",
+    response = httparty.get("/apps/provider/authorizations/#{options[:consumer_id]}.json",
       :base_uri   => options[:site], 
       :basic_auth => { 
         :username => options[:client_id],
@@ -30,6 +20,8 @@ class ExvoAuth::Autonomous::Provider
       :query => { :access_token => options[:access_token] }
     )
 
-    @@cache.write(options, response["scope"].to_s.split)
+    if scope = response["scope"] # only cache positive responses
+      @@cache.write(options, scope.split)
+    end
   end
 end

data/lib/exvo_auth/controllers/base.rb

@@ -46,6 +46,10 @@ module ExvoAuth::Controllers::Base
     return @current_user if defined?(@current_user)
     @current_user = session[:user_id] && find_user_by_id(session[:user_id])
   end
+  
+  def current_consumer_id
+    @current_consumer_id
+  end
 
   def signed_in?
     !!current_user

data/lib/exvo_auth/controllers/merb.rb

@@ -12,12 +12,14 @@ module ExvoAuth::Controllers::Merb
 
     def authenticate_app_in_scope!(scope)    
       basic_authentication do |consumer_id, access_token|
-        @current_scopes = ExvoAuth::Autonomous::Provider.new(
+        current_scopes = ExvoAuth::Autonomous::Provider.new(
           :consumer_id  => consumer_id,
           :access_token => access_token
         ).scopes
 
-        @current_scopes.include?(scope)
+        @current_consumer_id = consumer_id
+
+        current_scopes.include?(scope)
       end
     end
     

data/lib/exvo_auth/controllers/rails.rb

@@ -8,12 +8,14 @@ module ExvoAuth::Controllers::Rails
   module InstanceMethods
     def authenticate_app_in_scope!(scope)
       authenticate_or_request_with_http_basic do |consumer_id, access_token|
-        @current_scopes = ExvoAuth::Autonomous::Provider.new(
+        current_scopes = ExvoAuth::Autonomous::Provider.new(
           :consumer_id  => consumer_id, 
           :access_token => access_token
         ).scopes
         
-        @current_scopes.include?(scope)
+        @current_consumer_id = consumer_id
+        
+        current_scopes.include?(scope)
       end
     end
 

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+gem 'test-unit'
 require 'test/unit'
-
+require 'mocha'
 require 'exvo-auth'

data/test/test_exvo_auth.rb

@@ -1,7 +1,26 @@
 require 'helper'
 
 class TestExvoAuth < Test::Unit::TestCase
-  def test_something_for_real
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  def setup
+    ExvoAuth::Config.client_id     = "foo"
+    ExvoAuth::Config.client_secret = "bar"
+  end
+  
+  test "consumer sanity" do
+    c = ExvoAuth::Autonomous::Consumer.new(:provider_id => "baz")
+    httparty = stub(:get => {"access_token" => "qux"})
+    c.expects(:httparty).returns(httparty)
+    
+    assert_equal "qux", c.access_token
+    assert_equal "qux", c.access_token # second time from cache, without touching httparty
+  end
+
+  test "provider sanity" do
+    c = ExvoAuth::Autonomous::Provider.new(:consumer_id => "baz", :access_token => "qux")
+    httparty = stub(:get => {"scope" => "qux quux"})
+    c.expects(:httparty).returns(httparty)
+    
+    assert_equal ["qux", "quux"], c.scopes
+    assert_equal ["qux", "quux"], c.scopes # second time from cache, without touching httparty
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Jacek Becela
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 +02:00
+date: 2010-07-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,7 +36,7 @@ dependencies:
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -45,6 +45,34 @@ dependencies:
         version: 0.6.1
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
+  type: :development
+  version_requirements: *id004
 description: Sign in with Exvo account
 email: jacek.becela@gmail.com
 executables: []
@@ -64,6 +92,7 @@ files:
 - VERSION
 - exvo-auth.gemspec
 - lib/exvo-auth.rb
+- lib/exvo_auth/autonomous/base.rb
 - lib/exvo_auth/autonomous/cache.rb
 - lib/exvo_auth/autonomous/consumer.rb
 - lib/exvo_auth/autonomous/provider.rb