terrain 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35b20c85da62fa29911c7f66fd6c3152dd138d21
-  data.tar.gz: 16e76c904d30e761b3667f0ae0c135fad8b7529c
+  metadata.gz: 8c1a10bf232abf55b96aaf0f5809519e15e02fc8
+  data.tar.gz: eb8f11a4cb927851d7d306d45fb9560038d71f62
 SHA512:
-  metadata.gz: 42432a6d37702385300c453a526620951a797acfaeaece1f17b81546fb9b041921fb1ae5f452bd37892d5bccb2d6ec71a0037a811c250896f9e28558705f9fe2
-  data.tar.gz: 89b74868b62563bec9d303e926632559ee79a4d65d5759020d650b6cb9d35ca70e085f05d4d186017f94d457d9dad9956797bede36615216277ba59b3f7f8251
+  metadata.gz: 462efae4c908fb0eabdae60d9d0d22e492ea0c6778390a06e5a0fb30cab618a18ab24b9ee3e381d5d2ccede8937419774cfc11b04f9d41fe09c4c1a20c11ca13
+  data.tar.gz: 9d48ba7b2c0f69b6db24ffca860074118f5f136218c2683ecf09e7248e8601e1329466c02931aa1e8d9dd261a5e23e00ae19d66b6dfe29ddb630a42e2a1da2c1

data/README.md

@@ -1,6 +1,6 @@
 # Terrain
 
-[![Build Status](https://travis-ci.org/scttnlsn/terrain.png?branch=master)](https://travis-ci.org/scttnlsn/terrain)
+[![Build Status](https://travis-ci.org/scttnlsn/terrain.svg?branch=master)](https://travis-ci.org/scttnlsn/terrain)
 
 Opinionated toolkit for building CRUD APIs with Rails
 

data/lib/terrain/resource.rb

@@ -89,11 +89,13 @@ module Terrain
         end
       end
 
+      def pundit_policy?(object)
+        finder = Pundit::PolicyFinder.new(object)
+        finder.policy.present?
+      end
+
       def authorize_record(record)
-        finder = Pundit::PolicyFinder.new(record)
-        if finder.policy
-          authorize(record)
-        end
+        authorize(record) if pundit_policy?(record)
       end
 
       def order(scope)
@@ -116,7 +118,9 @@ module Terrain
       end
 
       def resource_scope
-        preloaded_resource.all
+        scope = preloaded_resource.all
+        scope = policy_scope(scope) if pundit_policy?(scope)
+        scope
       end
 
       def load_record

data/spec/support/blank_policy.rb

@@ -0,0 +1,7 @@
+class BlankPolicy
+  class Scope < Struct.new(:user, :scope)
+    def resolve
+      scope
+    end
+  end
+end

data/spec/terrain/resource_spec.rb

@@ -72,6 +72,18 @@ describe 'Terrain::Resource', type: :controller do
           expect(response.body).to eq serialize(Example.order('foo desc', 'bar asc')).to_json
         end
       end
+
+      context 'with restricted policy' do
+        before do
+          allow(Example).to receive(:policy_class) { BlankPolicy }
+          allow_any_instance_of(BlankPolicy::Scope).to receive(:resolve) { Example.where('1 = 0') }
+        end
+
+        it 'returns policy scoped results' do
+          get :index
+          expect(response.body).to eq serialize([]).to_json
+        end
+      end
     end
 
     context 'paged' do

data/terrain.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'terrain'
-  gem.version       = '0.0.2'
+  gem.version       = '0.0.3'
   gem.summary       = 'Terrain'
   gem.description   = ''
   gem.license       = 'MIT'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrain
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Scott Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -70,6 +70,7 @@ files:
 - lib/terrain/page.rb
 - lib/terrain/resource.rb
 - spec/spec_helper.rb
+- spec/support/blank_policy.rb
 - spec/support/example.rb
 - spec/support/example_factory.rb
 - spec/support/example_serializer.rb
@@ -100,12 +101,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Terrain
 test_files:
 - spec/spec_helper.rb
+- spec/support/blank_policy.rb
 - spec/support/example.rb
 - spec/support/example_factory.rb
 - spec/support/example_serializer.rb