restful_acl 3.0.0 → 3.0.1

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/lib/restful_acl/base.rb

@@ -4,18 +4,9 @@ module RestfulAcl
     attr_accessor :object, :parent, :user, :controller_name, :uri, :action, :object_id
 
 
-    def initialize(options = {})
-      @object_id       = options[:object_id]
-      @user            = options[:user]
-      @uri             = options[:uri]
-      @action          = options[:action]
-      @controller_name = options[:controller_name]
-
-      if @object_id.present?
-        load_actors_from_id
-      else
-        load_actors_from_uri
-      end
+    def initialize(options)
+      options.each{|(k,v)| instance_variable_set "@#{k}", v}
+      (@object_id.present?) ? load_actors_from_id : load_actors_from_uri
     end
 
     def load_actors_from_id

data/lib/restful_acl/helper.rb

@@ -8,5 +8,17 @@ module RestfulAcl
       yield if access.allowed?
     end
 
+    %w{creat delet updat read}.each do |m|
+      define_method("#{m}able?") do |*args, &block|
+        RAILS_DEFAULT_LOGGER.error <<-STR
+
+          *****************************************************************************************
+          * RESTful_ACL error => ##{m}able? has been removed as of v3.0.0, please use #allowable?
+          *****************************************************************************************
+
+        STR
+      end
+    end
+
   end
-end
+end

data/lib/restful_acl/url_parser.rb

@@ -8,23 +8,23 @@
 class UrlParser
 
   TypesOfURLs = [
-    {:name => "parent_with_specific_child", :controller_bit => 3, :object_id_bit => 4,   :regex => /\/(\w+)\/(\d+)[\w|-]*\/(\w+)\/(\d+)[\w|-]*$/},
-    {:name => "parent_with_edit_child",     :controller_bit => 3, :object_id_bit => 4,   :regex => /\/(\w+)\/(\d+)[\w|-]*\/(\w+)\/(\d+)[\w|-]*\/edit$/},
-    {:name => "parent_with_child_index",    :controller_bit => 3, :object_id_bit => nil, :regex => /\/(\w+)\/(\d+)[\w|-]*\/(\w+)$/},
-    {:name => "parent_with_new_child",      :controller_bit => 3, :object_id_bit => nil, :regex => /\/(\w+)\/(\d+)[\w|-]*\/(\w+)\/new$/},
-    {:name => "edit_singleton_child",       :controller_bit => 3, :object_id_bit => nil, :regex => /\/(\w+)\/(\d+)[\w|-]*\/(\w+)\/edit$/},
-    {:name => "new_singleton_child",        :controller_bit => 3, :object_id_bit => nil, :regex => /\/(\w+)\/(\d+)[\w|-]*\/(\w+)\/new$/},
-    {:name => "edit_parent",                :controller_bit => 1, :object_id_bit => 2,   :regex => /\/(\w+)\/edit$/},
+    {:name => "parent_with_specific_child", :controller_bit => 3, :object_id_bit => 4,   :regex => /\/(\w+)\/(\d+)[\w-]*\/(\w+)\/(\d+)[\w-]*$/},
+    {:name => "parent_with_edit_child",     :controller_bit => 3, :object_id_bit => 4,   :regex => /\/(\w+)\/(\d+)[\w-]*\/(\w+)\/(\d+)[\w-]*\/edit$/},
+    {:name => "parent_with_child_index",    :controller_bit => 3, :object_id_bit => nil, :regex => /\/(\w+)\/(\d+)[\w-]*\/(\w+)$/},
+    {:name => "parent_with_new_child",      :controller_bit => 3, :object_id_bit => nil, :regex => /\/(\w+)\/(\d+)[\w-]*\/(\w+)\/new$/},
+    {:name => "edit_singleton_child",       :controller_bit => 3, :object_id_bit => nil, :regex => /\/(\w+)\/(\d+)[\w-]*\/(\w+)\/edit$/},
+    {:name => "new_singleton_child",        :controller_bit => 3, :object_id_bit => nil, :regex => /\/(\w+)\/(\d+)[\w-]*\/(\w+)\/new$/},
+    {:name => "edit_parent",                :controller_bit => 1, :object_id_bit => 2,   :regex => /\/(\w+)\/(\d+)[\w-]*\/edit$/},
     {:name => "new_parent",                 :controller_bit => 1, :object_id_bit => nil, :regex => /\/(\w+)\/new$/},
-    {:name => "specific_parent",            :controller_bit => 1, :object_id_bit => 2,   :regex => /\/(\w+)\/(\d+)[\w|-]*$/},
+    {:name => "specific_parent",            :controller_bit => 1, :object_id_bit => 2,   :regex => /\/(\w+)\/(\d+)[\w-]*$/},
     {:name => "parent_index",               :controller_bit => 1, :object_id_bit => nil, :regex => /\/(\w+)$/}
   ]
 
-  URL        = /href="([\w|\/|-]+)"/
-  AJAXURL    = /url:'([\w|\/|-]+)'/
+  URL        = /href="([\w\/-?$_.+!*'(),]+)"/
+  AJAXURL    = /url:'([\w\/-?$_.+!*'(),]+)'/
   NewURL     = /\/new$/
   EditURL    = /\/edit$/
-  ObjectURL  = /\/(\d+)[\w|-]*$/
+  ObjectURL  = /\/(\d+)[\w-]*$/
   DestroyURL = /.*m\.setAttribute\('value', 'delete'\).*/
 
   attr_accessor :text, :user, :url
@@ -69,7 +69,8 @@ class UrlParser
 
     # Call the dynamically created method with arguments from deduced hash
     def invoke_url_type_method(type)
-      send(type[:name], @url, type[:controller_bit], type[:object_id_bit], type[:regex])
+      data = OpenStruct.new(type)
+      send(data.name, @url, data.controller_bit, data.object_id_bit, data.regex)
     end
 
     # Deduce the requested URL's "type" based on the TypesOfURLs hash

data/restful_acl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{restful_acl}
-  s.version = "3.0.0"
+  s.version = "3.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Darby"]
-  s.date = %q{2009-11-28}
+  s.date = %q{2009-12-07}
   s.description = %q{A Ruby on Rails plugin that provides fine grained access control to RESTful resources.}
   s.email = %q{matt@matt-darby.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: restful_acl
 version: !ruby/object:Gem::Version 
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors: 
 - Matt Darby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-28 00:00:00 -05:00
+date: 2009-12-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency