bartt-ssl_requirement 1.2.4 → 1.2.5

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.2.5

data/bartt-ssl_requirement.gemspec

@@ -1,47 +1,49 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{bartt-ssl_requirement}
-  s.version = "1.2.4"
+  s.version = "1.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RailsJedi", "David Heinemeier Hansson", "jcnetdev", "bcurren", "bmpercy", "revo", "nathany", "bartt", "Thorben Schr\303\266der"]
-  s.date = %q{2011-01-05}
+  s.date = %q{2011-03-25}
   s.description = %q{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 should be redirected.}
   s.email = %q{bart@thecodemill.biz}
   s.extra_rdoc_files = [
     "README"
   ]
   s.files = [
-    "README",
-    "Rakefile",
-    "VERSION",
-    "bartt-ssl_requirement.gemspec",
-    "init.rb",
-    "lib/ssl_requirement.rb",
-    "lib/url_for.rb",
-    "rails/init.rb",
-    "shoulda_macros/ssl_requirement_macros.rb",
-    "test/ssl_requirement_test.rb",
-    "test/url_for_test.rb"
+    ".gitignore",
+     "README",
+     "Rakefile",
+     "VERSION",
+     "bartt-ssl_requirement.gemspec",
+     "init.rb",
+     "lib/ssl_requirement.rb",
+     "lib/url_for.rb",
+     "rails/init.rb",
+     "shoulda_macros/ssl_requirement_macros.rb",
+     "test/ssl_requirement_test.rb",
+     "test/url_for_test.rb"
   ]
   s.homepage = %q{http://github.com/bartt/ssl_requirement}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Allow controller actions to force SSL on specific parts of the site.}
   s.test_files = [
     "test/ssl_requirement_test.rb",
-    "test/url_for_test.rb"
+     "test/url_for_test.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/ssl_requirement.rb

@@ -60,7 +60,7 @@ module SslRequirement
     def ssl_exceptions(*actions)
       write_inheritable_array(: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)
@@ -83,7 +83,7 @@ module SslRequirement
 
   def ssl_allowed?
     allowed_actions = (self.class.read_inheritable_attribute(:ssl_allowed_actions) || [])
-    
+
     allowed_actions == [:all] || allowed_actions.include?(action_name.to_sym)
   end
 
@@ -94,13 +94,12 @@ module SslRequirement
   private
   def ensure_proper_protocol
     return true if SslRequirement.disable_ssl_check?
-    
+
     if ssl_required? && !request.ssl?
       redirect_to determine_redirect_url(request, true)
       flash.keep
       return false
     elsif request.ssl? && ssl_allowed?
-      flash.keep
       return true
     elsif request.ssl? && !ssl_required?
       redirect_to determine_redirect_url(request, false)

data/lib/url_for.rb

@@ -36,7 +36,7 @@ module ActionDispatch
       # non-ssl host override, then use it
       def url_for_with_non_ssl_host(options)
         if !options[:only_path] && !SslRequirement.non_ssl_host.nil?
-          if !(/^https/ =~ (options[:protocol] || @request.protocol))
+          if !(/^https/ =~ (options[:protocol] || @request.try(:protocol)))
             options.merge! :host => SslRequirement.non_ssl_host
           end
         end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bartt-ssl_requirement
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 1
   - 2
-  - 4
-  version: 1.2.4
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - RailsJedi
@@ -23,7 +22,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 +00:00
+date: 2011-03-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +35,7 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
+- .gitignore
 - README
 - Rakefile
 - VERSION
@@ -52,32 +52,28 @@ homepage: http://github.com/bartt/ssl_requirement
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Allow controller actions to force SSL on specific parts of the site.