para 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 855b5d4493847325b66af2955504dcb8524f9e2d
-  data.tar.gz: 32e9da832c3641f4993cdd3c65096782ef4ba14b
+  metadata.gz: 19583a8f81d13b5d13e77b3ad1da83c9d9d8eae0
+  data.tar.gz: e45edc3103747e6d25ca80921f93f72552b21b2b
 SHA512:
-  metadata.gz: b5f34e153a1bc38d5e07e37c96b7a9f181e0be8957d1c1d685d3606649fcfefd88a426e8fd201302289f81d99ba076919e98295c8ae8c720cf3aed61698846db
-  data.tar.gz: 790dffa7b7fa6d327548b23e3a1dec0aeabf115bea3ceb6aa4fd31588f4c5f0318f1b23ca4daf3da6167e2bbde207bdcd1cdc4a5358443d23fcdc686bba1d86c
+  metadata.gz: a7ddf6fe3c253d66a3bc6804e27ca1b849e1bb1dcb7d54d40e892d6d95b35ce806a3a24740d2d590acfde5bcd538bde20baaf2efef3bcdc52254c27c4f20117e
+  data.tar.gz: da666593dfbcc85b37e87d8fc25345486ae0875b8e144dbd7da7a5e719a86b2a64cde7f535ec445c7c48668375f9bf5c33c2767c15bc0e00d28f4e9802c93392

data/app/assets/javascripts/para/admin/filters-form.coffee

@@ -0,0 +1,11 @@
+class FiltersForm
+  constructor: (options = {}) ->
+    @$el = options.$el
+    @$el.on('change', 'input, select', @onChange)
+
+  onChange: =>
+    @$el.submit()
+
+$(document).on 'page:change', ->
+  $('[data-filters-form]').each (i, el) ->
+    new FiltersForm($el: $(el))

data/app/assets/javascripts/para/admin/tabs.coffee

@@ -0,0 +1,21 @@
+# Tabs hash management adapted from SO answer :
+#   http://stackoverflow.com/a/21443271/685925
+#
+class Para.Tabs
+  constructor: (options = {}) ->
+    @$el = $(options.el)
+    @showActiveTab()
+    @$('a[data-toggle="tab"]').on('shown.bs.tab', @onTabShown)
+
+  showActiveTab: ->
+    @$('a[href="' + location.hash + '"]').tab('show') if location.hash isnt ''
+
+  onTabShown: (e) =>
+    tabHash = $(e.target).attr('href').substr(1)
+    history.pushState(null, null, "##{ tabHash }")
+
+  $: (args...) ->
+    $.fn.find.apply(@$el, args)
+
+$(document).on 'page:change', ->
+  $('[data-form-tabs]').each (i, el) -> new Para.Tabs(el: el)

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

@@ -8,7 +8,6 @@ html *
 body, html
   min-height: 100%
   position: relative
-  overflow-x: hidden
   -webkit-font-smoothing: antialiased
   -moz-osx-font-smoothing: grayscale
 
@@ -31,6 +30,10 @@ body, html
   padding-left: 10px
   padding-right: 10px
 
+.alert
+  position: relative
+  z-index: 4
+
 // Main container
 // -------------------------
 

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

@@ -132,8 +132,11 @@ button
     height: 50px
 
 .pull-right.btn-group
-  min-width: 97px
-
+  min-width: 145px
+  text-align: right
+  > .btn
+    float: none
+    
 // Form
 .input-group-btn
   .btn,

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

@@ -4,6 +4,7 @@ module Para
   module Admin
     class CrudResourcesController < Para::Admin::ResourcesController
       include Para::Admin::ResourceControllerConcerns
+      include Para::SearchHelper
 
       before_filter :load_and_authorize_crud_resource
       before_filter :add_breadcrumbs, only: [:show, :index, :edit, :new]
@@ -13,7 +14,7 @@ module Para
 
       def index
         @q = @component.resources.search(params[:q])
-        @resources = @q.result.uniq.page(params[:page])
+        @resources = distinct_search_results(@q).page(params[:page])
 
         # Sort collection for orderable and trees
         @resources = if @resources.respond_to?(:ordered)
@@ -79,7 +80,7 @@ module Para
 
       def resource_model
         @resource_model ||=
-          if @component.subclassable_with?(params[:type])
+          if params[:type] && @component.subclassable_with?(params[:type])
             params[:type].constantize
           else
             super

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

@@ -9,7 +9,13 @@ module Para
       end
 
       def relation_path(controller_or_resource, options = {})
-        find_path([:admin, self, controller_or_resource], options)
+        if Hash === controller_or_resource
+          options = controller_or_resource
+          controller_or_resource = nil
+        end
+
+        components = [:admin, self, controller_or_resource].compact
+        find_path(components, options)
       end
 
       private

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

@@ -9,10 +9,13 @@ module Para
       end
 
       def relation_path(controller_or_resource, *nested_resources, **options)
-        id_key = nested_resources.empty? ? :id : :resource_id
+        nested = nested_resources.any?
+        id_key = nested ? :resource_id : :id
 
         if (id = extract_id_from(controller_or_resource))
           options[id_key] = id
+        elsif Hash === controller_or_resource
+          options = controller_or_resource
         end
 
         route_key = route_key_for(options[id_key], options)
@@ -20,6 +23,8 @@ module Para
 
         data = [:admin, self, route_key].compact + nested_resources
 
+        options[:action] = action_option_for(options, nested: nested)
+
         polymorphic_path(data, options)
       end
 
@@ -40,6 +45,14 @@ module Para
       def model_singular_route_key
         @model_singular_route_key ||= model.model_name.singular_route_key
       end
+
+      def action_option_for(options, nested: false)
+        if !nested && options[:action].try(:to_sym) == :show
+          :edit
+        else
+          options[:action]
+        end
+      end
     end
   end
 end

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

@@ -4,11 +4,28 @@ module Para
       include Para::Component::BaseDecorator
 
       def path(options = {})
-        find_path([:admin, self], options)
+        find_path([:admin, self, :resource], options)
       end
 
-      def relation_path(controller_or_resource, options = {})
-        path
+      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)
+      end
+
+      def action_option_for(options, nested: false)
+        if !nested && options[:action].try(:to_sym) == :show
+          nil
+        else
+          options[:action]
+        end
       end
     end
   end

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

@@ -25,7 +25,7 @@ module Para
       def actions_for(type)
         Para.config.page_actions_for(type).map do |action|
           instance_eval(&action)
-        end
+        end.compact
       end
     end
   end

data/app/helpers/para/model_helper.rb

@@ -17,9 +17,13 @@ module Para
       component.class.reflect_on_association(relation).klass
     end
 
-    def field_value_for(object, field_name, type = nil)
+    def value_for(object, field_name, type = nil)
       field = model_field_mappings(object.class).field_for(field_name, type)
-      value = field.value_for(object)
+      field.value_for(object)
+    end
+
+    def field_value_for(object, field_name, type = nil)
+      value = value_for(object, field_name, type)
       excerpt_value_for(value)
     end
 

data/app/helpers/para/search_helper.rb

@@ -18,5 +18,9 @@ module Para
         attribute.attribute_column_path.join('_')
       end.join('_or_')
     end
+
+    def distinct_search_results(search)
+      Para::Search::Distinct.new(search).result
+    end
   end
 end

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

@@ -20,6 +20,16 @@ module Para
       def default_form_actions
         [:submit]
       end
+
+      def model_name
+        ModelName.new(self)
+      end
+
+      class ModelName < ActiveModel::Name
+        def singular_route_key
+          'singleton'
+        end
+      end
     end
   end
 end

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

@@ -1,4 +1,4 @@
-= search_form_for @q, builder: SimpleForm::FormBuilder, url: @component.path do |form|
+= search_form_for @q, builder: SimpleForm::FormBuilder, url: @component.path, html: { data: { :'filters-form' => true } } do |form|
   .input-group
     %span.input-group-addon
       %i.fa.fa-search

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

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

data/db/migrate/20160613172154_create_unaccent_extension.rb

@@ -0,0 +1,5 @@
+class CreateUnaccentExtension < ActiveRecord::Migration
+  def change
+    ActiveRecord::Base.connection.execute('CREATE EXTENSION IF NOT EXISTS unaccent')
+  end
+end

data/lib/generators/para/filters/templates/_filters.html.haml

@@ -1,4 +1,4 @@
-= search_form_for @q, builder: SimpleForm::FormBuilder, url: @component.path do |form|
+= search_form_for @q, builder: SimpleForm::FormBuilder, url: @component.path, html: { data: { :'filters-form' => true } } do |form|
   .input-group
     %span.input-group-addon
       %i.fa.fa-search

data/lib/generators/para/orderable/orderable_generator.rb

@@ -1,5 +1,5 @@
 module Para
-  class OrderableGenerator < Rails::Generators::NamedBase
+  class OrderableGenerator < Para::Generators::NamedBase
     include Rails::Generators::Migration
 
     source_root File.expand_path('../templates', __FILE__)
@@ -15,14 +15,14 @@ module Para
     def add_field_to_model
       migration_template(
         'orderable_migration.rb',
-        "db/migrate/add_orderable_position_to_#{ plural_file_name }.rb"
+        "db/migrate/add_orderable_position_to_#{ table_name }.rb"
       )
     end
 
     def add_orderable_to_model
       class_definition = "class #{ class_name } < ActiveRecord::Base\n"
 
-      inject_into_file "app/models/#{ file_name }.rb", after: class_definition do
+      inject_into_file "app/models/#{ singular_namespaced_path }.rb", after: class_definition do
         "  acts_as_orderable\n"
       end
     end
@@ -33,15 +33,7 @@ module Para
 
     def fianl_message
       message = "The #{ class_name } model is now orderable.\n"
-      message << "* Please migrate to update your model's table\n" unless options[:migrate]
-      message << <<-MESSAGE
-* Please add to your model resource's routes the ordering path.
-  e.g.: resources :#{ plural_file_name } do
-          collection do
-            patch 'order'
-          end
-        end
-      MESSAGE
+      message << "Please migrate to update your model's table\n" unless options[:migrate]
 
       say(message)
     end

data/lib/generators/para/orderable/templates/orderable_migration.rb

@@ -1,4 +1,4 @@
-class AddOrderablePositionTo<%= class_name.pluralize %> < ActiveRecord::Migration
+class AddOrderablePositionTo<%= table_name.camelize %> < ActiveRecord::Migration
   def change
     add_column :<%= table_name %>, :position, :integer, default: 0
     add_index :<%= table_name %>, :position

data/lib/generators/para/table/table_generator.rb

@@ -1,5 +1,8 @@
 module Para
   class TableGenerator < Para::Generators::NamedBase
+    include Para::Admin::BaseHelper
+    include Para::Generators::FieldHelpers
+
     source_root File.expand_path('../templates', __FILE__)
 
     desc 'Para resources table generator'
@@ -10,25 +13,5 @@ module Para
         "app/views/admin/#{ plural_namespaced_path }/_table.haml"
       )
     end
-
-    private
-
-    def attributes
-      @attributes ||= begin
-        model =
-          begin
-            Para.const_get(class_name)
-          rescue
-            class_name.classify.constantize
-          end
-        AttributeFieldMappings.new(model).fields
-      end
-    end
-
-    def attributes_list
-      @attributes_list ||= attributes.map do |field|
-        field.name.to_sym.inspect
-      end.join(', ')
-    end
   end
 end

data/lib/para/attribute_field/datetime.rb

@@ -6,7 +6,7 @@ module Para
       field_option :wrapper, :wrapper_name
 
       def value_for(instance)
-        (value = instance.send(name)) && I18n.l(value)
+        (value = instance.send(name)) && ::I18n.l(value)
       end
 
       def wrapper_name

data/lib/para/config.rb

@@ -57,8 +57,10 @@ module Para
       page_actions[type] ||= []
     end
 
-    def self.add_actions_for(type, &block)
-      page_actions_for(type) << block
+    def self.add_actions_for(*types, &block)
+      types.each do |type|
+        page_actions_for(type) << block
+      end
     end
   end
 end

data/lib/para/ext/paperclip.rb

@@ -28,7 +28,8 @@ module Para
 
               # Notify ActiveRecord that the model has changed so nested models
               # get to run validation hooks and attachments are cleared
-              send(:"#{ attachment_name }_file_name_will_change!")
+              column_name = attribute_container_column_for(attachment_name)
+              send(:"#{ column_name }_will_change!")
             end
           end
 
@@ -60,6 +61,18 @@ module Para
 
             @klass.send(:before_validation, :clear_removed_attachments)
           end
+
+          @klass.send(:define_method, :attribute_container_column_for) do |attachment_name|
+            attribute_name = "#{ attachment_name }_file_name"
+
+            if self.class.columns.any? { |column| column.name == attribute_name }
+              return attribute_name
+            end
+
+            stored_attribute = self.class.stored_attributes.each do |key, fields|
+              return key if fields.include?(attribute_name.to_sym)
+            end
+          end
         end
       end
     end

data/lib/para/form_builder/tabs.rb

@@ -2,22 +2,23 @@ module Para
   module FormBuilder
     module Tabs
       def tabs(&block)
-        tabs_manager = TabsManager.new(template, object)
-        block.call(tabs_manager)
+        manager = TabsManager.new(template, object, self)
+        block.call(manager)
 
-        template.render partial: 'para/form/tabs', locals: { tabs: tabs_manager.tabs }
+        template.render partial: 'para/form/tabs', locals: { tabs: manager.tabs }
       end
 
       class TabsManager
-        attr_reader :template, :object
+        attr_reader :template, :object, :builder
 
-        def initialize(template, object)
+        def initialize(template, object, builder)
           @template = template
           @object = object
+          @builder = builder
         end
 
         def tab(identifier, options = {}, &block)
-          tabs << Tab.new(template, object, identifier, options, &block)
+          tabs << Tab.new(template, object, builder, identifier, options, &block)
           nil
         end
 
@@ -27,13 +28,14 @@ module Para
       end
 
       class Tab
-        attr_reader :template, :object, :identifier, :icon, :content
+        attr_reader :template, :object, :builder, :identifier, :icon, :content
 
         delegate :capture, to: :template
 
-        def initialize(template, object, identifier, options, &content_block)
+        def initialize(template, object, builder, identifier, options, &content_block)
           @template = template
           @object = object
+          @builder = builder
           @identifier = identifier
           @content = capture { content_block.call }
           @icon = options[:icon]
@@ -48,7 +50,10 @@ module Para
         end
 
         def dom_id
-          @dom_id = identifier.to_s.parameterize
+          @dom_id = [
+            builder.nested_resource_dom_id.presence,
+            identifier.to_s.parameterize
+          ].compact.join('-')
         end
       end
     end

data/lib/para/generators/field_helpers.rb

@@ -5,7 +5,7 @@ module Para
 
       def attributes
         @attributes ||= begin
-          model = Para.const_get(class_name)
+          model = namespaced_class_name.constantize
           AttributeFieldMappings.new(model).fields
         end
       end

data/lib/para/generators/name_helpers.rb

@@ -4,6 +4,14 @@ module Para
       def plural_namespaced_path
         @plural_namespaced_path ||= File.join(*class_path, plural_name)
       end
+
+      def singular_namespaced_path
+        @singular_namespaced_path ||= File.join(*class_path, singular_name)
+      end
+
+      def namespaced_class_name
+        @namespaced_class_name ||= [namespace, class_name].compact.join('::')
+      end
     end
   end
 end

data/lib/para/model_field_parsers/paperclip.rb

@@ -43,7 +43,8 @@ module Para
       #
       def image?(options)
         if (styles = options[:styles]) && !styles.empty?
-          styles.values.first.match(/^(\d|x)/i)
+          styles.values.first.is_a?(String) &&
+            styles.values.first.match(/^(\d|x)/i)
         end
       end
     end

data/lib/para/search/distinct.rb

@@ -0,0 +1,111 @@
+# This class allows to unify search results and avoid duplicates, avoiding
+# SQL DISTINCT errors by adding ORDER BY fields to the DISTINCT selection
+# automatically
+#
+# This fixes a previous issue when trying to order search results with
+# Ransack sorting feature, when implying associated models
+#
+module Para
+  module Search
+    class Distinct
+      attr_reader :search
+
+      def initialize(search)
+        @search = search
+        @sort_index ||= 0
+      end
+
+      def result
+        selects = build_selects
+        search.result.select(selects).uniq
+      end
+
+      private
+
+      def build_selects
+        ([table_wildcard_select] + sort_selects).join(', ')
+      end
+
+      def table_wildcard_select
+        [search.klass.table_name, '*'].join('.')
+      end
+
+      def sort_selects
+        return [] unless search
+
+        search.sorts.map do |sort|
+          case sort.attr
+          when Arel::Attributes::Attribute then process_attribute(sort)
+          when Arel::Nodes::SqlLiteral then process_sql_literal(sort)
+          #
+          # Explicitly raise here to avoid the system to swallow sorting errors,
+          # since any unsupported class must have been explicitly used by the
+          # developer, and debugging it would be hard without an exception
+          #
+          else raise "Unsupported sort attribute class : #{ sort.attr.class.name }"
+          end
+        end
+      end
+
+      def process_attribute(sort)
+        sort_index = next_sort_index
+        sql = [sort.attr.relation.name, sort.attr.name].join('.')
+
+        replace_sort(sort, sort_index)
+        build_alias(sql, sort_index)
+      end
+
+      # When given an SQL literal, we store the sql expression in a named SELECT
+      # variable, and replace the expression by its variable name inside of the
+      # ransack sort instance
+      #
+      def process_sql_literal(sort)
+        sort_index = next_sort_index
+        sql = sort.attr.to_s
+
+        replace_sort(sort, sort_index)
+        build_alias(sql, sort_index)
+      end
+
+      def next_sort_index
+        ['sort', @sort_index += 1].join('_')
+      end
+
+      def replace_sort(sort, sort_index)
+        sort.instance_variable_set(:@attr, Arel::Nodes::SqlLiteral.new(sort_index))
+      end
+
+      def build_alias(sql, index)
+        Arel::Nodes::InfixOperation.new(
+          'AS',
+          format_string(sql),
+          Arel::Nodes::SqlLiteral.new(index)
+        ).to_sql
+      end
+
+      def format_string(sql)
+        sql_lower(sql_unaccent(sql_stringify(sql)))
+      end
+
+      def sql_lower(sql)
+        Arel::Nodes::NamedFunction.new('LOWER', [sql])
+      end
+
+      def sql_unaccent(sql)
+        Arel::Nodes::NamedFunction.new('UNACCENT', [sql])
+      end
+
+      def sql_stringify(sql)
+        Arel::Nodes::NamedFunction.new(
+          'CAST', [
+            Arel::Nodes::InfixOperation.new(
+              'AS',
+              Arel::Nodes::SqlLiteral.new(sql),
+              Arel::Nodes::SqlLiteral.new('text')
+            )
+          ]
+        )
+      end
+    end
+  end
+end

data/lib/para/search.rb

@@ -0,0 +1,6 @@
+module Para
+  module Search
+  end
+end
+
+require 'para/search/distinct'

data/lib/para/version.rb

@@ -1,3 +1,3 @@
 module Para
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/lib/para.rb

@@ -35,6 +35,7 @@ require 'para/exporter'
 require 'para/importer'
 require 'para/sti'
 require 'para/page'
+require 'para/search'
 
 module Para
   extend ActiveSupport::Autoload

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,22 @@ dependencies:
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -346,7 +352,9 @@ files:
 - app/assets/images/para/admin/loading-spinner.gif
 - app/assets/javascripts/admin/app.coffee
 - app/assets/javascripts/para/admin.coffee
+- app/assets/javascripts/para/admin/filters-form.coffee
 - app/assets/javascripts/para/admin/table.coffee
+- app/assets/javascripts/para/admin/tabs.coffee
 - app/assets/javascripts/para/admin/theme_actions.coffee
 - app/assets/javascripts/para/admin/tree.coffee
 - app/assets/javascripts/para/application.js
@@ -467,6 +475,7 @@ files:
 - db/migrate/20150203173219_add_identifier_to_para_components.rb
 - db/migrate/20160304113055_add_json_equality_operator_patch_to_postgres.rb
 - db/migrate/20160419145254_create_para_page_sections.rb
+- db/migrate/20160613172154_create_unaccent_extension.rb
 - lib/generators/para/admin_user/admin_user_generator.rb
 - lib/generators/para/component/component_generator.rb
 - lib/generators/para/component/crud/crud_generator.rb
@@ -573,6 +582,8 @@ files:
 - lib/para/plugins.rb
 - lib/para/plugins/routes.rb
 - lib/para/routes.rb
+- lib/para/search.rb
+- lib/para/search/distinct.rb
 - lib/para/sti.rb
 - lib/para/sti/root_model.rb
 - lib/para/version.rb