elucid-merb-ssl-requirement 0.0.2 → 0.0.3

data/README

@@ -5,6 +5,10 @@ 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.
 
+note: unlike the Rails plugin of which this is a port, this plugin does not
+provide an ssl_allowed method. actions that have not been specified as SSL
+only can run either with or without and will not be redirected to http.
+
 Example:
 
   class Application < Merb::Controller
@@ -13,25 +17,21 @@ Example:
 
   class Accounts < ApplicationController
     ssl_required :signup, :payment
-    ssl_allowed :index
-    
+
     def signup
-      # Non-SSL access will be redirected to SSL
-    end
-    
-    def payment
-      # Non-SSL access will be redirected to SSL
+      # non-SSL access will be redirected to SSL
     end
 
-    def index
-      # This action will work either with or without SSL
+    def payment
+      # non-SSL access will be redirected to SSL
     end
 
     def other
-      # SSL access will be redirected to non-SSL
+      # other actions will work either with or without SSL
+      # and will not be redirected to a different protocol
     end
   end
-  
+
 You can overwrite the protected method ssl_required? to rely on other things
 than just the declarative specification. Say, only premium accounts get SSL.
 
@@ -41,4 +41,5 @@ times you'll want to run other before filters before that. They should then be
 declared ahead of including this module.
 
 Copyright (c) 2005 David Heinemeier Hansson, released under the MIT license
-Copyright (c) 2008 Steve Tooke
+Copyright (c) 2008 Steve Tooke
+Copyright (c) 2008 Justin Giancola

data/Rakefile

@@ -5,14 +5,12 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb-ssl-requirement"
-GEM_VERSION = "0.0.1"
-AUTHOR = "Steve Tooke"
-EMAIL = "steve.tooke@gmail.com"
-SUMMARY = "Merb plugin that provides ssl_requirement from rails"
-HOMEPAGE = "http://www.merbivore.com"
+GEM_VERSION = "0.0.3"
+AUTHORS = ["Steve Tooke", "Justin Giancola"]
+EMAIL = "justin.giancola@gmail.com"
+SUMMARY = "Merb plugin similar to ssl_requirement from Rails (note: does not provide ssl_allowed class method)"
 
 spec = Gem::Specification.new do |s|
-  s.rubyforge_project = 'merb'
   s.name = GEM_NAME
   s.version = GEM_VERSION
   s.platform = Gem::Platform::RUBY
@@ -20,13 +18,11 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
   s.summary = SUMMARY
   s.description = s.summary
-  s.author = AUTHOR
+  s.authors = AUTHORS
   s.email = EMAIL
-  s.homepage = HOMEPAGE
   s.add_dependency('merb-core', '>= 0.9.10')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
-  
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
@@ -48,4 +44,4 @@ task :gemspec do
   File.open("#{GEM_NAME}.gemspec", "w") do |file|
     file.puts spec.to_ruby
   end
-end
+end

data/lib/merb-ssl-requirement/ssl_requirement.rb

@@ -1,5 +1,6 @@
 # Copyright (c) 2005 David Heinemeier Hansson
 # Copyright (c) 2008 Steve Tooke
+# Copyright (c) 2008 Justin Giancola
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -32,40 +33,22 @@ module SslRequirement
       self.ssl_required_actions.push(*actions)
     end
 
-    def ssl_allowed(*actions)
-      # write_inheritable_array(:ssl_allowed_actions, actions)
-      self.ssl_allowed_actions.push(*actions)
-    end
-    
     def ssl_required_actions
       @ssl_required_actions ||= []
     end
-    
-    def ssl_allowed_actions
-      @ssl_allowed_actions ||= []
-    end
   end
-  
+
   protected
-    # Returns true if the current action is supposed to run as SSL
-    def ssl_required?
-      # (self.class.read_inheritable_attribute(:ssl_required_actions) || []).include?(action_name.to_sym)
-      self.class.ssl_required_actions.include?(action_name.to_sym)
-    end
-    
-    def ssl_allowed?
-      self.class.ssl_allowed_actions.include?(action_name.to_sym)
-      # (self.class.read_inheritable_attribute(:ssl_allowed_actions) || []).include?(action_name.to_sym)
-    end
+  # Returns true if the current action is supposed to run as SSL
+  def ssl_required?
+    # (self.class.read_inheritable_attribute(:ssl_required_actions) || []).include?(action_name.to_sym)
+    self.class.ssl_required_actions.include?(action_name.to_sym)
+  end
 
   private
-    def ensure_proper_protocol
-      return true if ssl_allowed?
-      
-      if ssl_required? && !request.ssl?
-        throw :halt, redirect("https://" + request.host + request.uri)
-      elsif request.ssl? && !ssl_required?
-        throw :halt, redirect("http://" + request.host + request.uri)
-      end
+  def ensure_proper_protocol
+    if ssl_required? && !request.ssl?
+      throw :halt, redirect("https://" + request.host + request.uri)
     end
-end
+  end
+end

data/spec/controllers/ssl-requirement.rb

@@ -1,26 +1,25 @@
 class Secure < Merb::Controller
   include SslRequirement
-  
+
   ssl_required :a, :b
-  ssl_allowed :c
-  
+
   def a
     'a'
   end
-  
+
   def b
     return 'b'
   end
-  
+
   def c
     return 'c'
   end
-  
+
   def d
     return 'd'
   end
-    # 
+    #
     # def set_flash
     #   flash[:foo] = "bar"
     # end
-end
+end

data/spec/spec_helper.rb

@@ -1,13 +1,13 @@
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
- 
+
 require "rubygems"
 require "merb-core"
 require "merb-ssl-requirement"
 require File.dirname(__FILE__) / "controllers" / "ssl-requirement"
 require "spec"
- 
+
 Merb.start :environment => 'test'
- 
+
 Spec::Runner.configure do |config|
   config.include Merb::Test::RequestHelper
-end
+end

data/spec/ssl_requirement_spec.rb

@@ -1,21 +1,11 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe "SslRequirement" do
-  
+
   it "should not accidently introduce any methods as controller actions" do
     Merb::Controller.callable_actions.should be_empty
   end
-  
-end
 
-describe "ssl_allowed" do
-  it "should allow http connection to allowed action" do
-    dispatch_to(Secure, :c, {}, 'HTTPS' => nil).body.should == "c"
-  end
-  
-  it "should allow https connection to allowed action" do
-    dispatch_to(Secure, :c, {}, 'HTTPS' => 'on').body.should == "c" 
-  end
 end
 
 describe "ssl_required" do
@@ -24,7 +14,7 @@ describe "ssl_required" do
     controller.should redirect
     controller.headers['Location'].should match(%r{^https://})
   end
-  
+
   it "should allow https connection to required actions" do
     dispatch_to(Secure, :a, {}, 'HTTPS' => 'on').body.should == "a"
   end
@@ -34,10 +24,10 @@ describe "non-ssl actions" do
   it "should allow http connection" do
     dispatch_to(Secure, :d, {}, 'HTTPS' => nil).body.should == "d"
   end
-  
-  it "should redirect https connection to http" do
+
+  it "should not redirect https connection to http" do
     controller = dispatch_to(Secure, :d, {}, 'HTTPS' => 'on')
-    controller.should redirect
-    controller.headers['Location'].should match(%r{^http://})
+    controller.should_not redirect
+    controller.body.should == "d"
   end
-end
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: elucid-merb-ssl-requirement
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Steve Tooke
+- Justin Giancola
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-10-27 00:00:00 -07:00
+date: 2009-06-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,8 +23,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.10
     version: 
-description: Merb plugin that provides ssl_requirement from rails
-email: steve.tooke@gmail.com
+description: "Merb plugin similar to ssl_requirement from Rails (note: does not provide ssl_allowed class method)"
+email: justin.giancola@gmail.com
 executables: []
 
 extensions: []
@@ -45,7 +46,7 @@ files:
 - spec/spec_helper.rb
 - spec/ssl_requirement_spec.rb
 has_rdoc: true
-homepage: http://www.merbivore.com
+homepage: 
 post_install_message: 
 rdoc_options: []
 
@@ -65,10 +66,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: merb
+rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Merb plugin that provides ssl_requirement from rails
+summary: "Merb plugin similar to ssl_requirement from Rails (note: does not provide ssl_allowed class method)"
 test_files: []