cul_omniauth 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2f5e75dcb59b3b93419a19e1d32b6cfb0fdf251
-  data.tar.gz: 90baff7e34e64d4e86343977f47389c956b1780d
+  metadata.gz: a955dd2cc9270430db92c8b03bec61389433d945
+  data.tar.gz: 631f84ab0137bb08cba79631be673df44cb57f06
 SHA512:
-  metadata.gz: c73212bcb608d24654e4188575c72925012d9a0a60807e2354acea1a246f9e147995bb47312e4118c6ddba70ec3469d4cc29f76a092eaf89be77d7552ce18589
-  data.tar.gz: c8761a6dfd0805bc324f3e125b98736c6bc49896c020fb4245acc11528a8ab5a512a4f916be827764edc368d4fc51a5f4ceef4dbe92b040eeb45117885812ba8
+  metadata.gz: 7acc0a7d9c0fac857d28e5a9ef63894502dcbf9e8ade213cc387f254c7d31c75b3c2ed7fe65be36f3e46c2203eae239a5429b2b1e35770c0fffc94465c7bb050
+  data.tar.gz: 11feb2c0e5c9065a59a370f73134cf08400ee213975a36a9a1183c65095b7498d8190f18014ec428debb7f5fadc955ff87e6effcb33eba1dd490717bb44949f8

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

@@ -1,10 +1,11 @@
 module Cul::Omniauth::Abilities
   extend ActiveSupport::Concern
   EMPTY = [].freeze
-  def initialize(user, opts={})
+  def initialize(user=nil, opts={})
     @user = user || User.new
     if user
       role_permissions = self.class.config.select {|role,config| user.role? role }
+      opts = {user_id: user.login}.merge(opts)
     else
       role_permissions = {:'*' => self.class.config.fetch(:*,EMPTY)}
     end
@@ -16,17 +17,26 @@ module Cul::Omniauth::Abilities
           can action, :all
         else
           can action, Cul::Omniauth::AbilityProxy do |proxy|
-            r = !!proxy
-            if r
+            combine_with = conditions.fetch(:combine_with,:and).to_sym
+            r = (combine_with == :and)
+            if !!proxy
               conditions.fetch(:if,EMPTY).each do |property, comparisons|
                 p = value_for_property(proxy, property, opts)
-                r &= !!p
-                r &= comparisons.detect {|c,v| Comparisons.send(c, p, v)}
+                if combine_with == :and
+                  r &= !!p
+                  r &= comparisons.detect {|c,v| Comparisons.send(c, p, v)}
+                elsif p
+                  r ||= comparisons.detect {|c,v| Comparisons.send(c, p, v)}
+                end
               end
               conditions.fetch(:unless,EMPTY).each do |property, comparisons|
                 p = value_for_property(proxy, property, opts)
                 if p
-                  r &= !comparisons.detect {|c,v| Comparisons.send(c, p, v)}
+                  if combine_with == :and
+                    r &= !comparisons.detect {|c,v| Comparisons.send(c, p, v)}
+                  else
+                    r ||= !comparisons.detect {|c,v| Comparisons.send(c, p, v)}
+                  end
                 end
               end
             end
@@ -41,7 +51,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 = opts.fetch(property_handle,EMPTY) if property.blank? || property.empty?
     property
   end
   module Comparisons
@@ -49,10 +59,11 @@ 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 "#{context.inspect} #{value}"
+      puts "in? #{context.inspect} #{value}"
       (Array(value) & Array(context)).size > 0 
     end
   end

data/lib/cul/omniauth/ability_proxy.rb

@@ -1,12 +1,14 @@
 module Cul::Omniauth
   class AbilityProxy
-    attr_accessor :mime_type, :context, :content_models, :publisher, :remote_ip
+    attr_accessor :mime_type, :context, :content_models, :publisher, :remote_ip, :user_id, :user_roles
     def initialize(opts = {})
       self.mime_type = opts[:mime_type]
       self.context = opts[:context]
       self.content_models = opts[:content_models] || []
       self.publisher = opts[:publisher] || []
       self.remote_ip = opts[:remote_ip] || []
+      self.user_id = opts[:user_id] || []
+      self.user_roles = opts[:user_roles] || []
     end
     def to_h
       return {

data/lib/cul/omniauth/version.rb

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

metadata

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