restful_acl 3.0.2 → 3.0.3

data/VERSION

@@ -1 +1 @@
-3.0.2
+3.0.3

data/lib/restful_acl/url_parser.rb

@@ -81,8 +81,8 @@ class UrlParser
     # Find the requested URL out of the text block received
     def requested_url
       link = case @text
-        when URL then URL.match(@text)[1]
         when AJAXURL then AJAXURL.match(@text)[1]
+        when URL then URL.match(@text)[1]
         else raise RestfulAcl::UnrecognizedURLError, "'#{@text}' doesn't seem to contain a valid URL?"
       end
     end

data/restful_acl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{restful_acl}
-  s.version = "3.0.2"
+  s.version = "3.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Darby"]

data/spec/lib/url_parser.rb

@@ -58,6 +58,18 @@ describe UrlParser do
         UrlParser.new(@user){url("/parent_widgets/1")}.options_hash.should == expected
       end
 
+      it "should recognize destroy parent_widget URLs" do
+        expected = {
+          :controller_name => "parent_widgets",
+          :object_id       => "1",
+          :action          => "destroy",
+          :uri             => "/parent_widgets/1",
+          :user            => @user
+        }
+
+        UrlParser.new(@user){ destroy_url("/parent_widgets/1") }.options_hash.should == expected
+      end
+
     end
 
     describe "child resources" do
@@ -110,6 +122,18 @@ describe UrlParser do
         UrlParser.new(@user){url("/parent_widgets/1/child_widgets/1")}.options_hash.should == expected
       end
 
+      it "should recognize destroy child URLs" do
+        expected = {
+          :controller_name => "child_widgets",
+          :object_id       => "1",
+          :action          => "destroy",
+          :uri             => "/parent_widgets/1/child_widgets/1",
+          :user            => @user
+        }
+
+        UrlParser.new(@user){ destroy_url("/parent_widgets/1/child_widgets/1") }.options_hash.should == expected
+      end
+
     end
 
     describe "singleton resources" do
@@ -150,6 +174,32 @@ describe UrlParser do
         UrlParser.new(@user){url("/parent_widgets/1/singleton_widget")}.options_hash.should == expected
       end
 
+      it "should recognize destroy singleton_widget URLs" do
+        expected = {
+          :controller_name => "singleton_widget",
+          :object_id       => nil,
+          :action          => "destroy",
+          :uri             => "/parent_widgets/1/singleton_widget",
+          :user            => @user
+        }
+
+        UrlParser.new(@user){destroy_url("/parent_widgets/1/singleton_widget")}.options_hash.should == expected
+      end
+
+    end
+
+    describe "handling AJAX links" do
+      it "should give precidence to AJAX urls" do
+        expected = {
+          :controller_name => "parent_widgets",
+          :object_id       => "1",
+          :action          => "show",
+          :uri             => "/parent_widgets/1",
+          :user            => @user
+        }
+
+        UrlParser.new(@user){ajax_url("/parent_widgets/1")}.options_hash.should == expected
+      end
     end
 
   end

data/spec/spec_helper.rb

@@ -7,9 +7,20 @@ require 'rubygems'
 require 'activesupport'
 
 Spec::Runner.configure do |config|
-  
+
   def url(path)
     "<a href=\"#{path}\">#{path}</a>"
   end
-  
-end
+
+  def destroy_url(path)
+    "<a href=\"#{path}\" onclick=\"if (confirm('Are you sure?')) { var f = document.createElement('form');
+     f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;
+     var m = document.createElement('input'); m.setAttribute('type', 'hidden'); m.setAttribute('name', '_method');
+     m.setAttribute('value', 'delete'); f.appendChild(m);f.submit(); };return false;\">Delete Image</a>"
+  end
+
+  def ajax_url(path)
+    "<a href=\"#\" onclick=\"if (confirm('Are you sure?')) { $.ajax({beforeSend:function(request){;}, complete:function(request){}, data:'_method=delete', dataType:'script', type:'post', url:'#{path}'}); }; return false;\"></a>"
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: restful_acl
 version: !ruby/object:Gem::Version 
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors: 
 - Matt Darby