mobile-enhancements 0.0.4 → 0.0.5

data/lib/mobile_enhancements/railtie.rb

@@ -1,11 +1,12 @@
 require "mobile_enhancements/route_helpers"
 require "mobile_enhancements/helper_delegation"
+require "mobile_enhancements/url_helper"
 require "rails/railtie"
 
 module MobileEnhancements
   class Railtie < Rails::Railtie
 
-    config.to_prepare do
+    config.after_initialize do
       # setup our route helpers
       ActionDispatch::Routing::Mapper.send(:include, MobileEnhancements::RouteHelpers)
       # setup the path helpers
@@ -21,10 +22,8 @@ module MobileEnhancements
         # setup the format calculation
         ActionController::Base.class_eval do
           before_filter do |controller|
-            if controller.mobile_request?
-              controller.request.format = controller.determine_format
-              controller.params["mobile"] = MobileEnhancements.configuration.mobile_path_prefix
-            end
+            controller.request.format = controller.determine_format
+            controller.params["mobile"] = controller.mobile_param_value
           end
         end
       end

data/lib/mobile_enhancements/request_helper.rb

@@ -29,6 +29,11 @@ module MobileEnhancements
       mobile_request? ? mobile_format.to_sym : request.format.to_sym
     end
     
+    # returns what the value of the mobile parameter should be
+    def mobile_param_value
+      mobile_request? ? mobile_path_prefix : nil
+    end
+    
     # strips any mobile prefix from the url
     def desktop_url(url = request.url)
       desktop_path(url)

data/lib/mobile_enhancements/url_helper.rb

@@ -1,18 +1,34 @@
 module MobileEnhancements
   module UrlHelper
     def url_for(*args)
+      url = super
       # ignore our direct calls for desktop/mobile URLs
       if args.size == 1 && args.first.frozen?
-        super
+        url
       # if it's from a mobile
       elsif mobile_request?
         # mobilify the url
-        mobile_url(super)
+        murl = mobile_url(url)
+        # verify or resort to original
+        verify_path(murl) || url
       # if it's a desktop request
       else
-        # process as normal
-        super
+        # desktopify the url
+        durl = desktop_url(super)
+        # verify or resort to original
+        verify_path(durl) || durl
       end
     end
+    
+    # ensures a URL/path exists
+    def verify_path(url)
+      path = strip_domain(url)
+      Rails.application.routes.recognize_path(path) && url rescue false
+    end
+    
+    # converts a URL/path to a path
+    def strip_domain(url)
+      url.gsub(/([a-z]+\:)?\/\/.*?\//i, "/")
+    end
   end
 end

data/lib/mobile_enhancements/version.rb

@@ -1,3 +1,3 @@
 module MobileEnhancements
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/controllers/test_controller_spec.rb

@@ -47,6 +47,14 @@ describe TestController do
         expect(response).to redirect_to "http://test.host/#{MobileEnhancements.configuration.mobile_path_prefix}/two"
       end
     end
+    
+    describe "GET /#{MobileEnhancements.configuration.mobile_path_prefix}/mobile_to_desktop_path" do
+      before { get :mobile_to_desktop_path, mobile: MobileEnhancements.configuration.mobile_path_prefix }
+      
+      it "should render a desktop URL" do
+        expect(response.body).to eq "/one"
+      end
+    end
   end
   
   context "via the desktop UI" do

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

@@ -19,4 +19,6 @@ class TestController < ActionController::Base
   def fixed_redirect_checking
     redirect_to(mobile_url(optional_mobile_url))
   end
+  
+  def mobile_to_desktop_path; end
 end

data/spec/internal/app/views/test/mobile_to_desktop_path.mobile.erb

@@ -0,0 +1 @@
+<%= url_for(controller: "test", action: "one") %>

data/spec/internal/config/routes.rb

@@ -11,6 +11,7 @@ Rails.application.routes.draw do
   
   mobile_only do
     get "three", to: "test#three"
+    get "nine", to: "test#mobile_to_desktop_path"
     root to: "test#four"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobile-enhancements
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -152,6 +152,7 @@ files:
 - spec/internal/app/controllers/test_controller.rb
 - spec/internal/app/views/layouts/application.html.erb
 - spec/internal/app/views/layouts/application.mobile.erb
+- spec/internal/app/views/test/mobile_to_desktop_path.mobile.erb
 - spec/internal/app/views/test/path_rendering.html.erb
 - spec/internal/app/views/test/path_rendering.mobile.erb
 - spec/internal/config/initializers/mobile_enhancements.rb
@@ -175,12 +176,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -576039057823727365
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -576039057823727365
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -192,6 +199,7 @@ test_files:
 - spec/internal/app/controllers/test_controller.rb
 - spec/internal/app/views/layouts/application.html.erb
 - spec/internal/app/views/layouts/application.mobile.erb
+- spec/internal/app/views/test/mobile_to_desktop_path.mobile.erb
 - spec/internal/app/views/test/path_rendering.html.erb
 - spec/internal/app/views/test/path_rendering.mobile.erb
 - spec/internal/config/initializers/mobile_enhancements.rb