dato_dast 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 347783d66e05d06e13d0f81d428abd674ddef8204656ac1547d1617ac54460b7
-  data.tar.gz: f7ef816f78ae6dd8a94dd3e2af53c9b7e0be18109eb8a3684681702ac92ecce3
+  metadata.gz: c72b8aaf4727201859551e3b1a6bc0db761be538dc4411c3444e56454cde77d9
+  data.tar.gz: e69f5d9cec8ef6b7b6d96318b3fdfdc1be57e947d35d8117c64fdcaaa451b4be
 SHA512:
-  metadata.gz: 37d3846161531105d192f9b5ff5663990b595352780a5d7bba5a2abcd4de3eeba6e5ed0c456f706385c14adb1cccce8e6b28ce14d99033784c4e0ad4a2ea95e9
-  data.tar.gz: a760804657dde90e802502afc90b2747fcfd710b46ff76af8caf0757abc3dbd7a41d537832168427b975a583515dffd89af68b33274666583ba40ff1d88e81c6
+  metadata.gz: d18f729ed3d089d9038ecb12c4837e9b3c6bd1916cb7733d8c9ffdc4c59a97f2161079957b445d17171d65e1a3b4a1940bc8f02f6b2038953740ccf5dd370cb6
+  data.tar.gz: 9a06315c442542b0def184a4dbe513cf55a98a222b76eb63669b37e9e7c5aee64abcd0c0613d738a58282dd4550e08d47a7e8a89c9de6c8bd38d92ad334a7a32

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.5

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.2.0] - 2021-12-28
+
+Features:
+- Added `duplicate` for the configuration
+- Add wrappers option to middleman extension
+
+Fixes
+- Don't load extension twice in middleman
+
 ## [0.1.1] - 2021-11-20
 
 Fixes

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    dato_dast (0.1.1)
+    dato_dast (0.2.0)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (6.1.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -20,7 +20,7 @@ GEM
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    minitest (5.14.4)
+    minitest (5.15.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -43,9 +43,10 @@ GEM
     rspec-support (3.10.2)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.1)
 
 PLATFORMS
+  ruby
   x86_64-darwin-20
 
 DEPENDENCIES

data/README.md

@@ -66,6 +66,31 @@ config = DastDast::Configuration.new
 DatoDast.structured_text(item, config)
 ```
 
+### `DatoDast.configuration.duplicate`
+
+If you want to temporarily override the existing configuration, you can
+duplicate the current configuration and this method will return a configuration
+object you can pass to `DatoDast.structured_text(text, configuration)` as the
+configuration.
+
+An example below:
+
+```ruby
+DatoDast.configure do |config|
+  config.host = "https://example.com"
+end
+
+new_config = DatoDast.congfiguration.duplicate do |config|
+  config.highlight = false
+end
+
+DatoDast.configuration.host # => example.com
+DatoDast.configuration.highlight # => true
+
+new_config.host # => example.com
+new_config.highlight # => false
+```
+
 The configuration options are:
 
 ### `config.highlight`, default: `true`

data/lib/dato_dast/configuration.rb

@@ -44,6 +44,18 @@ module DatoDast
       @types = TYPE_CONFIG.transform_values { |value| value.dup }
     end
 
+    def duplicate(&blk)
+      config = DatoDast::Configuration.new
+
+      %w(blocks inline_items highlight host item_links marks smart_links types).each do |method|
+        config.send("#{method}=", send(method))
+      end
+
+      yield config if blk
+
+      config
+    end
+
     def host=(new_host)
       return unless new_host
 
@@ -59,13 +71,13 @@ module DatoDast
     def blocks=(new_blocks)
       validate_items_configuration(new_blocks, "blocks")
 
-      @blocks = new_blocks
+      @blocks.merge!(new_blocks)
     end
 
     def inline_items=(new_inline_items)
       validate_items_configuration(new_inline_items, "inline_items")
 
-      @inline_items = new_inline_items
+      @inline_items.merge!(new_inline_items)
     end
 
     def marks=(new_marks)

data/lib/dato_dast/extensions/middleman.rb

@@ -11,8 +11,11 @@ module DatoDast
       option :marks, {}, "Configuration hash for a given mark"
       option :smart_links, true, "Open Link items in new windows and ItemLinks in the same window"
       option :types, {}, "Configuration hash for a given block node type"
+      option :wrappers, {}, "Wrappers for types without changing specific implementation"
 
       def after_configuration
+        return if app.mode?(:config)
+
         DatoDast.configure do |config|
           config.blocks = options[:blocks]
           config.highlight = options[:highlight]
@@ -22,6 +25,11 @@ module DatoDast
           config.marks = options[:marks]
           config.smart_links = options[:smart_links]
           config.types = options[:types]
+          options[:wrappers].each do |type, wrappers|
+            wrappers.each do |wrapper|
+              config.add_wrapper(type, wrapper)
+            end
+          end
         end
       end
 
@@ -31,7 +39,7 @@ module DatoDast
         end
       end
     end
-
-    ::Middleman::Extensions.register(:dato_dast, DatoDast::Extensions::Middleman)
   end
 end
+
+::Middleman::Extensions.register(:dato_dast, DatoDast::Extensions::Middleman)

data/lib/dato_dast/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato_dast
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - John DeWyze
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-20 00:00:00.000000000 Z
+date: 2021-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -49,6 +49,7 @@ files:
 - ".gitignore"
 - ".projections.json"
 - ".rspec"
+- ".tool-versions"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -99,7 +100,7 @@ metadata:
   homepage_uri: https://github.com/dewyze/dato_dast
   source_code_uri: https://github.com/dewyze/dato_dast
   changelog_uri: https://github.com/dewyze/dato_dast/blob/main/CHANGELOG.md.
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -114,8 +115,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Gem for converting DatoCMS Structured Text to Html
 test_files: []