page_meta 0.2.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e9c07868edd3c003b06253874a088a2ea0bb00bd
-  data.tar.gz: d228a7a77ef36d2312c03bb0d7b2245872f44448
+SHA256:
+  metadata.gz: 89a7406728480d6a3eb785869d6cae90f32b3bfe2fd3e0f8a6a6ced5c03da4b3
+  data.tar.gz: e5db2e7b705299c0f736164fa5352242e2211a1c6bed9d12802263643cec2930
 SHA512:
-  metadata.gz: 51d00356fd9df12fcd14867e5bf158f9fa04cf1dbd66d1b20105a8fdeac5e8692fb765c3dc84bd319b8d246aa073345749cf5a7d490fc36dad78c23e05faddae
-  data.tar.gz: 181ead8af4434898b10f609784abecd295f5f098fcf333647997d556ce6b236473e7000bdf8e1bc0d4e2fbe5b661c207470041a3b406fb8fc488c2338479d4d1
+  metadata.gz: e3961943c7d5506baaa3ce0f28d06819dc430aa3c3f38e503324cb52277c1aa2163ef224e4be4f2cfd41fa2e322cc087e0fd6d3680674ccd036e3d9bb6a34c61
+  data.tar.gz: bf19f1d84e6fdcb8ad48b8d44a898d3682316680459c34d661f5844797912fa21f704cde143d6d079ac8d32895be2182c29f58d068df3fa2795e314beab5f11c

data/.github/CODEOWNERS

@@ -0,0 +1,4 @@
+# You can read more about CODEOWNERS at
+# https://help.github.com/github/creating-cloning-and-archiving-repositories/about-code-owners
+
+* @fnando

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+---
+github: [fnando]
+custom: ["https://www.paypal.me/nandovieira/🍕"]

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,41 @@
+---
+name: "🐛 Bug Report"
+about: Report a reproducible bug or regression.
+title: 'Bug: '
+labels: 'Status: Unconfirmed'
+
+---
+
+<!--
+  - Please provide a clear and concise description of what the bug is.
+  - If possible, add an example reproducing your issue.
+  - Please test using the latest version of page_meta
+    to make sure your issue has not already been fixed.
+-->
+
+## Description
+
+[Add bug description here]
+
+## How to reproduce
+
+[Add steps on how to reproduce this issue]
+
+## What do you expect
+
+[Describe what do you expect to happen]
+
+## What happened instead
+
+[Describe the actual results]
+
+## Software:
+
+- Gem version: [Add gem version here]
+- Ruby version: [Add version here]
+
+## Full backtrace
+
+```text
+[Paste full backtrace here]
+```

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,23 @@
+---
+name: "💡 Feature request"
+about: Have an idea that may be useful? Make a suggestion!
+title: 'Feature Request: '
+labels: 'Feature request'
+
+---
+
+## Description
+
+_A clear and concise description of what the problem is._
+
+## Describe the solution
+
+_A clear and concise description of what you want to happen._
+
+## Alternatives you considered
+
+_A clear and concise description of any alternative solutions or features you've considered._
+
+## Additional context
+
+_Add any other context, screenshots, links, etc about the feature request here._

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,38 @@
+<!--
+If you're making a doc PR or something tiny where the below is irrelevant,
+delete this template and use a short description, but in your description aim to
+include both what the change is, and why it is being made, with enough context
+for anyone to understand.
+-->
+
+<details>
+  <summary>PR Checklist</summary>
+
+### PR Structure
+
+- [ ] This PR has reasonably narrow scope (if not, break it down into smaller
+      PRs).
+- [ ] This PR avoids mixing refactoring changes with feature changes (split into
+      two PRs otherwise).
+- [ ] This PR's title starts is concise and descriptive.
+
+### Thoroughness
+
+- [ ] This PR adds tests for the most critical parts of the new functionality or
+      fixes.
+- [ ] I've updated any docs, `.md` files, etc… affected by this change.
+
+</details>
+
+### What
+
+[TODO: Short statement about what is changing.]
+
+### Why
+
+[TODO: Why this change is being made. Include any context required to understand
+the why.]
+
+### Known limitations
+
+[TODO or N/A]

data/.github/dependabot.yml

@@ -0,0 +1,15 @@
+---
+# Documentation:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/ruby-tests.yml

@@ -0,0 +1,56 @@
+---
+name: ruby-tests
+
+on:
+  pull_request_target:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+    inputs: {}
+
+jobs:
+  build:
+    name: Tests with Ruby ${{ matrix.ruby }} and ${{ matrix.gemfile }}
+    runs-on: "ubuntu-latest"
+    if: |
+      github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target' ||
+      github.actor != 'dependabot[bot]'
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7", "3.0", "3.1"]
+        gemfile:
+          - Gemfile
+          - gemfiles/7_0.gemfile
+          - gemfiles/6_1.gemfile
+          - gemfiles/6_0.gemfile
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/cache@v3
+        with:
+          path: vendor/bundle
+          key: >
+            ${{ runner.os }}-${{ matrix.ruby }}-gems-${{
+            hashFiles(matrix.gemfile) }}
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: Install gem dependencies
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+        run: |
+          gem install bundler
+          bundle config path vendor/bundle
+          bundle update --jobs 4 --retry 3
+
+      - name: Run Tests
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+        run: |
+          bundle exec rake

data/.gitignore

@@ -1,6 +1,6 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
+*.lock
 /_yardoc/
 /coverage/
 /doc/
@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 /log
+/bin/*

data/.rubocop.yml

@@ -1,50 +1,24 @@
-AllCops:
-  TargetRubyVersion: 2.4
+---
+inherit_gem:
+  rubocop-fnando: .rubocop.yml
 
-Metrics/LineLength:
+AllCops:
+  TargetRubyVersion: 2.7
+  NewCops: enable
+  Exclude:
+    - test/support/dummy.rb
+    - vendor/**/*
+    - bin/**/*
+    - gemfiles/vendor/**/*
+
+Layout/LineLength:
   Enabled: false
 
-Style/Documentation:
+Metrics:
   Enabled: false
 
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-Layout/SpaceInsideBlockBraces:
-  EnforcedStyle: space
-  EnforcedStyleForEmptyBraces: space
-  SpaceBeforeBlockParameters: false
-
-Layout/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-  EnforcedStyleForEmptyBraces: no_space
-
-Layout/FirstArrayElementLineBreak:
-  Enabled: true
-
-Layout/FirstHashElementLineBreak:
-  Enabled: true
-
-Style/SymbolArray:
-  Enabled: true
-
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%':  '[]'
-    '%i': '[]'
-    '%q': '[]'
-    '%Q': '[]'
-    '%r': '[]'
-    '%s': '[]'
-    '%w': '[]'
-    '%W': '[]'
-    '%x': '[]'
-
-Metrics/MethodLength:
+Minitest/MultipleAssertions:
   Enabled: false
 
-Style/FormatStringToken:
+Gemspec/DevelopmentDependencies:
   Enabled: false
-
-Style/Alias:
-  EnforcedStyle: prefer_alias_method

data/CHANGELOG.md

@@ -0,0 +1,23 @@
+# Changelog
+
+<!--
+Prefix your message with one of the following:
+
+- [Added] for new features.
+- [Changed] for changes in existing functionality.
+- [Deprecated] for soon-to-be removed features.
+- [Removed] for now removed features.
+- [Fixed] for any bug fixes.
+- [Security] in case of vulnerabilities.
+-->
+
+## 1.1.0
+
+- [Added] `<meta name="viewport" content="width=device-width,initial-scale=1">`
+  is now added by default.
+- [Changed] You can now group all translations under
+  `page_meta.controller.action.{title,description,keywords}`.
+
+## 1.0.0
+
+- Initial release.

data/CONTRIBUTING.md

@@ -0,0 +1,80 @@
+# Contributing to page_meta
+
+👍🎉 First off, thanks for taking the time to contribute! 🎉👍
+
+The following is a set of guidelines for contributing to this project. These are
+mostly guidelines, not rules. Use your best judgment, and feel free to propose
+changes to this document in a pull request.
+
+## Code of Conduct
+
+Everyone interacting in this project's codebases, issue trackers, chat rooms and
+mailing lists is expected to follow the
+[code of conduct](https://github.com/fnando/page_meta/blob/main/CODE_OF_CONDUCT.md).
+
+## Reporting bugs
+
+This section guides you through submitting a bug report. Following these
+guidelines helps maintainers and the community understand your report, reproduce
+the behavior, and find related reports.
+
+- Before creating bug reports, please check the open issues; somebody may
+  already have submitted something similar, and you may not need to create a new
+  one.
+- When you are creating a bug report, please include as many details as
+  possible, with an example reproducing the issue.
+
+## Contributing with code
+
+Before making any radicals changes, please make sure you discuss your intention
+by [opening an issue on Github](https://github.com/fnando/page_meta/issues).
+
+When you're ready to make your pull request, follow checklist below to make sure
+your contribution is according to how this project works.
+
+1. [Fork](https://help.github.com/forking/) page_meta
+2. Create a topic branch - `git checkout -b my_branch`
+3. Make your changes using [descriptive commit messages](#commit-messages)
+4. Update CHANGELOG.md describing your changes by adding an entry to the
+   "Unreleased" section. If this section is not available, create one right
+   before the last version.
+5. Push to your branch - `git push origin my_branch`
+6. [Create a pull request](https://help.github.com/articles/creating-a-pull-request)
+7. That's it!
+
+## Styleguides
+
+### Commit messages
+
+- Use the present tense ("Add feature" not "Added feature")
+- Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
+- Limit the first line to 72 characters or less
+- Reference issues and pull requests liberally after the first line
+
+### Changelog
+
+- Add a message describing your changes to the "Unreleased" section. The
+  changelog message should follow the same style as the commit message.
+- Prefix your message with one of the following:
+  - `[Added]` for new features.
+  - `[Changed]` for changes in existing functionality.
+  - `[Deprecated]` for soon-to-be removed features.
+  - `[Removed]` for now removed features.
+  - `[Fixed]` for any bug fixes.
+  - `[Security]` in case of vulnerabilities.
+
+### Ruby code
+
+- This project uses [Rubocop](https://rubocop.org) to enforce code style. Before
+  submitting your changes, make sure your tests are passing and code conforms to
+  the expected style by running `rake`.
+- Do not change the library version. This will be done by the maintainer
+  whenever a new version is about to be released.
+
+### JavaScript code
+
+- This project uses [ESLint](https://eslint.org) to enforce code style. Before
+  submitting your changes, make sure your tests are passing and code conforms to
+  the expected style by running `yarn test:ci`.
+- Do not change the library version. This will be done by the maintainer
+  whenever a new version is about to be released.

data/README.md

@@ -1,65 +1,84 @@
-# PageMeta
+# page_meta
 
-[![Travis-CI](https://travis-ci.org/fnando/page_meta.png)](https://travis-ci.org/fnando/page_meta)
-[![Code Climate](https://codeclimate.com/github/fnando/page_meta/badges/gpa.svg)](https://codeclimate.com/github/fnando/page_meta)
-[![Test Coverage](https://codeclimate.com/github/fnando/page_meta/badges/coverage.svg)](https://codeclimate.com/github/fnando/page_meta/coverage)
+[![Tests](https://github.com/fnando/page_meta/workflows/ruby-tests/badge.svg)](https://github.com/fnando/page_meta)
 [![Gem](https://img.shields.io/gem/v/page_meta.svg)](https://rubygems.org/gems/page_meta)
 [![Gem](https://img.shields.io/gem/dt/page_meta.svg)](https://rubygems.org/gems/page_meta)
 
-Easily define `<meta>` and `<link>` tags. I18n support for descriptions, keywords and titles.
+Easily define `<meta>` and `<link>` tags. I18n support for descriptions,
+keywords and titles.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+```bash
+gem install page_meta
+```
+
+Or add the following line to your project's Gemfile:
 
 ```ruby
 gem "page_meta"
 ```
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install page_meta
-
 ## Usage
 
-Your controller and views have an object called `page_meta`. You can use it to define meta tags and links. By default, it will include the encoding and language meta tags.
+Your controller and views have an object called `page_meta`. You can use it to
+define meta tags and links. By default, it will include the encoding, language
+and viewport meta tags.
 
 ```html
-<meta charset="utf-8">
-<meta name="language" content="en">
-<meta itemprop="language" content="en">
+<meta charset="utf-8" />
+<meta name="language" content="en" />
+<meta itemprop="language" content="en" />
+<meta name="viewport" content="width=device-width,initial-scale=1" />
 ```
 
-You can use I18n to define titles, descriptions and keywords. These values will be inferred from the controller and action names. For an action `SiteController#index` you'll need the following translation scope:
+You can use I18n to define titles, descriptions and keywords. These values will
+be inferred from the controller and action names. For an action
+`SiteController#index` you'll need the following translation scope:
 
 ```yaml
-page_meta:
-  titles:
-    base: "%{value} • MyApp"
+en:
+  page_meta:
+    title_base: "%{value} • MyApp"
+
     site:
-      index: "Welcome to MyApp"
+      index:
+        title: "Welcome to MyApp"
 ```
 
-The title can without the `base` context can be accessed through `page_meta.title.simple`.
+Previously, you could also use the `page_meta.{titles,description,keywords}` scopes, but this is now
+deprecated in favor of the above.
+
+```yaml
+---
+en:
+  page_meta:
+    titles:
+      base: "%{value} • MyApp"
+      site:
+        index: "Welcome to MyApp"
+```
+
+The title without the `base` context can be accessed through
+`page_meta.title.simple`.
 
 ```erb
 <%= page_meta.title %>          // Welcome to MyApp • MyApp
 <%= page_meta.title.simple %>   // Welcome to MyApp
 ```
 
-Sometimes you need to render some dynamic value. In this case, you can use the I18n placeholders.
+Sometimes you need to render some dynamic value. In this case, you can use the
+I18n placeholders.
 
 ```yaml
+---
 en:
   page_meta:
-    titles:
-      base: "%{title} • MyCompany"
-      workshops:
-        show: "%{name}"
+    title_base: "%{title} • MyCompany"
+
+    workshops:
+      show:
+        title: "%{name}"
 ```
 
 You can then set dynamic values using the `PageMeta::Base#[]=`.
@@ -75,27 +94,28 @@ end
 
 Some actions are aliased, so you don't have to duplicate the translations:
 
-* Action `create` points to `new`
-* Action `update` points to `edit`
-* Action `destroy` points to `remove`
+- Action `create` points to `new`
+- Action `update` points to `edit`
+- Action `destroy` points to `remove`
 
 The same concept is applied to descriptions and keywords.
 
 ```yaml
+---
 en:
   page_meta:
-    descriptions:
-      site:
-        home: MyApp is the best way of doing something.
-
-    keywords:
-      site:
-        home: "myapp, thing, other thing"
+    base_title: "%{value} • MyApp"
+    site:
+      show:
+        title: "Show"
+        description: MyApp is the best way of doing something.
+        keywords: "myapp, thing, other thing"
 ```
 
 ### Defining meta tags
 
-To define other meta tags, you have to use `PageMeta::Base#tag` like the following:
+To define other meta tags, you have to use `PageMeta::Base#tag` like the
+following:
 
 ```ruby
 class Workshops Controller < ApplicationController
@@ -158,7 +178,8 @@ page_meta.link :last, href: article_url(articles.last)
 page_meta.link :first, href: article_url(articles.first)
 ```
 
-The hash can be any of the link tag's attributes. The following example defines the Safari 9 Pinned Tab icon:
+The hash can be any of the link tag's attributes. The following example defines
+the Safari 9 Pinned Tab icon:
 
 ```ruby
 page_meta.link :mask_icon, color: "#4078c0", href: helpers.asset_url("mask_icon.svg")
@@ -182,26 +203,42 @@ To render all tags, just do something like this:
 
 #### Rendering titles and descriptions
 
-You may want to render title and description on your page. In this case, you may use something like this:
+You may want to render title and description on your page. In this case, you may
+use something like this:
 
 ```erb
 <h1><%= page_meta.title.simple %></h1>
 <p><%= page_meta.description.simple %></p>
 ```
 
-If your description contains HTML, you can use `page_meta.description(html: true).simple` instead. It will use Rails' `html_safe` helpers to safely retrieve the translation, just like regular Rails would do. [Please read Rails docs](http://guides.rubyonrails.org/i18n.html#using-safe-html-translations) for more info.
+If your description contains HTML, you can use
+`page_meta.description(html: true).simple` instead. It will use Rails'
+`html_safe` helpers to safely retrieve the translation, just like regular Rails
+would do.
+[Please read Rails docs](http://guides.rubyonrails.org/i18n.html#using-safe-html-translations)
+for more info.
 
-## Development
+## Maintainer
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+- [Nando Vieira](https://github.com/fnando)
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+## Contributors
 
-## Contributing
+- https://github.com/fnando/page_meta/contributors
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/fnando/page_meta. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+## Contributing
 
+For more details about how to contribute, please read
+https://github.com/fnando/page_meta/blob/main/CONTRIBUTING.md.
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the
+[MIT License](https://opensource.org/licenses/MIT). A copy of the license can be
+found at https://github.com/fnando/page_meta/blob/main/LICENSE.md.
+
+## Code of Conduct
+
+Everyone interacting in the page_meta project's codebases, issue trackers, chat
+rooms and mailing lists is expected to follow the
+[code of conduct](https://github.com/fnando/page_meta/blob/main/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake/testtask"
+require "rubocop/rake_task"
+
+RuboCop::RakeTask.new
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
-  t.libs << "lib"
   t.test_files = FileList["test/**/*_test.rb"]
+  t.warning = false
 end
 
-task default: :test
+task default: %i[test rubocop]

data/gemfiles/6_0.gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+gemspec path: ".."
+
+gem "rails", "~> 6.0.0"

data/gemfiles/6_1.gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+gemspec path: ".."
+
+gem "rails", "~> 6.1.0"

data/gemfiles/7_0.gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+gemspec path: ".."
+
+gem "rails", "~> 7.0.0"

data/lib/page_meta/action.rb

@@ -4,10 +4,11 @@ module PageMeta
   class Action
     # rubocop:disable Style/MutableConstant
     ALIASES = {
-      "update"  => "edit",
-      "create"  => "new",
+      "update" => "edit",
+      "create" => "new",
       "destroy" => "remove"
     }
+    # rubocop:enable Style/MutableConstant
 
     def initialize(action)
       @action = action

data/lib/page_meta/base.rb

@@ -2,7 +2,14 @@
 
 module PageMeta
   class Base
-    DEFAULT_META_TAGS = %i[language charset title keywords description].freeze
+    DEFAULT_META_TAGS = %i[
+      language
+      charset
+      title
+      keywords
+      description
+      viewport
+    ].freeze
 
     attr_reader :controller, :store
 
@@ -46,7 +53,7 @@ module PageMeta
       compute_default_meta_tags
       render_meta_tags + render_links
     end
-    alias_method :to_s, :render
+    alias to_s render
 
     def naming
       @naming ||= Naming.new(controller)
@@ -55,14 +62,14 @@ module PageMeta
     def render_meta_tags
       meta_tags
         .map {|name, value| MetaTag.build(name, value).render }
-        .join("")
+        .join
         .html_safe
     end
 
     def render_links
       links
         .map {|info| Link.build(info[:rel], info[:options]).render }
-        .join("")
+        .join
         .html_safe
     end
 
@@ -91,5 +98,9 @@ module PageMeta
     def compute_default_description
       tag(:description, description.to_s) unless description.to_s.empty?
     end
+
+    def compute_default_viewport
+      tag(:viewport, "width=device-width,initial-scale=1") unless meta_tags[:viewport]
+    end
   end
 end

data/lib/page_meta/hash_meta_tag.rb

@@ -7,6 +7,7 @@ module PageMeta
 
       content.each_with_object([]) do |(attr, value), buffer|
         next if value.blank?
+
         attr = attr.to_s.tr("_", ":")
         buffer << helpers.tag(:meta, property: "#{base_name}:#{attr}", content: value)
       end.join

data/lib/page_meta/link.rb

@@ -5,10 +5,10 @@ module PageMeta
     def self.build(rel, options)
       klass_name = "::PageMeta::Link::#{rel.to_s.camelize}"
       klass = begin
-                const_get(klass_name)
-              rescue ActionView::Template::Error, NameError
-                Link
-              end
+        const_get(klass_name)
+      rescue ActionView::Template::Error, NameError
+        Link
+      end
       klass.new(rel, options)
     end
 

data/lib/page_meta/meta_tag.rb

@@ -7,10 +7,10 @@ module PageMeta
     def self.build(name, content)
       klass_name = "::PageMeta::MetaTag::#{name.to_s.camelize}"
       klass = begin
-                const_get(klass_name)
-              rescue ActionView::Template::Error, NameError
-                MetaTag
-              end
+        const_get(klass_name)
+      rescue ActionView::Template::Error, NameError
+        MetaTag
+      end
       klass.new(name, content)
     end
 

data/lib/page_meta/naming.rb

@@ -19,7 +19,7 @@ module PageMeta
                       .name
                       .underscore
                       .gsub(/_controller/, "")
-                      .gsub(%r[/], ".")
+                      .tr("/", ".")
     end
   end
 end

data/lib/page_meta/translator.rb

@@ -13,20 +13,38 @@ module PageMeta
       @options = options
     end
 
+    def singular_scope
+      @singular_scope ||= scope == :keywords ? "keywords" : scope.to_s.singularize
+    end
+
     def to_s
       return "" if simple.blank?
-      t("page_meta.#{scope}.base", value: simple, default: simple)
+
+      [
+        t("page_meta.#{scope}.base", value: simple, default: ""),
+        t("page_meta.#{singular_scope}_base", value: simple, default: simple)
+      ].reject(&:blank?).first || ""
     end
 
     def translation_scope
-      "page_meta.#{scope}.#{naming.controller}.#{naming.action}"
+      [
+        "page_meta.#{scope}.#{naming.controller}.#{naming.action}",
+        "page_meta.#{naming.controller}.#{naming.action}.#{singular_scope}"
+      ]
     end
 
     def simple
       override_options = options.merge(default: "")
 
-      translation = t("#{translation_scope}_html", override_options) if html
-      translation = t(translation_scope, override_options) if translation.blank?
+      translation = ""
+
+      translation_scope.each do |scope|
+        translation = t("#{scope}_html", **override_options) if html
+        translation = t(scope, **override_options) if translation.blank?
+
+        break if translation.present?
+      end
+
       translation
     end
   end

data/lib/page_meta/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PageMeta
-  VERSION = "0.2.0"
+  VERSION = "1.1.0"
 end

data/page_meta.gemspec

@@ -7,22 +7,31 @@ Gem::Specification.new do |spec|
   spec.version       = PageMeta::VERSION
   spec.authors       = ["Nando Vieira"]
   spec.email         = ["fnando.vieira@gmail.com"]
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.metadata = {
+    "rubygems_mfa_required" => "true"
+  }
 
-  spec.summary       = "Easily define <meta> and <link> tags. I18n support for descriptions, keywords and titles."
+  spec.summary       = "Easily define <meta> and <link> tags. I18n support " \
+                       "for descriptions, keywords and titles."
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/fnando/page_meta"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r[^(test|spec|features)/]) }
+  spec.files         = `git ls-files -z`
+                       .split("\x0")
+                       .reject {|f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r[^exe/]) {|f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails"
+  spec.add_dependency "rails", ">=6.0"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest-utils"
-  spec.add_development_dependency "simplecov"
   spec.add_development_dependency "pry-meta"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-fnando"
+  spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: page_meta
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Nando Vieira
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-meta
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-utils
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop-fnando
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-meta
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -102,16 +130,27 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
+- ".github/FUNDING.yml"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/dependabot.yml"
+- ".github/workflows/ruby-tests.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/6_0.gemfile
+- gemfiles/6_1.gemfile
+- gemfiles/7_0.gemfile
 - lib/page_meta.rb
 - lib/page_meta/action.rb
 - lib/page_meta/base.rb
@@ -133,8 +172,9 @@ files:
 homepage: https://github.com/fnando/page_meta
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -142,16 +182,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.4.5
+signing_key:
 specification_version: 4
 summary: Easily define <meta> and <link> tags. I18n support for descriptions, keywords
   and titles.

data/.travis.yml

@@ -1,19 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-rvm:
-- 2.4.2
-- 2.3.5
-- 2.2.8
-before_install: gem install bundler --pre
-before_script:
-- "curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter"
-- chmod +x ./cc-test-reporter
-- "./cc-test-reporter before-build"
-after_script:
-- "./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"
-notifications:
-  email: false
-env:
-  global:
-    secure: pN+1uDJEgbIfpvSmk9owADeqXcQAXzMYMkM6XHR3IgfjbRZ39sBL11EkYziF90boEJPoMkVYmwYuTfGePPN7uWxkDBQJXTEaAXGeuAlQc1Fhzsj0WQZlOcQn1JHYmLtzBVe/B8J4z5ZuQMDFTMe+f2i1qIk00P/R1ozcbz9+g3Pi/5Esf7+6NY2rxQYeEw21/D7WM4UGAOJ+uX6rHdEUo/ej18bUZC8GBxZZy6jVeVqbBE8PPdzNcLkkUu+soPbZVBZiVF2bXn+N3AqXQqA4oL4t7zorG7xU4+2mUldbHRr3HaJBPSwnWzw6mjnSEq6OO77nTOrpwdrkb/Qz/slgL5cuqjlO0MRNq6THdBZT29vCqErxAFs9w4AUoFgwkzMe1mR8ZB8QuUct3xFpAMtE2q35efCuHFb5h682Ske8v0COnzsIRjN1NgSX3nx1oKIh7V9c9O84oDx+W/h0oL2RH/OjW4DcLaVBDS5MhaMZ1ySuBktmqDJD2OqsfbO4Gn+LrWbQAM2RFp2TTROyfDJJU3ITgE7DMqn0QiOcZIoCWzastamGJJs99WzmliouO87ZDSG5Kct2JXml0syyY/jBuR5nnJ9x6TyJpDD9jNMz6LOW9LZ31aOttGbAOQbYVgUgtPkITEuo8xhLCBc6ae+GVA4t8NcJx/rAn1U9E/CXiPs=