grape-cancan 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 34714b17e347b036572b0167cf8a550319b4fbf7
-  data.tar.gz: 17667b2a66979de84ef5b36d3a312e7d5b1716bc
+SHA256:
+  metadata.gz: b9b072e32444e118343956cb4f3cffa02d7587e8fa9b7744a2dcccb0a3a28e33
+  data.tar.gz: 604a6a1d922507672f37db5983f738793cd427035aa8833d6493922ca5fba40e
 SHA512:
-  metadata.gz: 89c43f7809c5dff5fe1e56d30993f9216ba9be96397f9128d15aa8fdc308b54361c5b9677a4aa249b04533aaef85399dfa9f972684ea2e8b146ba4dcdcf585a4
-  data.tar.gz: f9855032826bc43bad8438fd5caf06e31cb5ff8b32361d82ede73113a92ac733bcb17f3331b9d253cea8202aeaa8697043c17ec94911021075c43f24c68292ed
+  metadata.gz: 75e723b3b127a99fd703f8ba468283890cea6234cc7f547cdd4f5b22a894dae4da54b5ff258fd66cb58439cd02a3736bd3e7ab72320d818570e69cab9de40368
+  data.tar.gz: f91bbcb23de8f2f9fc89f632544df3adb3613dfeed7ebb7e9e4997f328b83dbcfd8c973491481dfd09174f287b42fde8d342b417102c4a32282ac354a1c0f87a

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+
+rvm:
+  - 2.6.3
+  - 2.5.4
+  - 2.4.5
+
+before_install: gem install bundler
+
+env:
+  matrix:
+    - GRAPE=HEAD
+    - GRAPE=1.2.4
+    - GRAPE=1.2.0

data/Gemfile

@@ -2,3 +2,12 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in grape-cancan.gemspec
 gemspec
+
+case ENV['GRAPE']
+when nil
+  gem 'grape'
+when 'HEAD'
+  gem 'grape', github: 'ruby-grape/grape'
+else
+  gem 'grape', ENV['GRAPE']
+end

data/README.md

@@ -1,4 +1,4 @@
-# Grape::CanCan
+# Grape::CanCan [![Build Status](https://travis-ci.org/rzane/grape-cancan.svg?branch=master)](https://travis-ci.org/rzane/grape-cancan)
 
 Use CanCan to authorize your Grape endpoints.
 
@@ -71,6 +71,25 @@ class Users < Grape::API
 end
 ```
 
+#### Handle Unauthorized Access
+
+If the user authorization fails, a `CanCan::AccessDenied` exception will be raised. You should catch this and respond appropriately. For example, you could [redirect the user to the root page](https://github.com/CanCanCommunity/cancancan#3-handle-unauthorized-access), or return a 403 Forbidden as in this example (the `error!` is a [convenience provided by Grape](https://github.com/ruby-grape/grape#raising-exceptions)):
+
+```ruby
+class Users < Grape::API
+  resource :users
+  rescue_from ::CanCan::AccessDenied do
+    error!('403 Forbidden', 403)
+  end
+
+  get '/:id' do
+    @user = User.find(params[:id])
+    authorize! :read, @user
+    @user
+  end
+end
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/rzane/grape-cancan/fork )

data/Rakefile

@@ -1,2 +1,8 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
+Rake::TestTask.new :test do |t|
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+task default: :test

data/grape-cancan.gemspec

@@ -18,9 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'grape', '>= 0.6.0'
+  spec.add_dependency 'grape', '~> 1.2'
   spec.add_dependency 'cancancan'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'minitest', '~> 5.8.4'
+  spec.add_development_dependency 'rack-test'
 end

data/lib/grape/cancan.rb

@@ -1,5 +1,7 @@
 require 'grape'
 require 'grape/cancan/version'
+require 'active_support/inflector'
+require 'active_support/core_ext/module/delegation'
 
 module Grape
   module CanCan
@@ -23,8 +25,8 @@ module Grape
         authorize!(*opts[:authorize]) if opts.key?(:authorize)
       end
     end
-
-    Grape::API.extend Grape::CanCan::API
-    Grape::Endpoint.send :include, Grape::CanCan::Endpoint
   end
 end
+
+Grape::API::Instance.extend Grape::CanCan::API
+Grape::Endpoint.send :include, Grape::CanCan::Endpoint

data/lib/grape/cancan/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module CanCan
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/test/grape/cancan_test.rb

@@ -0,0 +1,66 @@
+require 'minitest/autorun'
+require 'rack/test'
+require 'grape/cancan'
+require 'cancancan'
+
+User = Class.new
+
+class Ability
+  include CanCan::Ability
+
+  def initialize(user)
+    can :read, User
+    cannot :love, User
+  end
+end
+
+class API < Grape::API
+  authorize_routes!
+  helpers { define_method(:current_user) { User.new } }
+  get('/can') { can? :love, current_user }
+  get('/cannot') { cannot? :read, current_user }
+  get('/authorize_option', authorize: [:read, User])
+  get('/authorize_option_fail', authorize: [:love, User])
+  get('/authorize_explicit') { authorize! :read, current_user }
+  get('/authorize_explicit_fail') { authorize! :love, current_user }
+end
+
+class GrapeCancanTest < Minitest::Test
+  include Rack::Test::Methods
+
+  def app
+    API
+  end
+
+  def test_can
+    get '/can'
+    assert_equal 'false', last_response.body
+  end
+
+  def test_cannot
+    get '/cannot'
+    assert_equal 'false', last_response.body
+  end
+
+  def test_authorize_option
+    get '/authorize_option'
+    assert_equal 200, last_response.status
+  end
+
+  def test_authorize_option_failure
+    assert_raises CanCan::AccessDenied do
+      get '/authorize_option_fail'
+    end
+  end
+
+  def test_authorize_explicit
+    get '/authorize_explicit'
+    assert_equal 200, last_response.status
+  end
+
+  def test_authorize_explicit_failure
+    assert_raises CanCan::AccessDenied do
+      get '/authorize_explicit_fail'
+    end
+  end
+end

metadata

@@ -1,71 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: grape-cancan
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2019-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.8.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.8.4
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Authorize your Grape API with CanCan
 email:
 - raymondzane@gmail.com
@@ -73,7 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -82,6 +111,7 @@ files:
 - lib/grape-cancan.rb
 - lib/grape/cancan.rb
 - lib/grape/cancan/version.rb
+- test/grape/cancan_test.rb
 homepage: https://github.com/rzane/grape-cancan
 licenses:
 - MIT
@@ -92,18 +122,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Authorize your Grape API with CanCan
-test_files: []
+test_files:
+- test/grape/cancan_test.rb