para 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c04310b282e123cc4d2f5329d495d6133aaf8bfd
-  data.tar.gz: 3f5658e207ad84fd1820dc4428bc4a65b95635a8
+  metadata.gz: 732caede63e764554d7a140b937d9b2c22ca9c85
+  data.tar.gz: 2cf5c7b7351487eb7b6c73de119fe8e0b17a79af
 SHA512:
-  metadata.gz: 2553622ee949ea75a6c1de1db3c08af4058a41e134cf7b4c5d453dc83b20c03ab14e78144b3f9fa95ce0ea66efa8c8082e50feee00e26d28f53f09070dc9c65e
-  data.tar.gz: 6031a27defab3bbd0254dead9a8620009e43efe10ad2af914cf5bef8bc0f989c45c11f10cb0c79c8163afcf96ebe6455faabd93c09cd13934ad6afc8001d5d4b
+  metadata.gz: abf828d53004049d831e19fb4125cc5ab54c254decc1f28a30a06bf8866f5bae76ca287d2e2b5664a28685c278106bd9ce269c51c1f6822be0984beab3a47148
+  data.tar.gz: c271d48d9883fd0f5268efddddf48efa61a3b77cc8ca4309896aeb8ec3c18f17f60a59522d746e04b94b34fb84c7fc1683b6147bc24fec5780015197796a88b0

data/app/assets/stylesheets/para/admin/theme/_form.sass

@@ -21,7 +21,7 @@
       display: block
   &.fileinput-exists
     .fileinput-placeholder
-      display: none    
+      display: none
 
 .input-group-addon
   font-size: 13px
@@ -128,8 +128,7 @@ label.valid
 
 legend
   font-weight: 600
-  padding: 10px 12px 15px 12px
-  margin-top: 10px
+  padding: 15px 12px 15px 12px
   margin-bottom: 0
   width: auto
   margin-left: 0

data/app/assets/stylesheets/para/admin/theme/_table.sass

@@ -22,3 +22,7 @@
     line-height: 28px
   .progress-small
     margin: 7px 0 8px
+
+.panel-body
+  &.page-entries-info
+    padding: 0 20px

data/app/assets/stylesheets/para/overrides/theme.sass

@@ -9,13 +9,13 @@
   outline: none
   outline-offset: 0
 
-@mixin button-hover-focus-active($color-border, $color-bg) 
+@mixin button-hover-focus-active($color-border, $color-bg)
   position: relative
-  box-shadow: 0px 2px darken($color-border, 10%) 
+  box-shadow: 0px 2px darken($color-border, 10%)
   transition: none
   &:hover
     top: 1px
-    box-shadow: 0px 1px darken($color-border, 10%) 
+    box-shadow: 0px 1px darken($color-border, 10%)
     background-color: $color-bg
     border-color: $color-border
   &:focus,
@@ -29,7 +29,7 @@
     &:hover
       background-color: darken($color-bg, 7%)
 
-@mixin button-variant-inverse($color-border, $color-bg) 
+@mixin button-variant-inverse($color-border, $color-bg)
   color: $color-border
   background-color: transparent
   box-shadow: none
@@ -51,8 +51,8 @@
     background-color: darken($color-bg, 7%)
     outline: none
     outline: 0
-       
-.btn, 
+
+.btn,
 input,
 textarea,
 select,
@@ -61,15 +61,15 @@ button
   &,
   &:active,
   &.active
-    &:focus 
+    &:focus
       +tab-focus()
   &:hover,
   &:focus
     +tab-focus()
-  
+
 
 .btn-default
-  +button-hover-focus-active($btn-default-border, $btn-default-bg) 
+  +button-hover-focus-active($btn-default-border, $btn-default-bg)
   &.btn-inverse
     +button-variant-inverse($btn-default-border, $btn-default-bg)
     color: $btn-default-color
@@ -111,25 +111,25 @@ button
   background-color: $brand-primary
 
 .label-success,
-.badge-success 
+.badge-success
   background-color: $brand-success
 
 .label-info,
-.badge-info 
+.badge-info
   background-color: $brand-info
 
 .label-warning,
-.badge-warning 
+.badge-warning
   background-color: $brand-warning
 
 .label-danger,
-.badge-danger 
+.badge-danger
   background-color: $brand-danger
 
 // Table
 .para-component-relation-table
   td > img
-    height: 50px  
+    height: 50px
 
 .pull-right.btn-group
   min-width: 97px
@@ -148,9 +148,9 @@ button
     clear: both
     content: " "
     display: table
-    
+
 .block.form-inputs
-  margin-bottom: 20px
+  margin-bottom: 0
   padding: 0px 10px
   background-color: $body-bg
 

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

@@ -96,9 +96,18 @@ module Para
         end
       end
 
+      # We check for the existance of `params[:resource]` to avoid rails'
+      # params sanitizer to raise if no `:resource` key is found. We prefer
+      # to let the model handle validations instead of asking the controller
+      # to validate some params presence
+      #
+      # Note : This also created a bug with cancan which tried to build the
+      #        params on a `new` action, that did not contain the `:resource`
+      #        key in the params, which made the `#new` action form raise
+      #
       def resource_params
         @resource_params ||= parse_resource_params(
-          params.require(:resource).permit!
+          (params[:resource] && params.require(:resource).permit!) || {}
         )
       end
 

data/app/decorators/para/component/crud_decorator.rb

@@ -4,6 +4,7 @@ module Para
       include Para::Component::BaseDecorator
 
       def path(options = {})
+        options[:model] ||= model_singular_route_key
         find_path([:admin, self, :resources], options)
       end
 
@@ -13,7 +14,7 @@ module Para
         end
 
         route_key = route_key_for(options[:id], options)
-        options[:model] = model.model_name.singular_route_key
+        options[:model] = model_singular_route_key
 
         polymorphic_path([:admin, self, route_key].compact, options)
       end
@@ -31,6 +32,10 @@ module Para
           :resources
         end
       end
+
+      def model_singular_route_key
+        @model_singular_route_key ||= model.model_name.singular_route_key
+      end
     end
   end
 end

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

@@ -4,19 +4,39 @@ module Para
       include Para::ApplicationHelper
 
       def find_partial_for(relation, partial, partial_dir: 'admin/resources')
-        if relation.kind_of? ActiveRecord::Base
+        relation_class = if relation.kind_of?(ActiveRecord::Base)
           relation = relation.class
+        elsif model?(relation)
+          relation
         end
 
-        relation = relation.to_s.underscore.pluralize
+        relation_name = find_relation_name_for(
+          'admin', plural_file_path_for(relation), partial,
+          relation_class: relation_class
+        )
 
-        if lookup_context.find_all("admin/#{relation}/_#{ partial }").any?
-          "admin/#{ relation }/#{ partial }"
+        if relation_name
+          "admin/#{ relation_name }/#{ partial }"
         else
           "para/#{ partial_dir }/#{ partial }"
         end
       end
 
+      def find_relation_name_for(namespace, relation, partial, options = {})
+        return relation if partial_exists?(relation, partial)
+        return nil unless options[:relation_class]
+
+        relation = options[:relation_class].ancestors.find do |ancestor|
+          next unless model?(ancestor)
+          break if ancestor == ActiveRecord::Base
+
+          ancestor_name = plural_file_path_for(ancestor.name)
+          partial_exists?(ancestor_name, partial)
+        end
+
+        plural_file_path_for(relation) if relation
+      end
+
       def template_path_lookup(*paths)
         paths.find do |path|
           lookup_context.find_all(path).any?
@@ -57,6 +77,20 @@ module Para
       def flash_shared_key
         'para.flash.shared'
       end
+
+      private
+
+      def plural_file_path_for(class_name)
+        class_name.to_s.underscore.pluralize
+      end
+
+      def model?(object)
+        object.respond_to?(:model_name)
+      end
+
+      def partial_exists?(relation, partial)
+        lookup_context.find_all("admin/#{relation}/_#{ partial }").any?
+      end
     end
   end
 end

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

@@ -3,9 +3,9 @@ module Para
     def ordered_components
       @component_sections.each_with_object([]) do |section, components|
         section.components.each do |component|
-          components << component
+          components << component if can?(:read, component)
         end
-      end.sort_by(&:updated_at)
+      end.sort_by(&:name)
     end
   end
 end

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

@@ -7,6 +7,9 @@
       = render partial: find_partial_for(relation, :filters), locals: { attributes: attributes }
 
     - if resources.length > 0
+      = panel.body class: 'page-entries-info' do
+        = page_entries_info(resources)
+
       = panel.body class: '' do
         = table_for(resources: resources, model: model, component: component, attributes: attributes)
 

data/app/views/para/inputs/_nested_many.html.haml

@@ -1,10 +1,11 @@
 .nested-many-field{ class: ('orderable' if orderable) }
   .fields-list{ id: dom_identifier }
     = form.simple_fields_for attribute_name, resources, nested_attribute_name: attribute_name, orderable: orderable do |nested_form|
-      = render partial: find_partial_for(model, :nested_many_container, partial_dir: 'inputs'), locals: { form: nested_form, model: model }
+      = render partial: find_partial_for(model, 'nested_many/container', partial_dir: 'inputs'), locals: { form: nested_form, model: model, subclass: subclass, nested_locals: nested_locals }
 
   -# Add button
   - if add_button
-    = link_to_add_association form, attribute_name, partial: find_partial_for(model, :nested_many_container, partial_dir: 'inputs'), form_name: 'form', class: 'btn btn-primary', data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, orderable: orderable, locals: { model: model } } do
-      %i.fa.fa-plus
-      = t('para.form.nested.add')
+    - if subclass
+      = render partial: 'para/inputs/nested_many/add_with_subclasses', locals: { form: form, model: model, dom_identifier: dom_identifier, nested_locals: nested_locals, attribute_name: attribute_name, orderable: orderable }
+    - else
+      = render partial: 'para/inputs/nested_many/add', locals: { form: form, model: model, dom_identifier: dom_identifier, nested_locals: nested_locals, attribute_name: attribute_name, orderable: orderable }

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

@@ -0,0 +1,3 @@
+= link_to_add_association form, attribute_name, partial: find_partial_for(model, 'nested_many/container', partial_dir: 'inputs'), form_name: 'form', class: 'btn btn-primary', data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, orderable: orderable, locals: { model: model, nested_locals: nested_locals } } do
+    %i.fa.fa-plus
+    = t('para.form.nested.add')

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

@@ -0,0 +1,10 @@
+.add-button.dropdown
+  %button.btn.btn-primary{ type: 'button', data: { toggle: 'dropdown' } }
+    %i.fa.fa-plus
+    = t('para.form.nested.add')
+    %span.caret
+  %ul.dropdown-menu
+    - model.descendants.sort_by { |m| m.model_name.human }.each do |submodel|
+      %li
+        = link_to_add_association form, attribute_name, wrap_object: proc { submodel.new }, partial: find_partial_for(submodel, 'nested_many/container', partial_dir: 'inputs'), form_name: 'form', class: 'dropdown-link', data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, orderable: orderable, locals: { model: submodel, nested_locals: nested_locals } } do
+          = submodel.model_name.human

data/app/views/para/inputs/{_nested_many_container.html.haml → nested_many/_container.html.haml}

@@ -1,3 +1,5 @@
+- nested_locals ||= {}
+
 .panel.panel-default.form-fields
   .panel-heading
     = form.reorder_anchor
@@ -12,6 +14,8 @@
     .clearfix
 
   .panel-body.form-inputs.collapse{ id: form.nested_resource_dom_id }
-    = render partial: find_partial_for(model, :fields), locals: { form: form }
+    = render partial: find_partial_for(model, :fields), locals: { form: form }.merge(nested_locals)
+
+    = form.hidden_field :type if form.object.class.column_names.include?(form.object.class.inheritance_column)
 
   .clearfix

data/config/locales/fr.yml

@@ -114,3 +114,21 @@ fr:
   time:
     formats:
       admin: '%d/%m/%Y %H:%M'
+
+  # Kaminari translations
+  views:
+    pagination:
+      first: "« Première"
+      last: "Dernière »"
+      previous: "‹ Précédente"
+      next: "Suivante ›"
+      truncate: "…"
+  helpers:
+    page_entries_info:
+      one_page:
+        display_entries:
+          zero: "Aucune entrée trouvée"
+          one: "Affichage des entrées <b>1&nbsp;-&nbsp;1</b> sur <b>1</b> au total"
+          other: "Affichage des entrées <b>1&nbsp;-&nbsp;%{count}</b> sur <b>%{count}</b> au total"
+      more_pages:
+        display_entries: "Affichage des entrées <b>%{first}&nbsp;-&nbsp;%{last}</b> sur <b>%{total}</b> au total"

data/lib/para/attribute_field/datetime.rb

@@ -3,9 +3,15 @@ module Para
     class DatetimeField < AttributeField::Base
       register :datetime, :date, self
 
+      field_option :wrapper, :wrapper_name
+
       def value_for(instance)
         (value = instance.send(name)) && I18n.l(value)
       end
+
+      def wrapper_name
+        :horizontal_form
+      end
     end
   end
 end

data/lib/para/form_builder/containers.rb

@@ -1,9 +1,17 @@
 module Para
   module FormBuilder
     module Containers
-      def fieldset(&block)
+      def fieldset(options = {}, &block)
         template.content_tag(:div, class: 'block form-inputs') do
-          template.capture(&block)
+          buffer = if (title = options[:title])
+            template.content_tag(:div, class: 'form-group') do
+              template.content_tag(:legend, title)
+            end
+          else
+            ''.html_safe
+          end
+
+          buffer + template.capture(&block)
         end
       end
 

data/lib/para/form_builder/nested_form.rb

@@ -1,6 +1,10 @@
 module Para
   module FormBuilder
     module NestedForm
+      # FIXME : When we have a nested field that maps to an STI model, the _id
+      #         field is passed instead of the relation, and the inverse_of
+      #         guard doesn't work
+      #
       def nested_fields
         @nested_fields ||= fields.reject do |field|
           inverse_of?(field.name)

data/lib/para/inputs/nested_many_input.rb

@@ -4,8 +4,6 @@ module Para
       def input(wrapper_options = nil)
         input_html_options[:class] << "nested-many"
 
-        parent_model = @builder.object.class
-        model = parent_model.reflect_on_association(attribute_name).klass
         orderable = options.fetch(:orderable, model.orderable?)
         add_button = options.fetch(:add_button, true)
         # Load existing resources
@@ -13,6 +11,8 @@ module Para
         # Order them if the list should be orderable
         resources = resources.order(:position) if orderable
 
+        locals = options.fetch(:locals, {})
+
         template.render(
           partial: 'para/inputs/nested_many',
           locals: {
@@ -22,11 +22,21 @@ module Para
             orderable: orderable,
             add_button: add_button,
             dom_identifier: dom_identifier,
-            resources: resources
+            resources: resources,
+            nested_locals: locals,
+            subclass: subclass
           }
         )
       end
 
+      def parent_model
+        @parent_model ||= @builder.object.class
+      end
+
+      def model
+        @model ||= parent_model.reflect_on_association(attribute_name).klass
+      end
+
       def dom_identifier
         @dom_identifier ||= begin
           name = attribute_name
@@ -35,6 +45,13 @@ module Para
           [name, time, random].join('-')
         end
       end
+
+      def subclass
+        @subclass ||= options.fetch(
+          :subclass,
+          model.respond_to?(:descendants) && model.descendants.length > 0
+        )
+      end
     end
   end
 end

data/lib/para/plugins/routes.rb

@@ -14,7 +14,7 @@ module Para
 
         router.instance_eval do
           namespace :admin do
-            scope module: :acl do
+            scope module: [:para, identifier].join('/').to_sym, as: identifier do
               router.instance_eval(&block)
             end
           end

data/lib/para/version.rb

@@ -1,3 +1,3 @@
 module Para
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/rails/routing_mapper.rb

@@ -31,8 +31,8 @@ module ActionDispatch
         controller = [component_name.to_s.singularize, 'resources'].join('_')
 
         scope endpoint, as: as do
-          resources :resources, controller: controller do
-            scope options[:scope] do
+          scope options[:scope] do
+            resources :resources, controller: controller do
               collection do
                 patch :order
                 patch :tree

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -437,8 +437,10 @@ files:
 - app/views/para/admin/singleton_resources/show.html.haml
 - app/views/para/form/_tabs.html.haml
 - app/views/para/inputs/_nested_many.html.haml
-- app/views/para/inputs/_nested_many_container.html.haml
 - app/views/para/inputs/_nested_one.html.haml
+- app/views/para/inputs/nested_many/_add.html.haml
+- app/views/para/inputs/nested_many/_add_with_subclasses.html.haml
+- app/views/para/inputs/nested_many/_container.html.haml
 - config/locales/en.yml
 - config/locales/fr.yml
 - db/migrate/20140911091225_create_para_components.rb