schmobile 0.0.6 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.8

data/lib/rack/schmobile.rb

@@ -39,7 +39,7 @@ module Rack
       request = Rack::Request.new(env)
 
       if is_mobile_session?(env, request) && redirect?(request)
-        return [ 301, { "Location" => redirect(request) }, [] ]
+        return [ 301, { "Location" => redirect_location(request) }, [] ]
       end
 
       @app.call(env)
@@ -64,16 +64,27 @@ module Rack
     # Returns true if this middleware has been configured with a redirect_to and the requested path is not already
     # below the configured redirect_to
     def redirect?(request)
-      if @options[:if].is_a?(Proc)
-        return false unless @options[:if].call(request)
+      redirecting = true
+
+      if @options.key?(:redirect_if)
+        redirecting = @options[:redirect_if].call(request)
+      end
+
+      if @options.key?(:redirect_to)
+        redirecting &&= request.path !~ /^#{@options[:redirect_to]}/
+      else
+        redirecting = false
       end
 
-      !redirect(request).empty? && request.path !~ /^#{redirect(request)}/
+      redirecting
+    end
+
+    def redirect_location(request)
+      "#{@options[:redirect_to]}#{redirect_with(request)}"
     end
 
-    def redirect(request)
-      destination = @options[:redirect_to].to_s
-      build_path(destination, request)
+    def redirect_with(request)
+      build_path(@options[:redirect_with].to_s, request)
     end
 
     private

data/schmobile.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{schmobile}
-  s.version = "0.0.6"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Morten Primdahl"]

data/test/test_schmobile.rb

@@ -44,7 +44,7 @@ class TestSchmobile < Test::Unit::TestCase
     end
 
     should "return an HTTP permanent redirect when given a redirect path and used by a mobile client" do
-      @rack.stubs(:redirect).returns("/hello")
+      @rack = Rack::Schmobile.new(@app, :redirect_to => "/hello")
       @rack.expects(:is_mobile_session?).returns(true)
 
       assert_equal [301, {"Location"=>"/hello"}, []], @rack.call(environment)
@@ -126,20 +126,20 @@ class TestSchmobile < Test::Unit::TestCase
         end
 
         should "return false when :if resolves to false" do
-          @rack = Rack::Schmobile.new(@app, :if => Proc.new { |request| false })
+          @rack = Rack::Schmobile.new(@app, :redirect_to => "/wonderland", :redirect_if => Proc.new { |request| false })
           assert !@rack.redirect?(request("PATH_INFO" => "/somewhere"))
         end
       end
 
       context "#redirect" do
         should "interpolate the argument string" do
-          @rack = Rack::Schmobile.new(@app, :redirect_to => "/wonderland/{{path}}")
-          assert_equal "/wonderland/wiffle", @rack.redirect(request("PATH_INFO" => "wiffle"))
+          @rack = Rack::Schmobile.new(@app, :redirect_to => "/wonderland", :redirect_with => "/{{path}}")
+          assert_equal "/wonderland/wiffle", @rack.redirect_location(request("PATH_INFO" => "wiffle"))
         end
 
         should "interpolate a multipart argument string" do
-          @rack = Rack::Schmobile.new(@app, :redirect_to => "/wonderland/{{path}}/lemurs/{{path}}")
-          assert_equal "/wonderland/wiffle/lemurs/wiffle", @rack.redirect(request("PATH_INFO" => "wiffle"))
+          @rack = Rack::Schmobile.new(@app, :redirect_to => "/wonderland/", :redirect_with => "{{path}}/lemurs/{{path}}")
+          assert_equal "/wonderland/wiffle/lemurs/wiffle", @rack.redirect_location(request("PATH_INFO" => "wiffle"))
         end
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: schmobile
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Morten Primdahl