moat 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 159b847055cd79c58ce1e5b99788d74d78cb7dae
-  data.tar.gz: b5393955e97f8b5ccb8f9d8ff1dc29942307ca33
+  metadata.gz: e99313f748a138e0c9e6f5899ad3e7df1f255d8c
+  data.tar.gz: 4c9638daa7e628b3ce83d5e154bdb002762e5e78
 SHA512:
-  metadata.gz: 1f00dbf92a42d220e5ee6ff92a6f3a39994d4d37904a73ac4c328356a01796273cc1f74afa6621707c00936965d21ed2e490bfc640843f1b77dbb56b577bed84
-  data.tar.gz: cc8fbf90c9e3200b14c2f09646fe1ba9229b2451c6e15ca1ef016e508038e7638a4605bfd5c2532851aafe8815c2462af7d3beb9d263c355657cdd330bc89169
+  metadata.gz: 580d3411e85435820dcdcfb4bfcd7ae0f3411744744b1291a6986d1d121bb4396b9c6231674a418d0cd53209d770c4a085a1f9990ecb45b6c31e9e8670e32739
+  data.tar.gz: 7a91973ffcf54b70b5fb05367f2439ad1a4faba44dd7232ed5f459c4923979762cc6100c8435286811050d4cfa2aa464d386d1adb072e3adb331df7d0df531c6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    moat (0.1)
+    moat (0.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -319,6 +319,14 @@ describe ThingPolicy do
 end
 ```
 
+If a non-standard scope is required for filters, it can be overridden. It
+defaults to the `all` relation for ActiveRecord models or a simple Array
+otherwise.
+
+```ruby
+scope { resource.container }
+```
+
 ## Ensure all policies have full test coverage
 
 ```ruby

data/lib/moat.rb

@@ -78,6 +78,8 @@ module Moat
       object.policy_class
     elsif object.class.respond_to?(:policy_class)
       object.class.policy_class
+    elsif object.respond_to?(:to_ary)
+      find_policy(object.to_ary.first)
     else
       infer_policy(object)
     end

data/lib/moat/rspec.rb

@@ -138,7 +138,7 @@ module Moat
       end
 
       def permitted_through_filters(policy_class)
-        policy_instance = policy_class::Filter.new(public_send(role), policy_example_resource.class.all)
+        policy_instance = policy_class::Filter.new(public_send(role), policy_example_scope)
         policy_filters.select do |filter|
           policy_instance.public_send(filter).include?(policy_example_resource)
         end
@@ -160,10 +160,15 @@ module Moat
           alias_method :role, :roles
 
           def resource(&block)
-            fail ArgumentError, "#resource called without a block" if block.nil?
+            fail ArgumentError, "#{__method__} called without a block" unless block
             let(:policy_example_resource) { instance_eval(&block) }
           end
 
+          def scope(&block)
+            fail ArgumentError, "#{__method__} called without a block" unless block
+            let(:policy_example_scope) { instance_eval(&block) }
+          end
+
           def policy_filters(*filters)
             let(:policy_filters) { filters }
           end
@@ -187,6 +192,15 @@ module Moat
           let(:policy_example_resource) do
             fail NotImplementedError, "A resource has not been defined"
           end
+
+          # a scope that contains at least the resource
+          let(:policy_example_scope) do
+            if policy_example_resource.class.respond_to?(:all)
+              policy_example_resource.class.all
+            else
+              [policy_example_resource]
+            end
+          end
         end
       end
     end

data/lib/moat/version.rb

@@ -1,3 +1,3 @@
 module Moat
-  VERSION = "0.1".freeze
+  VERSION = "0.2".freeze
 end

data/spec/moat_spec.rb

@@ -113,25 +113,24 @@ describe Moat do
     end
 
     it "fails if a corresponding action can't be found" do
-      expect { moat_consumer.policy_filter([1, 2, 3], :invalid_action, policy: IntegerPolicy) }.
+      expect { moat_consumer.policy_filter([1, 2, 3], :invalid_action) }.
         to raise_error(Moat::ActionNotFoundError, "IntegerPolicy::Filter#invalid_action")
     end
 
     it "returns the value of applying a policy scope filter to the original scope" do
-      expect(moat_consumer.policy_filter([1, 2, 3, 4, 5], policy: IntegerPolicy)).to eql([2, 4])
+      expect(moat_consumer.policy_filter([1, 2, 3, 4, 5])).to eql([2, 4])
     end
 
     it "uses specified action" do
-      expect(moat_consumer.policy_filter([2, 3], :show, policy: IntegerPolicy)).to eql([3])
+      expect(moat_consumer.policy_filter([2, 3], :show)).to eql([3])
     end
 
     it "uses specified policy" do
-      expect(moat_consumer.policy_filter([2, 3], policy: OtherIntegerPolicy)).
-        to eql([3])
+      expect(moat_consumer.policy_filter([2, 3], policy: OtherIntegerPolicy)).to eql([3])
     end
 
     it "uses specified user" do
-      expect(moat_consumer.policy_filter([2, 3], user: "specified user", policy: IntegerPolicy)).to eql([2, 3])
+      expect(moat_consumer.policy_filter([2, 3], user: "specified user")).to eql([2, 3])
     end
   end
 
@@ -149,7 +148,7 @@ describe Moat do
     end
 
     it "fails if a corresponding action can't be found" do
-      expect { moat_consumer.authorize([1, 2, 3], :invalid_action?, policy: IntegerPolicy) }.
+      expect { moat_consumer.authorize([1, 2, 3], :invalid_action?) }.
         to raise_error(Moat::ActionNotFoundError, "IntegerPolicy::Authorization#invalid_action?")
     end
 
@@ -184,7 +183,7 @@ describe Moat do
     end
     context "policy_filter called" do
       it "does not raise an exception" do
-        moat_consumer.policy_filter([1, 2], policy: IntegerPolicy)
+        moat_consumer.policy_filter([1, 2])
         expect { moat_consumer.verify_policy_applied }.not_to raise_error
       end
     end
@@ -281,7 +280,7 @@ describe Moat do
     end
 
     it "infers a policy from an object's `model` method" do
-      class DefinesModelName
+      class DefinesModel
         def self.model
           Fake
         end
@@ -290,7 +289,25 @@ describe Moat do
           [11, 12]
         end
       end
-      expect(moat_consumer.policy_filter(DefinesModelName)).to eql([11, 12])
+      expect(moat_consumer.policy_filter(DefinesModel)).to eql([11, 12])
+    end
+
+    it "infers a policy from when scope is a non-Array that implements to_ary" do
+      class IntContainer
+        def initialize(*numbers)
+          @numbers = numbers
+        end
+
+        def to_ary
+          @numbers
+        end
+
+        def select
+          @numbers.select { |n| yield(n) }
+        end
+      end
+
+      expect(moat_consumer.policy_filter(IntContainer.new(1, 2, 3, 4, 5))).to eql([2, 4])
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moat
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Poll Everywhere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec