para 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58c45365ce3416da6671641777b577c9f4b406df
-  data.tar.gz: 10e4cf5a2aebb52802790aee53dd1cc8f207af61
+  metadata.gz: 47cd4fad8f6308c2c3ae1948bea744640d0ce772
+  data.tar.gz: e6f7cf338d48a9ef60f696221413c263d34dcc10
 SHA512:
-  metadata.gz: de0f4b0d6dfb69d07220eefc9701287dc3aadca482b0b0443b4e906d3192fad71a69c0ba7d4b6de5f024fc9ef6c82b10b0ece961b704b4f2e6e3794613923d48
-  data.tar.gz: 75109b33e3a76136ca050d5d772bcfde934ec73c0d9478a99981f458a923f53b419ef46c0612129f52ce174779419f0d7ac563aa43f134da9068e2c04ad852d8
+  metadata.gz: e38d091236ea396e0836560be1128c551393495ea6e967ee6a40f73ccfc301e1ded6e5682b5b23f65e1ae7406c8fc1e820d57a8c9edb3d53fc109735620b1960
+  data.tar.gz: c31d521f7c6a38eadb0646ecdc48f23ca8e258c4b0b285c5b90301013175fde19792716654d7ceeca9180895853d7c4c237dc9c1a10e41d7d5202cad8fb33c41

data/app/helpers/para/markup_helper.rb

@@ -4,8 +4,8 @@ module Para
       Para::Markup::Alert.new(self).container(message, options, &block)
     end
 
-    def resources_table(options = {}, &block)
-      Para::Markup::ResourcesTable.new(self).container(options, &block)
+    def resources_table(component:, **options, &block)
+      Para::Markup::ResourcesTable.new(component, self).container(options, &block)
     end
 
     def panel(options = {}, &block)

data/app/views/para/admin/resources/_table.html.haml

@@ -1,4 +1,4 @@
-= resources_table(model: model, component: component) do |table|
+= resources_table(component: component, model: model) do |table|
   = table.header do
     - attributes.each do |field|
       = table.header_for(field.name.to_sym)

data/app/views/para/admin/resources/_tree_item.html.haml

@@ -4,13 +4,13 @@
       %i.sort-dots
     %span.node-name
       = resource_name(root)
+    
+    - buttons = Para::Markup::ResourcesButtons.new(@component, self)
+    - actions = Para::Markup::ResourcesTable.default_actions
 
     .pull-right
-      = link_to @component.relation_path(root, action: :edit, return_to: request.fullpath), class: "btn btn-icon-primary btn-shadow btn-sm hint--left", :'aria-label' => ::I18n.t('para.shared.edit') do
-        %i.fa.fa-pencil
-
-      = link_to @component.relation_path(root), method: :delete, data: { confirm: ::I18n.t('para.list.delete_confirmation') }, class: 'btn btn-icon-danger btn-shadow btn-sm hint--left', :'aria-label' => ::I18n.t('para.shared.destroy') do
-        %i.fa.fa-times
+      - actions.each do |action|
+        = buttons.send(:"#{action}_button", root)
 
     .clearfix
   %ul.tree

data/lib/generators/para/table/templates/_table.html.haml

@@ -1,4 +1,4 @@
-= resources_table(model: model, component: component) do |table|
+= resources_table(component: component, model: model) do |table|
   = table.header do
     <%- attributes.each do |field| -%>
     = table.header_for(:<%= field.name %>)

data/lib/para/active_storage_downloader.rb

@@ -0,0 +1,23 @@
+module Para
+  class ActiveStorageDownloader
+    if defined?(ActiveStorage)
+      include ActiveStorage::Downloading
+    end
+
+    attr_reader :attachment
+    
+    delegate :blob, to: :attachment
+
+    def initialize(attachment)
+      @attachment = attachment
+    end
+
+    if defined?(ActiveStorage)
+      public :download_blob_to_tempfile
+    else
+      define_method(:download_blob_to_tempfile) do
+        raise NoMethodError, "ActiveStorage is not included in your application"
+      end
+    end
+  end
+end

data/lib/para/cloneable/attachments_cloner.rb

@@ -0,0 +1,36 @@
+module Para
+  module Cloneable
+    class AttachmentsCloner
+      attr_reader :original, :clone
+
+      def initialize(original, clone)
+        @original = original
+        @clone = clone
+      end
+      
+      def clone!
+        return unless defined?(ActiveStorage)
+        
+        attachment_reflections = original.class.reflections.select { |k, v| 
+          k.to_s.match(/_attachment\z/) && 
+          v.options[:class_name] == "ActiveStorage::Attachment" 
+        }
+
+        attachment_reflections.each do |name, reflection|
+          original_attachment = original.send(name)
+          next unless original_attachment
+          
+          association_name = name.gsub(/_attachment\z/, "")
+
+          Para::ActiveStorageDownloader.new(original_attachment).download_blob_to_tempfile do |tempfile|
+            clone.send(association_name).attach({
+              io: tempfile,
+              filename: original_attachment.blob.filename,
+              content_type: original_attachment.blob.content_type
+            })
+          end
+        end
+      end
+    end
+  end
+end

data/lib/para/cloneable/include_tree_builder.rb

@@ -0,0 +1,67 @@
+module Para
+  module Cloneable
+    class IncludeTreeBuilder
+      attr_reader :resource,  :cloneable_options
+
+      def initialize(resource, cloneable_options)
+        @resource = resource
+        @cloneable_options = cloneable_options.deep_dup
+      end
+      
+      def build
+        include_tree = build_cloneable_tree(resource, cloneable_options[:include])
+        cloneable_options[:include] = clean_include_tree(include_tree)
+        cloneable_options
+      end
+      
+      private
+
+      def build_cloneable_tree(resource, include)
+        include.each_with_object({}) do |reflection_name, hash|
+          hash[reflection_name] = {}
+
+          if (reflection = resource.class.reflections[reflection_name.to_s])
+            reflection_options = hash[reflection_name]
+            association_target = resource.send(reflection_name)
+            
+            if reflection.collection?
+              association_target.each do |nested_resource|
+                add_reflection_options(reflection_options, nested_resource)
+              end
+            else
+              add_reflection_options(reflection_options, association_target)
+            end
+          end      
+        end
+      end
+
+      def add_reflection_options(reflection_options, nested_resource)
+        options = nested_resource.class.try(:cloneable_options)
+        return reflection_options unless options
+        
+        include_options = options[:include]
+        target_options = build_cloneable_tree(nested_resource, include_options)
+        reflection_options.deep_merge!(target_options)
+      end
+
+      def clean_include_tree(tree)
+        shallow_relations = []
+        deep_relations = {}
+        
+        tree.each do |key, value|
+          if !value || value.empty?
+            shallow_relations << key
+          else
+            deep_relations[key] = clean_include_tree(value)
+          end
+        end
+
+        if deep_relations.empty?
+          shallow_relations
+        else
+          shallow_relations + [deep_relations]
+        end
+      end
+    end
+  end
+end

data/lib/para/cloneable.rb

@@ -1,20 +1,30 @@
 module Para
   module Cloneable
     extend ActiveSupport::Concern
+    extend ActiveSupport::Autoload
 
     included do
       class_attribute :cloneable_options
     end
 
+    eager_autoload do
+      autoload :IncludeTreeBuilder
+      autoload :AttachmentsCloner
+    end
+
     # Wraps the deep_cloneable gem #deep_clone method to allow using the
     # predefined associations and options from our Cloneable.acts_as_cloneable
     # macro.
     #
     def deep_clone!(options = {})
-      options = options.reverse_merge(cloneable_options)
+      processed_options = Para::Cloneable::IncludeTreeBuilder.new(self, cloneable_options).build
+      options = options.reverse_merge(processed_options)
       callback = build_clone_callback(options.delete(:prepare))
-
-      deep_clone(options, &callback)
+      
+      deep_clone(options) do |original, clone|
+        Para::Cloneable::AttachmentsCloner.new(original, clone).clone!
+        callback&.call(original, clone)
+      end
     end
 
     private
@@ -49,6 +59,10 @@ module Para
 
         options = args.extract_options!
 
+        # Allow nested STI resources to define their own relations to clone even
+        # if other sibling models don't define those relations
+        options[:skip_missing_associations] = true
+
         self.cloneable_options = options.reverse_merge({
           include: args
         })

data/lib/para/job/base.rb

@@ -9,7 +9,7 @@ module Para
 
       rescue_from Exception, with: :rescue_exception
 
-      before_perform :store_job_type
+      before_enqueue :store_job_type
 
       protected
 

data/lib/para/markup/resources_buttons.rb

@@ -0,0 +1,61 @@
+module Para
+  module Markup
+    class ResourcesButtons < Para::Markup::Component
+      attr_reader :component
+      
+      def initialize(component, view)
+        @component = component
+        super(view)
+      end
+
+      def clone_button(resource)
+        return unless resource.class.cloneable?
+
+        path = component.relation_path(
+          resource, action: :clone, return_to: view.request.fullpath
+        )
+
+        options = {
+          method: :post,
+          class: 'btn btn-sm btn-icon-info btn-shadow hint--left',
+          aria: {
+            label: ::I18n.t('para.shared.copy')
+          }
+        }
+
+        view.link_to(path, options) do
+          content_tag(:i, '', class: 'fa fa-copy')
+        end
+      end
+
+      def edit_button(resource)
+        path = component.relation_path(
+          resource, action: :edit, return_to: view.request.fullpath
+        )
+
+        view.link_to(path, class: 'btn btn-sm btn-icon-primary btn-shadow hint--left', aria: { label: ::I18n.t('para.shared.edit') }) do
+          content_tag(:i, '', class: 'fa fa-pencil')
+        end
+      end
+
+      def delete_button(resource)
+        path = component.relation_path(resource, return_to: view.request.fullpath)
+
+        options = {
+          method: :delete,
+          data: {
+            confirm: ::I18n.t('para.list.delete_confirmation')
+          },
+          class: 'btn btn-sm btn-icon-danger btn-shadow hint--left',
+          aria: {
+            label: ::I18n.t('para.shared.destroy')
+          }
+        }
+
+        view.link_to(path, options) do
+          content_tag(:i, '', class: 'fa fa-times')
+        end
+      end
+    end
+  end
+end

data/lib/para/markup/resources_table.rb

@@ -4,11 +4,15 @@ module Para
       class_attribute :default_actions
       self.default_actions = [:edit, :clone, :delete]
 
-      attr_reader :model, :component, :orderable, :actions
+      attr_reader :component, :model, :orderable, :actions
+      
+      def initialize(component, view)
+        @component = component
+        super(view)
+      end
 
       def container(options = {}, &block)
         @model = options.delete(:model)
-        @component = options.delete(:component)
 
         if !options.key?(:orderable) || options.delete(:orderable)
           @orderable = model.orderable?
@@ -131,62 +135,15 @@ module Para
       end
 
       def actions_cell(resource)
+        buttons = ResourcesButtons.new(component, view)
+
         content_tag(:td, class: 'table-row-actions') do
           actions.map do |type|
-            send(:"#{ type }_button", resource)
+            buttons.send(:"#{ type }_button", resource)
           end.compact.join.html_safe
         end
       end
 
-      def clone_button(resource)
-        return unless resource.class.cloneable?
-
-        path = component.relation_path(
-          resource, action: :clone, return_to: view.request.fullpath
-        )
-
-        options = {
-          method: :post,
-          class: 'btn btn-sm btn-icon-info btn-shadow hint--left',
-          aria: {
-            label: ::I18n.t('para.shared.copy')
-          }
-        }
-
-        view.link_to(path, options) do
-          content_tag(:i, '', class: 'fa fa-copy')
-        end
-      end
-
-      def edit_button(resource)
-        path = component.relation_path(
-          resource, action: :edit, return_to: view.request.fullpath
-        )
-
-        view.link_to(path, class: 'btn btn-sm btn-icon-primary btn-shadow hint--left', aria: { label: ::I18n.t('para.shared.edit') }) do
-          content_tag(:i, '', class: 'fa fa-pencil')
-        end
-      end
-
-      def delete_button(resource)
-        path = component.relation_path(resource, return_to: view.request.fullpath)
-
-        options = {
-          method: :delete,
-          data: {
-            confirm: ::I18n.t('para.list.delete_confirmation')
-          },
-          class: 'btn btn-sm btn-icon-danger btn-shadow hint--left',
-          aria: {
-            label: ::I18n.t('para.shared.destroy')
-          }
-        }
-
-        view.link_to(path, options) do
-          content_tag(:i, '', class: 'fa fa-times')
-        end
-      end
-
       private
 
       def search

data/lib/para/markup.rb

@@ -1,5 +1,6 @@
 require 'para/markup/component'
 require 'para/markup/resources_table'
+require 'para/markup/resources_buttons'
 require 'para/markup/modal'
 require 'para/markup/panel'
 require 'para/markup/alert'

data/lib/para/version.rb

@@ -1,3 +1,3 @@
 module Para
-  VERSION = '0.7.4'
+  VERSION = '0.8.0'
 end

data/lib/para.rb

@@ -52,6 +52,7 @@ module Para
     autoload :Cache
     autoload :Logging
     autoload :IframeTransport
+    autoload :ActiveStorageDownloader
   end
 
   def self.config(&block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -701,6 +701,7 @@ files:
 - lib/generators/para/table/templates/_table.html.haml
 - lib/generators/para/tree_item/tree_item_generator.rb
 - lib/para.rb
+- lib/para/active_storage_downloader.rb
 - lib/para/attribute_field.rb
 - lib/para/attribute_field/base.rb
 - lib/para/attribute_field/belongs_to.rb
@@ -726,6 +727,8 @@ files:
 - lib/para/cache.rb
 - lib/para/cache/database_store.rb
 - lib/para/cloneable.rb
+- lib/para/cloneable/attachments_cloner.rb
+- lib/para/cloneable/include_tree_builder.rb
 - lib/para/component.rb
 - lib/para/component/exportable.rb
 - lib/para/component/history.rb
@@ -782,6 +785,7 @@ files:
 - lib/para/markup/component.rb
 - lib/para/markup/modal.rb
 - lib/para/markup/panel.rb
+- lib/para/markup/resources_buttons.rb
 - lib/para/markup/resources_table.rb
 - lib/para/markup/resources_tree.rb
 - lib/para/model_field_parsers.rb