composite_content 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 680f59341660c804a27f25a26c3f7446431f3fbd3757a5eaa5b3604ef46beb06
-  data.tar.gz: c2ea06855dd833d72e66a2f62ce78f58fde9418c81d8c23c8c5415c37e984896
+  metadata.gz: 3745b218d85539ed9073b1d873a089cb105ad42a55626605e2efeaaaa4099229
+  data.tar.gz: eeeb112da951023401f8966f306cf9b9fbb353576c448b5b3ea515da390fc076
 SHA512:
-  metadata.gz: c2e7259176997a992fe3d415140e23fc4d5f9dbee1a7cf14b5fdf589b3a966fb4e5b54257f59dc7c76741b0e352522ce3cff1baefda77df2fa4f05b55fa8f5b9
-  data.tar.gz: c31419a9fd5cac3cf1d784523603b22ab7afebe068ecae2a0477a7203e2c503d49ba8e484c904237df33e78ab6b85ddd080f2beecf2c7de4e862540bfba9f2ee
+  metadata.gz: 91e67d3559f79d0c5d6aa82c22b6735389f22fbc8ea08b8e20a3657b915b7b91bdfeb6be08981fdcf99bdebf99672b44875d3f36184cad41c308c8095525e566
+  data.tar.gz: c235b84b318b7218a9cc545ef333cfaaae3339e673f495404f73046fc6706488c52599167c5b7cd669fb398001ecc56a0318e09248d01b245752a6acaebafb5f

data/CHANGELOG.md

@@ -6,6 +6,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## Version 2.1.1 (2024-02-10)
+
+### Changed
+
+* Compatibility with Cocooned 2.1 (#15)
+* Compatibility with Rails 7.1 (#14)
+* Update test matrix (#14)  
+  Add Ruby 3.3. Drop Ruby 2.6 and Ruby 2.7
+
+## Version 2.1.0 (2023-08-29)
+
+### Added
+
+* Allow to customize strong parameters names on a block class with `.strong_parameters_names` (#11)
+* Allow to change composite_content views base path with `CompositeContent::Engine.config.views_path` (#10)
+
+### Fixed
+
+* Typo in french translations
+
 ## Version 2.0.0 (2023-03-07)
 
 ### Breaking changes

data/README.md

@@ -97,7 +97,7 @@ In your forms, make composite content editable with:
 
 ```erbruby
 <%= form.fields_for :composite_content do |composite_content_form| %>
-  <%= render 'composite_content/slot/form', form: composite_content_form %>
+  <%= render "#{CompositeContent::Engine.config.views_path}/slot/form", form: composite_content_form %>
 <% end %>
 ```
 

data/composite_content.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'active_model_validations_reflection'
   spec.add_dependency 'acts_as_list', '>= 1.0.4'
-  spec.add_dependency 'cocooned', '~> 2.0.0'
+  spec.add_dependency 'cocooned', '~> 2.0'
   spec.add_dependency 'rails', '>= 6.1.0'
 
   # Development tools

data/config/locales/fr.yml

@@ -7,4 +7,4 @@ fr:
       quote:
         add: Ajouter une citation
       text:
-        add: Ajouter un text
+        add: Ajouter un texte

data/lib/composite_content/action_view.rb

@@ -6,7 +6,7 @@ module CompositeContent
     # Render the content of a CompositeContent::Slot.
     def composite_content_render(slot)
       renders = slot.blocks.collect do |block|
-        render "composite_content/blocks/#{block.blockable.block_type}/show", block: block
+        render "#{CompositeContent::Engine.config.views_path}/blocks/#{block.blockable.block_type}/show", block: block
       end
 
       safe_join(renders)
@@ -49,7 +49,7 @@ module CompositeContent
       label ||= composite_content_default_label(block_type)
       opts = (options || {}).except(:count, :form_name, :force_non_association_create)
                             .merge!(form_name: :form,
-                                    partial: 'composite_content/block/form',
+                                    partial: "#{CompositeContent::Engine.config.views_path}/block/form",
                                     wrap_object: ->(b) { composite_content_wrap_block(b, block_type) })
 
       cocooned_add_item_link(label, form, :blocks, opts)

data/lib/composite_content/active_record.rb

@@ -34,7 +34,7 @@ module CompositeContent
 
         def class_mixin(name)
           Module.new do
-            define_method "strong_parameters_for_#{name}" do
+            define_method :"strong_parameters_for_#{name}" do
               reflect_on_association(name).class_name.constantize.strong_parameters
             end
           end

data/lib/composite_content/engine.rb

@@ -14,7 +14,10 @@ module CompositeContent
     #
     #     # In config/initializers/composite_content.rb
     #     require 'composite_content'
-    #     CompositeContent::Engine.config.block_types += %w[CompositeContent::Blocks::Image]
+    #     CompositeContent::Engine.config.tap do |config|
+    #       config.block_types += %w[CompositeContent::Blocks::Image]
+    #       config.views_path = 'shared/composite_content'
+    #     end
 
     # Allowed block types
     config.block_types = %w[
@@ -23,6 +26,10 @@ module CompositeContent
       CompositeContent::Blocks::Text
     ]
 
+    # Path where the composite content partials are stored in your application.
+    # Relative to `app/views/`
+    config.views_path = 'composite_content'
+
     # Engine internals
     #
     # Following configurations are here for engine initialization and internal

data/lib/composite_content/model/blockable.rb

@@ -16,6 +16,12 @@ module CompositeContent
       def block_type
         self.class.name.demodulize.underscore
       end
+
+      module ClassMethods # :nodoc:
+        def strong_parameters_names
+          column_names.collect(&:to_sym) - %i[created_at updated_at]
+        end
+      end
     end
   end
 end

data/lib/composite_content/slot.rb

@@ -32,23 +32,26 @@ module CompositeContent
       end
 
       def strong_parameters
-        [:id, { blocks_attributes: block_column_names + [{ blockable_attributes: blockable_column_names }, :_destroy] }]
+        [
+          :id,
+          { blocks_attributes: block_strong_parameters_names + [
+            { blockable_attributes: blockable_strong_parameters_names },
+            :_destroy
+          ] }
+        ]
       end
 
       protected
 
-      def block_column_names
-        @block_column_names ||= begin
-          columns = block_class.column_names.collect(&:to_sym)
-          columns - %i[slot_id blockable_id created_at updated_at]
+      def block_strong_parameters_names
+        @block_strong_parameters_names ||= begin
+          parameters = block_class.column_names.collect(&:to_sym)
+          parameters - %i[slot_id blockable_id created_at updated_at]
         end
       end
 
-      def blockable_column_names
-        @blockable_column_names ||= begin
-          columns = blockable_classes.collect(&:column_names).flatten.collect(&:to_sym).compact.uniq
-          columns - %i[created_at updated_at]
-        end
+      def blockable_strong_parameters_names
+        @blockable_strong_parameters_names ||= blockable_classes.collect(&:strong_parameters_names).flatten.compact.uniq
       end
     end
   end

data/lib/composite_content/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CompositeContent
-  VERSION = '2.0.0'
+  VERSION = '2.1.1'
 end

data/lib/generators/composite_content/templates/block/_form.html.erb

@@ -4,7 +4,8 @@
   <%= form.hidden_field :blockable_type %>
 
   <%= form.fields_for :blockable, form.object.blockable do |blockable_form| %>
-    <%= render "composite_content/blocks/#{form.object.blockable.block_type}/form", form: blockable_form %>
+    <%= render "#{CompositeContent::Engine.config.views_path}/blocks/#{form.object.blockable.block_type}/form",
+               form: blockable_form %>
   <% end %>
 
   <%= composite_content_move_block_up_link form %>

data/lib/generators/composite_content/templates/slot/_form.html.erb

@@ -2,7 +2,8 @@
 
 <%= cocooned_container reorderable: true do %>
   <%= form.fields_for :blocks do |block_form| %>
-    <%= render 'composite_content/block/form', form: block_form %>
+    <%= render "#{CompositeContent::Engine.config.views_path}/block/form",
+               form: block_form %>
   <% end %>
 
   <div class="links">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_content
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Gaël-Ian Havard
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2024-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_validations_reflection
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Add composite content capacities to your ActiveRecord models.