rolypoly 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f4da324f740e09486d891362c4ccca59293f1e6
-  data.tar.gz: 8e81b842251b29657c0d853d1c30b686006dcba4
+  metadata.gz: b09c15051b80319c301293ec37ab69543724ca83
+  data.tar.gz: 3af871d40e05440ee846689d45bc479914bf26cb
 SHA512:
-  metadata.gz: bb720596c9c935a5d5f9f2d0483b67c09de67cd8572569322acecf9c487031a54aeb3cf46810333bfb2502e729922ff304ccca177c415972bfe25b2774a1854f
-  data.tar.gz: 27b4a65a2a1f986488f35e39f6b543079927fa8ec5efd6f4aeb0b62676e90e04654834696b8cf8433ccd114b88213e6e65277abc73d32c44075e3f6953321945
+  metadata.gz: 74757c303d7c9f040d8685a3baa9e0401584a3bea4ba6e241d883387e3089ee9db3c05e8644a8978b1efa70f91341a0d6a97bfa15909a43458d2be86a1cafb01
+  data.tar.gz: 01b232b80eeb8d65569fdc28a03348fedeb98bf50ca4b0ba003e068c1ed14afb6b478dca1d2b0d7f94d132353cd66dd7d2827f9bc9cdd997ef403f3c9a504cae

data/lib/rolypoly/role_gatekeeper.rb

@@ -84,8 +84,19 @@ module Rolypoly
 
     private def allowed_resource?(check_role, required_resource)
       return true unless require_resource?
+      return false unless check_role.respond_to?(:resource?)
+
+      if resources?(required_resource)
+        required_resource.any? do |r|
+          check_role.resource?(r)
+        end
+      else
+        check_role.resource?(required_resource)
+      end
+    end
 
-      check_role.respond_to?(:resource?) && check_role.resource?(required_resource)
+    private def resources?(resources)
+      resources.is_a?(Array) && !%w(String Symbol).include?(resources.first.class.name)
     end
 
     private def find_required_resource(options = {})

data/lib/rolypoly/version.rb

@@ -1,3 +1,3 @@
 module Rolypoly
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/lib/rolypoly/role_gatekeeper_spec.rb

@@ -119,41 +119,75 @@ module Rolypoly
 
       subject { described_class.new roles, actions, :resource }
 
-      describe "resource does not match" do
-        before do
-          allow(scorekeeper_role).to receive(:resource?).with(nil).and_return false
-          allow(scorekeeper_role).to receive(:to_role_string).and_return 'scorekeeper'
-        end
+      context 'with no resource' do
+        describe "resource does not match" do
+          before do
+            allow(scorekeeper_role).to receive(:resource?).with(nil).and_return false
+            allow(scorekeeper_role).to receive(:to_role_string).and_return 'scorekeeper'
+          end
 
-        it { expect(subject.allow?(nil, nil)).to be false }
-        it { expect(subject.allow?(scorekeeper_role, :index)).to be false }
-        it { expect(subject.allow?(scorekeeper_role, :edit)).to be false }
+          it { expect(subject.allow?(nil, nil)).to be false }
+          it { expect(subject.allow?(scorekeeper_role, :index)).to be false }
+          it { expect(subject.allow?(scorekeeper_role, :edit)).to be false }
+        end
       end
 
-      describe "resource does not match" do
-        let(:resource) { { resource: ['Organization', 123] } }
+      context 'with resource' do
+        describe "resource does not match" do
+          let(:resource) { { resource: ['Organization', 123] } }
 
-        before do
-          allow(scorekeeper_role).to receive(:resource?).with(resource[:resource]).and_return false
-          allow(scorekeeper_role).to receive(:to_role_string).and_return "scorekeeper"
-        end 
+          before do
+            allow(scorekeeper_role).to receive(:resource?).with(resource[:resource]).and_return false
+            allow(scorekeeper_role).to receive(:to_role_string).and_return "scorekeeper"
+          end
+
+          it { expect(subject.allow?(nil, nil, resource)).to be false }
+          it { expect(subject.allow?([scorekeeper_role], "index", resource)).to be false }
+          it { expect(subject.allow?([scorekeeper_role], "edit", resource)).to be false }
+        end
+
+        describe "resource matches" do
+          let(:resource) { { resource: ['Organization', 123] } }
+
+          before do
+            allow(scorekeeper_role).to receive(:resource?).with(resource[:resource]).and_return true
+          end
 
-        it { expect(subject.allow?(nil, nil, resource)).to be false }
-        it { expect(subject.allow?([scorekeeper_role], "index", resource)).to be false }
-        it { expect(subject.allow?([scorekeeper_role], "edit", resource)).to be false }
+          it { expect(subject.allow?(nil, nil, resource)).to be false }
+          it { expect(subject.allow?([scorekeeper_role], "index", resource)).to be true }
+          it { expect(subject.allow?([scorekeeper_role], "edit", resource)).to be false }
+        end
       end
 
-      describe "resource matches" do
-        let(:resource) { { resource: ['Organization', 123] } }
+      context 'with resources' do
+        let(:first_resource) { ['Organization', 1] }
+        let(:second_resource) { ['Organization', 123] }
+        let(:resource) { { resource: [first_resource, second_resource] } }
 
-        before do
-          allow(scorekeeper_role).to receive(:resource?).with(resource[:resource]).and_return true
+        describe 'none of the resources match' do
+          before do
+            allow(scorekeeper_role).to receive(:resource?).with(first_resource).and_return false
+            allow(scorekeeper_role).to receive(:resource?).with(second_resource).and_return false
+            allow(scorekeeper_role).to receive(:to_role_string).and_return "scorekeeper"
+          end
+
+          it { expect(subject.allow?(nil, nil, resource)).to be false }
+          it { expect(subject.allow?([scorekeeper_role], "index", resource)).to be false }
+          it { expect(subject.allow?([scorekeeper_role], "edit", resource)).to be false }
         end
 
-        it { expect(subject.allow?(nil, nil, resource)).to be false }
-        it { expect(subject.allow?([scorekeeper_role], "index", resource)).to be true }
-        it { expect(subject.allow?([scorekeeper_role], "edit", resource)).to be false }
+        describe 'one of the resources match' do
+          before do
+            allow(scorekeeper_role).to receive(:resource?).with(first_resource).and_return false
+            allow(scorekeeper_role).to receive(:resource?).with(second_resource).and_return true
+          end
+
+          it { expect(subject.allow?(nil, nil, resource)).to be false }
+          it { expect(subject.allow?([scorekeeper_role], "index", resource)).to be true }
+          it { expect(subject.allow?([scorekeeper_role], "edit", resource)).to be false }
+        end
       end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rolypoly
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jon Phenow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Tools for handling per-action and per-app Role authorization