rails_breadcrumbs 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 499ada8e53797f18823433809cc0a40f6bf4b8d8
-  data.tar.gz: ab246d30f73fd05dc26c066f3d941ad82f41bab5
+  metadata.gz: abef947da148da31044ca258afd1d00a3b28bd97
+  data.tar.gz: 6c73025f12bb5c7b2298626cc676634c4971b52a
 SHA512:
-  metadata.gz: 9263cd710811d05e0c5e833bc79d4b91ff834e9d419c05700d5b8f5113ab9f92c1ab3246afe51202d098242e06a713d264e7f1739f4b95a66858ba621bd5ec2e
-  data.tar.gz: cc68593c170f00109693510637768bb34e1c7d545141791147cfad95d2c35f7c0f2cf54790896caf8ac82f83cd34ac56b55ccac6736cf15c52d1b72fba78c876
+  metadata.gz: 91507749498cbb508a474c56cdeb9936e2cbdaf0f70f2a621b25be54d2e249074febb67edf91ead31d41d86a858896f0df42ea154193352f472353e29f65e4e1
+  data.tar.gz: 60188f5f410818bc42bf5a7a4529f5e6c29bafbcf9f7529b03ff6f0a360f548035de0401e19570bec84771cc3d32efa925d46b8729d9e4e8b850d38c9b4dde4e

data/lib/rails_breadcrumbs/controller_additions.rb

@@ -8,8 +8,9 @@ module RailsBreadcrumbs
 
     module ClassMethods
       def add_breadcrumb(name, url, options = {})
+        options = ::RailsBreadcrumbs.options.merge(options)
         before_filter options do |controller|
-          controller.send(:add_breadcrumb, name, url)
+          controller.send(:add_breadcrumb, localization(name, options), url)
         end
       end
     end
@@ -34,9 +35,7 @@ module RailsBreadcrumbs
       options = ::RailsBreadcrumbs.options.merge(options)
       path_parts = controller_path.split('/')
       path_parts.each do |segment|
-        link_name = segment.sub('_', ' ').camelcase
-        link_name = names[segment] if names.has_key?(segment)
-        name = I18n.t options[:locale_root] + segment, :default => link_name
+        name = localization(segment, options, names)
         if segment != path_parts.last
           route = nil
           path_parts.each do |temp|
@@ -55,9 +54,7 @@ module RailsBreadcrumbs
       options = ::RailsBreadcrumbs.options.merge(options)
       path_parts = controller_path.split('/') << action_name
       path_parts.each do |segment|
-        link_name = segment.sub('_', ' ').camelcase
-        link_name = names[segment] if names.has_key?(segment)
-        name = I18n.t options[:locale_root] + segment, :default => link_name
+        name = localization(segment, options, names)
         if segment != path_parts.last
           route = nil
           path_parts.each do |temp|
@@ -74,7 +71,7 @@ module RailsBreadcrumbs
 
     private
       # Add breadcrumb for page
-      def add_breadcrumb name, url = ''
+      def add_breadcrumb(name, url = '')
         @breadcrumbs ||= []
         url = eval(url.to_s) if url =~ /_path|_url|@/
         @breadcrumbs << [name, url]
@@ -95,5 +92,12 @@ module RailsBreadcrumbs
         url += ")"
         url
       end
+
+      def localization(name, options, names={})
+        name = name.to_s.underscore
+        default_name = name.sub('_', ' ').camelcase
+        default_name = names[name] if names.has_key?(name)
+        I18n.t options[:locale_root] + name, default: default_name
+      end
   end
 end

data/rails_breadcrumbs.gemspec

@@ -1,7 +1,7 @@
 require 'date'
 Gem::Specification.new do |s|
   s.name = %q{rails_breadcrumbs}
-  s.version = "0.5.7"
+  s.version = "0.5.8"
   s.date = Date.today.to_s
   s.summary = %q{RailsBreadcrumbs is a gem that implements breadcrumbs.}
   s.description = %q{RailsBreadcrumbs is a gem that implements breadcrumbs.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_breadcrumbs
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Artem Rufanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies: []
 description: RailsBreadcrumbs is a gem that implements breadcrumbs.
 email: developers@majoron.com