para 0.9.4 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45b33c0018d1c19e222c84f62ef8c0eb3820fbbe60dcc6c99da7a40bf229fc1b
-  data.tar.gz: fe48b49c545495cc4103418d4c75f3d34447b1003ef690ac45076768509cfc30
+  metadata.gz: 7dcae0fffaaeae962449f4f7f1849fdcd8817529e9fd16bd2c8a285233dd5a39
+  data.tar.gz: f3f52c91b79d7b4d6a2c24dd6f0bf9d4b84bec53c280febc2e7c657b58e3796b
 SHA512:
-  metadata.gz: f8e403bd825fbeba4dd042eb2a01a0f17562b9ab145ec400aa216ed81ed07e483b2b22984e9c6a63b55408367ef7b0faf7022e931a262fe61640a1fffc7c03da
-  data.tar.gz: c9e6a4da03d11873890d5c7c1c338f109fe03f0ebfe605022b304bce43758f650e05580df1899b5c68bfe523d47b16e3988f86ed5247b9e999bd4dd1816fef87
+  metadata.gz: e13111ccd12a242cca031cbf7b24e78e90f5ffbc40ea1c0947db0978b66196a308d4c04e9704fdf29379d9e5b8ef9e90b73c6b55e25c67fe71f42ed449a8b223
+  data.tar.gz: d632bd4802a23fe04d80b755c84f0f8250d6158a292326a0133ecac0f4220dd0236b813913d7237871d36f6348ed99e796b85b79c790cf6442fbdeffa2623c3c

data/app/controllers/para/admin/resources_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "para/application_controller"
+require_dependency 'para/application_controller'
 
 module Para
   module Admin
@@ -37,7 +37,7 @@ module Para
       end
 
       def update
-        if resource.update_attributes(resource_params)
+        if resource.update(resource_params)
           flash_message(:success, resource)
           redirect_to after_form_submit_path
         else
@@ -109,7 +109,7 @@ module Para
       def resource
         @resource ||= begin
           self.class.ensure_resource_name_defined!
-          instance_variable_get(:"@#{ self.class.resource_name }")
+          instance_variable_get(:"@#{self.class.resource_name}")
         end
       end
 
@@ -161,10 +161,10 @@ module Para
 
       def self.ensure_resource_name_defined!
         unless resource_name.presence
-          raise "Resource not defined in your controller. " \
-                "You can define the resource of your controller with the " \
-                "`resource :resource_name` macro when subclassing " \
-                "Para::Admin::ResourcesController"
+          raise 'Resource not defined in your controller. ' \
+                'You can define the resource of your controller with the ' \
+                '`resource :resource_name` macro when subclassing ' \
+                'Para::Admin::ResourcesController'
         end
       end
 
@@ -185,8 +185,8 @@ module Para
 
       def current_anchor
         @current_anchor ||= if (current_anchor = params[:_current_anchor]).presence
-          current_anchor.gsub(/^\#/, '')
-        end
+                              current_anchor.gsub(/^\#/, '')
+                            end
       end
     end
   end

data/app/helpers/para/admin/base_helper.rb

@@ -23,8 +23,8 @@ module Para
         end
       end
 
-      def find_relation_name_for(relation, partial, options = {})
-        return relation if partial_exists?(relation, partial, options)
+      def find_relation_name_for(relation, partial, **options)
+        return relation if partial_exists?(relation, partial, **options)
         return nil unless options[:relation_class]
 
         relation = options[:relation_class].ancestors.find do |ancestor|
@@ -32,7 +32,7 @@ module Para
           break if ancestor == ActiveRecord::Base
 
           ancestor_name = plural_file_path_for(ancestor.name)
-          partial_exists?(ancestor_name, partial, options)
+          partial_exists?(ancestor_name, partial, **options)
         end
 
         plural_file_path_for(relation) if relation

data/app/helpers/para/admin/nested_inputs_helper.rb

@@ -9,7 +9,7 @@ module Para
           association_name = parent_resource.association(attribute_name).options[:inverse_of]
           return resource unless association_name
 
-          resource.association(association_name).replace(parent_resource)
+          resource.association(association_name).send(:replace, parent_resource)
         end
       end
     end

data/app/helpers/para/translations_helper.rb

@@ -19,7 +19,7 @@ module Para
       defaults << options.delete(:default) if options[:default]
       options[:default] = defaults
 
-      I18n.translate(defaults.shift, options)
+      ::I18n.translate(defaults.shift, **options)
     end
   end
 end

data/app/models/para/application_record.rb

@@ -4,13 +4,15 @@ module Para
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true
 
-    private
-
     # Adds the `optional: true` option to the belongs_to calls inside the provided block,
     # but only for Rails 5.1+
     #
     def self.with_belongs_to_optional_option_if_needed(&block)
-      if ActiveRecord::Associations::Builder::BelongsTo.valid_options({}).include?(:optional)
+      belongs_to_accepts_optional = ActiveRecord::Associations::Builder::BelongsTo
+                                    .send(:valid_options, {})
+                                    .include?(:optional)
+
+      if belongs_to_accepts_optional
         with_options(optional: true, &block)
       else
         block.call

data/app/models/para/component/base.rb

@@ -10,7 +10,7 @@ module Para
         Para::Component.registered_components[name] = component
       end
 
-      def self.configurable_on(key, options = {})
+      def self.configurable_on(key, _options = {})
         store_accessor(:configuration, key)
       end
 
@@ -22,8 +22,8 @@ module Para
       end
 
       has_many :child_components, -> { ordered },
-                                  class_name: 'Para::Component::Base',
-                                  foreign_key: 'parent_component_id'
+               class_name: 'Para::Component::Base',
+               foreign_key: 'parent_component_id'
 
       validates :identifier, :type, presence: true
 
@@ -33,14 +33,14 @@ module Para
 
       def name
         read_attribute(:name) || ::I18n.t(
-          "components.component.#{ identifier }",
+          "components.component.#{identifier}",
           default: identifier.humanize
         )
       end
 
       def main_navigation_name
         ::I18n.t(
-          "components.main_navigation.#{ identifier }",
+          "components.main_navigation.#{identifier}",
           default: name
         )
       end
@@ -62,7 +62,7 @@ module Para
       end
 
       def default_form_actions
-        [:submit, :submit_and_edit, :submit_and_add_another, :cancel]
+        %i[submit submit_and_edit submit_and_add_another cancel]
       end
 
       def to_param

data/app/models/para/component_section.rb

@@ -1,8 +1,8 @@
 module Para
   class ComponentSection < Para::ApplicationRecord
     has_many :components, -> { ordered }, class_name: 'Para::Component::Base',
-             autosave: true, foreign_key: :component_section_id,
-             dependent: :destroy
+                                          autosave: true, foreign_key: :component_section_id,
+                                          dependent: :destroy
 
     scope :ordered, -> { order(position: :asc) }
 
@@ -10,7 +10,7 @@ module Para
 
     def name
       read_attribute(:name) || ::I18n.t(
-        "components.section.#{ identifier }",
+        "components.section.#{identifier}",
         default: identifier.humanize
       )
     end

data/app/models/para/library/file.rb

@@ -11,10 +11,10 @@ module Para
         def attachment_path
           return unless attachment.attached?
 
-          attachment.service_url
+          attachment.url
         end
 
-        alias_method :attachment_url, :attachment_path
+        alias attachment_url attachment_path
 
         def attachment_ext
           ::File.extname(attachment.filename.to_s) if attachment.attached?

data/app/models/para/page/section.rb

@@ -14,7 +14,6 @@ module Para
       end
 
       class << self
-
         # This method is a shortcut to create a has_one through relation
         def section_resource(*args, &block)
           _ensure_section_resource_relation
@@ -47,10 +46,10 @@ module Para
           return if @section_resources_already_initialized
 
           has_many :section_resources, -> { ordered },
-                                       foreign_key: 'section_id',
-                                       class_name: '::Para::Page::SectionResource',
-                                       inverse_of: :section,
-                                       dependent: :destroy
+                   foreign_key: 'section_id',
+                   class_name: '::Para::Page::SectionResource',
+                   inverse_of: :section,
+                   dependent: :destroy
 
           accepts_nested_attributes_for :section_resources, allow_destroy: true
 
@@ -74,7 +73,7 @@ module Para
             source_type: target_class_name
           )
 
-          has_one(*args, options, &block)
+          has_one(*args, **options, &block)
         end
 
         def _create_section_resource_has_many_relation_for(*args, &block)
@@ -94,7 +93,7 @@ module Para
             source_type: target_class_name
           )
 
-          has_many(*args, options, &block)
+          has_many(*args, **options, &block)
         end
       end
     end

data/app/views/para/admin/main/index.html.haml

@@ -1 +1 @@
-= render file: template_path_lookup('admin/dashboard', 'para/admin/dashboard')
+= render template: template_path_lookup('admin/dashboard', 'para/admin/dashboard')

data/app/views/para/inputs/nested_many/_container.html.haml

@@ -11,7 +11,7 @@
 
     = form.remove_association_button
 
-  .panel-collapse.form-inputs.collapse{ id: form.nested_resource_dom_id, class: ('in' if uncollapsed && form.object.persisted?), data: { rendered: render_partial, render_path: @component.path(remote_partial_params), id: form.object.id, :"object-name" => form.object_name, :"model-name" => model.name } }
+  .panel-collapse.form-inputs.collapse{ id: form.nested_resource_dom_id, class: ('in' if uncollapsed && form.object.persisted?), data: { rendered: render_partial, render_path: @component.path(**remote_partial_params), id: form.object.id, :"object-name" => form.object_name, :"model-name" => model.name } }
     .panel-body{ data: { :"nested-form-container" => true } }
       - if render_partial
         = render partial: find_partial_for(model, form.nested_fields_partial_name), locals: { form: form }.merge(nested_locals)

data/lib/para/active_storage_downloader.rb

@@ -1,23 +1,29 @@
 module Para
   class ActiveStorageDownloader
-    if defined?(ActiveStorage)
-      include ActiveStorage::Downloading
-    end
+    include ActiveStorage::Downloading if defined?(ActiveStorage::Downloading)
 
     attr_reader :attachment
-    
+
     delegate :blob, to: :attachment
 
     def initialize(attachment)
       @attachment = attachment
     end
 
-    if defined?(ActiveStorage)
+    if defined?(ActiveStorage::Downloading)
       public :download_blob_to_tempfile
+    elsif defined?(ActiveStorage)
+      # For versions of ActiveStorage that don't have an ActiveStorage::Downloading
+      # module, we define the method ourselves, as defined in the ActiveStorage::Analyzer
+      # and ActiveStorage::Previewer classes, which is simple enough to be copied here.
+      #
+      def download_blob_to_tempfile(&block)
+        blob.open tmpdir: Dir.tmpdir, &block
+      end
     else
       define_method(:download_blob_to_tempfile) do
-        raise NoMethodError, "ActiveStorage is not included in your application"
+        raise NoMethodError, 'ActiveStorage is not included in your application'
       end
     end
   end
-end
+end

data/lib/para/cloneable/attachments_cloner.rb

@@ -44,19 +44,20 @@ module Para
         Para::ActiveStorageDownloader.new(original_attachment).download_blob_to_tempfile do |tempfile|
           attachment_target = clone.send(association_name)
 
-          attachment_target.attach({
-            io: tempfile,
+          cloned_blob = ActiveStorage::Blob.create_and_upload!(
+            io: tempfile, 
             filename: original_blob.filename,
             content_type: original_blob.content_type
-          })
+          )
 
+          attachment_target.attach(cloned_blob)
           cloned_attachment = find_cloned_attachment(attachment_target, original_blob)
 
           # Store the cloned attachment and blob into the deep_cloneable dictionary used
           # by the `deep_clone` method to ensure that, if needed during the cloning
           # operation, they won't be cloned once more and are accessible for processing
           store_cloned(original_attachment, cloned_attachment)
-          store_cloned(original_blob, cloned_attachment.blob)
+          store_cloned(original_blob, cloned_blob)
         end
       end
 

data/lib/para/component.rb

@@ -21,10 +21,3 @@ require 'para/component/exportable'
 require 'para/component/importable'
 require 'para/component/subclassable'
 require 'para/component/history'
-
-# Require models
-require 'para/component/base'
-require 'para/component/resource'
-require 'para/component/crud'
-require 'para/component/form'
-require 'para/component/settings'

data/lib/para/components_configuration.rb

@@ -5,6 +5,7 @@ module Para
 
     def draw(&block)
       return unless components_installed?
+
       Para::LogConfig.with_log_level(:fatal) do
         log_level = Rails.logger.level
         Rails.logger.level = :fatal
@@ -36,10 +37,10 @@ module Para
         section
       else
         sections_cache[identifier] = if (section_id = sections_ids_hash[identifier])
-          Para::ComponentSection.find(section_id)
-        else
-          Para::ComponentSection.find_by(identifier: identifier)
-        end
+                                       Para::ComponentSection.find(section_id)
+                                     else
+                                       Para::ComponentSection.find_by(identifier: identifier)
+                                     end
       end
     end
 
@@ -48,10 +49,10 @@ module Para
         component
       else
         components_cache[identifier] = if (component_id = components_ids_hash[identifier])
-          Para::Component::Base.find(component_id)
-        else
-          Para::Component::Base.find_by(identifier: identifier)
-        end
+                                         Para::Component::Base.find(component_id)
+                                       else
+                                         Para::Component::Base.find_by(identifier: identifier)
+                                       end
       end
     end
 
@@ -64,9 +65,7 @@ module Para
           else
             component.child_components.each do |child_component|
               # If one of the component children has the searched identifier return it
-              if child_component.identifier.to_s == identifier.to_s
-                return child_component
-              end
+              return child_component if child_component.identifier.to_s == identifier.to_s
             end
           end
         end
@@ -116,14 +115,14 @@ module Para
     end
 
     def components_installed?
-      tables_exist = %w(component/base component_section).all? do |name|
+      tables_exist = %w[component/base component_section].all? do |name|
         Para.const_get(name.camelize).table_exists?
       end
 
       unless tables_exist
         Rails.logger.warn(
           "Para migrations are not installed.\n" \
-          "Skipping components definition until next app reload."
+          'Skipping components definition until next app reload.'
         )
       end
 
@@ -140,7 +139,7 @@ module Para
     #
     def eager_load_components!
       $LOAD_PATH.each do |path|
-        next unless path.match(/\/components$/)
+        next unless path.match(%r{/components$})
 
         glob = File.join(path, '**', '*_component.rb')
 
@@ -158,8 +157,8 @@ module Para
         instance_eval(&block)
       end
 
-      def component(*args, &block)
-        components << Component.new(*args, &block)
+      def component(*args, **options, &block)
+        components << Component.new(*args, **options, &block)
       end
 
       def components
@@ -191,19 +190,15 @@ module Para
         instance_eval(&block) if block
 
         unless type
-          raise UndefinedComponentTypeError.new(
-            "Undefined Para component : #{ type_identifier }. " +
-            "Please ensure that your app or gems define this component type."
-          )
+          raise UndefinedComponentTypeError, "Undefined Para component : #{type_identifier}. " +
+                                             'Please ensure that your app or gems define this component type.'
         end
       end
 
       def component(*args, **child_options, &block)
         # Do not allow nesting components more than one level as the display of illimited
         # child nesting deepness is not implemented
-        if parent
-          raise ComponentTooDeepError, "Cannot nest components more than one level"
-        end
+        raise ComponentTooDeepError, 'Cannot nest components more than one level' if parent
 
         child_component_options = child_options.merge(parent: self)
         child_components << Component.new(*args, **child_component_options, &block)

data/lib/para/inputs/nested_one_input.rb

@@ -17,11 +17,11 @@ module Para
           # Build association without trying to save the new record
           resource = case association
           when ActiveRecord::Associations::HasOneThroughAssociation
-            association.replace(model.new)
+            association.send(:replace, model.new)
           when ActiveRecord::Associations::HasOneAssociation
-            association.replace(model.new, false)
+            association.send(:replace, model.new, false)
           else
-            association.replace(model.new)
+            association.send(:replace, model.new)
           end
         end
 

data/lib/para/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Para
-  VERSION = '0.9.4'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-12 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails