cul_omniauth 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c61a80d8b694720517e45c004770acf8bfa5d1ab
-  data.tar.gz: ba3dec1e16ff45127e6f2dd5b6e40c51f679aacc
+  metadata.gz: bf19c3f3c7ecdf7bb405d29f7d2c593c190752ef
+  data.tar.gz: b67f3c701be26d95141e7c616346796f192c3886
 SHA512:
-  metadata.gz: 37c0e2aa4045bb96de86c0e4a098a169bb138bd46d49741f4fe4c9f085290fe425b7fa2436eafac785ca85b5089bc3277cd19aaf3473dadac229a39e80471fd5
-  data.tar.gz: d33ea623afc2dd57d7b64d423eb3e73936e38ac0a84ffc081959c1e862a3ae79c8e96e2d51f9de2ff7fe6fc8ab510f9bbee92558421b6fa40eb273a1b18678d7
+  metadata.gz: f28759221aae5a03b598b7d2c1a8df2da34471434d3991b7f84af6bf0a9930c1fa109a5a4ec9e7e5be1b75e97412070c3c81607f45cfc69f3acccdfa75771ff3
+  data.tar.gz: 340ee56f8116272c7937ad6c80ac7bc25b444aaa4f5b6ea94523a597a20cac77c10753dc8d54a40aa5e708825ef538e6be43bece722c88ecf06a4146aabfa58f

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

@@ -5,17 +5,21 @@ module Cul::Omniauth::Abilities
     ARRAY = [].freeze
   end
   def initialize(user=nil, opts={})
-    @user = user || User.new
-    roles = opts[:roles] || Empty::HASH
     if user
+      @user = user
+      opts = {user_id: user.uid}.merge(opts)
+    else
+      @user = User.new
+    end
+    roles = opts[:roles] || Empty::HASH
+    if @user
       role_permissions = self.class.config.select do |role,config|
-        roles.include?(role) or user.role?(role)
+        roles.include?(role) or @user.role?(role)
       end
-      role_permissions[:'*'] = self.class.config.fetch(:*,Empty::HASH)
-      opts = {user_id: user.uid}.merge(opts)
     else
-      role_permissions = {:'*' => self.class.config.fetch(:*,Empty::HASH)}
+      role_permissions = {}
     end
+    role_permissions[:'*'] = self.class.config.fetch(:*,Empty::HASH)
     role_permissions.each do |role, config|
       config.fetch(:can,Empty::HASH).each do |action, conditions|
         if conditions.blank?

data/lib/cul/omniauth/version.rb

@@ -1,5 +1,5 @@
 module Cul
   module Omniauth
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
   end
 end

data/spec/dummy/log/test.log

@@ -224,3 +224,27 @@ no persisted user for id {"uid"=>"foo", "extra"=>{}}
 no persisted user for id {"uid"=>"foo", "extra"=>{}}
 no persisted user for id {"uid"=>"foo", "extra"=>{}}
 no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}

data/spec/lib/cul/omniauth/abilities_spec.rb

@@ -163,4 +163,30 @@ describe Cul::Omniauth::Abilities do
       end
     end
   end
+
+  context "with no user" do
+  let(:current_user) { nil }
+    let(:rules) do
+      YAML.load(fixture('test/role_config/members.yml').read)['_all_environments']
+    end
+    before do
+      Ability.instance_variable_set :@role_proxy_config, symbolize_hash_keys(rules)
+      rig.instance_variable_set :@current_ability, nil
+    end
+    after do
+      Ability.instance_variable_set :@role_proxy_config, nil
+    end
+    subject do
+      rig.current_ability
+    end
+    it "has abilities of *" do
+        expect(subject.can?  :index, proxy).to be
+    end
+    it "has abilities of roles with member *" do
+        expect(subject.can?  :download, proxy).to be
+    end
+    it "doesn't have unexpected abilities" do
+        expect(subject.can?  :update, proxy).not_to be
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -61,4 +61,5 @@ class User
   def self.devise(*args); end
   def persisted?; persisted; end
   include Cul::Omniauth::Users
+  include Cul::Omniauth::Users::ConfiguredRoles
 end

metadata

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