restful_acl 3.0.1 → 3.0.2

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.0.2

data/lib/restful_acl/url_parser.rb

@@ -10,7 +10,7 @@ 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_child_index",    :controller_bit => 3, :object_id_bit => nil, :regex => /\/(\w+)\/(\d+)\/\b(?!edit\b)(\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$/},
@@ -92,11 +92,14 @@ class UrlParser
     def requested_action(controller_name)
       return "destroy" if @text =~ DestroyURL
 
-      case @url
-        when EditURL then "edit"
-        when NewURL then "new"
-        when ObjectURL || controller_name.singular? then "show"
-        else "index"
+      if @url =~ EditURL
+        "edit"
+      elsif @url =~ NewURL
+        "new"
+      elsif @url =~ ObjectURL || controller_name.singular?
+        "show"
+      else
+        "index"
       end
     end
 

data/restful_acl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{restful_acl}
-  s.version = "3.0.1"
+  s.version = "3.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Darby"]
-  s.date = %q{2009-12-07}
+  s.date = %q{2009-12-08}
   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 = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "lib/restful_acl/url_parser.rb",
      "rails/init.rb",
      "restful_acl.gemspec",
+     "spec/lib/url_parser.rb",
      "spec/spec_helper.rb",
      "uninstall.rb"
   ]
@@ -41,7 +42,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{A Ruby on Rails plugin that provides fine grained access control to RESTful resources.}
   s.test_files = [
-    "spec/spec_helper.rb"
+    "spec/lib/url_parser.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/lib/url_parser.rb

@@ -0,0 +1,157 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe UrlParser do
+
+  before do
+    @user = mock('user')
+  end
+
+  describe "deducing the requested action" do
+
+    describe "parent_widget resources" do
+
+      it "should recognize parent_widget index URLs" do
+        expected = {
+          :controller_name => "parent_widgets",
+          :object_id       => nil,
+          :action          => "index",
+          :uri             => "/parent_widgets",
+          :user            => @user
+        }
+
+        UrlParser.new(@user){url("/parent_widgets")}.options_hash.should == expected
+      end
+
+      it "should recognize parent_widget edit URLs" do
+        expected = {
+          :controller_name => "parent_widgets",
+          :object_id       => "1",
+          :action          => "edit",
+          :uri             => "/parent_widgets/1/edit",
+          :user            => @user
+        }
+
+        UrlParser.new(@user){url("/parent_widgets/1/edit")}.options_hash.should == expected
+      end
+
+      it "should recognize new parent_widget URLs" do
+        expected = {
+          :controller_name => "parent_widgets",
+          :object_id       => nil,
+          :action          => "new",
+          :uri             => "/parent_widgets/new",
+          :user            => @user
+        }
+
+        UrlParser.new(@user){url("/parent_widgets/new")}.options_hash.should == expected
+      end
+
+      it "should recognize show parent_widget URLs" do
+        expected = {
+          :controller_name => "parent_widgets",
+          :object_id       => "1",
+          :action          => "show",
+          :uri             => "/parent_widgets/1",
+          :user            => @user
+        }
+
+        UrlParser.new(@user){url("/parent_widgets/1")}.options_hash.should == expected
+      end
+
+    end
+
+    describe "child resources" do
+
+      it "should recognize child index URLs" do
+        expected = {
+          :controller_name => "child_widgets",
+          :object_id       => nil,
+          :action          => "index",
+          :uri             => "/parent_widgets/1/child_widgets",
+          :user            => @user
+        }
+
+        UrlParser.new(@user){url("/parent_widgets/1/child_widgets")}.options_hash.should == expected
+      end
+
+      it "should recognize child edit URLs" do
+        expected = {
+          :controller_name => "child_widgets",
+          :object_id       => "1",
+          :action          => "edit",
+          :uri             => "/parent_widgets/1/child_widgets/1/edit",
+          :user            => @user
+        }
+
+        UrlParser.new(@user){url("/parent_widgets/1/child_widgets/1/edit")}.options_hash.should == expected
+      end
+
+      it "should recognize new child URLs" do
+        expected = {
+          :controller_name => "child_widgets",
+          :object_id       => nil,
+          :action          => "new",
+          :uri             => "/parent_widgets/1/child_widgets/new",
+          :user            => @user
+        }
+
+        UrlParser.new(@user){url("/parent_widgets/1/child_widgets/new")}.options_hash.should == expected
+      end
+
+      it "should recognize show child URLs" do
+        expected = {
+          :controller_name => "child_widgets",
+          :object_id       => "1",
+          :action          => "show",
+          :uri             => "/parent_widgets/1/child_widgets/1",
+          :user            => @user
+        }
+
+        UrlParser.new(@user){url("/parent_widgets/1/child_widgets/1")}.options_hash.should == expected
+      end
+
+    end
+
+    describe "singleton resources" do
+
+      it "should recognize singleton_widget edit URLs" do
+        expected = {
+          :controller_name => "singleton_widget",
+          :object_id       => nil,
+          :action          => "edit",
+          :uri             => "/parent_widgets/1/singleton_widget/edit",
+          :user            => @user
+        }
+
+        UrlParser.new(@user){url("/parent_widgets/1/singleton_widget/edit")}.options_hash.should == expected
+      end
+
+      it "should recognize new singleton_widget URLs" do
+        expected = {
+          :controller_name => "singleton_widget",
+          :object_id       => nil,
+          :action          => "new",
+          :uri             => "/parent_widgets/1/singleton_widget/new",
+          :user            => @user
+        }
+
+        UrlParser.new(@user){url("/parent_widgets/1/singleton_widget/new")}.options_hash.should == expected
+      end
+
+      it "should recognize show singleton_widget URLs" do
+        expected = {
+          :controller_name => "singleton_widget",
+          :object_id       => nil,
+          :action          => "show",
+          :uri             => "/parent_widgets/1/singleton_widget",
+          :user            => @user
+        }
+
+        UrlParser.new(@user){url("/parent_widgets/1/singleton_widget")}.options_hash.should == expected
+      end
+
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -8,4 +8,8 @@ require 'activesupport'
 
 Spec::Runner.configure do |config|
   
+  def url(path)
+    "<a href=\"#{path}\">#{path}</a>"
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: restful_acl
 version: !ruby/object:Gem::Version 
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors: 
 - Matt Darby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 -05:00
+date: 2009-12-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ files:
 - lib/restful_acl/url_parser.rb
 - rails/init.rb
 - restful_acl.gemspec
+- spec/lib/url_parser.rb
 - spec/spec_helper.rb
 - uninstall.rb
 has_rdoc: true
@@ -78,4 +79,5 @@ signing_key:
 specification_version: 3
 summary: A Ruby on Rails plugin that provides fine grained access control to RESTful resources.
 test_files: 
+- spec/lib/url_parser.rb
 - spec/spec_helper.rb