crumbs 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65c23c3a5031cc7aee4ea4f9345d356a920ae45a
-  data.tar.gz: 1eac4ee8c700f05faaa1686802121c7d4a6099c7
+  metadata.gz: 23f731609ef462cb58727f9e67be6eac84f2475e
+  data.tar.gz: 954a7f6708787612add650639e15176c389aea0e
 SHA512:
-  metadata.gz: 11c1db3e6708873d5b70bdb8c852626e8db9ec0348b5e75d0e9c730fe5654fbd96f2037304451826bf63664f67eec1b1133c438d243f3c9530487e38908e9487
-  data.tar.gz: 15c226389376609305b7d1a26890df5788a67d4af6fbec7ad9e1a5e97b1e003072b5e3e6cd883594dfd2b0540d43c883b61e3918b42dd0a4b28e333b86a1dba0
+  metadata.gz: 89edb12b5f957aed754ff382564ce7f90f754f63179f53021720ce6615820bb33a39df9ce961b583d41cc49e26c438b4195f9b500a62e64a703f3bebd9e44a08
+  data.tar.gz: c6b1b02a804178b9e813059873da429532298834a4862667f315d1effd18f43899fa91ad0701bfd1e33621acf3123b33a07caa2f5e031bac531dc31262867595

data/MIT-LICENSE

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

data/README.rdoc

@@ -1,4 +1,4 @@
-{<img src="https://codeclimate.com/github/mattways/crumbs.png" />}[https://codeclimate.com/github/mattways/crumbs] {<img src="https://travis-ci.org/mattways/crumbs.png?branch=master" alt="Build Status" />}[https://travis-ci.org/mattways/crumbs] {<img src="https://gemnasium.com/mattways/crumbs.png" alt="Dependency Status" />}[https://gemnasium.com/mattways/crumbs]
+{<img src="https://badge.fury.io/rb/crumbs.png" alt="Gem Version" />}[http://badge.fury.io/rb/crumbs] {<img src="https://codeclimate.com/github/museways/crumbs.png" />}[https://codeclimate.com/github/museways/crumbs] {<img src="https://travis-ci.org/museways/crumbs.png?branch=master" alt="Build Status" />}[https://travis-ci.org/museways/crumbs] {<img src="https://gemnasium.com/museways/crumbs.png" alt="Dependency Status" />}[https://gemnasium.com/museways/crumbs]
 
 = Crumbs
 

data/lib/crumbs/action_controller/base.rb

@@ -7,114 +7,67 @@ module Crumbs
         before_filter :define_crumbs
       end
 
-      protected    
+      protected 
 
-      def define_crumbs    
-        check_referer
+      def define_crumbs
+        update_referers
         parts = request.path.split('/')
         parts.pop unless Rails.application.config.crumbs.show_last
         @crumbs = []
         while parts.size > 0
-          path = join_parts(parts)
-          if params = find_path_params(path)
-            if name = History.get_name(params[:controller], params[:action], params)
-              if index = in_referer?(path)
-                path = session[:referer][index][:fullpath]
-              end 
-              @crumbs << { name: name, path: path }   
-            end
-          end       
-          parts.pop      
-        end  
-        @crumbs.reverse!  
-      end
-
-      def find_path_params(path)
-        begin
-          Rails.application.routes.recognize_path(request.base_url + path) 
-        rescue
-          false
+          if crumb = find_crumb(parts.size == 1 ? '/' : parts.join('/'))
+            @crumbs << crumb
+          end
+          parts.pop
         end
+        @crumbs.reverse!
       end
 
-      def check_referer
-        if session[:referer].nil?
-          reset_referer
-        elsif is_last_referer?
-          last_index = session[:referer].size - 1
-          session[:referer][last_index][:fullpath] = request.fullpath
-        elsif add_to_referer?
-          add_to_referer
-        elsif index = in_referer_tree?
-          session[:referer] = session[:referer].slice(Range.new(0, index))
-          add_to_referer
-        else
-          reset_referer
-        end  
-      end
-
-      def add_to_referer
-        session[:referer] << { base_url: request.base_url, path: request.path, fullpath: request.fullpath }
-      end
-
-      def reset_referer
-        session[:referer] = [{ base_url: request.base_url, path: request.path, fullpath: request.fullpath }]   
-      end
-      
-      def join_parts(parts)
-        path = parts.join('/')
-        path[0] != '/' ? "/#{path}" : path
-      end
-    
-      def is_last_referer?
-        last = session[:referer].last
-        last[:base_url] == request.base_url and last[:path] == request.path
+      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 add_to_referer?   
-        last = session[:referer].last
-        parts = request.path.split('/')
-        parts.size > 0 and last[:path] == join_parts(parts.slice(0, parts.size - 1))
+ 
+      def referers
+        session[:referers] ||= []
       end
 
-      def in_referer?(path)
-        find_in_referer path
+      def referers=(value)
+        session[:referers] = value
       end
-
-      def in_referer_tree?
-        parts = request.path.split('/')
-        parts.pop
-        while parts.size > 0
-          index = find_in_referer_tree(parts)            
-          return index unless index.nil?
-          parts.pop
-        end
+ 
+      def find_referer_index(path)
+        referers.index { |referer| referer[:base_url] == request.base_url and referer[:path] == path }
       end
 
-      def find_in_referer(path)
-        session[:referer].index do |referer|
-          referer[:base_url] == request.base_url and referer[:path] == path
-        end
-      end         
-
-      def find_in_referer_tree(parts)
-        session[:referer].index do |referer|
-          referer[:base_url] == request.base_url and 
-          referer[:path] == join_parts(parts) and
-          referer[:path] != request.path
+      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
       end
-
+ 
       module ClassMethods
-        
+ 
         protected
-        
-        def crumb(action, name = nil, &block)
+ 
+        def crumb(action, name=nil, &block)
           controller = self.name.gsub('::', '/').gsub('Controller', '').underscore
           name = block_given? ? block : name
-          History.add(controller, action, name)
+          Crumbs::Definitions.add controller.to_s, action.to_s, name
         end
-        
+ 
       end
     end
   end

data/lib/crumbs/definitions.rb

@@ -0,0 +1,26 @@
+module Crumbs
+  class Definitions
+    class << self
+    
+      def all
+        @all ||= {}
+      end
+    
+      def add(controller, action, name)
+        if all.has_key? controller
+          all[controller][action] = name
+        else
+          all[controller] = { action => name }
+        end
+      end
+  
+      def find(controller, action, params)
+        if all.has_key? controller and all[controller].has_key? action
+          name = all[controller][action]
+          name.is_a?(Proc) ? name.call(params) : name
+        end
+      end
+  
+    end
+  end
+end

data/lib/crumbs/version.rb

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

data/lib/crumbs.rb

@@ -1,6 +1,5 @@
-require 'action_controller/metal/exceptions'
 require 'crumbs/action_controller/base'
-require 'crumbs/history'
+require 'crumbs/definitions'
 require 'crumbs/railtie'
 require 'crumbs/version'
 

data/test/dummy/app/controllers/pages_controller.rb

@@ -4,7 +4,7 @@ class PagesController < ApplicationController
   crumb(:static) { 'Static' }
   crumb :i18n do I18n.t('hello') end
   crumb :nested, ->(params) { 'Nested' }
-  crumb :param, proc { |params| params[:param] }
+  crumb :param, proc { |params| "Param#{params[:param]}" }
 
   def home
     render :crumbs