@@ -16,6 +16,8 @@ module NoamBenAri <% end %> include NoamBenAri::Acts::Permissible::InstanceMethods extend NoamBenAri::Acts::Permissible::SingletonMethods + + alias_method :full_permissions_hash, :permissions_hash end end @@ -37,8 +39,15 @@ module NoamBenAri module InstanceMethods # returns permissions in hash form + # from all levels recursively def permissions_hash - @permissions_hash ||= <%= table_name %>.inject({}) { |hsh,perm| hsh.merge(perm.to_hash) }.symbolize_keys! + @permissions_hash ||= lambda do + @permissions_hash = <%= table_name %>.inject({}) { |hsh,perm| hsh.merge(perm.to_hash) }.symbolize_keys! + <%= role_model_file_name %>s.each do |<%= role_model_file_name %>| + merge_permissions!(<%= role_model_file_name %>.permissions_hash) + end + @permissions_hash + end.call() end # accepts a permission identifier string or an array of permission identifier strings @@ -83,14 +92,7 @@ module NoamBenAri def in_any_<%= role_model_file_name %>?(*<%= role_model_file_name %>_names) <%= role_model_file_name %>_names.any? {|<%= role_model_file_name %>| <%= role_model_file_name %>s_list.include?(<%= role_model_file_name %>) } end - - def full_permissions_hash - permissions_hash - <%= role_model_file_name.pluralize %>.each do |<%= role_model_file_name %>| - merge_permissions!(<%= role_model_file_name %>.full_permissions_hash) - end - permissions_hash - end + <% end %> private # Nilifies permissions_hash instance variable. generators/permissible/templates/acts_as_permissible.rb 881e94bf0dab4481b4805ae4454bde4b1e07d707 Noam Ben-Ari nbenari@gmail.com http://github.com/NoamB/acts_as_permissible/commit/a3f25487398f59ef12f43f28d77fe1cda6812e80 a3f25487398f59ef12f43f28d77fe1cda6812e80 2008-07-25T05:00:29-07:00 2008-07-25T05:00:29-07:00 fixed problem with permissions_hash behaving differently whether full_permissions_hash was called or not. Thanks to Leonardo Mateo. 84a8e0134f7708631dbe619e7255ce7313df447a Noam Ben-Ari nbenari@gmail.com