restful_acl 3.1.1 → 3.1.2

data/README.markdown

@@ -2,6 +2,10 @@ RESTful_ACL
 ===========
 RESTful_ACL is a full-stack context-based permission engine. It provides access control that is contextually aware. (If a parent is closed, a child is not editable, etc.) Permission is as simple as true or false.
 
+Rails 3
+-------
+RESTful_ACL 3.1 and on are Rails 3 ready. Rails 2 will no longer be supported. Sorries.
+
 Requirements
 ------------
 RESTful_ACL requires the notion of a `current_user`. Most authenticaion plugins provide this (AuthLogic, RESTful_Authentication, etc.)
@@ -11,8 +15,8 @@ How to Install
 Install the RESTful_ACL gem:
 <pre><code>sudo gem install restful_acl -s http://gemcutter.org</code></pre>
 
-Add the gem to your environment.rb file as thus:
-<pre><code>config.gem "restful_acl"</code></pre>
+Add the gem to your Gemfile file as thus:
+<pre><code>gem "restful_acl"</code></pre>
 
 RESTful_ACL requires a named route named "denied". Add the following to your routes.rb file:
 <pre><code>map.denied 'denied', :controller => 'some_controller', :action => 'denied_action'</code></pre>

data/VERSION

@@ -1 +1 @@
-3.1.1
+3.1.2

data/lib/restful_acl.rb

@@ -1,3 +1,4 @@
+require 'restful_acl/railtie' if defined?(Rails)
 require 'restful_acl/string'
 require 'restful_acl/url_parser'
 require 'restful_acl/base'

data/lib/restful_acl/railtie.rb

@@ -1,19 +1,33 @@
+# 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
+#       ActiveRecord::Base.send(:include, RestfulAcl::Model)
+#       ActionController::Base.send(:include, RestfulAcl::Controller)
+#       ActionView::Base.send(:include, RestfulAcl::Helper)
+#     end
+#   end
+# end
+
+
 require 'restful_acl'
+require 'rails'
 
 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
+  class Railtie < Rails::Railtie
+    initializer 'restful_acl.insert' do
       ActiveRecord::Base.send(:include, RestfulAcl::Model)
       ActionController::Base.send(:include, RestfulAcl::Controller)
       ActionView::Base.send(:include, RestfulAcl::Helper)

data/restful_acl.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: restful_acl
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 3
   - 1
-  - 1
-  version: 3.1.1
+  - 2
+  version: 3.1.2
 platform: ruby
 authors: 
 - Matt Darby