bridgetown-content-security-policy 1.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f75a1bfbb00c754a13f87bc07d494e8fd5a73bc18ff032124407ba6c2d410ce
-  data.tar.gz: 824961a6500068aa87074b8cf9bab87d2baf6732ece45f950069aa5b19422b65
+  metadata.gz: 81decbc66abeba86a607d1a66667bbe9da1509fbb4d41f5965fc432d650cd308
+  data.tar.gz: d36a2c6a8cb1dabd51c264a308c26b1e0f92e399107ad0911dd0bbdbe18824be
 SHA512:
-  metadata.gz: 1fd88f9d078a63758bbe6d326af1d934b365160d64a29520f217595082d6f2b303fac4751cf3aa91def8e157c1af6bd3084173fc4cbd180b19ede8ac83970d7f
-  data.tar.gz: 9834a964cfc7f603010970637b0f399450d76e256abc0a46e71c43d94bc3eafda6135cc84069907fd08847b5ac2447275a634a67512fcd25b81a702adfd70a20
+  metadata.gz: b5c956da517a75a8cc80ce492b2bbe2671367bd02c31bf87c59b76c1ab578432b61701032c6cc1cfbb1826d54dae87491faf8716f019b066f0013f5d2e7a7d4e
+  data.tar.gz: 4fb5ce9e341174f174a8ad88e2ba7eee820186eb9eefaba29d086e371aefd3fa583e80f2beed3a09d44d7565dfd187086d8641717953bb0e93362eadcfaf0512

data/.github/workflows/tests.yml

@@ -13,8 +13,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version: [2.7.7, 3.0.5, 3.1.3, 3.2.0]
-        bridgetown_version: [1.0.0, 1.1.0]
+        ruby_version: [3.2.4, 3.3.6, 3.4.2]
+        bridgetown_version: [2.0.0, 2.1.0]
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
     # Has to be top level to cache properly
     env:

data/.rubocop.yml

@@ -4,19 +4,41 @@ inherit_gem:
   rubocop-bridgetown: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
-  Include:
-    - lib/**/*.rb
+  TargetRubyVersion: 2.7
 
   Exclude:
     - .gitignore
-    - .rspec
     - .rubocop.yml
+    - "*.gemspec"
 
     - Gemfile.lock
     - CHANGELOG.md
     - LICENSE.txt
     - README.md
+    - Rakefile
+    - bridgetown.automation.rb
 
     - script/**/*
+    - test/fixtures/**/*
     - vendor/**/*
+
+Layout/LineLength:
+  Max: 140
+
+Metrics/BlockLength:
+  Enabled: false
+
+Bundler/OrderedGems:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Layout/IndentationConsistency:
+  Enabled: false
+
+Layout/IndentationWidth:
+  Enabled: false
+
+Style/OptionalBooleanParameter:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # main
 
+# 2.0.0 / 25-01-2023
+
+* Restrict support to Bridgetown v1.2 and newer.
+* Initialize plugin using the new Ruby DSL in Bridgetown v1.2.
+
 # 1.2.0 / 23-01-2023
 
 * Require Bridgetown 1.0 or newer.

data/Gemfile

@@ -5,13 +5,8 @@ gemspec
 
 gem "bridgetown", ENV["BRIDGETOWN_VERSION"] if ENV["BRIDGETOWN_VERSION"]
 
-group :development, :test do
-  gem "byebug"
-end
-
 group :test do
   gem "minitest"
   gem "minitest-profile"
   gem "minitest-reporters"
-  gem "shoulda"
-end
+end

data/Rakefile

@@ -9,4 +9,5 @@ Rake::TestTask.new(:test) do |test|
   test.libs << "lib" << "test"
   test.pattern = "test/**/test_*.rb"
   test.verbose = true
+  test.warning = false
 end

data/bridgetown-content-security-policy.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.7.0"
 
-  spec.add_dependency "bridgetown", ">= 1.0", "< 2.0"
+  spec.add_dependency "bridgetown", ">= 2.0", "< 4.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "nokogiri"

data/bridgetown.automation.rb

@@ -36,6 +36,7 @@ create_file "config/content_security_policy.config.rb" do
   RUBY
 end
 
-say_status :content_security_policy, "All done! Please add {% content_security_policy %} to the head tag in your layouts."
-say_status :content_security_policy, "Please see the new content_security_policy.rb file for details"
+say_status :content_security_policy, "All done! Add `init :\"bridgetown-content-security-policy\"` to your `config/initializers.rb`"
+say_status :content_security_policy, "Add <% content_security_policy %> to the head tag in your layouts to render the CSP."
+say_status :content_security_policy, "See the new content_security_policy.rb file for details"
 say_status :content_security_policy, "More info available at: https://github.com/ayushn21/bridgetown-content-security-policy"

data/lib/bridgetown-content-security-policy/builder.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
 module BridgetownContentSecurityPolicy
-  mattr_reader :policies, default: {}
+  @policies ||= {}
 
   def self.configure(name, &block)
-    @@policies[name.to_sym] = BridgetownContentSecurityPolicy::Policy.new(&block)
+    @policies[name.to_sym] = BridgetownContentSecurityPolicy::Policy.new(&block)
+  end
+
+  def self.policies
+    @policies || {}
   end
 
   class Builder < Bridgetown::Builder
@@ -12,22 +16,16 @@ module BridgetownContentSecurityPolicy
       require_relative site.in_root_dir("config", "content_security_policy.config.rb")
 
       unless default_policy
-        # rubocop:disable Layout/LineLength
         Bridgetown.logger.error "\nDefault Content Security Policy not configured"
         Bridgetown.logger.info "Please configure a default CSP in content_security_policy.config.rb\n"
-        # rubocop:enable Layout/LineLength
       end
 
       liquid_tag "content_security_policy" do |_attributes, tag|
         render tag.context["page"]["content_security_policy"]
       end
 
-      helper "_csp" do |policy_name|
-        render policy_name
-      end
-
-      helper "content_security_policy", helpers_scope: true do
-        _csp view.page.data.content_security_policy
+      helper "content_security_policy" do
+        render helpers.view.page.data.content_security_policy
       end
     end
 

data/lib/bridgetown-content-security-policy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BridgetownContentSecurityPolicy
-  VERSION = "1.2.0"
+  VERSION = "3.0.0"
 end

data/lib/bridgetown-content-security-policy.rb

@@ -4,4 +4,6 @@ require "bridgetown"
 require "bridgetown-content-security-policy/policy"
 require "bridgetown-content-security-policy/builder"
 
-BridgetownContentSecurityPolicy::Builder.register
+Bridgetown.initializer :"bridgetown-content-security-policy" do |config|
+  config.builder BridgetownContentSecurityPolicy::Builder
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-content-security-policy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Ayush Newatia
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2026-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown
@@ -16,20 +15,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +85,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email: ayush@hey.com
 executables: []
 extensions: []
@@ -110,7 +108,6 @@ homepage: https://github.com/ayushn21/bridgetown-content-security-policy
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,8 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Add a content security policy to your website using a convenient Ruby DSL
 test_files: []