cul_omniauth 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a955dd2cc9270430db92c8b03bec61389433d945
-  data.tar.gz: 631f84ab0137bb08cba79631be673df44cb57f06
+  metadata.gz: d5c1805d9d83aa9df667abb8df5e5aed6c1a3421
+  data.tar.gz: a0d99e89e40921bff1d81724109fc97c84e336dc
 SHA512:
-  metadata.gz: 7acc0a7d9c0fac857d28e5a9ef63894502dcbf9e8ade213cc387f254c7d31c75b3c2ed7fe65be36f3e46c2203eae239a5429b2b1e35770c0fffc94465c7bb050
-  data.tar.gz: 11feb2c0e5c9065a59a370f73134cf08400ee213975a36a9a1183c65095b7498d8190f18014ec428debb7f5fadc955ff87e6effcb33eba1dd490717bb44949f8
+  metadata.gz: 5567910040ad0349764cac904e5f921afb7ff104862cfbfe77c79037aae0b76f675a50b11aa73c410f0dbfdc34b874840b1a7d8361b45560ee87514c3b9d5473
+  data.tar.gz: da1a4d534b2af97a107e8a3aef97ae126544c1fc56e5cb79711031aa93728ca96bee2b6b1e6ea9d4a3bc8a3e41c165f47f11393628066c9722ec014ff3567af8

data/app/controllers/concerns/cul/omniauth/callbacks.rb

@@ -18,7 +18,7 @@ module Cul::Omniauth::Callbacks
     find_method = "find_for_#{auth_type.downcase}".to_sym
     current_user ||= User.send(find_method,request.env["omniauth.auth"], current_user)
     affils = ["#{request.env["omniauth.auth"].uid}:users.cul.columbia.edu"]
-    affils << "staff:cul.columbia.edu" if current_user.cul_staff?
+    affils << "staff:cul.columbia.edu" if current_user.respond_to?(:cul_staff?) and  current_user.cul_staff?
     affils += (request.env["omniauth.auth"].extra.affiliations || [])
     affiliations(current_user,affils)
     session["devise.roles"] = affils

data/app/controllers/concerns/cul/omniauth/remote_ip_ability.rb

@@ -1,6 +1,6 @@
 module Cul::Omniauth::RemoteIpAbility
   extend ActiveSupport::Concern
   def current_ability
-    @current_ability ||= Ability.new(current_user, remote_ip:request.remote_ip)
+    @current_ability ||= Ability.new(current_user, roles: session["devise.roles"], remote_ip:request.remote_ip)
   end
 end

data/app/models/concerns/cul/omniauth/abilities.rb

@@ -1,26 +1,31 @@
 module Cul::Omniauth::Abilities
   extend ActiveSupport::Concern
-  EMPTY = [].freeze
+  module Empty
+    HASH = {}.freeze
+    ARRAY = [].freeze
+  end
   def initialize(user=nil, opts={})
     @user = user || User.new
+    roles = opts[:roles] || Empty::HASH
     if user
-      role_permissions = self.class.config.select {|role,config| user.role? role }
+      role_permissions = self.class.config.select do |role,config|
+        roles.include?(role) or user.role?(role)
+      end
+      role_permissions[:'*'] = self.class.config.fetch(:*,Empty::HASH)
       opts = {user_id: user.login}.merge(opts)
     else
-      role_permissions = {:'*' => self.class.config.fetch(:*,EMPTY)}
+      role_permissions = {:'*' => self.class.config.fetch(:*,Empty::HASH)}
     end
-    puts role_permissions.inspect
     role_permissions.each do |role, config|
-      config.fetch(:can,EMPTY).each do |action, conditions|
+      config.fetch(:can,Empty::HASH).each do |action, conditions|
         if conditions.blank?
-          puts "can #{action}, :all"
           can action, :all
         else
           can action, Cul::Omniauth::AbilityProxy do |proxy|
             combine_with = conditions.fetch(:combine_with,:and).to_sym
             r = (combine_with == :and)
             if !!proxy
-              conditions.fetch(:if,EMPTY).each do |property, comparisons|
+              conditions.fetch(:if,Empty::HASH).each do |property, comparisons|
                 p = value_for_property(proxy, property, opts)
                 if combine_with == :and
                   r &= !!p
@@ -29,7 +34,7 @@ module Cul::Omniauth::Abilities
                   r ||= comparisons.detect {|c,v| Comparisons.send(c, p, v)}
                 end
               end
-              conditions.fetch(:unless,EMPTY).each do |property, comparisons|
+              conditions.fetch(:unless,Empty::HASH).each do |property, comparisons|
                 p = value_for_property(proxy, property, opts)
                 if p
                   if combine_with == :and
@@ -51,7 +56,7 @@ module Cul::Omniauth::Abilities
     if proxy.respond_to? property_handle.to_sym
       property = proxy.send property_handle
     end
-    property = opts.fetch(property_handle,EMPTY) if property.blank? || property.empty?
+    property = opts.fetch(property_handle,Empty::ARRAY) if property.blank? || property.empty?
     property
   end
   module Comparisons
@@ -59,11 +64,9 @@ module Cul::Omniauth::Abilities
       context.include? value
     end
     def self.eql?(context, value)
-      puts "eql? #{context.inspect} #{value}"
       context.eql? value
     end
     def self.in?(context, value)
-      puts "in? #{context.inspect} #{value}"
       (Array(value) & Array(context)).size > 0 
     end
   end

data/lib/cul/omniauth/version.rb

@@ -1,5 +1,5 @@
 module Cul
   module Omniauth
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cul_omniauth
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - barmintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails