para 0.6.9 → 0.7.0

data/lib/para/breadcrumbs/manager.rb

@@ -3,8 +3,16 @@ module Para
     class Manager
       include Enumerable
 
+      attr_reader :controller
+
+      delegate :length, to: :breadcrumbs
+
+      def initialize(controller)
+        @controller = controller
+      end
+
       def add(identifier, path = nil, *args)
-        breadcrumbs << Breadcrumb.new(identifier, path, *args)
+        breadcrumbs << Breadcrumb.new(identifier, path, controller, *args)
       end
 
       def breadcrumbs

data/lib/para/config.rb

@@ -18,6 +18,9 @@ module Para
     mattr_accessor :resource_name_methods
     @@resource_name_methods = [:admin_name, :admin_title, :name, :title]
 
+    mattr_accessor :enable_app_breadcrumbs
+    @@enable_app_breadcrumbs = true
+
     mattr_reader :plugins
     @@plugins = Para::Plugins::Set.new
 

data/lib/para/controller_resource.rb

@@ -0,0 +1,34 @@
+module Para
+  class ControllerResource < CanCan::ControllerResource
+    # Todo : Document why this extension was added ?
+    def assign_attributes(resource)
+      if @options[:singleton] && parent_resource && resource.respond_to?(:"#{ parent_name }=")
+        resource.send(:"#{ parent_name }=", parent_resource)
+      end
+
+      initial_attributes.each do |attr_name, value|
+        resource.send(:"#{ attr_name }=", value)
+      end
+
+      resource
+    end
+
+    # Remove automatic params assignation and let our controllers do it
+    # manually, letting our attribute fields to parse the params with a
+    # reference to the current resource.
+    #
+    # Before this override, some attribute fields raised during #parse_input
+    # because of the controller resource that was missing at the time it
+    # was called (during the resource instanciation ...)
+    #
+    def build_resource
+      resource = resource_base.new
+
+      unless @options[:bypass_params_assignation]
+        resource.assign_attributes(resource_params || {})
+      end
+
+      assign_attributes(resource)
+    end
+  end
+end

data/lib/para/engine.rb

@@ -32,25 +32,13 @@ module Para
       next unless Kernel.const_defined?('Paperclip')
 
       ActiveSupport.on_load(:active_record) do
-        ::Paperclip::HasAttachedFile.send(
-          :include, Para::Ext::Paperclip::HasAttachedFileMixin
-        )
-      end
-    end
-
-    initializer 'Extend cancan ControllerResource class' do
-      next unless Kernel.const_defined?('CanCan')
-
-      ActiveSupport.on_load(:active_record) do
-        ::CanCan::ControllerResource.send(
-          :include, Para::Ext::Cancan::ControllerResource
-        )
+        ::Paperclip::HasAttachedFile.prepend Para::Ext::Paperclip::HasAttachedFileMixin
       end
     end
 
     initializer 'Add resource name methods to simple form extension' do
       ::SimpleFormExtension.resource_name_methods = (
-        Para.config.resource_name_methods + 
+        Para.config.resource_name_methods +
           ::SimpleFormExtension.resource_name_methods
       ).uniq
     end
@@ -63,6 +51,13 @@ module Para
       end
     end
 
+    initializer 'Override ActiveRecord::NestedAttributes' do
+      ActiveSupport.on_load(:active_record) do
+        prepend Para::Ext::ActiveRecord::NestedAttributes
+        extend Para::Ext::ActiveRecord::NestedAttributesClassMethods
+      end
+    end
+
     initializer 'Build components tree' do |app|
       components_config_path = Rails.root.join('config', 'components.rb')
 
@@ -75,6 +70,10 @@ module Para
       Para::PostgresExtensionsChecker.check_all
     end
 
+    initializer 'Initialize simple form wrappers' do
+      Para::SimpleFormConfig.configure
+    end
+
     initializer 'Configure ActiveJob' do
       if ActiveSupport::Cache::NullStore === ActiveJob::Status.store ||
          ActiveSupport::Cache::MemoryStore === ActiveJob::Status.store
@@ -85,6 +84,26 @@ module Para
       Para::Logging::ActiveJobLogSubscriber.attach_to :active_job
     end
 
+    # Allow any view or helper to check wether it is rendered inside the
+    # para admin by defaulting to false, and being overriden in
+    # Para::ApplicationController with true
+    #
+    initializer 'Add #admin? method to ActionController::Base' do
+      ActiveSupport.on_load(:action_controller) do
+        define_method(:admin?) { false }
+      end
+    end
+
+    initializer 'Include breadcrumbs manager in app ApplicationController' do
+      ActiveSupport.on_load(:action_controller) do
+        if Para.config.enable_app_breadcrumbs
+          include Para::Breadcrumbs::Controller
+        else
+          Para::ApplicationController.send(:include, Para::Breadcrumbs::Controller)
+        end
+      end
+    end
+
     # Allow generating resources in the gem without having all the unnecessary
     # files generated
     #

data/lib/para/exporter/base.rb

@@ -54,7 +54,7 @@ module Para
         @resources ||= if options[:resources]
           options[:resources]
         elsif options[:search]
-          model.search(options[:search]).result
+          model.ransack(options[:search]).result
         else
           model.all
         end

data/lib/para/ext.rb

@@ -9,6 +9,6 @@ module Para
   end
 end
 
-require 'para/ext/cancan'
 require 'para/ext/paperclip'
 require 'para/ext/active_job_status'
+require 'para/ext/active_record_nested_attributes'

data/lib/para/ext/active_record_nested_attributes.rb

@@ -0,0 +1,51 @@
+# This extension is needed because of Para's params input parsing which creates
+# empty placeholder records for nested attributes before their params are
+# assigned.
+#
+# This patch hooks into Rails nested attributes logic to clean all placeholder
+# data during the params assignation process.
+#
+module Para
+  module Ext
+    module ActiveRecord
+      module NestedAttributes
+        # Handle rejected nested records that have a fake id, which means that
+        # the resource was nevertheless created by Para during input params
+        # parsing. Therefore, we clean those records when they're rejected.
+        #
+        def call_reject_if(association_name, attributes)
+          super.tap do |rejected|
+            if rejected && attributes['id'].to_s.match(/\A__/)
+              records = association(association_name).target
+
+              if ::ActiveRecord::Base === records
+                records.destroy
+              elsif (record = records.find { |res| res.id == attributes['id'] })
+                records.delete(record)
+              end
+            end
+          end
+        end
+      end
+
+      module NestedAttributesClassMethods
+        # Override default :reject_all proc to handle fake ids as empty keys,
+        # avoiding the model to be created with only its fake id.
+        PARA_REJECT_ALL_BLANK_PROC = proc { |attributes|
+          attributes.all? { |key, value|
+            (key == 'id' && value.to_s.match(/\A__/)) || key == '_destroy' || value.blank?
+          }
+        }
+
+        # Intercept the `reject_if: :all_blank` option to also consider fake
+        # ids as blank fields and avoid empty params assignation
+        #
+        def accepts_nested_attributes_for(*attr_names)
+          options = attr_names.extract_options!
+          options[:reject_if] = PARA_REJECT_ALL_BLANK_PROC if options[:reject_if] == :all_blank
+          super(*attr_names, options)
+        end
+      end
+    end
+  end
+end

data/lib/para/ext/paperclip.rb

@@ -4,12 +4,8 @@ module Para
       module HasAttachedFileMixin
         extend ActiveSupport::Concern
 
-        included do
-          alias_method_chain :define, :removeable_management
-        end
-
-        def define_with_removeable_management
-          define_without_removeable_management
+        def define
+          super
           define_removeable
         end
 

data/lib/para/form_builder.rb

@@ -1,5 +1,6 @@
 require 'simple_form/form_builder'
 
+require 'para/form_builder/attributes_mappings_tracker'
 require 'para/form_builder/containers'
 require 'para/form_builder/field_mappings'
 require 'para/form_builder/nested_form'
@@ -13,6 +14,8 @@ require 'para/form_builder/tabs'
 # explicitly
 #
 SimpleForm::FormBuilder.class_eval do
+  prepend Para::FormBuilder::AttributesMappingsTracker
+
   include Para::FormBuilder::Containers
   include Para::FormBuilder::FieldMappings
   include Para::FormBuilder::NestedForm

data/lib/para/form_builder/attributes_mappings_tracker.rb

@@ -0,0 +1,45 @@
+module Para
+  module FormBuilder
+    module AttributesMappingsTracker
+      def initialize(*) #:nodoc:
+        @attributes_mappings = {}
+
+        super
+      end
+
+      def input(attribute_name, options = {}, &block)
+        store_attribute_mapping_for(attribute_name, options, &block)
+
+        super(attribute_name, options, &block)
+      end
+
+      def input_field(attribute_name, options = {})
+        store_attribute_mapping_for(attribute_name, options)
+
+        super(attribute_name, options)
+      end
+
+      def fields_for(*args, options, &block)
+        super(*args, options) do |fields|
+          fields_html = @template.capture { block.call(fields) }
+
+          fields_html + fields.attributes_mappings_field_for(fields)
+        end
+      end
+
+      def attributes_mappings_field_for(fields)
+        hidden_field :_attributes_mappings, value: @attributes_mappings.to_json,
+                     data: { :'attributes-mappings' => fields.options[:child_index] }
+      end
+
+      private
+
+      def store_attribute_mapping_for(attribute_name, options, &block)
+        input = find_input(attribute_name, options, &block)
+        type = input.class.name.demodulize.underscore.gsub(/_input\z/, '')
+
+        @attributes_mappings[attribute_name] = type
+      end
+    end
+  end
+end

data/lib/para/form_builder/containers.rb

@@ -2,11 +2,9 @@ module Para
   module FormBuilder
     module Containers
       def fieldset(options = {}, &block)
-        template.content_tag(:div, class: 'block form-inputs') do
+        template.content_tag(:div, class: 'form-inputs') do
           buffer = if (title = options[:title])
-            template.content_tag(:div, class: 'form-group') do
-              template.content_tag(:legend, title)
-            end
+            template.content_tag(:legend, title)
           else
             ''.html_safe
           end
@@ -16,16 +14,14 @@ module Para
       end
 
       def actions(options = {}, &block)
-        template.content_tag(:div, class: 'block form-actions form-group') do
-          template.content_tag(:div, class: 'col-sm-9 col-sm-offset-3') do
-            if block
-              template.capture(&block)
-            else
-              if options.empty?
-                options[:only] = template.instance_variable_get(:@component).default_form_actions
-              end
-              actions_buttons_for(options).join("\n").html_safe
+        template.content_tag(:div, class: 'form-actions') do
+          if block
+            template.capture(&block)
+          else
+            if options.empty?
+              options[:only] = template.instance_variable_get(:@component).default_form_actions
             end
+            actions_buttons_for(options).join("\n").html_safe
           end
         end
       end
@@ -45,7 +41,7 @@ module Para
       end
 
       def para_submit_button(options = {})
-        button(:submit, ::I18n.t('para.shared.save'), name: '_save', class: 'btn-success')
+        button(:submit, ::I18n.t('para.shared.save'), name: '_save', class: 'btn-success btn-shadow')
       end
 
       def para_submit_and_edit_button
@@ -59,21 +55,21 @@ module Para
         button_tag = button(
           :submit,
           ::I18n.t('para.shared.save_and_edit'),
-          name: '_save_and_edit', class: 'btn-primary'
+          name: '_save_and_edit', class: 'btn-primary btn-shadow'
         )
 
         current_anchor_tag + button_tag
       end
 
       def para_submit_and_add_another_button
-        button(:submit, ::I18n.t('para.shared.save_and_add_another_button'), name: '_save_and_add_another', class: 'btn-primary')
+        button(:submit, ::I18n.t('para.shared.save_and_add_another_button'), name: '_save_and_add_another', class: 'btn-primary btn-shadow')
       end
 
       def para_cancel_button
         template.link_to(
           ::I18n.t('para.shared.cancel'),
           return_to_path,
-          class: 'btn btn-danger'
+          class: 'btn btn-danger btn-shadow'
         )
       end
 

data/lib/para/form_builder/nested_form.rb

@@ -34,11 +34,10 @@ module Para
       def remove_association_button
         return "" unless allow_destroy?
 
-        template.content_tag(:div, class: 'panel-btns pull-right') do
+        template.content_tag(:div, class: 'panel-btns') do
           template.link_to_remove_association(
-            self, wrapper_class: 'form-fields', class: 'btn btn-danger'
+            self, wrapper_class: 'form-fields', class: 'btn btn-danger btn-xs'
           ) do
-            template.content_tag(:i, '', class: 'fa fa-trash') +
             ::I18n.t('para.form.nested.remove')
           end
         end

data/lib/para/helpers.rb

@@ -0,0 +1,8 @@
+module Para
+  module Helpers
+    extend ActiveSupport::Autoload
+
+    autoload :AttributesMappings
+    autoload :ResourceName
+  end
+end

data/lib/para/helpers/attributes_mappings.rb

@@ -0,0 +1,13 @@
+module Para
+  module Helpers
+    module AttributesMappings
+      def attributes_mappings_for(params)
+        if (data = params.delete('_attributes_mappings'))
+          JSON.parse(data)
+        else
+          {}
+        end
+      end
+    end
+  end
+end

data/lib/para/helpers/resource_name.rb

@@ -0,0 +1,14 @@
+module Para
+  module Helpers
+    module ResourceName
+      def resource_name(resource)
+        Para.config.resource_name_methods.each do |method|
+          return resource.send(method) if resource.respond_to?(method)
+        end
+
+        model_name = resource.class.model_name.human
+        "#{ model_name } - #{ resource.id }"
+      end
+    end
+  end
+end

data/lib/para/inputs.rb

@@ -4,6 +4,7 @@ module Para
 
     autoload :NestedOneInput
     autoload :NestedManyInput
+    autoload :MultiSelectInput
     autoload :HasOneInput
   end
 end

data/lib/para/inputs/multi_select_input.rb

@@ -0,0 +1,90 @@
+module Para
+  module Inputs
+    class MultiSelectInput < SimpleForm::Inputs::Base
+      include Para::Helpers::ResourceName
+      
+      attr_reader :resource
+
+      def input(wrapper_options = nil)
+        input_html_options[:class] << "multi-select"
+
+        # Load existing resources
+        resources = object.send(attribute_name)
+        # Order them if the list should be orderable
+        resources = resources.sort_by(&method(:resource_position)) if orderable?
+
+        template.render(
+          partial: 'para/inputs/multi_select',
+          locals: {
+            form: @builder,
+            model: model,
+            attribute_name: foreign_key,
+            orderable: orderable?,
+            resources: resources,
+            option_resources: option_resources
+          }
+        )
+      end
+
+      def option_resources
+        @option_resources ||= if model.orderable?
+          model.ordered
+        else
+          model.all.sort_by { |resource| resource_name(resource) }
+        end
+      end
+
+      def parent_model
+        @parent_model ||= @builder.object.class
+      end
+
+      def model
+        @model ||= reflection.klass
+      end
+
+      def reflection
+        @reflection ||= parent_model.reflect_on_association(attribute_name)
+      end
+
+      def foreign_key
+        :"#{ reflection.name.to_s.singularize }_ids"
+      end
+
+      def attribute_field
+        @attribute_field ||= AttributeField::HasManyField.new(object.class, name: attribute_name)
+      end
+
+      def orderable?
+        @orderable ||= options.fetch(:orderable) do
+          if attribute_field.through_reflection
+            attribute_field.through_reflection.klass.orderable?
+          else
+            model.orderable?
+          end
+        end
+      end
+
+      def resource_position(resource)
+        if attribute_field.through_reflection
+          resource = join_resources.find do |res|
+            res.send(attribute_field.through_relation_source_foreign_key) == resource.id
+          end
+        end
+
+        resource.position
+      end
+
+      def orderable_association
+        @orderable_association ||= if attribute_field.through_reflection
+          object.association(attribute_field.through_reflection.name)
+        else
+          object.association(attribute_name)
+        end
+      end
+
+      def join_resources
+        @join_resources ||= orderable_association.load_target
+      end
+    end
+  end
+end