crumpet 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afd1d70cd4361b4fd1f0742d1d19e92317d63ad3
-  data.tar.gz: 5b084bd6cdbcc268b3bbbc6c86b5a096133eb4d1
+  metadata.gz: 46c020bb8b8fd33ae4e359306880ddf0c37978df
+  data.tar.gz: 39dfcf96365be7747864c1718d66b018d1666799
 SHA512:
-  metadata.gz: c445f571cc7faa94e6e32383e48faa304f2adce1d5d5c13bffeb1fcb8159cf99ab1e9f63d60a16385d9e2a4194b48636c680f35d406729c5f7ab686bf73856e6
-  data.tar.gz: bee8cd6b5b023d780cb914675373a767b70988e5dd30c78fe1a57ad5f39a0cdb1bb3616a7d30dce4039387df78a2193629e2f6d2906f39104d90d2ddd47bb911
+  metadata.gz: 5e57311ee26d89332c8c4d12b5a5b1d63c73c36df1ac501e96b63d3d9a26e56600392f4ec1013c2b53de4e49541d8001ab096b707ade824d52ec89571633226c
+  data.tar.gz: b6366304158073f442de67cdbec8a48001ca2fda0a274a11db2a8d1765d4ecefa4936c1cb67e8b2c873df59aec6c1f6012cf1cb0b2b5834e3c95db973c2d820a

data/lib/crumpet/controller_additions.rb

@@ -5,11 +5,16 @@ module Crumpet
     end
 
     def add_crumb(*args)
-      Crumpet.repository.add_crumb(*args)
+      Crumpet.crumbs.add_crumb(*args)
     end
 
     def clear_crumbs
-      Crumpet.repository.clear
+      Crumpet.crumbs.clear
+    end
+
+    def crumbs(&block)
+      yield if block_given?
+      Crumpet.crumbs
     end
 
     module ClassMethods
@@ -18,11 +23,13 @@ module Crumpet
       end
 
       def crumbs_for(*args, &block)
-        options = {}
-        options[:only] = args if args.present?
-        before_action(options) do |instance|
-          instance.instance_exec(&block) if block_given?
+        if block_given?
+          options = args.present? ? { only: args } : {}
+          before_action(options) do |instance|
+            instance.instance_exec(:crumbs, &block)
+          end
         end
+        Crumpet.crumbs
       end
     end
   end

data/lib/crumpet/crumb.rb

@@ -1,49 +1,13 @@
 module Crumpet
   class Crumb
-    attr_reader :name, :url, :options
+    attr_reader :name, :url, :options, :item_options, :wrapper_options
 
     def initialize(name, *args)
       @options = args.extract_options!
+      @item_options = @options.delete(:item_options) || {}
+      @wrapper_options = @options.delete(:wrapper_options) || {}
       @name = name
       @url = args.first
     end
-
-    def link?
-      url.present? && option_or_default(:link).present?
-    end
-
-    def escape?
-      option_or_default(:escape)
-    end
-
-    def truncate?
-      truncate.present?
-    end
-
-    def truncate
-      option_or_default(:truncate)
-    end
-
-    def wrap?
-      wrapper.present?
-    end
-
-    def wrapper
-      option_or_default(:wrapper)
-    end
-
-    def item_options
-      options.fetch(:item_options, {})
-    end
-
-    def wrapper_options
-      options.fetch(:wrapper_options, {})
-    end
-
-    private
-
-    def option_or_default(option)
-      options.fetch(option, Crumpet.config.send(option.to_sym).clone)
-    end
   end
 end

data/lib/crumpet/renderer.rb

@@ -12,15 +12,15 @@ module Crumpet
     def render
       case option_or_default(:format)
       when :html
-        output = repository.map{ |crumb| render_html(crumb) }.join(option_or_default(:separator)).html_safe
+        output = crumbs.map{ |crumb| render_html(crumb) }.join(option_or_default(:separator)).html_safe
         output = content_tag(option_or_default(:container).to_sym, output, build_container_options) if option_or_default(:container).present?
         output
       when :xml
-        output = repository.map{ |crumb| render_xml(crumb) }.join
+        output = crumbs.map{ |crumb| render_xml(crumb) }.join
         output = content_tag(:crumbs, output)
         output
       when :json
-        repository.map{ |crumb| render_json(crumb) }.to_json
+        crumbs.map{ |crumb| render_json(crumb) }.to_json
       else
         raise NotImplementedError, "unsupported format: #{option_or_default(:format)}"
       end
@@ -28,8 +28,8 @@ module Crumpet
 
     private
 
-    def repository
-      Crumpet.repository
+    def crumbs
+      Crumpet.crumbs
     end
 
     def render_html(crumb)
@@ -38,7 +38,7 @@ module Crumpet
       wrapper_options = build_wrapper_options(crumb)
 
       output = link?(crumb) ? link_to(name, crumb.url, item_options) : content_tag(:span, name, item_options)
-      output = content_tag(crumb.wrapper, output, wrapper_options) if crumb.wrap?
+      output = content_tag(crumb_option_or_default(crumb, :wrapper), output, wrapper_options) if wrap?(crumb)
       output
     end
 
@@ -57,8 +57,8 @@ module Crumpet
 
     def render_name(crumb)
       name = crumb.name
-      name = name.truncate(crumb.truncate) if crumb.truncate?
-      name = h(name) if crumb.escape?
+      name = name.truncate(crumb_option_or_default(crumb, :truncate)) if truncate?(crumb)
+      name = h(name) if escape?(crumb)
       name.html_safe
     end
 
@@ -71,8 +71,8 @@ module Crumpet
 
       item_options[:class] = Array(item_options.fetch(:class, []))
       item_options[:class] << option_or_default(:default_crumb_class).presence
-      item_options[:class] << option_or_default(:first_crumb_class).presence if crumb == repository.first
-      item_options[:class] << option_or_default(:last_crumb_class).presence if crumb == repository.last
+      item_options[:class] << option_or_default(:first_crumb_class).presence if crumb == crumbs.first
+      item_options[:class] << option_or_default(:last_crumb_class).presence if crumb == crumbs.last
       item_options[:class].compact!
       item_options[:class].uniq!
       item_options.delete(:class) if item_options[:class].blank?
@@ -109,11 +109,27 @@ module Crumpet
     end
 
     def link?(crumb)
-      option_or_default(:link) && crumb.link? && ( option_or_default(:link_last_crumb) || crumb != repository.last )
+      crumb.url.present? && ( crumb_option_or_default(crumb, :link) && ( option_or_default(:link_last_crumb) || crumb != crumbs.last ) )
+    end
+
+    def truncate?(crumb)
+      crumb_option_or_default(crumb, :truncate)
+    end
+
+    def wrap?(crumb)
+      crumb_option_or_default(crumb, :wrapper).present?
+    end
+
+    def escape?(crumb)
+      crumb_option_or_default(crumb, :escape).present?
     end
 
     def option_or_default(option)
       options.fetch(option, Crumpet.config.send(option.to_sym)).clone
     end
+
+    def crumb_option_or_default(crumb, option)
+      crumb.options.fetch(option, option_or_default(option))
+    end
   end
 end

data/lib/crumpet/version.rb

@@ -1,3 +1,3 @@
 module Crumpet
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/crumpet/view_helpers.rb

@@ -5,7 +5,7 @@ module Crumpet
     end
 
     def crumbs
-      Crumpet.repository
+      Crumpet.crumbs
     end
   end
 end

data/lib/crumpet.rb

@@ -12,8 +12,8 @@ module Crumpet
     @config ||= Crumpet::Configuration.new
   end
 
-  module_function def repository
-    @repository ||= Crumpet::Repository.new
+  module_function def crumbs
+    @crumbs ||= Crumpet::Repository.new
   end
 
   def self.render(options = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crumpet
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Grant Colegate
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails