para 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 194f93e32421619179ac7bbe6ecafbca1956e001
-  data.tar.gz: 61742c2210cd54cb7081657d87bd811ee543b5cc
+  metadata.gz: f79b2e1b6163469c9247f53880b82b50527729e2
+  data.tar.gz: 46444b157efef7ace8f76a566dbcca7f90b62e1d
 SHA512:
-  metadata.gz: 2ef54e425e19c33d6f202c6cf0615393027be98198428d53b8c656ada2d3bfc76c739b721ce8b953a9062cbd207feef849e6b6bc33ff835171135af44b60ef35
-  data.tar.gz: 2940b7949484eb38d9c0006da8b3722383767a19373eeab8bce0cc2b41a66a499edcdc0f9a38215c0d6b9492ca2f6902dc9f1733f96b85b75889408f840aabe0
+  metadata.gz: 008274f36acb1819e3ac4b37d74eb115806c7c86d8a5e5f409e98bc568c788ce31e8e4019a412eeb1b86f11025805e7f2f47b9bb609f3e5a4994bebd733e176c
+  data.tar.gz: a08c53ae52881b5ce1d80a2bb951f089db476824802adea8b2e006165164063512b0f2bc660eaa309cd692a8b9a7ea2aee05a740dc81355e6628fbe9c04d453e

data/app/assets/javascripts/para/admin/{importers.coffee → job-tracker.coffee}

@@ -1,23 +1,24 @@
-class Para.Importer extends RemoteModalForm
+class Para.JobTracker extends RemoteModalForm
   initialize: (options = {}) ->
     super(options)
     @refreshOnClose = false
+    @trackProgress()
 
   formSuccess: (e, response) ->
     super(e, response)
-
-    if ($progressBar = @$el.find('[data-async-progress]')).length
-      @trackProgress($progressBar)
+    @trackProgress()
 
   trackProgress: ($progressBar) ->
-    @importStatusURL = @$el.data('import-status-url')
-    @progress = new Para.AsyncProgress(el: $progressBar, progressUrl: @importStatusURL)
+    return unless ($progressBar = @$el.find('[data-async-progress]')).length
+
+    @jobStatusURL = @$el.data('job-status-url')
+    @progress = new Para.AsyncProgress(el: $progressBar, progressUrl: @jobStatusURL)
     @listenTo(@progress, 'completed', @onImportComplete)
     @listenTo(@progress, 'failed', @onImportComplete)
 
   onImportComplete: ->
     $.ajax(
-      url: @importStatusURL
+      url: @jobStatusURL
       # Force HTTP ACCEPT header to HTML since Rails treats XHR request without
       # a specific ACCEPT header as JS or JSON by defaut.
       accepts:
@@ -34,5 +35,5 @@ class Para.Importer extends RemoteModalForm
     @progress?.stop()
 
 $(document).on 'page:change turbolinks:load', ->
-  $('body').on 'ajax:success', '[data-importer-button]', (e, response) ->
-      new Para.Importer(modalMarkup: response, $link: $(e.currentTarget))
+  $('body').on 'ajax:success', '[data-job-tracker-button]', (e, response) ->
+      new Para.JobTracker(modalMarkup: response, $link: $(e.currentTarget))

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

@@ -48,20 +48,6 @@ module Para
         end
       end
 
-      def export
-        if @component.exportable?
-          exporter = Para::Exporter.for(
-            resource_model.name, params[:format]
-          ).new(@component.resources.search(params[:q]).result.uniq)
-
-          send_data exporter.render, type: exporter.mime_type,
-                                     disposition: exporter.disposition,
-                                     filename: exporter.file_name
-        else
-          redirect_to @component.path
-        end
-      end
-
       private
 
       def resource_model

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

@@ -0,0 +1,33 @@
+module Para
+  module Admin
+    class ExportsController < Para::Admin::JobsController
+      layout false
+
+      before_action :load_exporter
+
+      def create
+        job = @exporter.perform_later(
+          model_name: @component.model.name,
+          search: params[:q]
+        )
+
+        track_job(job)
+      end
+
+      private
+
+      def load_exporter
+        exporter_name = params[:exporter]
+
+        @exporter = @component.exporters.find do |exporter|
+          exporter.name == exporter_name
+        end
+
+        unless @exporter
+          raise "Requested exporter (#{ exporter_name }) not found for " +
+                ":#{ @component.identifier } component."
+        end
+      end
+    end
+  end
+end

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

@@ -1,28 +1,10 @@
 module Para
   module Admin
-    class ImportsController < Para::Admin::ComponentController
-      include Para::Admin::ResourceControllerConcerns
-
+    class ImportsController < Para::Admin::JobsController
       layout false
 
       before_action :load_importer
 
-      def show
-        @status = ActiveJob::Status.get(params[:id])
-
-        respond_to do |format|
-          format.json do
-            if @status.failed?
-              render json: { status: @status.status }, status: 422
-            else
-              render json: { status: @status.status, progress: @status.progress * 100 }
-            end
-          end
-
-          format.html
-        end
-      end
-
       def new
         @file = Para::Library::File.new
         @model = resource_model
@@ -33,9 +15,8 @@ module Para
 
         if @file.save
           job = @importer.perform_later(@file)
-          @status = ActiveJob::Status.get(job)
 
-          render 'show'
+          track_job(job)
         else
           render 'new'
         end

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

@@ -0,0 +1,66 @@
+# This serves as the base controller class to create simple async ActiveJob
+# tracking modals, allowing easy job launching and tracking interfaces
+# implementation in Para and plugins.
+#
+# To use this controller, inherit from it in your app, call perform_async on an
+# ActiveJob class and pass the returned job to the `#track_job(job)` method.
+#
+# On the client side, it is advised to use the job-tracker javascript
+# plugin included into para, that will handle modal displaying and job
+# status tracking automatically with Ajax requests (ActionCable may come later).
+# Use a remote link or form, and add the [data-job-tracker-button] attribute,
+# which will immediately handle the ajax response and display the resulting
+# modal.
+#
+# This will render a modal and the javascript will automatically start tracking
+# the job progress and refresh the view with progression, success and error
+# informations
+#
+# Example :
+#
+#   class StatsGenerationController < Para::Admin::JobsController
+#     def run
+#       job = StatsGeneration.perform_async
+#       track_job(job)
+#     end
+#   end
+#
+module Para
+  module Admin
+    class JobsController < Para::Admin::ComponentController
+      include Para::Admin::ResourceControllerConcerns
+
+      def show
+        @status = ActiveJob::Status.get(params[:id])
+
+        respond_to do |format|
+          format.json do
+            if @status.failed?
+              render json: { status: @status.status }, status: 422
+            else
+              render json: { status: @status.status, progress: @status.progress * 100 }
+            end
+          end
+
+          format.html do
+            @job = @status[:job_type].constantize.new
+            # Assign job id to allow status to be retrieved, which in our case
+            # allows data persistence though the `#store` method
+            @job.job_id = params[:id]
+
+            render layout: false
+          end
+        end
+      end
+
+      protected
+
+      def track_job(job)
+        @job = job
+        @status = ActiveJob::Status.get(@job)
+
+        render 'show', layout: false
+      end
+    end
+  end
+end

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

@@ -4,15 +4,16 @@ module Para
       include Para::ApplicationHelper
 
       def find_partial_for(relation, partial, partial_dir: 'admin/resources')
-        relation_class = if relation.kind_of?(ActiveRecord::Base)
+        relation_class = if model?(relation.class)
           relation = relation.class
         elsif model?(relation)
           relation
         end
 
         relation_name = find_relation_name_for(
-          'admin', plural_file_path_for(relation), partial,
-          relation_class: relation_class
+          plural_file_path_for(relation), partial,
+          relation_class: relation_class,
+          overrides_root: 'admin'
         )
 
         if relation_name
@@ -22,8 +23,8 @@ module Para
         end
       end
 
-      def find_relation_name_for(namespace, relation, partial, options = {})
-        return relation if partial_exists?(relation, partial)
+      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|
@@ -31,7 +32,7 @@ module Para
           break if ancestor == ActiveRecord::Base
 
           ancestor_name = plural_file_path_for(ancestor.name)
-          partial_exists?(ancestor_name, partial)
+          partial_exists?(ancestor_name, partial, options)
         end
 
         plural_file_path_for(relation) if relation
@@ -88,10 +89,10 @@ module Para
         object.respond_to?(:model_name)
       end
 
-      def partial_exists?(relation, partial)
+      def partial_exists?(relation, partial, overrides_root: 'admin', **options)
         partial_path = partial.to_s.split('/')
         partial_path[-1] = "_#{ partial_path.last }"
-        lookup_context.find_all("admin/#{relation}/#{ partial_path.join('/') }").any?
+        lookup_context.find_all("#{ overrides_root }/#{relation}/#{ partial_path.join('/') }").any?
       end
     end
   end

data/app/helpers/para/application_helper.rb

@@ -9,6 +9,6 @@ module Para
     include Para::TagHelper
     include Para::TreeHelper
     include Para::FlashHelper
-    include Para::ExportsHelper
+    include Para::TranslationsHelper
   end
 end

data/app/helpers/para/translations_helper.rb

@@ -0,0 +1,25 @@
+module Para
+  module TranslationsHelper
+    # This helper method allows to use ActiveModel or ActiveRecord model
+    # hierarchy to use translations with automatic defaults from parent models.
+    #
+    # This works by scanning all the model ancestors to find an existing
+    # translation, allowing defining parent class translations and optionnaly
+    # overriding translations in subclasses scope
+    #
+    def model_translate(key, model: nil, scope: nil, **options)
+      # Get model class if model argument was passed a model instance
+      model = model.class if model.class.respond_to?(:model_name)
+
+      # Create a key for every parent class that could contain a translation
+      defaults = model.lookup_ancestors.map do |klass|
+        :"#{ scope }.#{ klass.model_name.i18n_key }.#{ key }"
+      end
+
+      defaults << options.delete(:default) if options[:default]
+      options[:default] = defaults
+
+      I18n.translate(defaults.shift, options)
+    end
+  end
+end

data/app/views/admin/para/exporter/bases/_completed.html.haml

@@ -0,0 +1,11 @@
+= modal.body do
+  .alert.alert-success
+    = model_translate(:success, scope: "para.jobs", model: job)
+
+  = javascript_tag do
+    :plain
+      window.location.href = '#{ job.file.attachment.url }';
+
+= modal.footer do
+  %button.btn.btn-default{ data: { dismiss: 'modal' } }
+    = t('para.shared.close')

data/app/views/para/admin/{imports → jobs}/_completed.html.haml

@@ -1,7 +1,7 @@
 = modal.body do
-  - if status[:errors].any?
+  - if status[:errors].try(:any?)
     .alert.alert-warning
-      = t('para.flash.shared.import.success_with_errors')
+      = model_translate(:success_with_errors, scope: "para.jobs", model: job)
 
       %ul
         - status[:errors].each do |message|
@@ -9,7 +9,7 @@
 
   - else
     .alert.alert-success
-      = t('para.flash.shared.import.success')
+      = model_translate(:success, scope: "para.jobs", model: job)
 
 = modal.footer do
   %button.btn.btn-default{ data: { dismiss: 'modal' } }

data/app/views/para/admin/{imports → jobs}/_failed.html.haml

@@ -1,6 +1,6 @@
 = modal.body do
   .alert.alert-danger
-    = t('para.flash.shared.import.error')
+    = model_translate(:error, scope: "para.jobs", model: job)
 
 = modal.footer do
   %button.btn.btn-default{ data: { dismiss: 'modal' } }

data/app/views/para/admin/jobs/_progress.html.haml

@@ -0,0 +1,5 @@
+= modal.body do
+  %p= model_translate(:progressing, scope: "para.jobs", model: job)
+
+  .progress{ data: { :'async-progress' => 'import' } }
+    .progress-bar.progress-bar-striped.active{ role: "progressbar", style: "width: #{ status.progress.nan? ? 100 : (status.progress * 100) }%" }

data/app/views/para/admin/jobs/show.html.haml

@@ -0,0 +1,10 @@
+= modal id: "job-#{ @job.model_name.route_key }", data: { :'job-status-url' => url_for(action: :show, id: @status.job_id) } do |modal|
+  = modal.header do
+    = @job.model_name.human
+
+  - if @status.failed?
+    = render partial: find_partial_for(@job, :failed, partial_dir: 'admin/jobs'), locals: { modal: modal, job: @job }
+  - elsif @status.completed?
+    = render partial: find_partial_for(@job, :completed, partial_dir: 'admin/jobs'), locals: { modal: modal, job: @job, status: @status }
+  - else
+    = render partial: find_partial_for(@job, :progress, partial_dir: 'admin/jobs'), locals: { modal: modal, job: @job, status: @status }

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

@@ -1,12 +1,19 @@
 - if component.exportable?
-  - component.exports.each do |export|
+  - if component.exporters.length == 1
+    - exporter = component.exporters.first
+
+    = link_to component.path(namespace: :exports, exporter: exporter.name, q: params[:q]), class: 'btn btn-default', method: :post, remote: true, data: { :'job-tracker-button' => true } do
+      = fa_icon 'download'
+      = exporter.model_name.human
+
+  - else
     .btn-group
-      %button.btn.btn-default.dropdown-toggle{"aria-expanded" => "false", "data-toggle" => "dropdown", :type => "button"}
-        %i.fa.fa-download
-        = export_name_for(model, export)
+      %button.btn.btn-default{ type: 'button', data: { toggle: 'dropdown' } }
+        = fa_icon 'download'
+        = t('para.export.name')
         %span.caret
-      %ul.dropdown-menu{:role => "menu"}
-        - export[:formats].each do |format|
+      %ul.dropdown-menu
+        - component.exporters.each do |exporter|
           %li
-            = link_to component.relation_path(model.model_name.route_key, action: :export, format: format) do
-              = t('para.export.as', extension: format)
+            = link_to component.path(namespace: :exports, exporter: exporter.name, q: params[:q]), method: :post, remote: true, data: { :'job-tracker-button' => true } do
+              = exporter.model_name.human

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

@@ -2,7 +2,7 @@
   - if component.importers.length == 1
     - importer = component.importers.first
 
-    = link_to component.path(namespace: :import, action: :new, importer: importer.model_name.singular_route_key), class: 'btn btn-default', remote: true, data: { :'importer-button' => true } do
+    = link_to component.path(namespace: :import, action: :new, importer: importer.model_name.singular_route_key), class: 'btn btn-default', remote: true, data: { :'job-tracker-button' => true } do
       = fa_icon 'upload'
       = importer.model_name.human
 
@@ -15,5 +15,5 @@
       %ul.dropdown-menu
         - component.importers.each do |importer|
           %li
-            = link_to component.path(:imports, action: :new, importer: importer.model_name.singular_route_key), remote: true, data: { :'importer-button' => true } do
+            = link_to component.path(namespace: :import, action: :new, importer: importer.model_name.singular_route_key), remote: true, data: { :'job-tracker-button' => true } do
               = importer.model_name.human

data/config/locales/fr.yml

@@ -14,13 +14,21 @@ fr:
         clone:
           success: "%{model} cloné(e)"
           error: "Impossible de cloner le(a) %{model}"
-        import:
-          success: "L'import du fichier a été effectué avec succès"
-          success_with_errors: |
-            L'import du fichier a été effectué, mais certaines lignes n'ont pas
-            été prises en compte à causes d'erreurs :
-          other_errors: "<br>Et <b>%{count}</b> autres erreurs ..."
-          error: "Le fichier choisi contient des erreurs et n'a pu être importé"
+
+    jobs:
+      para/importer/base:
+        progressing: "Le fichier est en cours d'import, merci de patienter quelques instants ..."
+        success: "L'import du fichier a été effectué avec succès"
+        success_with_errors: |
+          L'import du fichier a été effectué, mais certaines lignes n'ont pas
+          été prises en compte à causes d'erreurs :
+        other_errors: "<br>Et <b>%{count}</b> autres erreurs ..."
+        error: "Le fichier choisi contient des erreurs et n'a pu être importé"
+
+      para/exporter/base:
+        progressing: "Le fichier est en cours d'export, merci de patienter quelques instants ..."
+        success: "Le fichier d'export a été généré, son téléchargement va démarrer ..."
+        error: "Erreur lors de la génération du fichier d'export ..."
 
     admin:
       title: "Administration"
@@ -57,7 +65,7 @@ fr:
       empty: "Aucune entrée créée pour le moment. Créez une nouvelle entrée avec le bouton suivant :"
 
     export:
-      name: "Export %{name}"
+      name: "Exporter"
       as: "Exporter (.%{extension})"
 
     import:
@@ -69,7 +77,6 @@ fr:
         cliquez sur le bouton "Importer".
       placeholder: Fichier au format ( .csv .xlsx )
       row_error_prefix: "Ligne %{number} :"
-      importing_file: "Le fichier est en cours d'import, merci de patienter quelques instants ..."
 
     shared:
       save: "Enregistrer"
@@ -116,7 +123,9 @@ fr:
       settings_rails/form:
         one: "Configuration"
         other: "Configuration"
-
+      para/exporter/base:
+        one: "Export des données"
+        other: "Exports des données"
   date:
     formats:
       admin: '%d/%m/%Y'

data/lib/para/component/exportable.rb

@@ -4,21 +4,19 @@ module Para
       extend ActiveSupport::Concern
 
       included do
-        configurable_on :export
-      end
+        configurable_on :exporters
 
-      def exportable?
-        @exportable ||= exports.length > 0
+        define_method(:exporters) do
+          @exporters ||= if (exporters = configuration['exporters'].presence)
+            eval(exporters).map(&:constantize)
+          else
+            []
+          end
+        end
       end
 
-      # TODO : Move :configuration column store to JSON instead of HStore
-      # which handles more data types and will help us avoid eval here
-      def exports
-        @exports ||= if export.present?
-          eval(export).map(&:with_indifferent_access)
-        else
-          []
-        end
+      def exportable?
+        @exportable ||= exporters.length > 0
       end
     end
   end

data/lib/para/exporter/base.rb

@@ -1,39 +1,41 @@
 module Para
   module Exporter
-    class Base
-      attr_reader :resources
-      class_attribute :model_name
+    class Base < Para::Job::Base
+      attr_reader :name, :model, :options
 
-      def initialize(resources)
-        @resources = resources
-      end
-
-      def model
-        @model ||= if (model_name = self.class.model_name)
-          model_name.constantize
-        else
-          raise 'You must define model to export in your exporter as following: `exports \'YourModelName\'`'
-        end
-      end
+      def perform(model_name: nil, **options)
+        @model = model_name && model_name.constantize
+        @options = options
+        @name = model.try(:model_name).try(:route_key).try(:parameterize)
 
-      def self.exports model_name
-        self.model_name = model_name
+        # Render file and store it in a Library::File object, allowing us
+        # to retrieve that file easily from the job and subsequent requests
+        #
+        file = Para::Library::File.create!(attachment: render)
+        store(:file_gid, file.to_global_id)
       end
 
-      def disposition
-        'inline'
-      end
-
-      def extension
-        raise '#extension must be defined to create the export file name'
+      def file
+        @file ||= GlobalID::Locator.locate(store(:file_gid))
       end
 
       def file_name
-        @file_name ||= [name, extension].join('.')
+        @file_name ||= [name, extension].join
       end
 
-      def self.register_base_exporter(type, exporter)
-        Exporter.base_exporters[type] = exporter
+      private
+
+      # Allow passing a `:resources` option or a ransack search hash to filter
+      # exported resources
+      #
+      def resources
+        @resources ||= if options[:resources]
+          options[:resources]
+        elsif options[:search]
+          model.search(options[:search]).result
+        else
+          model.all
+        end
       end
     end
   end

data/lib/para/exporter/csv.rb

@@ -3,32 +3,27 @@ require 'csv'
 module Para
   module Exporter
     class Csv < Base
-      register_base_exporter :csv, self
-
-      def extension
-        'csv'
-      end
-
-      def mime_type
-        'text/csv'
-      end
-
-      def export_type
-        :excel
-      end
-
       def render
-        CSV.generate do |csv|
+        data = CSV.generate do |csv|
           csv << headers
 
           resources.each do |resource|
             csv << row_for(resource)
           end
         end
+
+        Tempfile.new([name, extension]).tap do |file|
+          file.write(data)
+          file.rewind
+        end
       end
 
       private
 
+      def extension
+        '.csv'
+      end
+
       def headers
         fields.map do |field|
           encode(model.human_attribute_name(field))

data/lib/para/exporter.rb

@@ -1,55 +1,5 @@
 module Para
   module Exporter
-    class MissingExporterError < StandardError
-      attr_accessor :model_name, :format, :exporter_name
-
-      def initialize(model_name, format, exporter_name)
-        @model_name = model_name
-        @format = format
-        @exporter_name = exporter_name
-      end
-
-      def message
-        "No exporter found for model \"#{ model_name }\" and format " +
-        "\"#{ format }\". Please create the #{ exporter_name } class " +
-        "manually or with the following command : " +
-        "`rails g para:exporter #{ model_name.underscore } #{ format }"
-      end
-    end
-
-    def self.for(model_name, format)
-      exporter_name = name_for(model_name, format)
-
-      begin
-        const_get(exporter_name)
-      rescue NameError => e
-        if e.message == "uninitialized constant Para::Exporter::#{ exporter_name }"
-          raise MissingExporterError.new(model_name, format, exporter_name)
-        else
-          raise e
-        end
-      end
-    end
-
-    def self.name_for(model_name, format)
-      [
-        '',
-        format_exporter_name(format),
-        model_exporter_name(model_name)
-      ].join('::')
-    end
-
-    def self.model_exporter_name(model_name)
-      [model_name.to_s.pluralize, 'Exporter'].join
-    end
-
-    def self.format_exporter_name(format)
-      format.to_s.camelize
-    end
-
-    def self.base_exporters
-      @base_exporters ||= {}.with_indifferent_access
-    end
   end
 end
 

data/lib/para/importer/base.rb

@@ -1,12 +1,6 @@
 module Para
   module Importer
-    class Base < ActiveJob::Base
-      include ActiveJob::Status
-      # Used to store import errors on the object
-      include ActiveModel::Validations
-      # Used to translate importer name with rails default `activemodel` i18n keys
-      extend  ActiveModel::Naming
-
+    class Base < Para::Job::Base
       rescue_from Exception, with: :rescue_exception
 
       class_attribute :allows_import_errors
@@ -16,12 +10,11 @@ module Para
       def perform(file, options = {})
         @file = file
         @sheet = Roo::Spreadsheet.open(file.attachment_path, options)
-        progress.total = sheet.last_row - 1
 
         ActiveRecord::Base.transaction do
           (2..(sheet.last_row)).each do |index|
             begin
-              progress.increment
+              progress!
               import_from_row(sheet.row(index))
             rescue ActiveRecord::RecordInvalid => error
               if allows_import_errors?
@@ -33,11 +26,15 @@ module Para
           end
         end
 
-        status.update(errors: errors.full_messages)
+        save_errors!
       end
 
       private
 
+      def progress_total
+        sheet.last_row - 1
+      end
+
       def import_from_row(row)
         raise '#import_from_row(row) must be defined'
       end

data/lib/para/job/base.rb

@@ -0,0 +1,53 @@
+module Para
+  module Job
+    class Base < ActiveJob::Base
+      include ActiveJob::Status
+      # Used to store import errors on the object
+      include ActiveModel::Validations
+      # Used to translate importer name with rails default `activemodel` i18n keys
+      extend  ActiveModel::Translation
+
+      before_perform :store_job_type
+
+      protected
+
+      def store_job_type
+        status.update(job_type: self.class.name)
+      end
+
+      def progress!
+        ensure_total_progress
+        progress.increment
+      end
+
+      def save_errors!
+        status.update(errors: errors.full_messages)
+      end
+
+      # Default total progress to nil, making the UI show an animated porgress
+      # bar, indicating work is in progress, but not the exact progress
+      def total_progress
+        nil
+      end
+
+      def ensure_total_progress
+        return if @total_progress
+
+        @total_progress ||= if respond_to?(:progress_total)
+          progress.total = progress_total
+        else
+          progress[:total]
+        end
+      end
+
+      def store(key, value = nil)
+        if value
+          status.update(key => value)
+        else
+          status[key]
+        end
+      end
+    end
+  end
+end
+

data/lib/para/job.rb

@@ -0,0 +1,8 @@
+module Para
+  module Job
+    extend ActiveSupport::Autoload
+
+    autoload :Base
+  end
+end
+

data/lib/para/version.rb

@@ -1,3 +1,3 @@
 module Para
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

data/lib/para.rb

@@ -39,6 +39,7 @@ require 'para/form_builder'
 require 'para/markup'
 require 'para/engine'
 require 'para/components_configuration'
+require 'para/job'
 require 'para/exporter'
 require 'para/importer'
 require 'para/sti'

data/lib/rails/routing_mapper.rb

@@ -47,6 +47,7 @@ module ActionDispatch
         #
         controller = options.fetch(:controller, '/para/admin/crud_resources')
         imports_controller = options.fetch(:imports_controller, '/para/admin/imports')
+        exports_controller = options.fetch(:exports_controller, '/para/admin/exports')
 
         namespace :admin do
           constraints Para::Routing::ComponentControllerConstraint.new(controller) do
@@ -56,7 +57,6 @@ module ActionDispatch
                   collection do
                     patch :order
                     patch :tree
-                    get :export
                   end
 
                   member do
@@ -70,6 +70,10 @@ module ActionDispatch
                 scope ':importer' do
                   resources :imports, controller: imports_controller
                 end
+
+                scope ':exporter' do
+                  resources :exports, controller: exports_controller
+                end
               end
             end
           end

data/lib/tasks/para_tasks.rake

@@ -9,9 +9,9 @@ namespace :para do
       end
 
       Para::Component::Base.where(type: 'Para::Component::SingletonResource').pluck(:identifier, :id).each do |identifier, id|
-        Para::ComponentResource.where(component_id: id).update_all(
-          component_id: Para::Component::Form.find_by_identifier(identifier: identifier).id
-        )
+        if (form_component_id = Para::Component::Form.find_by_identifier(identifier).try(:id))
+          Para::ComponentResource.where(component_id: id).update_all(component_id: form_component_id)
+        end
 
         Para::Component::Base.where(id: id).destroy_all
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -388,7 +388,7 @@ files:
 - app/assets/javascripts/para/admin.coffee
 - app/assets/javascripts/para/admin/async-progress.coffee
 - app/assets/javascripts/para/admin/filters-form.coffee
-- app/assets/javascripts/para/admin/importers.coffee
+- app/assets/javascripts/para/admin/job-tracker.coffee
 - app/assets/javascripts/para/admin/table.coffee
 - app/assets/javascripts/para/admin/tabs.coffee
 - app/assets/javascripts/para/admin/theme_actions.coffee
@@ -438,8 +438,10 @@ files:
 - app/controllers/para/admin/base_controller.rb
 - app/controllers/para/admin/component_controller.rb
 - app/controllers/para/admin/crud_resources_controller.rb
+- app/controllers/para/admin/exports_controller.rb
 - app/controllers/para/admin/form_resources_controller.rb
 - app/controllers/para/admin/imports_controller.rb
+- app/controllers/para/admin/jobs_controller.rb
 - app/controllers/para/admin/main_controller.rb
 - app/controllers/para/admin/resources_controller.rb
 - app/controllers/para/admin/settings_component_controller.rb
@@ -456,7 +458,6 @@ files:
 - app/helpers/para/admin/page_helper.rb
 - app/helpers/para/admin/resources_helper.rb
 - app/helpers/para/application_helper.rb
-- app/helpers/para/exports_helper.rb
 - app/helpers/para/flash_helper.rb
 - app/helpers/para/form_helper.rb
 - app/helpers/para/markup_helper.rb
@@ -465,6 +466,7 @@ files:
 - app/helpers/para/ordering_helper.rb
 - app/helpers/para/search_helper.rb
 - app/helpers/para/tag_helper.rb
+- app/helpers/para/translations_helper.rb
 - app/helpers/para/tree_helper.rb
 - app/models/para/ability.rb
 - app/models/para/component/base.rb
@@ -477,16 +479,17 @@ files:
 - app/models/para/library.rb
 - app/models/para/library/file.rb
 - app/models/para/page/section.rb
+- app/views/admin/para/exporter/bases/_completed.html.haml
 - app/views/layouts/para/admin.html.haml
 - app/views/layouts/para/application.html.erb
 - app/views/para/admin/crud_resources/index.html.haml
 - app/views/para/admin/dashboard.html.haml
 - app/views/para/admin/form_resources/show.html.haml
-- app/views/para/admin/imports/_completed.html.haml
-- app/views/para/admin/imports/_failed.html.haml
-- app/views/para/admin/imports/_progress.html.haml
 - app/views/para/admin/imports/new.html.haml
-- app/views/para/admin/imports/show.html.haml
+- app/views/para/admin/jobs/_completed.html.haml
+- app/views/para/admin/jobs/_failed.html.haml
+- app/views/para/admin/jobs/_progress.html.haml
+- app/views/para/admin/jobs/show.html.haml
 - app/views/para/admin/main/index.html.haml
 - app/views/para/admin/resources/_actions.html.haml
 - app/views/para/admin/resources/_add_button.html.haml
@@ -612,6 +615,8 @@ files:
 - lib/para/inputs.rb
 - lib/para/inputs/nested_many_input.rb
 - lib/para/inputs/nested_one_input.rb
+- lib/para/job.rb
+- lib/para/job/base.rb
 - lib/para/logging.rb
 - lib/para/logging/active_job_log_subscriber.rb
 - lib/para/markup.rb
@@ -668,7 +673,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Rails admin engine

data/app/helpers/para/exports_helper.rb

@@ -1,11 +0,0 @@
-module Para
-  module ExportsHelper
-    def export_name_for(model, export)
-      model_name = (
-        export[:model] && export[:model].constantize.model_name.human
-      ) || model.model_name.human
-
-      t('para.export.name', name: model_name)
-    end
-  end
-end

data/app/views/para/admin/imports/_progress.html.haml

@@ -1,5 +0,0 @@
-= modal.body do
-  %p= t('para.import.importing_file')
-
-  .progress{ data: { :'async-progress' => 'import' } }
-    .progress-bar.progress-bar-striped.active{ role: "progressbar", style: "width: #{ status.progress * 100 }%" }

data/app/views/para/admin/imports/show.html.haml

@@ -1,10 +0,0 @@
-= modal id: "component-import-#{ @importer.model_name.route_key }", data: { :'import-status-url' => @component.path(namespace: :import, importer: @importer.name, id: @status.job_id) } do |modal|
-  = modal.header do
-    = @importer.model_name.human
-
-  - if @status.failed?
-    = render partial: 'failed', locals: { modal: modal }
-  - elsif @status.completed?
-    = render partial: 'completed', locals: { modal: modal, status: @status }
-  - else
-    = render partial: 'progress', locals: { modal: modal, status: @status }