snorlax 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be13f32a9698ae9750463da812a2ed87659b7c29
-  data.tar.gz: 06ac5cd2284cf73a824082e603588a3ae68ebaed
+  metadata.gz: 2275e30723ffb0f1d7e9892ec4398cd0715e90f0
+  data.tar.gz: 05b2977a32bb2c0102fb6bad962c66692523607a
 SHA512:
-  metadata.gz: 5aa804452d8a9ae79275abb60e6498390faa8dd28d23e62ce0052c618d670a27f87781696e7f7c223495f10a983f11addafa10af4b3286e01c9691945f95d19d
-  data.tar.gz: 829cc1b3f7afa7bf1dba86ec76420899d4411b04ead11d94137c4275536a37d39e5bbe0cf9c3c5f0c24fb12da9236d034bce528d98a47a9da63e53a214aec223
+  metadata.gz: 60299279a6e0e7e7d48e0307d4c5b3571bda085df43f3569ae28e94565e415b697313022e175e2ac34b690f82f071e9dbc6ef5456ad65ff5bed149ca3854ae06
+  data.tar.gz: 95366fa304596bbdb4e3d99d06dc2bb6685dd0ae5e5703eacadadde54a7078b06a876d2b5e1150cda58dc9418ce8e32c4422da53f50edbd16af5b01b2ba97360

data/Gemfile

@@ -4,7 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rails', '> 4.1.0'
-gem 'cancancan', '~> 1.12.0'
 
 group :development, :test do
   gem 'byebug', require: nil

data/README.md

@@ -146,7 +146,7 @@ If you want to disallow timeframing and/or pagination for a particular action, s
 ```
 class SquirtlesController < Snorlax::Base
   def all_squirtles
-    instantiate_collection paginate_collection: false, timeframe_collection: false
+    instantiate_collection page_collection: false, timeframe_collection: false
     respond_with_collection
   end
 end

data/app/controllers/snorlax/base.rb

@@ -3,7 +3,13 @@ module Snorlax
 
     def self.snorlax_used_rest!(controller)
       controller.class_eval do
-        rescue_from(CanCan::AccessDenied)                    { |e| respond_with_standard_error e, 403 }
+        if defined? CanCan::AccessDenied
+          rescue_from(CanCan::AccessDenied)                  { |e| respond_with_standard_error e, 403 }
+        end
+        if defined? Pundit::NotAuthorizedError
+          rescue_from(Pundit::NotAuthorizedError)            { |e| respond_with_standard_error e, 403 }
+        end
+
         rescue_from(ActionController::UnpermittedParameters) { |e| respond_with_standard_error e, 400 }
         rescue_from(ActionController::ParameterMissing)      { |e| respond_with_standard_error e, 400 }
         rescue_from(ActiveRecord::RecordNotFound)            { |e| respond_with_standard_error e, 404 }
@@ -18,7 +24,7 @@ module Snorlax
         end
 
         def create
-          instantiate_resouce
+          instantiate_resource
           create_action
           respond_with_resource
         end
@@ -65,7 +71,7 @@ module Snorlax
           instance_variable_set :"@#{resource_name.pluralize}", value
         end
 
-        def instantiate_resouce
+        def instantiate_resource
           self.resource = resource_class.new(resource_params)
         end
 

data/lib/snorlax/version.rb

@@ -1,3 +1,3 @@
 module Snorlax
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/snorlax.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "rails", "> 4.1"
-  spec.add_runtime_dependency "cancancan", "~> 1.10.1"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snorlax
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - James Kiesel (gdpelican)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,20 +24,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: cancancan
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.10.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement