page_meta 1.3.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 732b10b45a16c54c1d95e8f20440bc52cbac065e378e1eed2284c6d99c2f9d47
-  data.tar.gz: 0266ece7ba5fbd03f8e0c9f4b77ff3097192ef8999292342680149b77cd8577c
+  metadata.gz: f948175f35af9b5f92902225e895d0e7c7fe664afd54f3ca8d6d82fc77c9b2c5
+  data.tar.gz: 6034bbcff7b2079c8f234e447ffc8804bfda09989874a66952bc467765cc7b1c
 SHA512:
-  metadata.gz: a9eef3c915a3d762e53aef9d75ab95c11ccd76d5a2385d07f7159c69cae9e48488295100d36e349369c65cb4e8e255a7d8078c058cd40cbdc5bc0c704de07c05
-  data.tar.gz: a4e04ac623c1e2963b23c747008d7d2e84fac6d4bfda74bf7b516258a2b71e5032e215fce03c89d57f68532e1e336e5239dae9f432b233e4f800ed05ddd1bffe
+  metadata.gz: '06529e97cbaf313bd71be194e578cc8ce3f3c1f8d3b646fa1b71adf10bb81f7c3f31584683f29c64f158dd7ee6e4e196ac5a5e6cb548372911cc278e8a9d1d2a'
+  data.tar.gz: e9d86f55d916c7b2d4b4cd2bd9d8161caf089733df76811a3e735cee1b5f1a0c777406fde3599879e0a04774b88274853ee5c598200481a2782f3e7fbda07b50

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

@@ -19,12 +19,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.1", "3.2", "3.3"]
+        ruby: ["3.2", "3.3", "3.4"]
         gemfile:
           - Gemfile
+          - gemfiles/7_2.gemfile
           - gemfiles/7_1.gemfile
-          - gemfiles/7_0.gemfile
-          - gemfiles/6_1.gemfile
 
     steps:
       - uses: actions/checkout@v4

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
   rubocop-fnando: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.2
   NewCops: enable
   Exclude:
     - test/support/dummy.rb

data/CHANGELOG.md

@@ -11,10 +11,22 @@ Prefix your message with one of the following:
 - [Security] in case of vulnerabilities.
 -->
 
+## 2.0.1
+
+- [Removed] Support for old format.
+- [Added] Support for custom base scope targeting controller or controller +
+  action.
+
+## 2.0.0
+
+- [Added] Add support for placeholders in base title.
+- [Changed] Set minimum ruby version to 3.2.
+- [Added] Add method to delete items by their name.
+
 ## 1.3.0
 
 - [Added] `page_meta.base` will now set the base url.
-- [Changed] Some tags will be enforced to show up first. It loosely follows 
+- [Changed] Some tags will be enforced to show up first. It loosely follows
   https://rviscomi.github.io/capo.js/user/rules/.
 
 ## 1.2.0

data/README.md

@@ -231,6 +231,15 @@ would do.
 [Please read Rails docs](http://guides.rubyonrails.org/i18n.html#using-safe-html-translations)
 for more info.
 
+### Removing meta tags
+
+You can use `PageMeta::Base#delete` to remove meta tags. All matching tags will
+be removed.
+
+```ruby
+page_meta.delete(:description)
+```
+
 ## Maintainer
 
 - [Nando Vieira](https://github.com/fnando)

data/gemfiles/{6_1.gemfile → 7_2.gemfile}

@@ -3,4 +3,4 @@
 source "https://rubygems.org"
 gemspec path: ".."
 
-gem "rails", "~> 6.1.0"
+gem "rails", "~> 7.2.0"

data/lib/page_meta/base.rb

@@ -54,6 +54,11 @@ module PageMeta
       }
     end
 
+    # Delete all matching meta tags by name.
+    def delete(name)
+      items.delete_if { _1[:name] == name }
+    end
+
     # Add a new meta tag.
     def tag(name, value = nil, order: nil, **kwargs)
       order = order || META_TAG_ORDER[name] || DEFAULT_ORDER
@@ -73,13 +78,13 @@ module PageMeta
 
     # The title translation.
     def title
-      @title ||= Translator.new(:titles, naming, store)
+      @title ||= Translator.new(:title, naming, store)
     end
 
     # The description translation.
     def description(html: false)
       @description[html] ||= Translator.new(
-        :descriptions,
+        :description,
         naming,
         store.merge(html:)
       )
@@ -130,6 +135,7 @@ module PageMeta
     end
 
     private def compute_default_title
+      return if has?(:title)
       return if title.to_s.blank?
 
       html(:title, title.to_s, order: 3)
@@ -137,21 +143,31 @@ module PageMeta
     end
 
     private def compute_default_charset
+      return if has?(:charset)
+
       tag(:charset, Rails.configuration.encoding, order: 0)
     end
 
     private def compute_default_keywords
+      return if has?(:keywords)
+
       tag(:keywords, keywords.to_s) unless keywords.to_s.blank?
     end
 
     private def compute_default_description
+      return if has?(:description)
+
       tag(:description, description.to_s) unless description.to_s.blank?
     end
 
     private def compute_default_viewport
-      return if items.any? { _1[:name] == :viewport && _1[:type] == :tag }
+      return if has?(:viewport)
 
       tag(:viewport, "width=device-width,initial-scale=1", order: 1)
     end
+
+    private def has?(name)
+      items.any? { _1[:name] == name }
+    end
   end
 end

data/lib/page_meta/translator.rb

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

data/lib/page_meta/version.rb

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

data/page_meta.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.version       = PageMeta::VERSION
   spec.authors       = ["Nando Vieira"]
   spec.email         = ["me@fnando.com"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
   spec.metadata = {
     "rubygems_mfa_required" => "true"
   }
@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest-utils"
-  spec.add_development_dependency "pry-meta"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "rubocop-fnando"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: page_meta
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Nando Vieira
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-17 00:00:00.000000000 Z
+date: 2024-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,20 +51,6 @@ dependencies:
     - - ">="
       - !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
@@ -148,9 +133,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/6_1.gemfile
-- gemfiles/7_0.gemfile
 - gemfiles/7_1.gemfile
+- gemfiles/7_2.gemfile
 - lib/page_meta.rb
 - lib/page_meta/action.rb
 - lib/page_meta/base.rb
@@ -176,7 +160,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -184,15 +167,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Easily define <meta> and <link> tags. I18n support for descriptions, keywords
   and titles.

data/gemfiles/7_0.gemfile

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