bartt-ssl_requirement 1.4.0 → 1.4.1

data/README.md

@@ -1,3 +1,13 @@
+Installing
+==========
+
+This version of SSL Requirement is **only** compatible with Rails 3.x.  To install add the following line to your project's
+`Gemfile`:
+
+    gem 'bartt-ssl_requirement', '~>1.4.0', :require => 'ssl_requirement'
+
+`bartt-ssl_requirement` is compatible with ruby 1.8.7 and 1.9.x.
+
 SSL Requirement
 ===============
 

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/lib/ssl_requirement.rb

@@ -22,6 +22,8 @@ require "active_support/core_ext/class"
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 module SslRequirement
+  extend ActiveSupport::Concern
+
   mattr_writer :ssl_host, :ssl_port, :non_ssl_host, :disable_ssl_check
   mattr_accessor :redirect_status
 
@@ -55,34 +57,39 @@ module SslRequirement
   end
 
 
-  # called when Module is mixed in
-  def self.included(controller)
-    controller.extend(ClassMethods)
-    controller.before_filter(:ensure_proper_protocol)
+  included do
+    class_attribute :ssl_required_actions
+    class_attribute :ssl_required_except_actions
+    class_attribute :ssl_allowed_actions
+
+    before_filter :ensure_proper_protocol
   end
 
   module ClassMethods
     # Specifies that the named actions requires an SSL connection to be performed (which is enforced by ensure_proper_protocol).
     def ssl_required(*actions)
-      write_inheritable_array(:ssl_required_actions, actions)
+      self.ssl_required_actions ||= []
+      self.ssl_required_actions += actions
     end
 
     def ssl_exceptions(*actions)
-      write_inheritable_array(:ssl_required_except_actions, actions)
+      self.ssl_required_except_actions ||= []
+      self.ssl_required_except_actions += actions
     end
 
     # To allow SSL for any action pass :all as action like this:
     # ssl_allowed :all
     def ssl_allowed(*actions)
-      write_inheritable_array(:ssl_allowed_actions, actions)
+      self.ssl_allowed_actions ||= []
+      self.ssl_allowed_actions += actions
     end
   end
 
   protected
   # Returns true if the current action is supposed to run as SSL
   def ssl_required?
-    required = (self.class.read_inheritable_attribute(:ssl_required_actions) || [])
-    except  = self.class.read_inheritable_attribute(:ssl_required_except_actions)
+    required = self.class.ssl_required_actions || []
+    except  = self.class.ssl_required_except_actions
 
     unless except
       required.include?(action_name.to_sym)
@@ -92,7 +99,7 @@ module SslRequirement
   end
 
   def ssl_allowed?
-    allowed_actions = (self.class.read_inheritable_attribute(:ssl_allowed_actions) || [])
+    allowed_actions = self.class.ssl_allowed_actions || []
 
     allowed_actions == [:all] || allowed_actions.include?(action_name.to_sym)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bartt-ssl_requirement
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000 Z
+date: 2012-01-03 00:00:00.000000000 Z
 dependencies: []
 description: SSL requirement adds a declarative way of specifying that certain actions
   should only be allowed to run under SSL, and if they're accessed without it, they
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Allow controller actions to force SSL on specific parts of the site.