loaf 0.6.2 → 0.10.0

data/lib/loaf/errors.rb

@@ -11,7 +11,7 @@ module Loaf #:nodoc:
     end
 
     def translate(key, options)
-      ::I18n.translate("#{BASE_KEY}.#{key}", { :locale => :en }.merge(options))
+      ::I18n.translate("#{BASE_KEY}.#{key}", **{ :locale => :en }.merge(options))
     end
   end
 

data/lib/loaf/translation.rb

@@ -2,12 +2,15 @@
 
 module Loaf
   module Translation
-    extend self
-
     # Returns translation lookup
+    #
+    # @return [String]
+    #
+    # @api private
     def translation_scope
-      "loaf.breadcrumbs"
+      'loaf.breadcrumbs'
     end
+    module_function :translation_scope
 
     # Translate breadcrumb title
     #
@@ -18,12 +21,17 @@ module Loaf
     # @option options [String] :default
     #   The default translation
     #
+    # @return [String]
+    #
     # @api public
     def find_title(title, options = {})
+      return title if title.nil? || title.empty?
+
       options[:scope] ||= translation_scope
       options[:default] = Array(options[:default])
       options[:default] << title if options[:default].empty?
-      I18n.t("#{title}", options)
+      I18n.t(title.to_s, **options)
     end
+    module_function :find_title
   end # Translation
 end # Loaf

data/lib/loaf/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Loaf
-  VERSION = '0.6.2'
+  VERSION = "0.10.0"
 end # Loaf

data/lib/loaf/view_extensions.rb

@@ -2,13 +2,12 @@
 
 require_relative 'breadcrumb'
 require_relative 'crumb'
-require_relative 'crumb_formatter'
 require_relative 'options_validator'
+require_relative 'translation'
 
 module Loaf
   # A mixin to define view extensions
   module ViewExtensions
-    include Loaf::CrumbFormatter
     include Loaf::OptionsValidator
 
     def initialize(*)
@@ -46,14 +45,14 @@ module Loaf
     #
     # @api public
     def breadcrumb_trail(options = {})
-      return enum_for(:breadcrumb_trail) unless block_given?
+      return enum_for(:breadcrumb_trail, options) unless block_given?
 
       valid?(options)
-      options = Loaf.configuration.to_hash.merge(options)
+
       _breadcrumbs.each do |crumb|
-        name = format_name(crumb.name, options)
+        name = title_for(crumb.name)
         path = url_for(_expand_url(crumb.url))
-        current = current_crumb?(path, crumb.match)
+        current = current_crumb?(path, options.fetch(:match) { crumb.match })
 
         yield(Loaf::Breadcrumb[name, path, current])
       end
@@ -69,10 +68,10 @@ module Loaf
     def current_crumb?(path, pattern = :inclusive)
       return false unless request.get? || request.head?
 
-      origin_path = URI.parser.unescape(path).force_encoding(Encoding::BINARY)
+      origin_path = URI::DEFAULT_PARSER.unescape(path).force_encoding(Encoding::BINARY)
 
       request_uri = request.fullpath
-      request_uri = URI.parser.unescape(request_uri)
+      request_uri = URI::DEFAULT_PARSER.unescape(request_uri)
       request_uri.force_encoding(Encoding::BINARY)
 
       # strip away trailing slash
@@ -107,6 +106,15 @@ module Loaf
 
     private
 
+    # Find title translation for a crumb name
+    #
+    # @return [String]
+    #
+    # @api private
+    def title_for(name)
+      Translation.find_title(name)
+    end
+
     # Expand url in the current context of the view
     #
     # @api private

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: loaf
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2020-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,113 +42,40 @@ description: Loaf manages and displays breadcrumb trails in your Rails app. It a
   to handle breadcrumb data through easy dsl and expose it through view helpers without
   any assumptions about markup.
 email:
-- ''
-executables:
-- appraisal
-- rake
-- setup
+- piotr@piotrmurach.com
+executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
+- CHANGELOG.md
+- LICENSE.txt
 files:
-- ".document"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Appraisals
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
-- Rakefile
-- assets/loaf_logo.png
-- bin/appraisal
-- bin/rake
-- bin/setup
 - config/locales/loaf.en.yml
-- gemfiles/rails3.2.gemfile
-- gemfiles/rails4.0.gemfile
-- gemfiles/rails4.1.gemfile
-- gemfiles/rails4.2.gemfile
-- gemfiles/rails5.0.gemfile
-- gemfiles/rails5.1.gemfile
 - lib/generators/loaf/install_generator.rb
 - lib/loaf.rb
 - lib/loaf/breadcrumb.rb
 - lib/loaf/configuration.rb
 - lib/loaf/controller_extensions.rb
 - lib/loaf/crumb.rb
-- lib/loaf/crumb_formatter.rb
 - lib/loaf/errors.rb
 - lib/loaf/options_validator.rb
 - lib/loaf/railtie.rb
 - lib/loaf/translation.rb
 - lib/loaf/version.rb
 - lib/loaf/view_extensions.rb
-- loaf.gemspec
-- spec/integration/breadcrumb_trail_spec.rb
-- spec/integration/configuration_spec.rb
-- spec/rails_app/Rakefile
-- spec/rails_app/app/controllers/application_controller.rb
-- spec/rails_app/app/controllers/comments_controller.rb
-- spec/rails_app/app/controllers/home_controller.rb
-- spec/rails_app/app/controllers/posts_controller.rb
-- spec/rails_app/app/views/comments/index.html.erb
-- spec/rails_app/app/views/home/index.html.erb
-- spec/rails_app/app/views/layouts/_breadcrumbs.html.erb
-- spec/rails_app/app/views/layouts/application.html.erb
-- spec/rails_app/app/views/posts/index.html.erb
-- spec/rails_app/app/views/posts/new.html.erb
-- spec/rails_app/app/views/posts/show.html.erb
-- spec/rails_app/config.ru
-- spec/rails_app/config/application.rb
-- spec/rails_app/config/boot.rb
-- spec/rails_app/config/database.yml
-- spec/rails_app/config/environment.rb
-- spec/rails_app/config/environments/development.rb
-- spec/rails_app/config/environments/production.rb
-- spec/rails_app/config/environments/test.rb
-- spec/rails_app/config/initializers/backtrace_silencers.rb
-- spec/rails_app/config/initializers/inflections.rb
-- spec/rails_app/config/initializers/mime_types.rb
-- spec/rails_app/config/initializers/secret_token.rb
-- spec/rails_app/config/initializers/session_store.rb
-- spec/rails_app/config/initializers/wrap_parameters.rb
-- spec/rails_app/config/locales/en.yml
-- spec/rails_app/config/locales/loaf.en.yml
-- spec/rails_app/config/routes.rb
-- spec/rails_app/config/secrets.yml
-- spec/rails_app/db/seeds.rb
-- spec/rails_app/log/.gitkeep
-- spec/rails_app/public/404.html
-- spec/rails_app/public/422.html
-- spec/rails_app/public/500.html
-- spec/rails_app/public/favicon.ico
-- spec/rails_app/public/robots.txt
-- spec/spec_helper.rb
-- spec/support/capybara.rb
-- spec/support/dummy_controller.rb
-- spec/support/dummy_view.rb
-- spec/support/load_routes.rb
-- spec/unit/configuration_spec.rb
-- spec/unit/controller_extensions_spec.rb
-- spec/unit/crumb_formatter_spec.rb
-- spec/unit/crumb_spec.rb
-- spec/unit/generators/install_generator_spec.rb
-- spec/unit/options_validator_spec.rb
-- spec/unit/translation_spec.rb
-- spec/unit/view_extensions/breadcrumb_spec.rb
-- spec/unit/view_extensions/breadcrumb_trail_spec.rb
-- spec/unit/view_extensions/has_breadcrumbs_spec.rb
-- tasks/console.rake
-- tasks/coverage.rake
-- tasks/spec.rake
 homepage: https://github.com/piotrmurach/loaf
-licenses: []
+licenses:
+- MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  source_code_uri: https://github.com/piotrmurach/loaf
+  bug_tracker_uri: https://github.com/piotrmurach/loaf/issues
   changelog_uri: https://github.com/piotrmurach/loaf/blob/master/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/loaf
+  homepage_uri: https://github.com/piotrmurach/loaf
+  source_code_uri: https://github.com/piotrmurach/loaf
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -171,70 +84,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Loaf manages and displays breadcrumb trails in your Rails application.
-test_files:
-- spec/integration/breadcrumb_trail_spec.rb
-- spec/integration/configuration_spec.rb
-- spec/rails_app/Rakefile
-- spec/rails_app/app/controllers/application_controller.rb
-- spec/rails_app/app/controllers/comments_controller.rb
-- spec/rails_app/app/controllers/home_controller.rb
-- spec/rails_app/app/controllers/posts_controller.rb
-- spec/rails_app/app/views/comments/index.html.erb
-- spec/rails_app/app/views/home/index.html.erb
-- spec/rails_app/app/views/layouts/_breadcrumbs.html.erb
-- spec/rails_app/app/views/layouts/application.html.erb
-- spec/rails_app/app/views/posts/index.html.erb
-- spec/rails_app/app/views/posts/new.html.erb
-- spec/rails_app/app/views/posts/show.html.erb
-- spec/rails_app/config.ru
-- spec/rails_app/config/application.rb
-- spec/rails_app/config/boot.rb
-- spec/rails_app/config/database.yml
-- spec/rails_app/config/environment.rb
-- spec/rails_app/config/environments/development.rb
-- spec/rails_app/config/environments/production.rb
-- spec/rails_app/config/environments/test.rb
-- spec/rails_app/config/initializers/backtrace_silencers.rb
-- spec/rails_app/config/initializers/inflections.rb
-- spec/rails_app/config/initializers/mime_types.rb
-- spec/rails_app/config/initializers/secret_token.rb
-- spec/rails_app/config/initializers/session_store.rb
-- spec/rails_app/config/initializers/wrap_parameters.rb
-- spec/rails_app/config/locales/en.yml
-- spec/rails_app/config/locales/loaf.en.yml
-- spec/rails_app/config/routes.rb
-- spec/rails_app/config/secrets.yml
-- spec/rails_app/db/seeds.rb
-- spec/rails_app/log/.gitkeep
-- spec/rails_app/public/404.html
-- spec/rails_app/public/422.html
-- spec/rails_app/public/500.html
-- spec/rails_app/public/favicon.ico
-- spec/rails_app/public/robots.txt
-- spec/spec_helper.rb
-- spec/support/capybara.rb
-- spec/support/dummy_controller.rb
-- spec/support/dummy_view.rb
-- spec/support/load_routes.rb
-- spec/unit/configuration_spec.rb
-- spec/unit/controller_extensions_spec.rb
-- spec/unit/crumb_formatter_spec.rb
-- spec/unit/crumb_spec.rb
-- spec/unit/generators/install_generator_spec.rb
-- spec/unit/options_validator_spec.rb
-- spec/unit/translation_spec.rb
-- spec/unit/view_extensions/breadcrumb_spec.rb
-- spec/unit/view_extensions/breadcrumb_trail_spec.rb
-- spec/unit/view_extensions/has_breadcrumbs_spec.rb
+test_files: []

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.gitignore

@@ -1,23 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-gemfiles/*.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-spec/rails_app/tmp
-spec/rails_app/db
-spec/rails_app/log
-tmp
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log

data/.rspec

@@ -1,2 +0,0 @@
---color
---require spec_helper

data/.travis.yml

@@ -1,48 +0,0 @@
----
-language: ruby
-sudo: false
-cache: bundler
-install:
-  - bundle install
-  - bundle exec bin/appraisal install
-script:
-  - bundle exec appraisal rake ci
-rvm:
-  - 2.1.10
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
-matrix:
-  include:
-    - rvm: jruby-9.1.1.0
-    - rvm: jruby-head
-    - rvm: ruby-head
-  exclude:
-    - rvm: 2.1.10
-      gemfile:
-        - gemfiles/rails5.0.gemfile
-        - gemfiles/rails5.1.gemfile
-    - rvm: 2.2.9
-      gemfile: gemfiles/rails3.2.gemfile
-    - rvm: 2.3.6
-      gemfile: gemfiles/rails3.2.gemfile
-    - rvm: 2.4.3
-      gemfile:
-        - gemfiles/rails3.2.gemfile
-        - gemfiles/rails4.0.gemfile
-        - gemfiles/rails4.1.gemfile
-    - rvm: 2.5.0
-      gemfile:
-        - gemfiles/rails3.2.gemfile
-        - gemfiles/rails4.0.gemfile
-        - gemfiles/rails4.1.gemfile
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-9.1.1.0
-    - rvm: jruby-head
-  fast_finish: true
-branches:
-  only: master
-notifications:
-  email: false

data/Appraisals

@@ -1,36 +0,0 @@
-if RUBY_VERSION < '2.2.0'
-  appraise 'rails3.2' do
-    gem 'rails', '~> 3.2.22.5'
-    gem 'test-unit', '~> 3.0'
-  end
-end
-
-if RUBY_VERSION < '2.4.0'
-  appraise 'rails4.0' do
-    gem 'rails', '~> 4.0.13'
-    gem 'test-unit'
-    gem 'mime-types', '~> 2.99'
-  end
-
-  appraise 'rails4.1' do
-    gem 'rails', '~> 4.1.16'
-    gem 'mime-types', '~> 2.99'
-  end
-end
-
-appraise 'rails4.2' do
-  gem 'rails', '~> 4.2.9'
-  gem 'mime-types', '~> 2.99'
-end
-
-if RUBY_VERSION >= '2.2.0'
-  appraise 'rails5.0' do
-    gem 'rails', '~> 5.0.6'
-    gem 'rspec-rails', '~> 3.6.1'
-  end
-
-  appraise 'rails5.1' do
-    gem 'rails', '~> 5.1.4'
-    gem 'rspec-rails', '~> 3.6.1'
-  end
-end