crumbs 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23f731609ef462cb58727f9e67be6eac84f2475e
-  data.tar.gz: 954a7f6708787612add650639e15176c389aea0e
+  metadata.gz: d7de3dbbb857eb4469756682e3ad60e55088e4d2
+  data.tar.gz: 32c47f6e9baf0c2eea655548ec895832e7d1fca4
 SHA512:
-  metadata.gz: 89edb12b5f957aed754ff382564ce7f90f754f63179f53021720ce6615820bb33a39df9ce961b583d41cc49e26c438b4195f9b500a62e64a703f3bebd9e44a08
-  data.tar.gz: c6b1b02a804178b9e813059873da429532298834a4862667f315d1effd18f43899fa91ad0701bfd1e33621acf3123b33a07caa2f5e031bac531dc31262867595
+  metadata.gz: 3863266a5fc2e73132384ed76e07c9b3efb7f515779a8e95351e7ee56e794241940604b6091e14ded0cd17f4461077d92c5fe040829d4d206c2731bebec4fcee
+  data.tar.gz: 0954ec6072305b562961214bfbdc747e594d2546d010853da18f3071b4a74307e7ede34c84e4354c3fba0bb53bc851414b3d101391114a32ba3131d332031deb

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 Museways
+Copyright 2014 Museways
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/crumbs/action_controller/base.rb

@@ -10,29 +10,30 @@ module Crumbs
       protected 
 
       def define_crumbs
-        update_referers
-        parts = request.path.split('/')
-        parts.pop unless Rails.application.config.crumbs.show_last
+        paths = [request.path]
+        paths.unshift File.dirname(paths.first) until paths.first == '/'
+        if referers.empty? or referers.last[:base_url] != request.base_url
+          self.referers = [build_referer]
+        elsif request.path.starts_with? "#{referers.last[:path]}/".squeeze('/')
+          self.referers << build_referer
+        elsif index = find_referer_index(paths)
+          self.referers = referers[0...index] + [build_referer]
+        elsif
+          self.referers = [build_referer]
+        end
+        paths.pop unless Rails.application.config.crumbs.show_last
         @crumbs = []
-        while parts.size > 0
-          if crumb = find_crumb(parts.size == 1 ? '/' : parts.join('/'))
-            @crumbs << crumb
+        paths.each do |path|
+          params = Rails.application.routes.recognize_path("#{request.base_url}#{path}") rescue next
+          if name = Crumbs::Definitions.find(params[:controller], params[:action], params)
+            if index = find_referer_index(path)
+              path = referers[index][:fullpath]
+            end
+            @crumbs << { name: name, path: path }
           end
-          parts.pop
         end
-        @crumbs.reverse!
       end
 
-      def find_crumb(path)
-        params = Rails.application.routes.recognize_path(request.base_url + path) rescue return
-        if name = Crumbs::Definitions.find(params[:controller], params[:action], params)
-          if index = find_referer_index(path)
-            path = referers[index][:fullpath]
-          end
-          { name: name, path: path }
-        end
-      end
- 
       def referers
         session[:referers] ||= []
       end
@@ -40,22 +41,14 @@ module Crumbs
       def referers=(value)
         session[:referers] = value
       end
- 
-      def find_referer_index(path)
-        referers.index { |referer| referer[:base_url] == request.base_url and referer[:path] == path }
-      end
 
-      def update_referers
-        if referers.empty? or index = find_referer_index(request.path) or (referers.last[:path].count('/') == 1 ? '/' : request.path[0...request.path.rindex('/')])
-          if index == 0
-            self.referers = []
-          elsif index
-            self.referers = referers[0...index]
-          end
-          referers << { base_url: request.base_url, path: request.path, fullpath: request.fullpath }
-        else
-          self.referers = [{ base_url: request.base_url, path: request.path, fullpath: request.fullpath }]
-        end
+      def build_referer
+        { base_url: request.base_url, path: request.path, fullpath: request.fullpath }
+      end
+ 
+      def find_referer_index(paths)
+        paths = [paths] unless paths.is_a? Array
+        referers.rindex { |referer| paths.include? referer[:path] }
       end
  
       module ClassMethods

data/lib/crumbs/version.rb

@@ -1,5 +1,5 @@
 module Crumbs
 
-  VERSION = '1.0.9'
+  VERSION = '1.1.0'
 
 end

data/test/dummy/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require "crumbs"
+require 'crumbs'
 
 module Dummy
   class Application < Rails::Application
@@ -18,6 +18,6 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
+     I18n.enforce_available_locales = false
   end
 end
-