cbac 0.6.8 → 0.6.9

data/cbac.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cbac"
-  s.version = "0.6.8"
+  s.version = "0.6.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bert Meerman"]

data/lib/cbac.rb

@@ -58,7 +58,9 @@ module Cbac
         }
 
         # Check the context roles Get the permissions
-        privilege_sets.collect{|privilege_set|Cbac::Permission.find(:all, :conditions => ["privilege_set_id = ? AND generic_role_id = 0", privilege_set.id.to_s])}.flatten.each do |permission|
+        privilege_sets.collect do |privilege_set|
+          Cbac::Permission.where(privilege_set_id: privilege_set.id, generic_role_id: 0)
+        end.flatten.each do |permission|
           puts "Checking for context_role:#{permission.context_role} on privilege_set:#{permission.privilege_set.name}" if Cbac::Config.verbose
           eval_string = ContextRole.roles[permission.context_role.to_sym]
           begin

data/lib/cbac/cbac_pristine/pristine.rb

@@ -81,12 +81,12 @@ module Cbac
     end
 
     def delete_generic_known_permissions
-      known_permissions = Cbac::KnownPermission.find(:all, :conditions => {:permission_type => Cbac::KnownPermission.PERMISSION_TYPES[:generic]})
+      known_permissions = Cbac::KnownPermission.where(permission_type: Cbac::KnownPermission.PERMISSION_TYPES[:generic])
       known_permissions.each { |p| p.destroy }
     end
 
     def delete_generic_permissions
-      permissions = Cbac::Permission.find(:all, :conditions => {:context_role => nil})
+      permissions = Cbac::Permission.find(context_role: nil)
       # for backwards compatibility, generic_role name was administrators instead of administrator
       # SMELL: administrator role *only* identified by name
       (permissions.select { |perm| perm.generic_role.name != "administrator" and perm.generic_role.name != "administrators" }).each { |p| p.destroy }

data/lib/cbac/cbac_pristine/pristine_permission.rb

@@ -39,7 +39,7 @@ module Cbac
         yml << pristine_role.name if pristine_role.role_type == PristineRole.ROLE_TYPES[:context]
         yml << "\n"
         yml << "  generic_role_id: " << pristine_role.role_id.to_s << "\n"
-        yml << "  privilege_set_id: <%= Cbac::PrivilegeSetRecord.find(:first, :conditions => {:name => '" << privilege_set_name << "'}).id %>\n"
+        yml << "  privilege_set_id: <%= Cbac::PrivilegeSetRecord.where(name: '#{privilege_set_name}').first.id %>\n"
         yml << "  created_at: " << Time.now.strftime("%Y-%m-%d %H:%M:%S") << "\n"
         yml << "  updated_at: " << Time.now.strftime("%Y-%m-%d %H:%M:%S") << "\n"
         yml << "\n"

data/lib/generators/cbac/copy_files/controllers/memberships_controller.rb

@@ -5,15 +5,18 @@ class Cbac::MembershipsController < ApplicationController
   # GET /index
   # GET /index.xml
   def index
-    @generic_roles = Cbac::GenericRole.find(:all)
-    @users = User.find(:all)
+    @generic_roles = Cbac::GenericRole.all
+    @users = User.all
   end
 
   # POST /update
   def update
-    Cbac::Membership.find(:all, :conditions => ["generic_role_id = ? AND user_id = ?", params[:generic_role_id], params[:user_id]]).each{|p|p.delete}
+    Cbac::Membership.where(generic_role_id: params[:generic_role_id], user_id: params[:user_id]).each(&:delete)
     if params[:member].to_s == "1"
-      Cbac::Membership.create(:generic_role_id => params[:generic_role_id], :user_id => params[:user_id])
+      Cbac::Membership.create do |membership|
+        membership.generic_role_id = params[:generic_role_id]
+        membership.user_id = params[:user_id]
+      end
     end
     role = Cbac::GenericRole.find(params[:generic_role_id])
     render :partial => "cbac/memberships/update.html", :locals => {:generic_role => role,

data/lib/generators/cbac/copy_files/controllers/permissions_controller.rb

@@ -10,11 +10,11 @@ class Cbac::PermissionsController < ApplicationController
 
       params[:role_substr].split('|').each do |role_start|
           @context_roles += (ContextRole.roles.select {|key,value| !key.to_s.match(/^#{role_start}/).nil?}).collect{|key, value| [key, value]}
-        @generic_roles += Cbac::GenericRole.find(:all).select {|role| !role.name.match(/^#{role_start}/).nil? }
+        @generic_roles += Cbac::GenericRole.all.select {|role| !role.name.match(/^#{role_start}/).nil? }
       end
     else
       @context_roles = ContextRole.roles
-      @generic_roles = Cbac::GenericRole.all    
+      @generic_roles = Cbac::GenericRole.all
     end
 
     if params[:priv_substr] && params[:priv_substr] != ""
@@ -22,7 +22,7 @@ class Cbac::PermissionsController < ApplicationController
       params[:priv_substr].split('|').each do |priv_start|
         @sets += PrivilegeSet.sets.select {|key, value| !key.to_s.match(/^#{priv_start}/).nil?}
       end
-    else 
+    else
       @sets = PrivilegeSet.sets
     end
   end
@@ -41,7 +41,7 @@ class Cbac::PermissionsController < ApplicationController
 
   # POST /update
   def update_context_role
-    Cbac::Permission.find(:all, :conditions => ["context_role = ? AND privilege_set_id = ?", params[:context_role], params[:privilege_set_id]]).each{|p|p.delete}
+    Cbac::Permission.where(context_role: params[:context_role], privilege_set_id: params[:privilege_set_id]).each(&:delete)
     if params[:permission].to_s == "1"
       Cbac::Permission.create(:context_role => params[:context_role], :privilege_set_id => params[:privilege_set_id])
     end
@@ -50,9 +50,12 @@ class Cbac::PermissionsController < ApplicationController
   end
 
   def update_generic_role
-    Cbac::Permission.find(:all, :conditions => ["generic_role_id = ? AND privilege_set_id = ?", params[:generic_role_id], params[:privilege_set_id]]).each{|p|p.delete}
+    Cbac::Permission.where(generic_role_id: = params[:generic_role_id], privilege_set_id: = params[:privilege_set_id]).each(&:delete)
     if params[:permission].to_s == "1"
-      Cbac::Permission.create(:generic_role_id => params[:generic_role_id], :privilege_set_id => params[:privilege_set_id])
+      Cbac::Permission.create do |permission|
+        permission.generic_role_id = params[:generic_role_id]
+        permission.privilege_set_id = params[:privilege_set_id]
+      end
     end
     role = Cbac::GenericRole.find(params[:generic_role_id])
     render :partial => "cbac/permissions/update_generic_role.html", :locals => {:role =>role,

data/lib/generators/cbac/copy_files/tasks/cbac.rake

@@ -39,7 +39,7 @@
   def dump_permissions_to_yaml_file(permissions)
     permissions.each do |cp|
       privilege_set_name = get_privilege_set(:id => cp['privilege_set_id']).name
-      cp['privilege_set_id'] = "<%= Cbac::PrivilegeSetRecord.find(:first, :conditions => {:name => '#{privilege_set_name}'}).id %>"
+      cp['privilege_set_id'] = "<%= Cbac::PrivilegeSetRecord.where(name: '#{privilege_set_name}').first.id %>"
     end
     dump_objects_to_yaml_file(permissions, "permissions")
   end

data/lib/generators/cbac/copy_files/views/generic_roles/index.html.erb

@@ -7,7 +7,7 @@
       <th class="small">&nbsp;</th>
     </tr>
 
-    <% Cbac::GenericRole.find(:all).each do |role| %>
+    <% Cbac::GenericRole.all.each do |role| %>
       <tr class="row">
         <% form_for role do |r| %>
           <td class="medium"><%= r.text_field :name %></td>
@@ -48,7 +48,7 @@
       </tr>
       <tr>
         <td class="medium">Select role</td>
-        <td class="medium"><%= select_tag "id", Cbac::GenericRole.find(:all).collect{|role|"<option value='#{role.id}'>#{role.name}</option>"} %>
+        <td class="medium"><%= select_tag "id", Cbac::GenericRole.all.collect{|role|"<option value='#{role.id}'>#{role.name}</option>"} %>
         </td>
       </tr>
       <tr>
@@ -56,4 +56,4 @@
       </tr>
     <% end %>
   </table>
-</div>
+</div>

data/lib/generators/cbac/copy_files/views/memberships/_update.html.erb

@@ -6,7 +6,7 @@
     <%= hidden_field_tag "generic_role_id" + update_name, generic_role.id.to_s, :name => "generic_role_id" %>
     <%= hidden_field_tag "user_id" + update_name, user_id.to_s, :name => "user_id" %>
     <%= check_box_tag "member" + update_name, "1",
-      (Cbac::Membership.find(:all, :conditions => ["generic_role_id = ? AND user_id = ?", generic_role.id.to_s, user_id.to_s]).length > 0),
+      (Cbac::Membership.where(generic_role_id: generic_role.id, user_id: user_id).count > 0),
       {:onclick => "this.form.onsubmit();", :name => "member"}%>
   <% end %>
-<% unless update_partial %></div><% end %>
+<% unless update_partial %></div><% end %>

data/lib/generators/cbac/copy_files/views/permissions/_update_context_role.html.erb

@@ -6,7 +6,7 @@
     <%= hidden_field_tag "context_role" + update_name, context_role.to_s, :name => "context_role" %>
     <%= hidden_field_tag "privilege_set_id" + update_name, set_id.to_s, :name => "privilege_set_id" %>
     <%= check_box_tag "permission" + update_name, "1",
-      (Cbac::Permission.find(:all, :conditions => ["context_role = ? AND privilege_set_id = ?", context_role.to_s, set_id.to_s]).length > 0),
+      (Cbac::Permission.where(context_role: context_role.to_s, privilege_set_id: set_id.to_s).count > 0),
       {:onclick => "this.form.onsubmit();", :name => "permission"}%>
   <% end %>
-<% unless update_partial %></div><% end %>
+<% unless update_partial %></div><% end %>

data/lib/generators/cbac/copy_files/views/permissions/_update_generic_role.html.erb

@@ -6,7 +6,7 @@
     <%= hidden_field_tag "generic_role_id" + update_name, role.id.to_s, :name => "generic_role_id" %>
     <%= hidden_field_tag "privilege_set_id" + update_name, set_id.to_s, :name => "privilege_set_id" %>
     <%= check_box_tag "permission" + update_name, "1",
-      (Cbac::Permission.find(:all, :conditions => ["generic_role_id = ? AND privilege_set_id = ?", role.id.to_s, set_id.to_s]).length > 0),
+      (Cbac::Permission.where(generic_role_id: role.id, privilege_set_id: set_id).count > 0),
       {:onclick => "this.form.onsubmit();", :name => "permission"}%>
   <% end %>
-<% unless update_partial %></div><% end %>
+<% unless update_partial %></div><% end %>

data/tasks/cbac.rake

@@ -39,7 +39,7 @@
   def dump_permissions_to_yaml_file(permissions)
     permissions.each do |cp|
       privilege_set_name = get_privilege_set(:id => cp['privilege_set_id']).name
-      cp['privilege_set_id'] = "<%= Cbac::PrivilegeSetRecord.find(:first, :conditions => {:name => '#{privilege_set_name}'}).id %>"
+      cp['privilege_set_id'] = "<%= Cbac::PrivilegeSetRecord.where(name: '#{privilege_set_name}').first.id %>"
     end
     dump_objects_to_yaml_file(permissions, "permissions")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cbac
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
   prerelease: 
 platform: ruby
 authors: