cbac 0.6.7 → 0.6.8

data/cbac.gemspec

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

data/lib/cbac/cbac_pristine/pristine_file.rb

@@ -131,16 +131,20 @@ module Cbac
         if context_role_name = line.match(/^.*ContextRole\(\s*([A-Za-z0-9_]+)\s*\)/)
           # NOTE: the 0 for an ID is very important! In CBAC a context role permission MUST have 0 as generic_role_id
           # if not, the context role is not found by CBAC and thus will not work
-          
+
           # this may be a context role that's already in the database
           context_role = use_db ? PristineRole.first(:conditions => {:role_type => PristineRole.ROLE_TYPES[:context], :name => context_role_name.captures[0]}) : nil
-          
+
           # this may still be a context role we've seen before...
           context_role = @context_roles.select do |cr| cr.role_type == PristineRole.ROLE_TYPES[:context] and cr.name == context_role_name.captures[0] end.first if context_role.nil?
-          
-          if context_role.nil? 
+
+          if context_role.nil?
             # this is a never-before-seen context role
-            context_role = PristineRole.new(:role_id => 0, :role_type => PristineRole.ROLE_TYPES[:context], :name => context_role_name.captures[0]) if context_role.nil?
+            context_role = PristineRole.new do |role|
+              role.role_id = 0
+              role.role_type = PristineRole.ROLE_TYPES[:context]
+              role.name = context_role_name.captures[0]
+            end
             context_role.save if use_db
             @context_roles.push context_role
           end
@@ -165,7 +169,11 @@ module Cbac
           role = use_db ? PristineRole.first(:conditions => {:role_type => PristineRole.ROLE_TYPES[:generic], :name => generic_role.captures[0]}) : nil
 
           if role.nil?
-            role =  PristineRole.new(:role_id => @generic_roles.length + 2, :role_type => PristineRole.ROLE_TYPES[:generic], :name => generic_role.captures[0])
+            role = PristineRole.new do |role|
+              role.role_id = @generic_roles.length + 2
+              role.role_type = PristineRole.ROLE_TYPES[:generic]
+              role.name = generic_role.captures[0]
+            end
             role.save if use_db
           end
 

data/lib/cbac/cbac_pristine/pristine_role.rb

@@ -9,7 +9,6 @@ module Cbac
         {:context => "context", :generic => "generic", :admin => "administrator"}
       end
 
-     
       #convert this cbac role to a yml statement which can be used to create a yml fixtures file
       #executing this statement will result in one cbac_generic_role in the DB
       def to_yml_fixture(fixture_id = nil)
@@ -36,7 +35,11 @@ module Cbac
       def self.admin_role(use_db = true)
         admin_role =  use_db ? PristineRole.first(:conditions => {:role_type => PristineRole.ROLE_TYPES[:admin]}) : nil
 
-        admin_role.nil?  ? PristineRole.new(:role_id => 1, :role_type => PristineRole.ROLE_TYPES[:admin], :name => "administrator") : admin_role
+        admin_role || PristineRole.new do |role|
+          role.role_id = 1
+          role.role_type = PristineRole.ROLE_TYPES[:admin]
+          role.name = "administrator"
+        end
       end
     end
   end

metadata

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