permissify 0.0.11 → 0.0.12

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

@@ -38,10 +38,8 @@ class PermissionsController < ApplicationController
     class_attributes ||= {}
     # @saved = @permissions_object.update_attributes class_attributes.merge(permission_attributes)
     attrs = class_attributes.merge(permission_attributes)
-    @permissions_object.domain_type = attrs[:domain_type]
-    @permissions_object.managed_by = attrs[:managed_by]
-    @permissions_object.can_manage_roles = attrs[:can_manage_roles]
     @permissions_object.permissions = attrs[:permissions]
+    set_permissions_object_specific_values(attrs)
     # @permissions_object.attributes = class_attributes.merge(permission_attributes)
     @saved = @permissions_object.save
     js_response

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

@@ -10,9 +10,9 @@ class Role < ActiveRecord::Base
   before_create :initialize_permissions
   before_validation :initialize_non_permission_values
   serialize :permissions
-  serialize :can_manage_roles
-  after_save :propagate_managed_by
-    
+  has_and_belongs_to_many :managers, :class_name => 'Role', :join_table => :manages_roles, :association_foreign_key => :manage_id, :foreign_key => :role_id
+  has_and_belongs_to_many :manages, :class_name => 'Role', :join_table => :manages_roles, :association_foreign_key => :role_id, :foreign_key => :manage_id
+  
   class << self
     include Permissify::ModelClass
     include SystemFixtures::Roles
@@ -23,39 +23,15 @@ class Role < ActiveRecord::Base
   end
   
   def default_non_permissions_values
-    self.can_manage_roles ||= []
     self.domain_type = DOMAIN_TYPES.last if self.domain_type.blank?
     self.name = self.name.gsub("'","")
   end
   
   def copy_non_permissions_values
     self.domain_type = self.from_permissions_model.domain_type
-    self.managed_by  = self.from_permissions_model.managed_by
-    self.can_manage_roles = self.from_permissions_model.can_manage_roles
-  end
-  
-  def manages_roles
-    return [] if quoted_role_names.blank?
-    self.class.find(:all, :conditions => ["name in (#{quoted_role_names})"], :order => :name)
+    self.managers = self.from_permissions_model.managers
+    self.manages = self.from_permissions_model.manages
   end
   
   def remove(permissions_list); permissions_list.each{|permission| self.permissions.delete(permission)}; save; end
-  
-  def quoted_role_names; self.can_manage_roles.collect{|n| "'#{n}'"}.join(', ') rescue []; end
-  
-  def managed_by=(role_name_list); @managed_by = role_name_list; end
-  def managed_by
-    @managed_by ||= Role.all.select{|r| r.can_manage_roles.include?(self.name)}.collect(&:name)
-  end
-  
-  def propagate_managed_by
-    Role.all.each{ |r| r.update_manages_roles(managed_by.include?(r.name), self.name) } unless @managed_by.nil?
-  end
-  
-  def update_manages_roles(manages_role_name, role_name)
-    old = self.manages_roles
-    old = [] if old.blank?
-    new_value = manages_role_name ? old | [role_name] : old - [role_name]
-    update_attribute(:can_manage_roles, new_value) if old != new_value
-  end
 end

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

@@ -4,18 +4,25 @@ module SystemFixtures::Roles
   SEED_SPECIFICATIONS   = (1..SEEDED_ORDERED_ROLES.length).zip(SEEDED_ORDERED_ROLES)
 
   def seeded?(role); role.id <= SEEDED_ORDERED_ROLES.length; end
-  def seed; create_seeds :roles, SEED_SPECIFICATIONS; end
+  def seed
+    create_seeds :roles, SEED_SPECIFICATIONS
+    Role.find(1).manage_ids = [2,3,4,5,6]
+    Role.find(2).manage_ids = [2,3,4,5,6]
+    Role.find(3).manage_ids = [3,4,5,6]
+    Role.find(4).manage_ids = [4,5,6]
+    Role.find(5).manage_ids = [6]
+    Role.find(6).manage_ids = [6]
+  end
   
-  def create_super_user;      create_with(1, SEEDED_ORDERED_ROLES,       'Admin')     ; end
-  def create_system_admin;    create_with(2, SEEDED_ORDERED_ROLES[1..5], 'Admin')     ; end
-  def create_dealer_admin;    create_with(3, SEEDED_ORDERED_ROLES[2..5], 'Dealer')    ; end
-  def create_corporate_admin; create_with(4, SEEDED_ORDERED_ROLES[3..5], 'Corporate') ; end
-  def create_brand_admin;     create_with(5, ['Merchant'], 'Brand')                   ; end
-  def create_merchant_admin;  create_with(6, ['Merchant'], 'Merchant')                ; end
+  def create_super_user;      create_with(1, 'Admin')     ; end
+  def create_system_admin;    create_with(2, 'Admin')     ; end
+  def create_dealer_admin;    create_with(3, 'Dealer')    ; end
+  def create_corporate_admin; create_with(4, 'Corporate') ; end
+  def create_brand_admin;     create_with(5, 'Brand')     ; end
+  def create_merchant_admin;  create_with(6, 'Merchant')  ; end
   
-  def create_with(id, other_roles, domain_type)
+  def create_with(id, domain_type)
     role = create_with_id(:role, id, SEED_SPECIFICATIONS.assoc(id)[1])
-    role.can_manage_roles = other_roles
     role.domain_type = domain_type
     role.save
     role

data/lib/generators/permissify/views/template/permissions/_add_form.erb

@@ -5,7 +5,7 @@
       <%= form_for Role.new, :remote => true do |f| %>
         <%= f.text_field :name, :maxlength => 31, :size => 12 %>
         &nbsp;&nbsp;&nbsp;
-        <%= f.submit 'create role', :class => 'fncyBtn' %>
+        <%= f.submit 'new role', :class => 'fncyBtn' %>
       <%- end %>
     </td>
   </tr>

data/lib/generators/permissify/views/template/permissions/_form.erb

@@ -21,7 +21,7 @@
         <td></td>
         <td colspan="2">
           <%- if allowed_to?(:update, @permissions_category) %>
-            <input type="submit" value="Save"/> or
+            <input type="submit" value="save" class="fncyBtn"/> or
           <%- end %>
           <a href="#" onclick="toggle_views(); self.scrollTo(0, 0); $('af_permissions_categories').hide();">cancel</a>
         </td>

data/lib/generators/permissify/views/template/roles/_permissions_fields.erb

@@ -10,18 +10,22 @@
 
 <tr>
   <td>
-    <%= label :role, :can_manage_roles, "Manages users with roles" %>
+    <%= label :role, :manages_role_ids, "Manages users with roles" %>
   </td>
   <td>
-    <%= label :role, :managed_by, "Managed by users with roles" %>
+    <%= label :role, :role_manager_ids, "Managed by users with roles" %>
   </td>
 </tr>
 
 <tr>
   <td>
-    <%= select :role, :can_manage_roles, all_roles_grouped_by_domain_type.collect(&:name) - [@role.name], {}, {:multiple => true, :size => [all_roles.size, 12].min} %>
+    <%= select :role, :manage_ids,
+        all_roles_grouped_by_domain_type.select{|r| r.id != @role.id}.collect{|r| [r.name, r.id]},
+        {}, {:multiple => true, :size => [all_roles.size, 12].min} %>
   </td>
   <td>
-    <%= select :role, :managed_by, all_roles_grouped_by_domain_type.collect(&:name), {}, {:multiple => true, :size => [all_roles.size, 12].min} %>
+    <%= select :role, :manager_ids,
+        all_roles_grouped_by_domain_type.collect{|r| [r.name, r.id]},
+        {}, {:multiple => true, :size => [all_roles.size, 12].min} %>
   </td>
 </tr>

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

@@ -4,5 +4,4 @@ module RolesHelper
   def additional_column1_value; @permissions_object.domain_type; end
   def additional_column2_value; "#{@permissions_object.users.count} users"; end
   def all_roles; @lazy_all_roles ||= Role.all; end
-  def roles_that_current_user_manages; @lazy_roles_that_current_user_manages = @current_user.manages_roles; end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: permissify
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Frederick Fix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-03 00:00:00 Z
+date: 2012-06-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec