page_title_helper 5.0.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ca84d323ad19f09e49b6ee6333f2cd3c06f0e2e3f8748b8081a204fdebc4ac
-  data.tar.gz: 4c9affff4ee6f51d0dfccb906ec4406e5a50032da651fcc92be19603368741e0
+  metadata.gz: 5526377f52ae74a93d1dd45729c0278258db52f32e5e38e37ec9baed06a33a6d
+  data.tar.gz: bd18c28d5e3f5bfe0b0d2138d305d4af987293088dd7ac3c362db127ef903cbf
 SHA512:
-  metadata.gz: 19879f1e33647398e8d15ee0b3adbaacd29a6645fd89b33838fddf11f469a577abf2467a368f6b352e61ad4db8fc71f0ac4f5e918112b16c59ab84751bfca0a2
-  data.tar.gz: c28883f1bd9cefd68c8f121b4caced4bd946ffec08d5e10f4e33f8a6008ed825132886362b97afa36a642ce05e02b22182899743daeb56515962e24ac9e51fdd
+  metadata.gz: d1fe1095a08095559012b02daceda00de0152bf1f4dd531a719acbdabac958f5a0e2722950119bf0091783c2592a0c90720dbfaaf9f2f98d26e07012b400f347
+  data.tar.gz: 18c030e2df24abbe72cbfbecb39b3ee373b7a4723aeb1b03c3ab2d55a7a27bcec56bc3c4d5618ebc862e202f56369e672ec106af9fbf6039fbec4d26104f1b4a

data/CHANGELOG.md

@@ -20,6 +20,18 @@ about why a change log is important.
 
 ### Security
 
+## 6.0.0
+
+### Added
+- Add support for Rails 7.0 (#131)
+- Add support for Ruby 3.1 (#143)
+
+### Removed
+- Drop support for Ruby 2.5 and 2.6 (#127, #145)
+
+### Fixed
+- Avoid modifying a frozen array in Ruby 3 (#135)
+
 ## 5.0.0
 
 ### Added

data/lib/page_title_helper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PageTitleHelper
-  VERSION = '5.0.0'
+  VERSION = '6.0.0'
 end

data/lib/page_title_helper.rb

@@ -7,7 +7,7 @@
 # Copyright:: Copyright (c) 2009 Lukas Westermann (Zurich, Switzerland)
 # Licence:: MIT-Licence (https://www.opensource.org/licenses/mit-license.php)
 #
-# See documentation for +page_title+ for usage examples and more informations.
+# See documentation for +page_title+ for usage examples and more information.
 require 'active_support'
 
 # PageTitleHelper
@@ -25,7 +25,7 @@ module PageTitleHelper
     end
 
     def app(env)
-      env[:app] || I18n.translate('app.name', default: File.basename(Rails.root).humanize)
+      env[:app] || I18n.t('app.name', default: File.basename(Rails.root).humanize)
     end
 
     def title(env)
@@ -69,18 +69,13 @@ module PageTitleHelper
     options[:format] ||= :title # handles :format => false
     options.assert_valid_keys(:app, :default, :format)
 
-    # read page title and split into 'real' title and customized format
-    title = @_page_title ||= page_title_from_translation(options[:default])
-    title, options[:format] = *(title << options[:format]) if title.is_a?(Array)
+    format, real_title = build_title_and_format(options)
 
     # handle format aliases
-    format = options.delete(:format)
-    if PageTitleHelper.formats.include?(format)
-      format = PageTitleHelper.formats[format]
-    end
+    format = PageTitleHelper.formats[format] if PageTitleHelper.formats.include?(format)
 
     # construct basic env to pass around
-    env = { title: title, app: options.delete(:app), options: options, view: self }
+    env = { title: real_title, app: options[:app], options: options, view: self }
 
     # interpolate format
     Interpolations.interpolate(format, env)
@@ -100,7 +95,30 @@ module PageTitleHelper
       keys << :"#{base}.title"
       keys << default
 
-      I18n.translate(keys.shift, default: keys)
+      I18n.t(keys.shift, default: keys)
+    end
+
+  private
+
+    ##
+    # Read the page title and splits it into 'real' title and the customized
+    # format.
+    #
+    # @param {Hash} options
+    #
+    # @return {Array}
+    #
+    def build_title_and_format(options)
+      raw_title = @_page_title ||= page_title_from_translation(options[:default])
+      if raw_title.is_a?(Array)
+        title_and_format = raw_title + [options[:format]]
+        real_title, format = *title_and_format
+      else
+        real_title = raw_title
+        format = options[:format]
+      end
+
+      [format, real_title]
     end
 end
 

data/page_title_helper.gemspec

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'page_title_helper/version'
 
 Gem::Specification.new do |s|
@@ -9,22 +8,24 @@ Gem::Specification.new do |s|
   s.summary     = 'Simple, internationalized and DRY page titles and headings for Rails.'
   s.description = 'Simple, internationalized and DRY page titles and headings for Rails.'
 
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.7.0'
 
   s.authors  = ['Lukas Westermann']
   s.email    = ['lukas.westermann@gmail.com']
   s.homepage = 'https://github.com/lwe/page_title_helper'
 
-  s.files            = %w{Gemfile LICENSE README.md CODE_OF_CONDUCT.md CHANGELOG.md Rakefile page_title_helper.gemspec} + Dir['**/*.{rb,yml}']
+  s.files            = %w[Gemfile LICENSE README.md CODE_OF_CONDUCT.md CHANGELOG.md Rakefile
+                          page_title_helper.gemspec] + Dir['**/*.{rb,yml}']
   s.test_files       = s.files.grep(%r{^(test|spec)/})
   s.require_path     = 'lib'
 
   s.license          = 'MIT'
 
-  s.add_dependency 'rails', '>= 5.2.0', '< 6.2'
+  s.add_dependency 'rails', '>= 5.2.0', '< 7.1'
 
-  s.add_development_dependency 'rake', '>= 10.3.2'
-  s.add_development_dependency 'shoulda'
-  s.add_development_dependency 'rubocop', '~> 0.82.0'
-  s.add_development_dependency 'rubocop-rails', '~> 2.5.2'
+  s.add_development_dependency 'rake', '~> 13.0.6'
+  s.add_development_dependency 'rubocop', '~> 1.26.1'
+  s.add_development_dependency 'rubocop-rails', '~> 2.14.2'
+  s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
+  s.add_development_dependency 'shoulda', '~> 4.0.0'
 end

data/test/multiple_formats_test.rb

@@ -47,7 +47,8 @@ class MultipleFormatsTest < ActiveSupport::TestCase
 
       should 'override locally supplied :format arguments' do
         assert_equal('Something', @view.page_title { ['Something', '* * * :title * * *'] })
-        assert_equal '* * * Something * * *', @view.page_title(format: '-= :title =-') # yeah, using x-tra ugly titles :)
+        # yeah, using x-tra ugly titles :)
+        assert_equal '* * * Something * * *', @view.page_title(format: '-= :title =-')
       end
     end
   end
@@ -60,7 +61,7 @@ class MultipleFormatsTest < ActiveSupport::TestCase
       @view = TestView.new
     end
 
-    should 'allow to overide format through YAML' do
+    should 'allow to override format through YAML' do
       @view.controller! 'pages', 'features'
       assert_equal 'Wohaapp > Feature comparison', @view.page_title
     end

data/test/page_title_helper_test.rb

@@ -32,7 +32,9 @@ class PageTitleHelperTest < ActiveSupport::TestCase
         PageTitleHelper.interpolates(:foobar_test) { |_env| 'foobar_test' }
         PageTitleHelper.interpolates(:title_foobar) { |_env| 'title_foobar' }
 
-        assert_equal 'title_foobar / foobar_test / foobar / foobar_x', PageTitleHelper::Interpolations.interpolate(':title_foobar / :foobar_test / :foobar / :foobar_x', {})
+        assert_equal 'title_foobar / foobar_test / foobar / foobar_x',
+                     PageTitleHelper::Interpolations.interpolate(':title_foobar / :foobar_test / :foobar / :foobar_x',
+                                                                 {})
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: page_title_helper
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Lukas Westermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,63 +29,77 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.26.1
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 2.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 2.14.2
 - !ruby/object:Gem::Dependency
-  name: rubocop-rails
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 4.0.0
 description: Simple, internationalized and DRY page titles and headings for Rails.
 email:
 - lukas.westermann@gmail.com
@@ -119,14 +133,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Simple, internationalized and DRY page titles and headings for Rails.