invitational 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84e55fa3994b13b2b2d2916363decf894c4e8bff
-  data.tar.gz: bf6ee875a454487dbc6362cbb0a4cf8e59dab81c
+  metadata.gz: 35c05aee3ab709cc47a1e71a237f376e122a0235
+  data.tar.gz: cb2dd18f0d4de8fbc32b460aebfb2b4506ff255d
 SHA512:
-  metadata.gz: 055d06625f07896c2da05dec3b70ed14b00901f18b6af5822e5c893b628cec1835e52c5eb9093ff924dcddd804d2e2063cd3935e1f05ac275edd80fb9108cfac
-  data.tar.gz: a961c3c3a27703b6dd8314dc1144baffc4320fccbb2aeb62750f31406ad7cbe523414890fd7a7658d63d5876eb1fc1b85e6f82e8746ccaf039af1ab1627bc14c
+  metadata.gz: cbebbf65af7035028eadad8fdae4aa0a29e288b057f06aa6ff4d37dcea42cc9b12d7a8b106147d875baec782b1e1e2c9f4d5b27b45b4bb9e9a4a41659b7949ce
+  data.tar.gz: 5b45c2359e524077bb1ad9ab7695ee6379c88bcf0acfec744ea40364c54422d8158a4fc4db6abe5bd7432319327cbd471c36989445d5c6a9787c80de9d59eeaa

data/README.md

@@ -227,9 +227,9 @@ You can test to see if the a user is an uberadmin through:
 current_user.uberadmin?
 ```
 
-##CanCan
+##CanCanCan
 
-Invitational adds a new condition key to CanCan's abilities, `:role`. This allows you to define the role(s)
+Invitational adds a new condition key to CanCanCan's abilities, `:role`. This allows you to define the role(s)
 that a user must be invited into for a specific entity in order to perform the specified action.  For example, 
 to indicate that a user invited to a parent entity in an admin role can manage the parent entity, but a user 
 invited to a staff role can only read the parent entity, in your `ability.rb` file:
@@ -237,6 +237,7 @@ invited to a staff role can only read the parent entity, in your `ability.rb` fi
 ```
 can :manage, Parent, roles: [:admin]
 can :read, Parent, roles: [:staff]
+cannot :edit, Parent, roles: [:consultant]
 ```
 
 ###System Roles

data/app/services/invitational/checks_for_invitation.rb

@@ -1,8 +1,12 @@
 module Invitational
   class ChecksForInvitation
 
-    def self.for user, invitable, roles=nil
-      self.uberadmin?(user) || self.specific_invite?(user, invitable, roles)
+    def self.for user, invitable, roles=nil, role_specific=false
+      if role_specific
+        self.specific_invite?(user, invitable, roles)
+      else
+        self.uberadmin?(user) || self.specific_invite?(user, invitable, roles)
+      end
     end
 
 private 

data/lib/invitational/cancan.rb

@@ -7,13 +7,24 @@ module Invitational
           roles = conditions.delete(:roles) if conditions
           conditions = nil if conditions and conditions.empty?
 
-          block ||= setup_role_based_block_for roles, subject, action
+          block ||= setup_role_based_block_for roles, subject, action, false
         end
 
         rules << ::CanCan::Rule.new(true, action, subject, conditions, block)
       end
 
-      def setup_role_based_block_for roles, subject, action
+      def cannot(action = nil, subject = nil, conditions = nil, &block)
+        if conditions && conditions.has_key?(:roles)
+          roles = conditions.delete(:roles) if conditions
+          conditions = nil if conditions and conditions.empty?
+
+          block ||= setup_role_based_block_for roles, subject, action, true
+        end
+
+        rules << ::CanCan::Rule.new(false, action, subject, conditions, block)
+      end
+
+      def setup_role_based_block_for roles, subject, action, role_specific
         key = subject.name.underscore + action.to_s
 
         if roles.respond_to? :values
@@ -30,35 +41,35 @@ module Invitational
 
         block = ->(model){
           roles = role_mappings[key]
-          check_permission_for model, user, roles
+          check_permission_for model, user, roles, role_specific
         }
 
         block
       end
 
-      def check_permission_for model, user, in_roles
+      def check_permission_for model, user, in_roles, role_specific
 
         in_roles.inject(false) do |result,role|
           result || if role.respond_to? :values
-            check_permission_for_keyed_roles model, user, role
+            check_permission_for_keyed_roles model, user, role, role_specific
           else
-            Invitational::ChecksForInvitation.for(user, model, role)
+            Invitational::ChecksForInvitation.for(user, model, role, role_specific)
           end
         end
 
       end
 
-      def check_permission_for_keyed_roles model, user, role
+      def check_permission_for_keyed_roles model, user, role, role_specific
         key = role.keys.first
 
         if key == :system_roles
-          check_permission_for_system_role user, role
+          check_permission_for_system_role user, role, role_specific
         else
-          check_permission_for_attribute model, user, role
+          check_permission_for_attribute model, user, role, role_specific
         end
       end
 
-      def check_permission_for_system_role user, role
+      def check_permission_for_system_role user, role, role_specific
         roles = role.values.flatten
 
         user.uberadmin? || roles.any? do |system_role|
@@ -66,16 +77,16 @@ module Invitational
         end
       end
 
-      def check_permission_for_attribute model, user, role
+      def check_permission_for_attribute model, user, role, role_specific
         method = role.keys.first
         related = model.send(method)
 
         if related.respond_to? :any?
           related.any? do |model|
-            check_permission_for model, user, role.values.flatten
+            check_permission_for model, user, role.values.flatten, role_specific
           end
         else
-          check_permission_for related, user, role.values.flatten
+          check_permission_for related, user, role.values.flatten, role_specific
         end
       end
 

data/lib/invitational/version.rb

@@ -1,3 +1,3 @@
 module Invitational
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: invitational
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Dave Goerlich
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -135,10 +135,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/javascripts/invitational/application.js
-- app/assets/stylesheets/invitational/application.css
-- app/controllers/invitational/application_controller.rb
-- app/helpers/invitational/application_helper.rb
 - app/modules/invitational/accepts_invitation_as.rb
 - app/modules/invitational/invitation_core.rb
 - app/modules/invitational/invited_to.rb
@@ -148,7 +144,6 @@ files:
 - app/services/invitational/creates_invitation.rb
 - app/services/invitational/creates_system_user_invitation.rb
 - app/services/invitational/creates_uber_admin_invitation.rb
-- app/views/layouts/invitational/application.html.erb
 - config/routes.rb
 - db/migrate/20130528220144_create_invitations.rb
 - lib/generators/invitational/install/USAGE

data/app/assets/javascripts/invitational/application.js

@@ -1,15 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .

data/app/assets/stylesheets/invitational/application.css

@@ -1,13 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
- */

data/app/controllers/invitational/application_controller.rb

@@ -1,4 +0,0 @@
-module Invitational
-  class ApplicationController < ActionController::Base
-  end
-end

data/app/helpers/invitational/application_helper.rb

@@ -1,4 +0,0 @@
-module Invitational
-  module ApplicationHelper
-  end
-end

data/app/views/layouts/invitational/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Invitational</title>
-  <%= stylesheet_link_tag    "invitational/application", :media => "all" %>
-  <%= javascript_include_tag "invitational/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>