permissify 0.0.18 → 0.0.19

data/lib/generators/permissify/ability/template/abilities.rb

@@ -12,13 +12,17 @@ module SystemFixtures::Abilities
     # This is a name coupling (see Permissify::Union) that can be overriden.
     
     # applies_to_users_only = [User::PERMISSIFIED_ABILITY_APPLICABILITY]
-    # add_category('Tabs', 'Tabs', applies_to_users_only, %w(Admin Dealer Corporate Brand Merchant))
+    # add_category('Tabs', 'Tabs', applies_to_users_only, %w(Admin Dealers Corporations Brands Merchants))
     # { 'Roles'                 => 'Admin',
     #   'Admin Users'           => 'Admin',
+    #   'Dealers'               => 'Dealer Admin',
     #   'Dealer Users'          => 'Dealer Admin',
-    #   'Corporate Users'       => 'Corporate Admin',
+    #   'Corporation Users'     => 'Corporation Admin',
+    #   'Corporations'          => 'Corporation Admin',
     #   'Brand Users'           => 'Brand Admin',
+    #   'Brands'                => 'Brand Admin',
     #   'Merchant Users'        => 'Merchant Admin',
+    #   'Merchants'             => 'Merchant Admin',
     # }.each{ |category, section| add_category(category, section, applies_to_users_only) }
   end
   

data/lib/generators/permissify/controller/template/permissions_controller.rb

@@ -72,5 +72,6 @@ class PermissionsController < ApplicationController
     @active_tab = 'admin'
     @active_section = 'Admin'
     @active_nav = 'Roles'
+    @current_entity = @entity = Admin.first
   end
 end

data/lib/generators/permissify/role/template/role.rb

@@ -1,5 +1,5 @@
 class Role < ActiveRecord::Base
-  DOMAIN_TYPES = %w(Admin Dealer Corporate Brand Merchant)
+  DOMAIN_TYPES = %w(Admin Dealer Corporation Brand Merchant)
   # DOMAIN_TYPES = %w(Admin Operations CallCenter)
   include Permissify::Model
   # is_paranoid

data/lib/generators/permissify/views/template/permissions/_aggregate_permissions.html.erb

@@ -1,5 +1,4 @@
 <% category_permissions.each do |@permission| %>
-  <% next if (@permission[:key] == 'corporate_portal_delete') || (@permission[:key] == 'brand_portal_delete') %>
   <%- mthp = models_that_have_permission %>
   <a href='#' title='<%=mthp%>' style='color:<%= mthp == 'none' ? 'red':'green' %>'>
     <%= @permission[:action] %>

data/lib/generators/permissify/views/template/permissions/_model_permissions.html.erb

@@ -1,11 +1,9 @@
 <% category_permissions.each do |@permission| %>
-  <% next if (@permission[:key] == 'corporate_portal_delete') || (@permission[:key] == 'brand_portal_delete') %>
   <%= render :partial => 'permissions/color_coded_permission' %>
 <% end %>
 <table id="<%=category_name%>" style="display:none;">
   <tbody>
     <% category_permissions.each do |@permission| %>
-      <% next if (@permission[:key] == 'corporate_portal_delete') || (@permission[:key] == 'brand_portal_delete') %>
       <%= render :partial => 'permissions/permission' %>
     <% end %>
   </tbody>

data/lib/generators/permissify/views/template/permissions_helper.rb

@@ -69,7 +69,7 @@ module PermissionsHelper
     { 'role'     => [ 'Tabs',
                       'Admin',
                       'Dealer Admin',
-                      'Corporate Admin',
+                      'Corporation Admin',
                       'Brand Admin',
                       'Merchant Admin'
                     ],

data/lib/permissify/ability_class.rb

@@ -27,6 +27,10 @@ module Permissify
       all.select{ |ability| ability[:key] == key }.first
     end
     
+    def actions(category_prefix)
+      all.collect{|a| a[:action] if a[:key].start_with?("#{key_token(category_prefix)}_")}.compact
+    end
+    
     def add(category, section, action, applicability, requires_any_or_all, number_of_values, position, default_values, admin_expression='', category_allows = :multiple)
       applicability = applicability.to_set
       @@abilities <<  { :key => key_for(action, category), :category => category, :section => section, :action => action,

data/lib/permissify/union.rb

@@ -3,6 +3,10 @@ module Permissify
 
     include Permissify::Common
 
+    def permissions
+      @union ||= construct_union
+    end
+
     def permission(action, category) # interface used by Permissify::Common.allowed_to?
       @union ||= construct_union # TODO : get lazier?
       permissible?(@union, action, category)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: permissify
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  - 19
+  version: 0.0.19
 platform: ruby
 authors: 
 - Frederick Fix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-13 00:00:00 Z
+date: 2012-06-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec