bridgetown-cloudinary 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '094d6f9ea2137031f59a039a70c6225447a27c2149dd3f4aaf40c1a010ecce37'
-  data.tar.gz: a8f336a1dee7036d4db63852cd24b42aa9c6fadfe945c7f971f48b79a55c496e
+  metadata.gz: 42cfebd13b5873c08022a83f4d44f0bc0623583dbb7b67dd6f6fd11d8f5f84d0
+  data.tar.gz: f880397f2c76021e165f53ae95911cf3f7af0bd332f83910a5721e600b46a666
 SHA512:
-  metadata.gz: 94401e8f4c81dfe33194dbff7335981c61503150b02e299e1663a90ff97877ebde9fb629d22c429a3fca43e9b7e9b216d1f6871fee217937d15ad8fccd6a3041
-  data.tar.gz: 7fd2188450afdefb79c57a910ed114f1e3b031ce984c9de79b79c180ff4889bcccec8c4f2ea8dd3a5ac9ae9d840563f0ff73b9b0612174dc42d30f1694e5fd9d
+  metadata.gz: 45a29ae57fc94caed150a151325d6a84a40143f182d9eaf976148bc271a370c0d8f2f7051ae2837bd94ae79e8cf3bf7e20988d3343ea49900cbe6222b385f020
+  data.tar.gz: acb7aa35e195caf534287040d1d8aab172167c74f780f6ebad28fd0e7c79bbdb3792ddc18c86bcfc84b3bac66a5924327858f2cbbd69d5070996d9162b82d29d

data/.rubocop.yml

@@ -5,21 +5,22 @@ inherit_gem:
 
 AllCops:
   TargetRubyVersion: 2.5
-  Include:
-    - lib/**/*.rb
-
   Exclude:
     - .gitignore
     - .rspec
     - .rubocop.yml
 
+    - Rakefile
+    - bridgetown.automation.rb
     - Gemfile.lock
+    - "*.gemspec"
     - CHANGELOG.md
     - LICENSE.txt
     - README.md
 
     - script/**/*
     - vendor/**/*
+    - spec/**/*
 
 Metrics/AbcSize:
   Exclude:

data/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.1.0] - 2022-10-09
+
+- Provide configuration features through either initializer or YAML
+- Update the automation script
 
 ## [2.0.0] - 2022-10-08
 

data/bridgetown.automation.rb

@@ -6,13 +6,13 @@ cloud_name = ask("What's your Cloudinary cloud name?")
 
 add_bridgetown_plugin "bridgetown-cloudinary"
 
-append_to_file "bridgetown.config.yml" do
-  <<~YAML
-
-    cloudinary:
-      cloud_name: #{cloud_name}
-  YAML
+add_initializer :"bridgetown-cloudinary" do
+  <<~RUBY
+     do
+      cloud_name "#{cloud_name}"
+    end
+  end
 end
 
-say_status :cloudinary, "All set! Double-check the cloudinary block in your config file and review docs at"
+say_status :cloudinary, "All set! Double-check the cloudinary block in your config/initializers.rb file and review docs at"
 say_status :cloudinary, "https://github.com/bridgetownrb/bridgetown-cloudinary"

data/lib/bridgetown-cloudinary/builder.rb

@@ -5,23 +5,6 @@ module Bridgetown
     class Builder < Bridgetown::Builder
       include Bridgetown::Filters
 
-      CONFIG_DEFAULTS = {
-        cloudinary: {
-          cloud_name: nil,
-          default_transformation: "open_graph",
-          default_image_format: "jpg",
-          transformations: {
-            open_graph: "c_fill,g_face:center,w_1600,h_900,q_50",
-            tiny: "w_300,c_limit,q_90",
-            small: "w_600,c_limit,q_85",
-            medium: "w_1200,c_limit,q_80",
-            large: "w_1800,c_limit,q_80",
-            xlarge: "w_2048,c_limit,q_75",
-          },
-          add_transformed_urls_to_image_front_matter: false,
-        },
-      }.freeze
-
       # Set up the Cloudinary configuration
       def build
         ::Cloudinary.config({

data/lib/bridgetown-cloudinary/utils.rb

@@ -18,7 +18,7 @@ module Bridgetown
         cloudinary_url&.sub("/image/upload", "/image/upload#{transformation}")
       end
 
-      def self.add_image_urls_to_resources(site, config)
+      def self.add_image_urls_to_resources(site, config) # rubocop:todo Metrics/CyclomaticComplexity
         site.contents.each do |resource|
           next unless resource.data[:cloudinary_id] && !resource.data[:image]
           next if resource.respond_to?(:collection) && resource.collection.data?

data/lib/bridgetown-cloudinary/version.rb

@@ -2,6 +2,6 @@
 
 module Bridgetown
   module Cloudinary
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/lib/bridgetown-cloudinary.rb

@@ -5,6 +5,35 @@ require "cloudinary"
 require "bridgetown-cloudinary/utils"
 require "bridgetown-cloudinary/builder"
 
-Bridgetown.initializer :"bridgetown-cloudinary" do |config|
+# rubocop:disable Metrics/ParameterLists
+Bridgetown.initializer :"bridgetown-cloudinary" do |config,
+  cloud_name: nil,
+  default_transformation: "open_graph",
+  default_image_format: "jpg",
+  transformations: {},
+  add_transformed_urls_to_image_front_matter: false|
+
+  options = {
+    default_transformation: default_transformation,
+    default_image_format: default_image_format,
+    transformations: {
+      open_graph: "c_fill,g_face:center,w_1600,h_900,q_50",
+      tiny: "w_300,c_limit,q_90",
+      small: "w_600,c_limit,q_85",
+      medium: "w_1200,c_limit,q_80",
+      large: "w_1800,c_limit,q_80",
+      xlarge: "w_2048,c_limit,q_75",
+    }.merge(transformations),
+    add_transformed_urls_to_image_front_matter: add_transformed_urls_to_image_front_matter,
+  }
+
+  if config.cloudinary
+    config.cloudinary Bridgetown::Utils.deep_merge_hashes(options, config.cloudinary)
+  else
+    config.cloudinary(options)
+  end
+  config.cloudinary.cloud_name = cloud_name if cloud_name
+
   config.builder Bridgetown::Cloudinary::Builder
 end
+# rubocop:enable Metrics/ParameterLists

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-cloudinary
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Bridgetown Team