excursion 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 970c66c03bce9f7cc650641b90518f7b81d0c716
-  data.tar.gz: d63f0475015ad67d34e5ef75a84d12f1f723cc81
+  metadata.gz: 5051561169a6698e74f8d5a2c7b6e4e52f76e7d9
+  data.tar.gz: 6ef2e2dc1242941eaa65346109310c0f6e11fd35
 SHA512:
-  metadata.gz: 4922ab494d86409741c2229dc85a5cfd5ffa5696bfdb44545c08f74c646608ab40e9ba35b012c3329fd8c7d7c178cabd5253819ab34c48d50c81217fa32f11dd
-  data.tar.gz: e219ee026b5d0d6615869a72efb30a18a911c5de42e6a214fa42c1a630f17e1926858b1566e953b6bc339754b05939d9208912cb1fc2654f33007f9fda8add16
+  metadata.gz: 2d633f5c68f9034e696f633d93100465eacd80a1eb7a5c4ece829cc98f7f1f3f799904cb5487b3758494a7a3cb1da46861b4cc285f47d0c7ef123cc6891856da
+  data.tar.gz: 5541d5df8aa7be16528f8743800a87fef0848978ed76251710a7a6c7e67d9cebb0685758aaa5d966359e2aa4145b4813a59c233a348d61c0e797ebb93b3a0419

data/lib/excursion/helpers/application_helper.rb

@@ -20,6 +20,10 @@ module Excursion
         end
       end
 
+      def respond_to_missing?(meth, include_private=false)
+        app_exists?(meth.to_s) || super
+      end
+
       protected
 
       def app_exists?(app_name)

data/lib/excursion/helpers/url_helper.rb

@@ -9,36 +9,59 @@ module Excursion
 
       def method_missing(meth, *args)
         if meth.to_s.match(/\A(#{routes.collect { |name,route| name }.join("|")})_(url|path)\Z/)
-          if Excursion.rails4?
-            ActionDispatch::Routing::RouteSet::NamedRouteCollection::UrlHelper.create(routes.get($1.to_sym), @application.default_url_options).call(Rails.application.routes, args)
-          elsif Excursion.rails3?
+          route = routes.get($1.to_sym)
+
+          url_opts = @application.default_url_options.clone
+          url_opts.merge!(args.slice!(args.length-1)) if args.last.is_a?(Hash) #&& args.last.has_key?(:host)
+            
+          return ActionDispatch::Http::URL.url_for(url_opts.merge({path: replaced_path(route, args)}))
+          
+          # This stuff is being deprecated.
+          # We're transitioning towards using our custom path replacement and the uniform call to the base url_for method.
+
+          #if Excursion.rails4?
+            #ActionDispatch::Routing::RouteSet::NamedRouteCollection::UrlHelper.create(route, url_opts).call(Rails.application.routes, args)
+          #elsif Excursion.rails3?
             # Playing with getting Rails3 working
             #mapping = ActionDispatch::Routing::Mapper::Mapping.new(routes, {}, routes.get($1.to_sym).path.spec.to_s.dup, {:controller => 'dummy', :action => 'dummy'})
             #puts mapping.send(:instance_variable_get, :@path)
-            ActionDispatch::Http::URL.url_for(@application.default_url_options.merge({path: replaced_path(routes.get($1.to_sym), args)}))
-          end
+          #end
         else
           super
         end
       end
 
+      def respond_to_missing?(meth, include_private=false)
+        meth.to_s.match(/\A(#{routes.collect { |name,route| name }.join("|")})_(url|path)\Z/) || super
+      end
+
       protected
 
       def initialize(app)
         @application = app
       end
 
-      # Playing with getting Rails3 working
+      # Very hacky method to replace path parts with values
+      #
+      # Needs work, particularly around formatting which is basically ignored right now.
       def replaced_path(route, args)
-        path = route.path.spec.to_s.dup # ActionDispatch::Routing::Mapper.normalize_path(route.path.spec.to_s.dup)
+        path = route.path.spec.to_s.dup
 
         route.required_parts.zip(args) do |part, arg|
-          path.gsub!(/(\*|:)#{part}/, Journey::Router::Utils.escape_fragment(arg.to_param))
+          path.gsub!(/(\*|:)#{part}/, journey_utils_class.escape_fragment(arg.to_param))
         end
 
         path.gsub!(/\(\.:format\)/, '') # This is really gross, and :format should actually be supported
         path
       end
+
+      def journey_utils_class
+        if Excursion.rails3?
+          Journey::Router::Utils
+        elsif Excursion.rails4?
+          ActionDispatch::Journey::Router::Utils
+        end
+      end
     end
   end
 end

data/lib/excursion/version.rb

@@ -1,3 +1,3 @@
 module Excursion
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excursion
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails