restful_acl 3.0.4 → 3.1.0

data/VERSION

@@ -1 +1 @@
-3.0.4
+3.1.0

data/init.rb

@@ -1 +1,2 @@
-require File.dirname(__FILE__) + "/rails/init"
+require File.dirname(__FILE__) + "/rails/init"
+puts "+++++"

data/lib/restful_acl/controller.rb

@@ -12,7 +12,7 @@ module RestfulAcl
         options = {
           :controller_name => self.controller_name,
           :object_id       => params[:id],
-          :uri             => request.request_uri,
+          :uri             => request.fullpath,
           :user            => current_user,
           :action          => params[:action]
         }
@@ -24,7 +24,7 @@ module RestfulAcl
       private
 
         def permission_denied
-          logger.info("[RESTful_ACL] Permission denied to %s at %s for %s" % [blame, Time.now, request.request_uri])
+          logger.info("[RESTful_ACL] Permission denied to %s at %s for %s" % [blame, Time.now, request.fullpath])
           redirect_to denied_url
         end
 

data/lib/restful_acl/railtie.rb

@@ -0,0 +1,23 @@
+require 'restful_acl'
+
+module RestfulAcl
+  if defined? Rails::Railtie
+    require 'rails'
+    class Railtie < Rails::Railtie
+      initializer 'restful_acl.insert_into_active_record' do
+        ActiveSupport.on_load :active_record do
+          RestfulAcl::Railtie.insert
+        end
+      end
+    end
+  end
+
+  class Railtie
+    def self.insert
+      puts ">>>>>>>>>>"
+      ActiveRecord::Base.send(:include, RestfulAcl::Model)
+      ActionController::Base.send(:include, RestfulAcl::Controller)
+      ActionView::Base.send(:include, RestfulAcl::Helper)
+    end
+  end
+end

data/lib/restful_acl/url_parser.rb

@@ -25,7 +25,7 @@ class UrlParser
   NewURL     = /\/new$/
   EditURL    = /\/edit$/
   ObjectURL  = /\/(\d+)[\w-]*$/
-  DestroyURL = /.*m\.setAttribute\('value', 'delete'\).*/
+  DestroyURL = /data-method="delete"/
 
   attr_accessor :text, :user, :url
 

data/rails/init.rb

@@ -1,7 +1,3 @@
-require 'restful_acl'
-
-ActionController::Base.send :include, RestfulAcl::Controller
-ActionView::Base.send :include, RestfulAcl::Helper
-ActiveRecord::Base.send :include, RestfulAcl::Model
-
-RAILS_DEFAULT_LOGGER.debug "** [RESTful_ACL] loaded"
+require 'restful_acl/railtie'
+puts "<<<<<<<<<<"
+RestfulAcl::Railtie.insert

data/restful_acl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{restful_acl}
-  s.version = "3.0.4"
+  s.version = "3.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Darby"]
-  s.date = %q{2010-01-24}
+  s.date = %q{2010-08-31}
   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 = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/restful_acl/errors.rb",
      "lib/restful_acl/helper.rb",
      "lib/restful_acl/model.rb",
+     "lib/restful_acl/railtie.rb",
      "lib/restful_acl/string.rb",
      "lib/restful_acl/url_parser.rb",
      "rails/init.rb",
@@ -39,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/mdarby/restful_acl}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Ruby on Rails plugin that provides fine grained access control to RESTful resources.}
   s.test_files = [
     "spec/lib/url_parser.rb",
@@ -50,7 +51,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: restful_acl
 version: !ruby/object:Gem::Version 
-  version: 3.0.4
+  hash: 3
+  prerelease: false
+  segments: 
+  - 3
+  - 1
+  - 0
+  version: 3.1.0
 platform: ruby
 authors: 
 - Matt Darby
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 -05:00
+date: 2010-08-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 description: A Ruby on Rails plugin that provides fine grained access control to RESTful resources.
 email: matt@matt-darby.com
 executables: []
@@ -43,6 +55,7 @@ files:
 - lib/restful_acl/errors.rb
 - lib/restful_acl/helper.rb
 - lib/restful_acl/model.rb
+- lib/restful_acl/railtie.rb
 - lib/restful_acl/string.rb
 - lib/restful_acl/url_parser.rb
 - rails/init.rb
@@ -60,21 +73,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Ruby on Rails plugin that provides fine grained access control to RESTful resources.