rack-rewrite-dynamic 0.0.6 → 0.0.7

data/lib/rack/rewrite/dynamic/base.rb

@@ -23,6 +23,8 @@ module Rack
         def scoped_slug_type?(slug_name, slug_type, prev_slug)
           association_name = slug_type.downcase.pluralize
           prev_slug.sluggable.send(association_name).find(slug_name) if prev_slug
+        rescue
+          nil
         end
         def find_sluggable(friendly_id)
           slug_klass.find(friendly_id)
@@ -41,9 +43,9 @@ module Rack
         def route_generator_klass
           @route_generator_klass ||= @opts[:route_generator_name].constantize
         end
-        def slug_path_if_present(slug, rack_env)
+        def slug_path_if_present(slug, rack_env, opts={})
           if slug
-            route_generator_klass.route_for slug
+            route_generator_klass.route_for slug, opts
           else
             original_path(rack_env)
           end

data/lib/rack/rewrite/dynamic/filter_rewrite.rb

@@ -27,9 +27,9 @@ module Rack
                 slugs.each do |s|
                   add_filter_param(filter_params, s)
                 end
-                return "/#{@opts[:target]}?#{filter_params.to_query}" if filter_params.length > 0
               end
-              original_path(rack_env)
+
+              return "/#{@opts[:target]}?#{filter_params.to_query}" if filter_params.length > 0
             end
             original_path(rack_env)
           end

data/lib/rack/rewrite/dynamic/rails_route_generator.rb

@@ -2,11 +2,11 @@ module Rack
   class Rewrite
     module Dynamic
       class RailsRouteGenerator
-        def self.route_for slug
+        def self.route_for(slug, opts={})
           if slug.kind_of?(Slug)
-            Rails.application.routes.url_helpers.send("#{slug[:sluggable_type].underscore}_path", slug[:sluggable_id])
+            Rails.application.routes.url_helpers.send("#{slug[:sluggable_type].underscore}_path", slug[:sluggable_id], opts)
           else
-            Rails.application.routes.url_helpers.send("#{slug.class.name.underscore}_path", slug.id)
+            Rails.application.routes.url_helpers.send("#{slug.class.name.underscore}_path", slug.id, opts)
           end
         end
       end

data/lib/rack/rewrite/dynamic/rewrite.rb

@@ -28,21 +28,29 @@ module Rack
           scope_slug = nil
           slugs = url_parts.each_with_index.map do |url_part, index|
             if url_part[1] == 'slug'
-              scope_slug = slug_type?(match[index+1].split('?')[0], url_part[0])
+              scope_slug = slug_type?(match[index+1], url_part[0])
             elsif url_part[1] == 'scoped_slug'
-              scope_slug = scoped_slug_type?(match[index+1].split('?')[0], url_part[0], scope_slug)
+              scope_slug = scoped_slug_type?(match[index+1], url_part[0], scope_slug)
             else
               'static'
             end
           end
+          slugs.reject!{|s| s == 'static'}
           if !slugs.include?(nil)
-            slug_path_if_present(slugs[url_parts.length-1], rack_env)
+            slug_path_if_present(slugs[url_parts.reject{|k, v| v == 'static' }.length-1], rack_env, static: static_match(url_parts, match))
           else
             nil
           end
         end
 
         private
+          def static_match(url_parts, match)
+            static_index = url_parts.values.index('static')
+            if static_index
+              match[static_index+1]
+            end
+          end
+
           def build_match_string
             match_string = "^\/"
             match_string << @opts[:url_parts].first.map do |url_value, url_type|

data/lib/rack/rewrite/dynamic/version.rb

@@ -1,7 +1,7 @@
 module Rack
   class Rewrite
     module Dynamic
-      VERSION = "0.0.6"
+      VERSION = "0.0.7"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rewrite-dynamic
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-rewrite