para 0.6.3 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f79b2e1b6163469c9247f53880b82b50527729e2
-  data.tar.gz: 46444b157efef7ace8f76a566dbcca7f90b62e1d
+  metadata.gz: d05cde47a5cf42feab91f48cb5df06d758a6d8c8
+  data.tar.gz: 82e6001147de85294dff0e7337d23049449aa32a
 SHA512:
-  metadata.gz: 008274f36acb1819e3ac4b37d74eb115806c7c86d8a5e5f409e98bc568c788ce31e8e4019a412eeb1b86f11025805e7f2f47b9bb609f3e5a4994bebd733e176c
-  data.tar.gz: a08c53ae52881b5ce1d80a2bb951f089db476824802adea8b2e006165164063512b0f2bc660eaa309cd692a8b9a7ea2aee05a740dc81355e6628fbe9c04d453e
+  metadata.gz: 1f0fdafd15411b30ae0ef8a42ed3afd38d8e9656ebb4f8c25190498518ce895185deb3f285bebdaf6be9c3d9b649373cfd2e3392e1961b52b28b6fb87cfb3029
+  data.tar.gz: 5178cecb9fc29faf92e294870888ec665c4da549b720e59856492077e0479e3467c3a703a582cf94e0082ca54b0d0e089a9651c9bc84a650cc156a0c3c625cf5

data/app/assets/javascripts/para/admin/job-tracker.coffee

@@ -28,7 +28,7 @@ class Para.JobTracker extends RemoteModalForm
 
   onFinalModalLoaded: (response) =>
     @formSuccess(null, response)
-    @refreshOnClose = true
+    @refreshOnClose = !(@$link?.data('refresh-on-close') is false)
 
   modalHide: ->
     super()

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

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

data/app/assets/javascripts/para/admin.js

@@ -0,0 +1,20 @@
+//= require jquery
+//= require jquery_ujs
+//= require turbolinks
+//= require bootstrap
+//= require vertebra
+//= require jasny.bootstrap.min
+//= require simple_form_extension
+//= require jquery.scrollto
+//= require html5-sortable
+//= require cocoon
+//= require jquery.remote-modal-form
+//= require_self
+//= require_tree ./lib
+//= require_tree ./inputs
+//= require_tree ./admin
+//= require ./plugins-includes
+//= require admin/app
+
+// Initialize scope
+window.Para = {}

data/app/assets/javascripts/para/plugins-includes.js.erb

@@ -0,0 +1 @@
+<% Para.config.plugins.javascript_includes.each { |path| require_asset(path) } %>

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

@@ -8,4 +8,5 @@
 //= require ./admin/theme
 //= require_tree ./overrides
 //= require_tree ./admin/src
+//= require ./plugins-includes
 //= require admin/app

data/app/assets/stylesheets/para/plugins-includes.sass.erb

@@ -0,0 +1 @@
+<% Para.config.plugins.stylesheet_includes.each { |path| require_asset(path) } %>

data/app/controllers/concerns/para/admin/resource_controller_concerns.rb

@@ -2,11 +2,17 @@ module Para
   module Admin
     module ResourceControllerConcerns
       def resource_model
-        @resource_model ||= @component.model
+        @resource_model ||= @component.try(:model)
       end
 
       def resource
-        @resource ||= instance_variable_get(:"@#{ resource_name }")
+        @resource ||= begin
+          resource = instance_variable_get(:"@#{ resource_name }")
+          # We ensure that the fetched resource is not a relation, which could
+          # happen for uncountable resource names (like "news") and would make
+          # code depending on the `resource` getter to fail unexpectedly
+          resource unless ActiveRecord::Relation === resource
+        end
       end
 
       def resource_name

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

@@ -14,7 +14,7 @@ module Para
 
       def index
         @q = @component.resources.search(params[:q])
-        @resources = distinct_search_results(@q).page(params[:page])
+        @resources = distinct_search_results(@q).page(params[:page]).per(params[:per_page])
 
         # Sort collection for orderable and trees
         @resources = if @resources.respond_to?(:ordered)

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

@@ -7,7 +7,7 @@ module Para
 
       def create
         job = @exporter.perform_later(
-          model_name: @component.model.name,
+          model_name: @component.try(:model).try(:name),
           search: params[:q]
         )
 

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

@@ -77,7 +77,7 @@ module Para
 
       def after_form_submit_path
         if params[:_save_and_edit]
-          { action: 'edit', id: resource.id }
+          { action: 'edit', id: resource.id, anchor: current_anchor }
         elsif params[:_save_and_add_another]
           { action: 'new' }
         else
@@ -157,7 +157,6 @@ module Para
 
       def resources_hash
         @resources_hash ||= begin
-
           ids = resources_data.map { |resource| resource[:id] }
 
           resources = resource_model.where(id: ids)
@@ -166,6 +165,12 @@ module Para
           end
         end
       end
+
+      def current_anchor
+        @current_anchor ||= if (current_anchor = params[:_current_anchor]).presence
+          current_anchor.gsub(/^\#/, '')
+        end
+      end
     end
   end
 end

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

@@ -4,8 +4,8 @@ module Para
       include Rails.application.routes.mounted_helpers
       include ActionDispatch::Routing::PolymorphicRoutes
 
-      def path(options = {})
-        find_path([:admin, self], options)
+      def path(namespace: nil, **options)
+        find_path([:admin, self, namespace].compact, options)
       end
 
       def relation_path(controller_or_resource, options = {})

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

@@ -0,0 +1,31 @@
+module Para
+  module Admin
+    module PaginationHelper
+      def page_entries(resources)
+        page_entries_info(resources) + per_page_select
+      end
+
+      private
+
+      def per_page_select
+        options = [25, 50, 100, 250, 500, 1000]
+
+        params = (Rack::Utils.parse_query(request.env['QUERY_STRING']).symbolize_keys rescue {})
+        params.delete(:page)
+        count_with_url = options.each_with_object({}) do |count, hash|
+          query = params.merge(:per_page => count)
+          url  = request.env['PATH_INFO'] + (query.empty? ? '' : "?#{query.to_query}")
+      
+          hash[count] = url
+        end
+
+        current_per_page = params[:per_page] || Kaminari.config.default_per_page
+
+        render partial: 'para/admin/resources/per_page_select', locals: { 
+          count_with_url: count_with_url, 
+          current_per_page: current_per_page 
+        }
+      end
+    end
+  end
+end

data/app/helpers/para/model_helper.rb

@@ -17,21 +17,31 @@ module Para
       component.class.reflect_on_association(relation).klass
     end
 
+    def field_for(model, field_name, type = nil)
+      model_field_mappings(model).field_for(field_name, type)
+    end
+
     def value_for(object, field_name, type = nil)
-      field = model_field_mappings(object.class).field_for(field_name, type)
+      field = field_for(object.class, field_name, type)
       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)
+      field = field_for(object.class, field_name, type)
+      value = field.value_for(object)
+
+      if field.excerptable_value?
+        excerpt_value_for(value)
+      else
+        value
+      end
     end
 
     def excerpt_value_for(value)
       return value unless value.kind_of?(String)
 
       value = sanitize(value, tags: [])
-      
+
       if (truncated = value[0..100]) != value
         "#{ truncated }..."
       else

data/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/app/models/para/cache/item.rb

@@ -0,0 +1,27 @@
+# Borrowed from activesupport-db-cache gem (https://github.com/sergio-fry/activesupport-db-cache),
+# which is out of date now not allowing us to depend on it in para
+#
+module Para
+  module Cache
+    class Item < ActiveRecord::Base
+      def value
+        Marshal.load(::Base64.decode64(self[:value])) if self[:value].present?
+      end
+
+      def value=(new_value)
+        @raw_value = new_value
+        self[:value] = ::Base64.encode64(Marshal.dump(@raw_value))
+      end
+
+      def expired?
+        read_attribute(:expires_at).try(:past?) || false
+      end
+
+      # From ActiveSupport::Cache::Store::Entry
+      # Seconds since the epoch when the entry will expire.
+      def expires_at
+        read_attribute(:expires_at).try(:to_f)
+      end
+    end
+  end
+end

data/app/models/para/page/section.rb

@@ -3,16 +3,10 @@ module Para
     class Section < ActiveRecord::Base
       self.table_name = 'para_page_sections'
 
-      include Para::Sti::RootModel
-
       acts_as_orderable
 
       belongs_to :page, polymorphic: true
 
-      def self.subclasses_namespace
-        'PageSection'
-      end
-
       def css_class
         @css_class ||= self.class.name.demodulize.underscore.gsub(/_/, '-')
       end

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

@@ -2,7 +2,7 @@
   - 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
+    = 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, :'refresh-on-close' => false } do
       = fa_icon 'download'
       = exporter.model_name.human
 
@@ -15,5 +15,5 @@
       %ul.dropdown-menu
         - component.exporters.each do |exporter|
           %li
-            = link_to component.path(namespace: :exports, exporter: exporter.name, q: params[:q]), method: :post, remote: true, data: { :'job-tracker-button' => true } do
+            = link_to component.path(namespace: :exports, exporter: exporter.name, q: params[:q]), method: :post, remote: true, data: { :'job-tracker-button' => true, :'refresh-on-close' => false } do
               = exporter.model_name.human

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

@@ -8,7 +8,7 @@
 
     - if resources.length > 0
       = panel.body class: 'page-entries-info' do
-        = page_entries_info(resources)
+        = page_entries(resources)
 
       = panel.body class: '' do
         = table_for(resources: resources, model: model, component: component, attributes: attributes)

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

@@ -0,0 +1,10 @@
+\.
+= t('helpers.page_entries_info.number_per_page')
+\:
+%span.dropdown
+  %button.btn.btn-default.btn-xs{ data: { toggle: 'dropdown' } }
+    = current_per_page
+    %span.caret
+  %ul.dropdown-menu
+    - count_with_url.each do |count, url|
+      %li= link_to count, url

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

@@ -5,6 +5,6 @@
   -# Add button
   - if add_button
     - 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 }
+      = 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, subclasses: subclasses }
     - 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_with_subclasses.html.haml

@@ -4,7 +4,7 @@
     = t('para.form.nested.add')
     %span.caret
   %ul.dropdown-menu
-    - model.descendants.sort_by { |m| m.model_name.human }.each do |submodel|
+    - subclasses.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/config/locales/fr.yml

@@ -144,6 +144,7 @@ fr:
       truncate: "…"
   helpers:
     page_entries_info:
+      number_per_page: Nombre d'entrées par page
       one_page:
         display_entries:
           zero: "Aucune entrée trouvée"

data/db/migrate/20161006105728_create_para_cache_items.rb

@@ -0,0 +1,12 @@
+class CreateParaCacheItems < ActiveRecord::Migration
+  def change
+    create_table :para_cache_items do |t|
+      t.string :key
+      t.text :value
+
+      t.datetime :expires_at
+
+      t.timestamps
+    end
+  end
+end

data/lib/generators/para/admin_user/admin_user_generator.rb

@@ -6,7 +6,8 @@ module Para
       say 'Creating default admin...'
 
       email =    ask('Email    [admin@example.com] : ').presence || 'admin@example.com'
-      password = ask('Password [password]          : ').presence || 'password'
+      password = ask('Password [password]          : ', echo: false).presence || 'password'
+      print "\n" # echo: false doesn't print a newline so we manually add it
 
       AdminUser.create! email: email, password: password
 

data/lib/generators/para/exporter/exporter_generator.rb

@@ -14,7 +14,7 @@ module Para
 
         template(
           "#{ base_exporter_template_name_for(format) }_exporter.rb",
-          "app/exporters/#{ format }/#{ plural_file_name }_exporter.rb"
+          "app/exporters/#{ plural_file_name }_exporter.rb"
         )
       end
     end
@@ -25,10 +25,6 @@ module Para
       Para::Exporter.model_exporter_name(class_name)
     end
 
-    def format_module_name_for(format)
-      Para::Exporter.format_exporter_name(format)
-    end
-
     def base_exporter_template_name_for(format)
       format_specific_template = "../templates/#{ format }_exporter.rb"
 

data/lib/generators/para/exporter/templates/base_exporter.rb

@@ -1,17 +1,23 @@
-module <%= format_module_name_for(@format) %>
-  class <%= model_exporter_name %> < Para::Exporter::Base
-    exports '<%= class_name %>'
+class <%= model_exporter_name %> < Para::Exporter::Base
+  def name
+    '<%= file_name %>'
+  end
 
-    def extension
-      '<%= @format %>'
-    end
+  protected
 
-    def name
-      'export'
-    end
+  def generate
+    # Add your export logic here, returning the exported data that will be
+    # stored with Paperclip and then directly served to the user
+  end
 
-    def render
-      # Add your export logic here
-    end
+  def extension
+    '.<%= @format %>'
   end
+
+  # If your #generate method returns binary data, uncomment the following
+  # method.
+  #
+  # def binary?
+  #   true
+  # end
 end

data/lib/generators/para/exporter/templates/csv_exporter.rb

@@ -1,15 +1,39 @@
-module <%= format_module_name_for(@format) %>
-  class <%= model_exporter_name %> < Para::Exporter::Csv
-    exports '<%= class_name %>'
-
-    def name
-      'export'
-    end
+class <%= model_exporter_name %> < Para::Exporter::Csv
+  def name
+    '<%= file_name %>'
+  end
 
-    private
+  protected
 
-    def fields
-      [:id]
-    end
+  # Defining the fields that you want to export will export all those fields
+  # directly to the CSV file
+  #
+  def fields
+    [:id]
   end
+
+  # If you need special behavior in the row generation (rendering associated
+  # models or other specific logic), you can return an array here that will
+  # be written to the CSV
+  #
+  # For safe CSV writing, use the #encode method on every string in the
+  # returned array.
+  #
+  # Example :
+  #
+  #   fields = [...]
+  #   fields.map!(&:encode)
+  #
+  # def row_for(resource)
+  # end
+
+  # If you need complete control over you CSV generation, use the following
+  # method instead of the #fields or #row_for methods, and return a valid CSV
+  # string
+  #
+  # You can use the `csv` extension from the ruby stdlib, for example with the
+  # CSV.generate method (more information )
+  #
+  # def generate
+  # end
 end

data/lib/generators/para/exporter/templates/xls_exporter.rb

@@ -0,0 +1,48 @@
+class <%= model_exporter_name %> < Para::Exporter::Xls
+  def name
+    '<%= file_name %>'
+  end
+
+  protected
+
+  # Defining the fields that you want to export will export all those fields
+  # directly to the XLS file
+  #
+  def fields
+    [:id]
+  end
+
+  # If you need special behavior in the row generation (rendering associated
+  # models or other specific logic), you can return an array here that will
+  # be written to the XLS
+  #
+  # For safe XLS writing, use the #encode method on every string in the
+  # returned array.
+  #
+  # Example :
+  #
+  #   fields = [...]
+  #   fields.map!(&:encode)
+  #
+  # def row_for(resource)
+  # end
+
+  # If you need complete control over you XLS generation, use the following
+  # method instead of the #fields or #row_for methods, and return a valid XLS
+  # StringIO object.
+  #
+  # A `#generate_workbook` method is provided, which will yield the workbook to
+  # you so you can just fill it, and then returns a StringIO that can be
+  # directly written to the Excel file.
+  #
+  # Please check the [Spreadsheet](https://github.com/zdavatz/spreadsheet) gem
+  # documentation for more informations about how to build your Excel document.
+  #
+  # def generate
+  #   generate_workbook do |workbook|
+  #     sheet = workbook.create_worksheet
+  #     sheet.row(0).concat ['data', 'row']
+  #     sheet.row(1).concat ['other', 'row']
+  #   end
+  # end
+end

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

@@ -20,7 +20,7 @@ module Para
     end
 
     def add_orderable_to_model
-      class_definition = "class #{ class_name } < ActiveRecord::Base\n"
+      class_definition = /class #{ class_name } < (ActiveRecord::Base|ApplicationRecord)\n/
 
       inject_into_file "app/models/#{ singular_namespaced_path }.rb", after: class_definition do
         "  acts_as_orderable\n"

data/lib/generators/para/page/section/section_generator.rb

@@ -10,7 +10,7 @@ module Para
       def generate_form
         template(
           "section.rb.erb",
-          "app/models/page_section/#{ plural_namespaced_path }.rb"
+          "app/models/page_section/#{ singular_namespaced_path }.rb"
         )
       end
 

data/lib/para/attribute_field/base.rb

@@ -71,6 +71,10 @@ module Para
         instance.send(name)
       end
 
+      def excerptable_value?
+        true
+      end
+
       #
       def searchable?
         options[:searchable] != false && (

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, format: :admin)
       end
 
       def wrapper_name

data/lib/para/attribute_field/file.rb

@@ -14,6 +14,10 @@ module Para
         end
       end
 
+      def excerptable_value?
+        false
+      end
+
       def wrapper_name
         :horizontal_file_input
       end

data/lib/para/attribute_field/image.rb

@@ -13,6 +13,10 @@ module Para
         end
       end
 
+      def excerptable_value?
+        false
+      end
+
       private
 
       def attachment_thumb_style_for(instance)