para 0.5.4 → 0.6.2

data/app/decorators/para/component/{singleton_resource_decorator.rb → form_decorator.rb}

@@ -1,23 +1,23 @@
 module Para
   module Component
-    module SingletonResourceDecorator
+    module FormDecorator
       include Para::Component::BaseDecorator
 
-      def path(options = {})
-        find_path([:admin, self, :resource], options)
+      def path(namespace: :resource, **options)
+        find_path([:admin, self, namespace], options)
       end
 
       def relation_path(controller_or_resource, *nested_resources, **options)
         nested = nested_resources.any?
-        nested_resources << :resource unless nested
 
         if Hash === controller_or_resource
           options = controller_or_resource
         end
 
         options[:action] = action_option_for(options, nested: nested)
-        data = [:admin, self, *nested_resources]
-        polymorphic_path(data, options)
+        data = [:admin, self, :resource, *nested_resources]
+
+        find_path(data, options)
       end
 
       def action_option_for(options, nested: false)

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

@@ -1,7 +1,18 @@
 module Para
   module Admin::ComponentsHelper
+    # Return the sections / components structure, with components properly
+    # decorated
+    #
+    def admin_component_sections
+      @admin_component_sections ||= begin
+        Para::ComponentSection.ordered.includes(:components).tap do |sections|
+          sections.flat_map(&:components).each(&method(:decorate))
+        end
+      end
+    end
+
     def ordered_components
-      @component_sections.each_with_object([]) do |section, components|
+      admin_component_sections.each_with_object([]) do |section, components|
         section.components.each do |component|
           components << component if can?(:read, component)
         end

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

@@ -0,0 +1,13 @@
+module Para
+  module Admin
+    module DecoratorsHelper
+      def decorated(object)
+        object.tap(&method(:decorate))
+      end
+
+      def decorate(object)
+        ActiveDecorator::Decorator.instance.decorate(object)
+      end
+    end
+  end
+end

data/app/helpers/para/markup_helper.rb

@@ -11,5 +11,9 @@ module Para
     def panel(options = {}, &block)
       Para::Markup::Panel.new(self).container(options, &block)
     end
+
+    def modal(options = {}, &block)
+      Para::Markup::Modal.new(self).container(options, &block)
+    end
   end
 end

data/app/helpers/para/search_helper.rb

@@ -9,10 +9,7 @@ module Para
     end
 
     def searchable_attributes(attributes)
-      whitelist = attributes.select do |attribute|
-        [:string, :text].include?(attribute.type.to_sym) &&
-          !attribute.name.match(/password/)
-      end
+      whitelist = attributes.select(&:searchable?)
 
       whitelist.map do |attribute|
         attribute.attribute_column_path.join('_')

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

@@ -3,13 +3,19 @@ module Para
     class Base < ActiveRecord::Base
       self.table_name = 'para_components'
 
-      class_attribute :component_name, :configurable_attributes
+      class_attribute :component_name
 
       def self.register(name, component)
         self.component_name = name
         Para::Component.registered_components[name] = component
       end
 
+      def self.configurable_on(key, options = {})
+        store_accessor(:configuration, key)
+      end
+
+      configurable_on :controller
+
       belongs_to :component_section, class_name: 'Para::ComponentSection'
 
       validates :identifier, :type, presence: true
@@ -37,19 +43,6 @@ module Para
         @model_name ||= ModelName.new(self)
       end
 
-      def self.configurable_on(key, options = {})
-        store_accessor(:configuration, key)
-        configurable_attributes[key] = options
-      end
-
-      def self.configurable?
-        configurable_attributes.length > 0
-      end
-
-      def self.configurable_attributes
-        @configurable_attributes ||= {}
-      end
-
       def default_form_actions
         [:submit, :submit_and_edit, :submit_and_add_another, :cancel]
       end
@@ -58,6 +51,16 @@ module Para
         slug
       end
 
+      # This method is used by the components configuration system to assign
+      # updated attributes from the config file to the component.
+      #
+      # This is meant to be overriden by components that have to define specific
+      # behavior, like for the Crud component
+      #
+      def update_with(attributes)
+        assign_attributes(attributes)
+      end
+
       private
 
       def ensure_slug

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

@@ -13,6 +13,8 @@ module Para
       has_many :component_resources, class_name: 'Para::ComponentResource',
                foreign_key: :component_id, autosave: true, dependent: :destroy
 
+      before_validation :ensure_model_type
+
       def namespaced?
         case namespaced
         when 'true' then true
@@ -32,6 +34,17 @@ module Para
         component_resources.where(resource: resource).first.destroy
       end
 
+      def update_with(attributes)
+        # If no model_type is provided in the configuration file, default to
+        # the singular and camelized version of the identifier, allowing to
+        # create crud components without setting the :model_type option, when
+        # given a conventional name
+        attributes[:model_type] ||= identifier.to_s.camelize.singularize if identifier
+        attributes[:controller] ||= '/para/admin/crud_resources'
+
+        super
+      end
+
       private
 
       def namespaced_resources
@@ -42,6 +55,10 @@ module Para
           para_component_resources: { component_id: id }
         )
       end
+
+      def ensure_model_type
+        self.model_type ||= identifier
+      end
     end
   end
 end

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

@@ -0,0 +1,36 @@
+module Para
+  module Component
+    class Form < Para::Component::Resource
+      register :form, self
+
+      configurable_on :model_type
+
+      has_one :component_resource, class_name: 'Para::ComponentResource',
+              foreign_key: :component_id, autosave: true, dependent: :destroy
+
+      def resource
+        build_component_resource(resource: model.new) unless component_resource
+        component_resource.resource ||= model.new
+      end
+
+      def resource=(value)
+        build_component_resource(resource: value) unless component_resource
+      end
+
+      def default_form_actions
+        [:submit]
+      end
+
+      def update_with(attributes)
+        # If no model_type is provided in the configuration file, default to
+        # the camelized version of the identifier, allowing to create
+        # form components without setting the :model_type option,
+        # when given a conventional name
+        attributes[:model_type] ||= identifier.to_s.camelize.singularize if identifier
+        attributes[:controller] ||= '/para/admin/form_resources'
+
+        super
+      end
+    end
+  end
+end

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

@@ -1,33 +1,22 @@
 module Para
   module Component
     class Resource < Para::Component::Base
+      class ModelNotFound < NameError; end
+
       def model
         @model ||= model_type.presence && model_type.constantize
-      end
-
-      def available_models
-        Rails.application.eager_load!
-
-        ActiveRecord::Base.descendants.map(&:name).sort.reject do |name|
-          next true if name == 'ActiveRecord::SchemaMigration'
-          next true if name.match(/^HABTM_/)
-          next true if name.match(/Component$/)
-          next true if name.match(/^Para::Component/)
-          next true if excluded_models.include?(name)
-
-          false
-        end
+      rescue NameError
+        raise ModelNotFound,
+          "The model #{ model_type } was not found. You may need to set " +
+          "the :model_type option in your component definition in the " +
+          "config/components.rb file. If no component should actually " +
+          "reference this model, you may need to run the " +
+          "`rake para:components:clean` task to clean up your components index."
       end
 
       def model_table_name
         model && model.table_name
       end
-
-      private
-
-      def excluded_models
-        %w(FriendlyId::Slug)
-      end
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Para
     class Settings < Para::Component::Base
       register :settings, self
 
-      configurable_on :settings, as: :selectize
+      configurable_on :settings
 
       def settings
         eval(configuration['settings'])

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

@@ -0,0 +1,23 @@
+module Para
+  module Library
+    class File < ActiveRecord::Base
+      has_attached_file :attachment
+
+      validates :attachment, presence: true
+      do_not_validate_attachment_file_type :attachment
+
+      # Return attachment.path or attachment.url depending on the storage
+      # backend, allowing 'openuri' and 'roo' libraries to load easily the
+      # file at the right path, on filesystem or othe storage systems, like S3.
+      #
+      def attachment_path
+        return unless attachment?
+
+        case attachment.options[:storage]
+        when :filesystem then attachment.path
+        else attachment.url
+        end
+      end
+    end
+  end
+end

data/app/models/para/library.rb

@@ -0,0 +1,5 @@
+module Para::Library
+  def self.table_name_prefix
+    'para_library_'
+  end
+end

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

@@ -0,0 +1,4 @@
+= page_top_bar(title: @component.name, type: 'form/show')
+
+.page-content-wrap
+  = render find_partial_for(resource, :form)

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

@@ -0,0 +1,16 @@
+= modal.body do
+  - if status[:errors].any?
+    .alert.alert-warning
+      = t('para.flash.shared.import.success_with_errors')
+
+      %ul
+        - status[:errors].each do |message|
+          %li= message.html_safe
+
+  - else
+    .alert.alert-success
+      = t('para.flash.shared.import.success')
+
+= modal.footer do
+  %button.btn.btn-default{ data: { dismiss: 'modal' } }
+    = t('para.shared.close')

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

@@ -0,0 +1,7 @@
+= modal.body do
+  .alert.alert-danger
+    = t('para.flash.shared.import.error')
+
+= modal.footer do
+  %button.btn.btn-default{ data: { dismiss: 'modal' } }
+    = t('para.shared.close')

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

@@ -0,0 +1,5 @@
+= 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/new.html.haml

@@ -0,0 +1,14 @@
+= modal id: "component-import-#{ @importer.model_name.route_key }" do |modal|
+  = modal.header do
+    = @importer.model_name.human
+
+  = simple_form_for @file, as: :file, url: @component.path(namespace: :imports, importer: @importer.name), remote: true do |form|
+    = modal.body do
+      %p= t('para.import.help_text')
+
+      = form.input :attachment, label: false, placeholder: t('para.import.placeholder')
+
+      = modal.footer do
+        %button.btn.btn-primary{ type: 'submit' }
+          = fa_icon 'upload'
+          = t('para.import.name')

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

@@ -0,0 +1,10 @@
+= 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 }

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

@@ -1,5 +1,2 @@
 - form.nested_fields.each do |field|
-  - if field.field_type
-    = form.send(field.field_method, field.field_name, as: field.field_type)
-  - else
-    = form.send(field.field_method, field.field_name)
+  = form.send(field.field_method, field.field_name, field.field_options)

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

@@ -1,22 +1,19 @@
 - if component.importable?
-  - component.imports.each do |importer|
-    = form_tag component.relation_path(model.model_name.route_key, action: :import, importer: importer), method: 'post', multipart: 'true' do
-      .fileinput.fileinput-new.input-group{ data: { provides: 'fileinput' } }
-        .form-control.uneditable-input{ data: { trigger: 'fileinput' } }
-          %span.fileinput-placeholder
-            = t('para.import.placeholder')
-          = fa_icon 'file', class: 'fileinput-exists'
-          %span.fileinput-filename
-        .input-group-btn  
-          .btn.btn-default.btn-file
-            %span.fileinput-new
-              = t('para.import.select')
-            %span.fileinput-exists  
-              = t('para.import.change')
-            = file_field_tag 'file', class: 'file file-upload'
-          .btn.btn-danger.fileinput-exists{ type: 'button', data: { dismiss: 'fileinput' } }
-            = fa_icon 'times'
+  - if component.importers.length == 1
+    - importer = component.importers.first
 
-          %button.btn.btn-default{ type: 'submit' }
-            = fa_icon 'upload'
-            = t('para.import.name')
+    = 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
+      = fa_icon 'upload'
+      = importer.model_name.human
+
+  - else
+    .btn-group
+      %button.btn.btn-default{ type: 'button', data: { toggle: 'dropdown' } }
+        = fa_icon 'upload'
+        = t('para.import.name')
+        %span.caret
+      %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
+              = importer.model_name.human

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

@@ -1,7 +1,7 @@
 .page-content-wrap
   = panel do |panel|
     = panel.header do
-      = icon_link_to t('para.shared.add'), component.relation_path(model.model_name.singular_route_key, action: :new), icon: 'plus', class: 'btn btn-primary'
+      = render partial: find_partial_for(relation, :actions), locals: { relation: relation, component: component, model: model, allow_adding_resource: allow_adding_resource }
 
     - if resources.length > 0
       = panel.body do

data/app/views/para/admin/shared/_breadcrumbs.html.haml

@@ -2,7 +2,4 @@
   - breadcrumbs.each do |breadcrumb|
     - active = breadcrumb.active?(request)
     %li{ class: ('active' if active) }
-      - if active
-        = breadcrumb.title
-      - else
-        = link_to breadcrumb.title, breadcrumb.path
+      = link_to breadcrumb.title, breadcrumb.path

data/app/views/para/admin/shared/_navigation.html.haml

@@ -3,8 +3,8 @@
     = link_to admin_path do
       = t('para.admin.title')
 
-  - if @component_sections.any?
-    - @component_sections.each do |component_section|
+  - if admin_component_sections.any?
+    - admin_component_sections.each do |component_section|
       - next unless component_section.components.any? { |component| can?(:manage, component) }
 
       %li.component-section-item

data/app/views/para/form/_tabs.html.haml

@@ -1,4 +1,4 @@
-.form-tabs{ data: { 'form-tabs': true } }
+.form-tabs{ data: { :'form-tabs' => true } }
   %nav.navbar.navbar-inverse
     %ul.nav.navbar-nav{ role: 'tablist' }
       - tabs.each_with_index do |tab, index|

data/config/locales/en.yml

@@ -14,6 +14,9 @@ en:
 
     admin:
       title: "Admin"
+      toggle_navigation: "Open navigation"
+      back_to_app: "Back to app"
+      sign_out: "Sign out"
 
     confirmation:
       shared:
@@ -28,6 +31,9 @@ en:
       singleton_resource:
         name: "Resource form"
 
+    dashboard:
+      title: "Dashboard"
+
     component_section:
       add: "Add a component section"
       edit: 'Edit section'
@@ -73,6 +79,10 @@ en:
         "true": "Yes"
         "false": "No"
 
+  admin:
+    breadcrumbs:
+      home: "Dashboard"
+
   activerecord:
     errors:
       relation_length_is_smaller: "must contain at least %{minimum} elements"

data/config/locales/fr.yml

@@ -15,8 +15,12 @@ fr:
           success: "%{model} cloné(e)"
           error: "Impossible de cloner le(a) %{model}"
         import:
-          success: "Import réussi"
-          error: "Merci de sélectionner un fichier à importer"
+          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é"
 
     admin:
       title: "Administration"
@@ -60,7 +64,12 @@ fr:
       name: Importer
       select: "Sélectionnez un fichier"
       change: "Changer"
+      help_text: |
+        Sélectionnez un fichier Excel (.xls, .xlsx) ou CSV (.csv) à importer et
+        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"
@@ -70,6 +79,7 @@ fr:
       save_and_edit: "Enregistrer et éditer"
       save_and_add_another_button: "Enregistrer et créer un(e) autre"
       destroy: "Supprimer"
+      close: "Fermer"
 
     types:
       boolean:

data/db/migrate/20160905134106_create_para_library_files.rb

@@ -0,0 +1,9 @@
+class CreateParaLibraryFiles < ActiveRecord::Migration
+  def change
+    create_table :para_library_files do |t|
+      t.attachment :attachment
+
+      t.timestamps null: false
+    end
+  end
+end

data/lib/generators/para/importer/templates/base_importer.rb

@@ -1,5 +1,12 @@
 class <%= model_importer_name %> < Para::Importer::Base
+  # Let the importer rescue ActiveRecord::RecordInvalid errors and display them
+  # as flash messages after importing valid records
+  #
+  # Remove or comment this line to disable this behavior
+  #
+  allow_import_errors!
+
   def import_from_row(row)
     # Add your import logic here
   end
-end
+end

data/lib/generators/para/install/install_generator.rb

@@ -24,7 +24,7 @@ module Para
       gemfile_contents = File.read(Rails.root.join('Gemfile'))
 
       [
-        ['devise', '~> 3.0'],
+        ['devise', '>= 3.0'],
         # Allows for installing default wrappers and bootstrap adapters
         # This should be avoided when add an initializer namespaced to the
         # para environment
@@ -32,7 +32,6 @@ module Para
         ['simple_form_extension'],
         # Pull requests are pending, and I don't want to release the gem
         # under another name to be able to depend on it
-        ['active_decorator', github: 'glyph-fr/active_decorator', branch: 'dev'],
         ['kaminari', '>= 0.16.1'],
         ['ransack', '>= 1.4.1'],
         ['bootstrap-kaminari-views', '>= 0.0.5']

data/lib/generators/para/install/templates/components.rb

@@ -3,11 +3,15 @@ Para.components.draw do
   # You can translate the section title at: components.section.menu
   #
   # section :menu do
-  #
-  #  # Create a component of type :crud in the the section :menu, with the
-  #  # identifier :pages, with the model 'Page' as the target type and
-  #  # namespacing it's managed to resources to the component
+  #  # Creating crud components can be done the following way
+  #  #
+  #  component :pages,   :crud
+  #  component :members, :crud, model_type: 'User'
+  #  component :news,    :crud, model_type: 'Page', namespaced: true
+
+  #  # Creating a component allowing you to edit a single resource is done
+  #  # with the `singleton_resource` component, the following way
   #  #
-  #  component :pages, :crud, model_type: 'Page', namespaced: true
+  #  component :home,    :singleton_resource, model_type: 'HomePage'
   # end
 end

data/lib/generators/para/tree_item/tree_item_generator.rb

@@ -0,0 +1,17 @@
+module Para
+  class TreeItemGenerator < Para::Generators::NamedBase
+    include Para::Admin::BaseHelper
+    include Para::Generators::FieldHelpers
+
+    source_root File.expand_path('../../../../../app/views/para/admin/resources', __FILE__)
+
+    desc 'Para resource tree item generator'
+
+    def generate_table
+      template(
+        '_tree_item.html.haml',
+        "app/views/admin/#{ plural_namespaced_path }/_tree_item.haml"
+      )
+    end
+  end
+end

data/lib/para/attribute_field/base.rb

@@ -4,7 +4,7 @@ module Para
       class_attribute :_field_options
       cattr_accessor :_field_types
 
-      attr_reader :model, :name, :type, :field_type, :field_method
+      attr_reader :model, :name, :type, :field_type, :field_method, :options
 
       def self.field_option(key, method_name, options = {})
         self._field_options ||= []
@@ -43,9 +43,10 @@ module Para
 
       def initialize(model, options = {})
         @model = model
-        @name = options[:name]
-        @type = options[:type]
-        @field_type = options[:field_type]
+        @name = options.delete(:name)
+        @type = options.delete(:type)
+        @field_type = options.delete(:field_type)
+        @options = options
 
         determine_name_and_field_method!
       end
@@ -70,6 +71,13 @@ module Para
         instance.send(name)
       end
 
+      #
+      def searchable?
+        options[:searchable] != false && (
+          [:string, :text].include?(type.to_sym) && !name.match(/password/)
+        )
+      end
+
       # Allows parsing input params before they're passed to the model, so
       # it can be easy to edit them according to some field type specific
       # behavior