roled 0.0.2 → 0.0.3

data/lib/roled/acts_as.rb

@@ -3,19 +3,10 @@ module Roled
     extend ActiveSupport::Concern
     
     included do
-      
-    end
-    
-    def model_name
-      self.class.name.sub("Controller", "").singularize
-    end
-    
-    def current_aro
-      Aro.where(:model => model_name, :foreign_id => self.id).first
     end
     
-    def create_aro
-      Aro.new(:foreign_id => self.id, :model => model_name).save
+    def permission?(controller, action)
+      return has_permission_to?(controller,action)
     end
     
     def has_permission_to?(controller, action)
@@ -109,6 +100,18 @@ module Roled
       end
     end
     
+    def current_aro
+      Aro.where(:model => model_name, :foreign_id => self.id).first
+    end
+    
+    def create_aro
+      Aro.new(:foreign_id => self.id, :model => model_name).save
+    end
+    
+    def model_name
+      self.class.name.sub("Controller", "").singularize
+    end
+    
     module ClassMethods
     	def acts_as_aro(options = {})
           class_eval do

data/lib/roled/version.rb

@@ -1,3 +1,3 @@
 module Roled
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/tasks/acos.rake

@@ -26,46 +26,43 @@ namespace :acos do
 	      create_action(controller, action)
 	    end
 	  end
-	  
-	  puts "All done! :)"
-#		
-#     dir = Rails.root.join('app', 'controllers').to_s
-#		
-#	  @controllers = Dir.entries(dir)
-#	  @actions = Roled::Aco.all
-#	  
-#	  if(@actions.blank?)
-#		Roled::Aco.new(:name => "roled_root").save
-#	    puts "New install, preparing table..."
-#	  end
-#		
-#		@controllers.each do |name|
-#			if name=~ /^(?!application).*_controller.rb/
-#				
-#				controller = File.read(dir + '/' + name)
-#				name = name.gsub('_controller.rb', "")
-#				create_action(name, nil)
-#				
-#				lines = controller.split(/\r?\n/)
-#				lines.each do |l|
-#				  if l.strip =~ /(\Aprotected\z|\Aprivate\z)/
-#					break
-#			      end
-#				  if l.strip =~ /\Adef \w*/
-#				    create_action(l.gsub('def','').strip!, name)
-#				  end
-#				end
-#			end
-#		end
-#		puts "All Done... :)"
+		
+      dir = Rails.root.join('app', 'controllers').to_s
+		
+	  @controllers = Dir.entries(dir)
+	  @actions = Roled::Aco.all
+	  	
+      @controllers.each do |name|
+			if name=~ /^(?!application).*_controller.rb/
+				controller = File.read(dir + '/' + name)
+				name = name.gsub('_controller.rb', "")
+				create_action(name)
+				
+				lines = controller.split(/\r?\n/)
+				ignore = false
+				lines.each do |l|
+				  if l.strip =~ /(\Aprotected\z|\Aprivate\z)/ && !ignore
+					ignore = true
+				  elsif l.strip == "public" && ignore
+				    ignore = false
+				  elsif l.strip =~ /\Adef \w*/ && !ignore
+				    create_action(name, l.gsub('def','').strip!)
+				  end
+				end
+			end
+		end
+      puts "All done! :)"
 	end	
 end
 
-
 def create_action(controller = nil, action = nil)
-    controller_name = controller + "_controller"
+    controller_name = "#{controller}_controller"
 	if(!Roled::Aco.where(:action => action, :parent => controller_name).exists?)
-		puts "Saving action: " + action + " for controller: " + controller
+		if(action.blank?)
+		  puts "Saving controller: #{controller} "
+		else
+		  puts "Saving action: #{controller}##{action} "
+		end
 		Roled::Aco.new(:action => action, :parent => controller_name).save
 	end
 	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roled
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: