aker 3.0.1 → 3.0.2

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 Aker History
 ============
 
+3.0.2
+-----
+- Added missing LICENSE file. Aker is made available under the MIT
+  license. (#9)
+- Fixed: `Aker::Cas::Middleware::TicketRemover` now sets its response's
+  Content-Type.  `TicketRemover` also now returns a link to the cleaned URI,
+  following recommendations set forth in RFC 2616.  (#10)
+- Added: `Aker::User#permit?` accepts an `:affiliate_ids` option. (#11)
+
 3.0.1
 -----
 - Fixed: with AS3, using `active_support/core_ext` requires the i18n

data/lib/aker/cas/middleware/ticket_remover.rb

@@ -15,8 +15,11 @@ module Aker::Cas::Middleware
 
     def call(env)
       if authenticated?(env) && ticket_present?(env)
-        url = Aker::Cas::ServiceUrl.service_url(Rack::Request.new(env))
-        [301, { 'Location' => url }, ["Removing authenticated CAS ticket"] ]
+        request = Rack::Request.new(env)
+        url = Aker::Cas::ServiceUrl.service_url(request)
+        body = request.get? ? [%Q{<a href="#{url}">Click here to continue</a>}] : []
+
+        [301, { 'Location' => url, 'Content-Type' => 'text/html' }, body]
       else
         @app.call(env)
       end

data/lib/aker/user.rb

@@ -68,6 +68,7 @@ module Aker
     #   @param [Hash] options additional constraints on the query
     #   @option options [#to_sym] :portal (#default_portal) the portal
     #     within which to do the group check
+    #   @option options [Array] :affiliate_ids ([]) Affiliate ids constraining group membership
     #   @return [Boolean]
     #
     # @overload permit?(*groups, options={}, &block)
@@ -78,17 +79,19 @@ module Aker
     #   @param [Hash] options additional constraints on the condition
     #   @option options [#to_sym] :portal (#default_portal) the portal
     #     within which to do the group check
+    #   @option options [Array] :affiliate_ids ([]) Affiliate ids constraining group membership
     #   @return [Object,nil] the value of the block if it is
     #     executed; otherwise nil
     def permit?(*args)
       options = args.last.is_a?(Hash) ? args.pop : { }
       portal = options[:portal] || default_portal
+      affiliate_ids = options[:affiliate_ids] || []
 
       permitted =
         if args.empty?
           may_access?(portal)
         else
-          args.detect { |group| group_memberships(portal).include?(group.to_sym) }
+          args.detect { |group| group_memberships(portal).include?(group.to_sym, *affiliate_ids) }
         end
 
       if block_given?

data/lib/aker/version.rb

@@ -1,3 +1,3 @@
 module Aker
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/spec/aker/cas/middleware/ticket_remover_spec.rb

@@ -29,19 +29,41 @@ module Aker::Cas::Middleware
         last_response.body.should == 'Requested content'
       end
 
-      context 'ticket is present and the user is authenticated' do
-        before do
-          env['aker.check'] = Aker::Rack::Facade.new(Aker.configuration, Aker::User.new('jo'))
+      context 'with ticket and successful authentication' do
+        shared_examples_for 'a ticket cleaner' do |method|
+          before do
+            env['aker.check'] = Aker::Rack::Facade.new(Aker.configuration, Aker::User.new('jo'))
 
-          get '/foo?ticket=ST-45&q=bar', {}, env
+            send(method, '/foo?ticket=ST-45&q=bar', {}, env)
+          end
+
+          it 'sends a permanent redirect' do
+            last_response.status.should == 301
+          end
+
+          it 'redirects to the same URI without the ticket' do
+            last_response.headers['Location'].should == 'http://example.org/foo?q=bar'
+          end
+
+          it 'has Content-Type text/html' do
+            last_response.headers['Content-Type'].should == 'text/html'
+          end
         end
 
-        it 'sends a permanent redirect' do
-          last_response.status.should == 301
+        context 'on GET' do
+          it_should_behave_like 'a ticket cleaner', :get do
+            it 'has a link to the cleaned URI in its body' do
+              last_response.body.should == %q{<a href="http://example.org/foo?q=bar">Click here to continue</a>}
+            end
+          end
         end
 
-        it 'redirects to the same URI without the ticket' do
-          last_response.headers['Location'].should == 'http://example.org/foo?q=bar'
+        context 'on HEAD' do
+          it_should_behave_like 'a ticket cleaner', :head do
+            it 'has an empty body' do
+              last_response.body.should be_empty
+            end
+          end
         end
       end
     end

data/spec/aker/cas/proxy_mode_spec.rb

@@ -11,7 +11,7 @@ module Aker::Cas
       @env['aker.configuration'] = Aker::Configuration.new
     end
 
-    it_should_behave_like "a aker mode"
+    it_should_behave_like "an aker mode"
 
     describe "#key" do
       it "is :cas_proxy" do

data/spec/aker/cas/service_mode_spec.rb

@@ -11,7 +11,7 @@ module Aker::Cas
       @mode = ServiceMode.new(@env, @scope)
     end
 
-    it_should_behave_like "a aker mode"
+    it_should_behave_like "an aker mode"
 
     describe "#key" do
       it "is :cas" do

data/spec/aker/form/a_form_mode.rb

@@ -13,7 +13,7 @@ module Aker::Form
       @mode = Mode.new(@env, @scope)
     end
 
-    it_should_behave_like "a aker mode"
+    it_should_behave_like "an aker mode"
 
     describe "#kind" do
       it "is :user" do

data/spec/aker/ldap/authority_spec.rb

@@ -13,7 +13,7 @@ module Aker::Ldap
         :ldif => File.expand_path("../ldap-users.ldif", __FILE__),
         :domain => "dc=northwestern,dc=edu",
         :port => 3897 + port_offset,
-        :timeout => ENV['AKER_ENV'] ? 45 : 15 # the CI server is slow sometimes
+        :timeout => ENV['CI_RUBY'] ? 90 : 15 # the CI server is slow sometimes
       )
     end
 

data/spec/aker/modes/a_aker_mode.rb

@@ -6,7 +6,7 @@ require 'warden'
 #
 # * @mode: an instance of the mode under test
 # * @env: a Rack environment used by the mode
-shared_examples_for "a aker mode" do
+shared_examples_for "an aker mode" do
   it "is a Warden strategy" do
     (@mode.class < Warden::Strategies::Base).should be_true
   end

data/spec/aker/modes/http_basic_spec.rb

@@ -12,7 +12,7 @@ module Aker::Modes
       @env['aker.configuration'] = Aker::Configuration.new
     end
 
-    it_should_behave_like "a aker mode"
+    it_should_behave_like "an aker mode"
 
     describe "#key" do
       it "is :http_basic" do

data/spec/aker/user_spec.rb

@@ -143,6 +143,24 @@ module Aker
         end
       end
 
+      describe "with affiliate_ids" do
+        before do
+          affiliated_membership = GroupMembership.new(Group.new('Affiliated'))
+          affiliated_membership.affiliate_ids = [1]
+          @user.group_memberships(:NOTIS) << affiliated_membership
+          @user.group_memberships(:ENU) << affiliated_membership
+        end
+        it "returns true if the user is in the group for that affiliate id" do
+          @user.permit?(:Affiliated, :affiliate_ids => [1]).should be_true
+        end
+        it "returns false if the user in the group for a different affiliate id" do
+          @user.permit?(:Affiliated, :affiliate_ids => [4]).should be_false
+        end
+        it "returns true if user in group if affiliate_ids is empty array" do
+          @user.permit?(:Affiliated, :affiliate_ids => []).should be_true
+        end
+      end
+
       describe "with a block" do
         it "yields to a passed block if the user matches the group" do
           executed = nil
@@ -170,6 +188,7 @@ module Aker
           @user.permit?(:Admin) { "block value" }.should == nil
         end
       end
+
     end
 
     describe "#merge!" do

data/spec/spec_helper.rb

@@ -33,7 +33,7 @@ RSpec.configure do |config|
 end
 
 def port_offset
-  base = case ENV["AKER_ENV"]
+  base = case ENV['CI_RUBY']
          when /jruby/
            17
          when /1.9/

metadata

@@ -1,22 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: aker
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
+  hash: 3
+  prerelease: false
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - Rhett Sutphin
 - David Yip
+- William Dix
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 Z
+date: 2011-10-07 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubytree
@@ -238,6 +240,7 @@ files:
 - spec/matchers.rb
 - spec/mock_builder.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/NUBIC/aker
 licenses: []
 
@@ -267,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A flexible authentication and authorization framework for Rack applications.