crumbs 1.2.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c715baffe0b9150974ecaf21136eaafa4658fce
-  data.tar.gz: 3ffe476295357d0fc7340023bc8ad2de8090a538
+  metadata.gz: a340edbee8381a599cfed3c3c5f495b0bf0bd156
+  data.tar.gz: 3d74d95648151946cc7bf9c11de2d7e3f0dcc63f
 SHA512:
-  metadata.gz: f57b8383972f6e81684f64ce2b52cc20484614f5b42395b3a8aae56bd4904f2e45d8f7d5367962f4ab49f92b62e247e7d0e98c7a7f204b2f246c6ae83951e551
-  data.tar.gz: 2b50d86d388bd2a28efc7a3d58a3638208ead254458c80208ea68b7de03eb70382cf47ae5bdde7545b591f531e341249c1ee8ffa8b8fb84cbc6ab52909d85630
+  metadata.gz: 1628bf8db851169079ee1dfdd3ab1435dbdc60989bd1c8629a2225ecbee046e68812069be363155c680d54061ee78705470470c57ebb8d4e58f594cf9e811fa3
+  data.tar.gz: 24e176e3328621d1cf08c47b386a281c9ee618baa886186b0d733a752104eb33d2fa9cfd0fd35cecec26a7c3cc2ef6225bfa307dfc4f6c780cf3b69388066ea0

data/README.md

@@ -18,12 +18,12 @@ $ bundle
 
 ## Configuration
 
-Generate the configuration file:
+Generate the initialization file:
 ```
 rails g crumbs:install
 ```
 
-The defaults values are:
+The defaults configuration values are:
 ```ruby
 Crumbs.configure do |config|
   config.show_last = false
@@ -32,14 +32,24 @@ end
 
 ## Usage
 
-In your controllers add crumbs to the actions you want:
+In your initialization file add crumbs referencing the controller and action with the dsl:
 ```ruby
-crumb :home, 'Home'
+Crumbs.define do
+  controller :site do
+    action :home, 'Home'
+  end
+end
 ```
 
 You can use a lambda, proc or block too, will receive the corresponding url parameters:
 ```ruby
-crumb :product, proc { |params| Product.find(params[:id]).name }
+Crumbs.define do
+  controller :site do
+    action :product do |params|
+      Product.find(params[:id]).name
+    end
+  end
+end
 ```
 
 Then in your views would be available a crumbs variable:

data/lib/crumbs/action_controller/base.rb

@@ -26,7 +26,7 @@ module Crumbs
         @crumbs = []
         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 name = Crumbs.find(params[:controller], params[:action], params)
             if index = find_referer_index(path)
               path = session[:referers][index][:fullpath]
             end
@@ -41,16 +41,7 @@ module Crumbs
           paths.include? referer[:path]
         end
       end
-
-      module ClassMethods
-
-        protected
-
-        def crumb(action, name=nil, &block)
-          Crumbs::Definitions.add controller_path, action.to_s, (block_given? ? block : name)
-        end
-
-      end
     end
+
   end
 end

data/lib/crumbs/controller.rb

@@ -0,0 +1,21 @@
+module Crumbs
+  class Controller
+
+    def initialize(controller)
+      @controller = controller
+    end
+
+    def action(action, name=nil, &block)
+      controller = @controller.to_s
+      action = action.to_s
+      name = (block_given? ? block : name)
+      all = Crumbs.all
+      if all.has_key? controller
+        all[controller][action] = name
+      else
+        all[controller] = { action => name }
+      end
+    end
+
+  end
+end

data/lib/crumbs/proxy.rb

@@ -0,0 +1,9 @@
+module Crumbs
+  class Proxy
+
+    def controller(name, &block)
+      Controller.new(name).instance_eval(&block)
+    end
+
+  end
+end

data/lib/crumbs/version.rb

@@ -1,5 +1,5 @@
 module Crumbs
 
-  VERSION = '1.2.1'
+  VERSION = '2.0.2'
 
 end

data/lib/crumbs.rb

@@ -1,5 +1,6 @@
 require 'crumbs/action_controller/base'
-require 'crumbs/definitions'
+require 'crumbs/proxy'
+require 'crumbs/controller'
 require 'crumbs/railtie'
 
 module Crumbs
@@ -17,5 +18,24 @@ module Crumbs
       end
     end
 
+    def define(&block)
+      Proxy.new.instance_eval &block
+    end
+
+    def find(controller, action, params)
+      if all.has_key? controller and all[controller].has_key? action
+        name = all[controller][action]
+        if name.is_a? Proc
+          name.call params
+        else
+          name
+        end
+      end
+    end
+
+    def all
+      @all ||= {}
+    end
+
   end
 end

data/lib/generators/crumbs/templates/crumbs.rb

@@ -1,2 +1,2 @@
-Crumbs.configure do |config|
+Crumbs.define do
 end

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

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

data/test/dummy/config/initializers/crumbs.rb

@@ -0,0 +1,19 @@
+Crumbs.define do
+
+  controller :pages do
+    action :home, 'Home'
+    action :static do
+      'Static'
+    end
+    action :i18n do
+      I18n.t('hello')
+    end
+    action :nested do |params|
+      'Nested'
+    end
+    action :param do |params|
+      "Param#{params[:param]}"
+    end
+  end
+
+end