mobile-enhancements 0.0.2 → 0.0.3

data/README.md

@@ -31,17 +31,17 @@ In your config/routes.rb file:
 
 ```ruby
 YourApp::Application.routes.draw do
-  # this can be accessed via mobile or desktop versions
+  # accessible via /items and /mobile/items
   mobile_optional do
     resource :items
   end
   
-  # this cannot be access via desktop
+  # only accessible via /mobile/barcode_scanner
   mobile_only do
     get :barcode_scanner, to: "scans#new"
   end
   
-  # normal routes are desktop-only
+  # only accessible via /guides (normal routing)
   resource :guides
 end
 ```

data/lib/mobile_enhancements/helper_delegation.rb

@@ -1,6 +1,7 @@
 require "forwardable"
 require "mobile_enhancements"
 require "mobile_enhancements/request_helper"
+require "mobile_enhancements/url_helper"
 
 module MobileEnhancements
   module HelperDelegation
@@ -11,6 +12,8 @@ module MobileEnhancements
       if base.respond_to?(:helper_method)
         base.helper_method *RequestHelper.delegated_methods
       end
+      # include the UrlHelper
+      base.send(:include, UrlHelper)
     end
 
     private

data/lib/mobile_enhancements/railtie.rb

@@ -19,7 +19,10 @@ module MobileEnhancements
         # setup the format calculation
         ActionController::Base.class_eval do
           before_filter do |controller|
-            controller.request.format = controller.determine_format
+            if controller.mobile_request?
+              controller.request.format = controller.determine_format
+              controller.params["mobile"] = MobileEnhancements.configuration.mobile_path_prefix
+            end
           end
         end
       end

data/lib/mobile_enhancements/url_helper.rb

@@ -0,0 +1,18 @@
+module MobileEnhancements
+  module UrlHelper
+    def url_for(*args)
+      # ignore our direct calls for desktop/mobile URLs
+      if args.size == 1 && args.first.frozen?
+        super
+      # if it's from a mobile
+      elsif mobile_request?
+        # mobilify the url
+        mobile_url(super)
+      # if it's a desktop request
+      else
+        # process as normal
+        super
+      end
+    end
+  end
+end

data/lib/mobile_enhancements/version.rb

@@ -1,3 +1,3 @@
 module MobileEnhancements
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/controllers/test_controller_spec.rb

@@ -9,6 +9,30 @@ describe TestController do
         expect(@response.body).to eq "two, #{MobileEnhancements.configuration.mobile_format}"
       end
     end
+    
+    describe "GET /#{MobileEnhancements.configuration.mobile_path_prefix}/path_checking" do
+      before { get :path_checking, mobile: MobileEnhancements.configuration.mobile_path_prefix }
+      
+      it "should render a mobile URL" do
+        expect(@response.body).to eq "http://test.host/#{MobileEnhancements.configuration.mobile_path_prefix}/two"
+      end
+    end
+    
+    describe "GET /#{MobileEnhancements.configuration.mobile_path_prefix}/redirect_checking" do
+      before { get :redirect_checking, mobile: MobileEnhancements.configuration.mobile_path_prefix }
+      
+      it "should redirect to a mobile URL" do
+        expect(@response.headers["Location"]).to eq "http://test.host/#{MobileEnhancements.configuration.mobile_path_prefix}/two"
+      end
+    end
+    
+    describe "GET /#{MobileEnhancements.configuration.mobile_path_prefix}/fixed_redirect_checking" do
+      before { get :fixed_redirect_checking, mobile: MobileEnhancements.configuration.mobile_path_prefix }
+      
+      it "should redirect to a mobile URL" do
+        expect(@response.headers["Location"]).to eq "http://test.host/#{MobileEnhancements.configuration.mobile_path_prefix}/two"
+      end
+    end
   end
   
   context "via the desktop UI" do
@@ -19,5 +43,29 @@ describe TestController do
         expect(@response.body).to eq "two, html"
       end
     end
+    
+    describe "GET /path_checking" do
+      before { get :path_checking }
+      
+      it "should render a desktop URL" do
+        expect(@response.body).to eq "http://test.host/two"
+      end
+    end
+    
+    describe "GET /redirect_checking" do
+      before { get :redirect_checking }
+      
+      it "should redirect to a desktop URL" do
+        expect(@response.headers["Location"]).to eq "http://test.host/two"
+      end
+    end
+    
+    describe "GET /fixed_redirect_checking" do
+      before { get :fixed_redirect_checking }
+      
+      it "should redirect to a mobile URL" do
+        expect(@response.headers["Location"]).to eq "http://test.host/#{MobileEnhancements.configuration.mobile_path_prefix}/two"
+      end
+    end
   end
 end

data/spec/internal/app/controllers/test_controller.rb

@@ -5,4 +5,16 @@ class TestController < ActionController::Base
   alias_method :two, :one
   alias_method :three, :one
   alias_method :four, :one
+  
+  def path_checking
+    render text: optional_mobile_url
+  end
+  
+  def redirect_checking
+    redirect_to(optional_mobile_url)
+  end
+  
+  def fixed_redirect_checking
+    redirect_to(mobile_url(optional_mobile_url))
+  end
 end

data/spec/internal/config/routes.rb

@@ -2,7 +2,10 @@ Rails.application.routes.draw do
   get "one", to: "test#one"
   
   mobile_optional do
-    get "two", to: "test#two"
+    get "two", to: "test#two", as: :optional_mobile
+    get "five", to: "test#path_checking"
+    get "six", to: "test#redirect_checking"
+    get "seven", to: "test#fixed_redirect_checking"
   end
   
   mobile_only do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobile-enhancements
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -145,6 +145,7 @@ files:
 - lib/mobile_enhancements/railtie.rb
 - lib/mobile_enhancements/request_helper.rb
 - lib/mobile_enhancements/route_helpers.rb
+- lib/mobile_enhancements/url_helper.rb
 - lib/mobile_enhancements/version.rb
 - mobile-enhancements.gemspec
 - spec/controllers/test_controller_spec.rb