flexible_accessibility 0.2.6.pre → 0.2.7.pre

data/Rakefile

@@ -15,7 +15,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "flexible_accessibility"
-  gem.version = "0.2.6.pre"
+  gem.version = "0.2.7.pre"
   gem.homepage = "http://github.com/mochnatiy/flexible_accessibility"
   gem.license = "MIT"
   gem.summary = %Q{Flexible access control system}

data/flexible_accessibility.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "flexible_accessibility"
-  s.version = "0.2.6.pre"
+  s.version = "0.2.7.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergey Awanesov"]

data/lib/flexible_accessibility/permission.rb

@@ -1,21 +1,29 @@
 module FlexibleAccessibility
   class Permission
-    attr_reader :controller
+    attr_reader :resource
     attr_reader :actions
 
     def initialize args={}
-      @controller = args[:controller]
+      @resource = args[:resource]
       @actions = args[:actions]
     end
 
+    def controller
+    	ApplicationResource.new(self.resource).controller
+    end
+
+    def namespace
+    	ApplicationResource.new(self.resource).namespace
+    end
+
   	class << self
 		  def all
 				permissions = []
 				Utils.new.get_controllers.each do |scope|
 					namespace = scope.first
-				  (scope - namespace.to_a).each do |klass|
-				  	klass = "#{namespace}::#{klass}" unless namespace == "default"
-				  	permissions << Permission.new(:controller => klass.gsub(/_controller/, "").to_sym, :actions => ApplicationResource.new(klass).klass.instance_variable_get(:@_checkable_routes))
+				  (scope - namespace.to_a).each do |resource|
+				  	resource = "#{namespace}::#{resource}" unless namespace == "default"
+				  	permissions << Permission.new(:resource => resource.gsub(/_controller/, "").to_sym, :actions => ApplicationResource.new(resource).klass.instance_variable_get(:@_checkable_routes))
 				  end
 				end
 				permissions

data/lib/flexible_accessibility/resource.rb

@@ -1,15 +1,20 @@
 module FlexibleAccessibility
 	class ApplicationResource
-		attr_reader :class
+		attr_reader :controller
 		attr_reader :namespace
 
 	  def initialize resource_string
-	  	@class = resource_string.split("::").last
+	  	@controller = resource_string.split("::").last
 	  	@namespace = resource_string.split("::").first
 	  end
 
 		def klass
-			(@namespace.camelize + "::" + @class.camelize).constantize
+			(@namespace.camelize + "::" + @controller.camelize).constantize unless is_standard_resource?
+			@controller.camelize.constantize if is_standard_resource?
+		end
+
+		def is_standard_resource?
+			@namespace == "default"
 		end
   end
 end

data/lib/flexible_accessibility.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'flexible_accessibility/controller_methods.rb'
 require 'flexible_accessibility/exceptions.rb'
 require 'flexible_accessibility/permission.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: flexible_accessibility
 version: !ruby/object:Gem::Version 
-  hash: -2053399853
+  hash: -1231723782
   prerelease: 6
   segments: 
   - 0
   - 2
-  - 6
+  - 7
   - pre
-  version: 0.2.6.pre
+  version: 0.2.7.pre
 platform: ruby
 authors: 
 - Sergey Awanesov