grape-cancan 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38721406628690b22a71b1089852cf9817243d66
-  data.tar.gz: 909778e00ac3260ab4b8e2756f47ca9073d54532
+  metadata.gz: 34714b17e347b036572b0167cf8a550319b4fbf7
+  data.tar.gz: 17667b2a66979de84ef5b36d3a312e7d5b1716bc
 SHA512:
-  metadata.gz: a6facc9a56bc9889ed35589dcd11b3f3ff73296eeab18ad5d9a2416bcaf6e8c75c214daf52a0fd5dde1d8ba9fec9be673ec7ba65f695269f8a459f7475e43b47
-  data.tar.gz: 35d2caf20054ad54f7a7618f0015792df7d88ba57231e7b4fc395915658f22dfc365bbed4c01110d181a2cb663ff74bcf2597be36e213524dd2445bd5ffab549
+  metadata.gz: 89c43f7809c5dff5fe1e56d30993f9216ba9be96397f9128d15aa8fdc308b54361c5b9677a4aa249b04533aaef85399dfa9f972684ea2e8b146ba4dcdcf585a4
+  data.tar.gz: f9855032826bc43bad8438fd5caf06e31cb5ff8b32361d82ede73113a92ac733bcb17f3331b9d253cea8202aeaa8697043c17ec94911021075c43f24c68292ed

data/README.md

@@ -22,7 +22,7 @@ __NOTE:__ The [cancan](https://github.com/ryanb/cancan) gem by Ryan Bates is no
 
 ## Usage
 
-This gem adds the __can?__, __cannot?__, and __authorize!__ helper methods to all Grape API endpoints. This gem expects you to have a __current_user__ helper.
+This gem adds the __current_ability__, __can?__, __cannot?__, and __authorize!__ helper methods to all Grape API endpoints. This gem expects you to have a __current_user__ helper.
 
 ```ruby
 class Users < Grape::API

data/lib/grape/cancan.rb

@@ -3,10 +3,28 @@ require 'grape/cancan/version'
 
 module Grape
   module CanCan
-    autoload :Helpers,    'grape/cancan/helpers'
-    autoload :Authorizer, 'grape/cancan/authorizer'
+    module API
+      # Convienience method to authorize every route
+      def authorize_routes!
+        before { authorize_route! }
+      end
+    end
 
-    Grape::Endpoint.send :include, Grape::CanCan::Helpers
-    Grape::API.extend Grape::CanCan::Authorizer
+    module Endpoint
+      # Returns an instance of the CanCan ability
+      def current_ability
+        @current_ability ||= ::Ability.new(current_user)
+      end
+      delegate :can?, :cannot?, :authorize!, to: :current_ability
+
+      # Call authorize using the :authorize key on the route
+      def authorize_route!
+        opts = env['api.endpoint'].options[:route_options]
+        authorize!(*opts[:authorize]) if opts.key?(:authorize)
+      end
+    end
+
+    Grape::API.extend Grape::CanCan::API
+    Grape::Endpoint.send :include, Grape::CanCan::Endpoint
   end
 end

data/lib/grape/cancan/version.rb

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

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: grape-cancan
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-06-03 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !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'
 description: Authorize your Grape API with CanCan
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -81,8 +81,6 @@ files:
 - grape-cancan.gemspec
 - lib/grape-cancan.rb
 - lib/grape/cancan.rb
-- lib/grape/cancan/authorizer.rb
-- lib/grape/cancan/helpers.rb
 - lib/grape/cancan/version.rb
 homepage: https://github.com/rzane/grape-cancan
 licenses:
@@ -94,12 +92,12 @@ 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: []

data/lib/grape/cancan/authorizer.rb

@@ -1,10 +0,0 @@
-module Grape
-  module CanCan
-    module Authorizer
-      # Convienience method to authorize every route
-      def authorize_routes!
-        before { authorize_route! }
-      end
-    end
-  end
-end

data/lib/grape/cancan/helpers.rb

@@ -1,19 +0,0 @@
-module Grape
-  module CanCan
-    module Helpers
-      delegate :can?, :cannot?, :authorize!, to: :current_ability
-
-      # Returns an instance of the CanCan ability
-      def current_ability
-        @current_ability ||= ::Ability.new(current_user)
-      end
-
-      # Call authorize using the :authorize key on the route
-      def authorize_route!
-        opts = env['api.endpoint'].options[:route_options]
-        return unless opts.key?(:authorize)
-        authorize!(*opts[:authorize])
-      end
-    end
-  end
-end