para 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 732caede63e764554d7a140b937d9b2c22ca9c85
-  data.tar.gz: 2cf5c7b7351487eb7b6c73de119fe8e0b17a79af
+  metadata.gz: 855b5d4493847325b66af2955504dcb8524f9e2d
+  data.tar.gz: 32e9da832c3641f4993cdd3c65096782ef4ba14b
 SHA512:
-  metadata.gz: abf828d53004049d831e19fb4125cc5ab54c254decc1f28a30a06bf8866f5bae76ca287d2e2b5664a28685c278106bd9ce269c51c1f6822be0984beab3a47148
-  data.tar.gz: c271d48d9883fd0f5268efddddf48efa61a3b77cc8ca4309896aeb8ec3c18f17f60a59522d746e04b94b34fb84c7fc1683b6147bc24fec5780015197796a88b0
+  metadata.gz: b5f34e153a1bc38d5e07e37c96b7a9f181e0be8957d1c1d685d3606649fcfefd88a426e8fd201302289f81d99ba076919e98295c8ae8c720cf3aed61698846db
+  data.tar.gz: 790dffa7b7fa6d327548b23e3a1dec0aeabf115bea3ceb6aa4fd31588f4c5f0318f1b23ca4daf3da6167e2bbde207bdcd1cdc4a5358443d23fcdc686bba1d86c

data/app/assets/javascripts/para/inputs/nested_many.coffee

@@ -17,7 +17,7 @@ class Para.NestedManyField
 
     @$fieldsList.on('sortupdate', $.proxy(@sortUpdate, this))
 
-  sortUpdate: (e, ui) ->
+  sortUpdate: ->
     @$fieldsList.find('.form-fields').each (i, el) ->
       $(el).find('.resource-position-field').val(i)
 
@@ -31,6 +31,7 @@ class Para.NestedManyField
     if @orderable
       @$fieldsList.sortable('destroy')
       @initializeOrderable()
+      @sortUpdate()
 
     if ($redactor = $element.find('[data-redactor]')).length
       $redactor.simpleFormRedactor()

data/app/assets/stylesheets/para/admin/src/page-top-bar.sass

@@ -0,0 +1,9 @@
+.page-actions
+  float: left
+  padding:
+    left: 10px
+  margin:
+    top: 15px
+    left: 10px
+  border:
+    left: 1px solid #ccc

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

@@ -13,6 +13,7 @@ body, html
   -moz-osx-font-smoothing: grayscale
 
 .body-full-height
+  height: 100%
   body
     height: 100%
 

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

@@ -95,7 +95,7 @@ module Para
       end
 
       def add_breadcrumbs
-        add_breadcrumb(resource_title_for(resource)) if resource
+        add_breadcrumb(resource_title_for(resource), path_to_edit(resource)) if resource
       end
 
       def attach_resource_to_component
@@ -107,6 +107,12 @@ module Para
         return unless @component.namespaced?
         @component.remove_resource(resource)
       end
+
+      def path_to_edit(resource)
+        @component.relation_path(
+          resource, action: (resource.persisted? ? :edit : :new)
+        )
+      end
     end
   end
 end

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

@@ -4,6 +4,20 @@ module Para
       def show
         @settings = SettingsRails::Form.new
       end
+
+      def update
+        form = SettingsRails::Form.new
+        form.settings_attributes = settings_params[:settings_attributes]
+        form.save
+        flash_message(:success, form)
+        redirect_to admin_settings_path(@component)
+      end
+
+      private
+
+      def settings_params
+        params.require(:resource).permit(settings_attributes: [:key, :_type, :value])
+      end
     end
   end
 end

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

@@ -8,15 +8,19 @@ module Para
         find_path([:admin, self, :resources], options)
       end
 
-      def relation_path(controller_or_resource, options = {})
+      def relation_path(controller_or_resource, *nested_resources, **options)
+        id_key = nested_resources.empty? ? :id : :resource_id
+
         if (id = extract_id_from(controller_or_resource))
-          options[:id] = id
+          options[id_key] = id
         end
 
-        route_key = route_key_for(options[:id], options)
+        route_key = route_key_for(options[id_key], options)
         options[:model] = model_singular_route_key
 
-        polymorphic_path([:admin, self, route_key].compact, options)
+        data = [:admin, self, route_key].compact + nested_resources
+
+        polymorphic_path(data, options)
       end
 
       private

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

@@ -66,9 +66,9 @@ module Para
         key = "#{ flash_shared_key }.#{ params[:action] }.#{ type }"
 
         translation = if resource
-          I18n.t(key, model: resource.class.model_name.human)
+          ::I18n.t(key, model: resource.class.model_name.human)
         else
-          I18n.t(key)
+          ::I18n.t(key)
         end
 
         flash[type] = translation
@@ -89,7 +89,9 @@ module Para
       end
 
       def partial_exists?(relation, partial)
-        lookup_context.find_all("admin/#{relation}/_#{ partial }").any?
+        partial_path = partial.to_s.split('/')
+        partial_path[-1] = "_#{ partial_path.last }"
+        lookup_context.find_all("admin/#{relation}/#{ partial_path.join('/') }").any?
       end
     end
   end

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

@@ -0,0 +1,32 @@
+module Para
+  module Admin
+    module PageHelper
+      def page_top_bar(options = {})
+        content_tag(:div, class: 'page-title') do
+          content_tag(:h1, options[:title]) +
+
+          if (actions = actions_for(options[:type]))
+            content_tag(:div, class: 'page-actions') do
+              actions.map(&method(:build_action)).join('').html_safe
+            end
+          end
+        end
+      end
+
+      def build_action(action)
+        link_to(action[:url], class: 'btn btn-default') do
+          (
+            (fa_icon(action[:icon]) if action[:icon]) +
+            action[:label]
+          ).html_safe
+        end
+      end
+
+      def actions_for(type)
+        Para.config.page_actions_for(type).map do |action|
+          instance_eval(&action)
+        end
+      end
+    end
+  end
+end

data/app/helpers/para/tree_helper.rb

@@ -30,7 +30,7 @@ module Para
         component.relation_path(resource),
         method: :delete,
         data: {
-          confirm: I18n.t('para.list.delete_confirmation')
+          confirm: ::I18n.t('para.list.delete_confirmation')
         },
         class: 'btn btn-danger'
       ) do
@@ -38,4 +38,4 @@ module Para
       end
     end
   end
-end
+end

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

@@ -19,7 +19,7 @@ module Para
       scope :ordered, -> { order(position: :asc) }
 
       def name
-        read_attribute(:name) || I18n.t(
+        read_attribute(:name) || ::I18n.t(
           "components.component.#{ identifier }",
           default: identifier.humanize
         )

data/app/models/para/component_section.rb

@@ -9,7 +9,7 @@ module Para
     validates :identifier, presence: true
 
     def name
-      read_attribute(:name) || I18n.t(
+      read_attribute(:name) || ::I18n.t(
         "components.section.#{ identifier }",
         default: identifier.humanize
       )

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

@@ -0,0 +1,21 @@
+module Para
+  module Page
+    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
+    end
+  end
+end

data/app/views/layouts/para/admin.html.haml

@@ -1,7 +1,7 @@
 !!!
-%html{ lang: 'en' }
+%html.body-full-height{ lang: 'en' }
   %head
-    %title= Para.config.admin_title || I18n.t('para.admin.title')
+    %title= Para.config.admin_title || ::I18n.t('para.admin.title')
 
     %meta{ charset: 'utf-8' }/
     %meta{ content: 'IE=edge', 'http-equiv' => 'X-UA-Compatible' }/

data/app/views/para/admin/crud_resources/index.html.haml

@@ -1,4 +1,3 @@
-.page-title
-  %h1= @component.name
+= page_top_bar(title: @component.name, type: 'crud/index')
 
 = listing_for(@resources)

data/app/views/para/admin/dashboard.html.haml

@@ -1,5 +1,4 @@
-.page-title
-  %h1= t('para.dashboard.title')
+= page_top_bar(title: t('para.dashboard.title'), type: 'dashboard/show')
 
 .page-content-wrap
   - ordered_components.each_slice(3) do |components|

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

@@ -1,8 +1,8 @@
 = resources_table(model: model, component: component) do |table|
   = table.header do
     - attributes.each do |field|
-      = table.header_for(field.name)
+      = table.header_for(field.name.to_sym)
 
   = table.rows(resources) do |resource|
     - attributes.each do |field|
-      = table.data_for(resource, field.name)
+      = table.data_for(resource, field.name.to_sym)

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

@@ -2,15 +2,18 @@
   .node-row
     %span.handle
       %i.fa.fa-bars.fa-fw
-    %span.node-name  
+    %span.node-name
       = root.name
+
     .pull-right.btn-group
       = link_to @component.relation_path(root, action: :edit, return_to: request.fullpath), class: "btn btn-primary" do
         %i.fa.fa-pencil
-      = link_to @component.relation_path(root), method: :delete, data: { confirm: I18n.t('para.list.delete_confirmation') }, class: 'btn btn-danger' do
+
+      = link_to @component.relation_path(root), method: :delete, data: { confirm: ::I18n.t('para.list.delete_confirmation') }, class: 'btn btn-danger' do
         %i.fa.fa-trash
-    .clearfix    
+
+    .clearfix
   %ul.tree
     %li.placeholder{ class: "#{ 'hidden' unless needs_placeholder?(root) }"}
     = render partial: find_partial_for(model, 'tree_item'), collection: root.children.ordered, as: :root, locals: { model: model }
-    
+

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

@@ -1,6 +1,4 @@
-.page-title
-  %h1
-    = resource_title_for(resource)
+= page_top_bar(title: resource_title_for(resource), type: 'crud/edit')
 
 .page-content-wrap
   = render find_partial_for(resource, :form)

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

@@ -1,6 +1,4 @@
-.page-title
-  %h1
-    = resource_title_for(resource)
+= page_top_bar(title: resource_title_for(resource), type: 'crud/new')
 
 .page-content-wrap
   = render find_partial_for(resource, :form)

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

@@ -1,8 +1,7 @@
-.page-title
-  %h1= @component.name
+= page_top_bar(title: @component.name, type: 'settings/show')
 
 .page-content-wrap
-  = para_form_for @settings, url: admin_settings_settings_form_path(@component) do |form|
+  = para_form_for @settings, url: admin_settings_path(@component) do |form|
     = form.fieldset do
       - @component.settings.each do |setting, type|
         = form.settings_input setting, type: type

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

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

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

@@ -1,8 +1,7 @@
 .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, subclass: subclass, nested_locals: nested_locals }
-
+      = render partial: find_partial_for(model, 'nested_many/container', partial_dir: 'inputs'), locals: { form: nested_form, model: nested_form.object.class, subclass: subclass, nested_locals: nested_locals }
   -# Add button
   - if add_button
     - if subclass

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

@@ -16,6 +16,7 @@
   .panel-body.form-inputs.collapse{ id: form.nested_resource_dom_id }
     = 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)
+    -# Add inheritance column field if needed
+    = form.hidden_field form.object.class.inheritance_column if form.object.class.column_names.include?(form.object.class.inheritance_column)
 
   .clearfix

data/db/migrate/20160419145254_create_para_page_sections.rb

@@ -0,0 +1,12 @@
+class CreateParaPageSections < ActiveRecord::Migration
+  def change
+    create_table :para_page_sections do |t|
+      t.string :type
+      t.jsonb :data
+      t.integer :position, default: 0
+      t.references :page, index: true, polymorphic: true
+
+      t.timestamps null: false
+    end
+  end
+end

data/lib/generators/para/component/templates/show.html.haml

@@ -1,2 +1 @@
-.page-title
-  %h1= @component.name
+= page_top_bar(title: @component.name, type: '<%= file_name %>/show')

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

@@ -9,7 +9,7 @@ Para.config do |config|
   # config.pagination_theme = 'twitter-bootstrap-3'
 
   # Configure the default admin HTML page <title>
-  # config.admin_title = I18n.t('para.admin.title')
+  # config.admin_title = ::I18n.t('para.admin.title')
 
   # Configure the default max depth for trees
   # config.default_tree_max_depth = 3
@@ -20,4 +20,8 @@ Para.config do |config|
   # Default is [:name, :title]
   #
   # config.resource_name_methods += [:full_name]
+
+  # Para plugins to load
+  #
+  # config.plugins = []
 end

data/lib/generators/para/nested_fields/nested_fields_generator.rb

@@ -16,8 +16,8 @@ module Para
 
     def generate_fields_container
       template(
-        "../../../../../app/views/para/inputs/_nested_many_container.html.haml",
-        "app/views/admin/#{ plural_namespaced_path }/_nested_many_container.html.haml"
+        "../../../../../app/views/para/inputs/nested_many/_container.html.haml",
+        "app/views/admin/#{ plural_namespaced_path }/nested_many/_container.html.haml"
       ) if options[:container]
     end
   end

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

@@ -0,0 +1,28 @@
+module Para
+  module Page
+    class SectionGenerator < Rails::Generators::NamedBase
+      include Para::Generators::NameHelpers
+
+      source_root File.expand_path("../templates", __FILE__)
+
+      argument :attributes, type: :array
+
+      def generate_form
+        template(
+          "section.rb.erb",
+          "app/models/page_section/#{ plural_namespaced_path }.rb"
+        )
+      end
+
+      private
+
+      def attributes_separated_with_commas
+        if attributes.empty?
+          ':title'
+        else
+          attributes.map { |attribute| ":#{ attribute.name }" }.join(', ')
+        end
+      end
+    end
+  end
+end

data/lib/generators/para/page/section/templates/section.rb.erb

@@ -0,0 +1,6 @@
+module PageSection
+  class <%= class_name %> < Para::Page::Section
+    # Your page section fields are declared here as store accessors
+    store_accessor :data, <%= attributes_separated_with_commas %>
+  end
+end

data/lib/para/attribute_field/boolean.rb

@@ -6,7 +6,7 @@ module Para
       field_option :wrapper, :wrapper_name
 
       def value_for(instance)
-        I18n.t("para.types.boolean.#{ (!!instance.send(name)).to_s }")
+        ::I18n.t("para.types.boolean.#{ (!!instance.send(name)).to_s }")
       end
 
       def wrapper_name

data/lib/para/attribute_field/enum.rb

@@ -6,7 +6,7 @@ module Para
       def value_for(instance)
         if (raw_value = instance.send(name)) &&
           path = enum_path_for(instance, raw_value)
-          translation = I18n.t("activerecord.#{ path }", default: false)
+          translation = ::I18n.t("activerecord.#{ path }", default: false)
 
           translation || raw_value
         end

data/lib/para/breadcrumbs/breadcrumb.rb

@@ -11,7 +11,7 @@ module Para
 
       def title
         @title ||= if Symbol === identifier
-          I18n.t("admin.breadcrumbs.#{ identifier }")
+          ::I18n.t("admin.breadcrumbs.#{ identifier }")
         else
           identifier
         end

data/lib/para/config.rb

@@ -18,11 +18,18 @@ module Para
     mattr_accessor :resource_name_methods
     @@resource_name_methods = [:admin_name, :admin_title, :name, :title]
 
+    mattr_accessor :plugins
+    @@plugins = []
+
+    # Hidden from initializer on purpose.
+    #
+    # This is mainly here to be overriden from a gem, not the app dev
+    #
     mattr_accessor :ability_class_name
     @@ability_class_name = 'Para::Ability'
 
-    mattr_accessor :plugins
-    @@plugins = []
+    mattr_accessor :page_actions
+    @@page_actions = {}
 
     # Allows accessing plugins root module to configure them through a method
     # from the Para::Config class.
@@ -41,5 +48,17 @@ module Para
         super
       end
     end
+
+    def self.routes
+      Para::Routes
+    end
+
+    def self.page_actions_for(type)
+      page_actions[type] ||= []
+    end
+
+    def self.add_actions_for(type, &block)
+      page_actions_for(type) << block
+    end
   end
 end

data/lib/para/engine.rb

@@ -48,6 +48,14 @@ module Para
       end
     end
 
+    initializer 'Extend simple form extension selectize input' do
+      ActiveSupport.on_load(:active_record) do
+        ::SimpleFormExtension::Inputs::SelectizeInput.send(
+          :include, Para::Ext::SimpleFormExtension::SelectizeInput
+        )
+      end
+    end
+
     initializer 'Build components tree' do |app|
       components_config_path = Rails.root.join('config', 'components.rb')
 
@@ -55,5 +63,9 @@ module Para
         require components_config_path if File.exist?(components_config_path)
       end
     end
+
+    initializer 'Load page sections' do |app|
+      Para::Page::Section.eager_load!
+    end
   end
 end

data/lib/para/ext/simple_form_extension.rb

@@ -0,0 +1,21 @@
+module Para
+  module Ext
+    module SimpleFormExtension
+      module SelectizeInput
+        extend ActiveSupport::Concern
+
+        included do
+          alias_method_chain :name_for, :admin_name
+        end
+
+        def name_for_with_admin_name(option)
+          Para.config.resource_name_methods.each do |method|
+            if (name = option.try(method))
+              return name
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/para/ext.rb

@@ -11,3 +11,4 @@ end
 
 require 'para/ext/cancan'
 require 'para/ext/paperclip'
+require 'para/ext/simple_form_extension'

data/lib/para/form_builder/containers.rb

@@ -45,20 +45,20 @@ 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')
       end
 
       def para_submit_and_edit_button
-        button(:submit, I18n.t('para.shared.save_and_edit'), name: '_save_and_edit', class: 'btn-primary')
+        button(:submit, ::I18n.t('para.shared.save_and_edit'), name: '_save_and_edit', class: 'btn-primary')
       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')
       end
 
       def para_cancel_button
         template.link_to(
-          I18n.t('para.shared.cancel'),
+          ::I18n.t('para.shared.cancel'),
           return_to_path,
           class: 'btn btn-danger'
         )

data/lib/para/form_builder/nested_form.rb

@@ -39,7 +39,7 @@ module Para
             self, wrapper_class: 'form-fields', class: 'btn btn-danger'
           ) do
             template.content_tag(:i, '', class: 'fa fa-trash') +
-            I18n.t('para.form.nested.remove')
+            ::I18n.t('para.form.nested.remove')
           end
         end
       end
@@ -75,7 +75,7 @@ module Para
 
       def default_resource_name
         model_name = object.class.model_name.human
-        id_or_new = (id = object.id) ? id : I18n.t('para.form.nested.new')
+        id_or_new = (id = object.id) ? id : ::I18n.t('para.form.nested.new')
 
         [model_name, id_or_new].join(' - ')
       end

data/lib/para/form_builder/tabs.rb

@@ -41,7 +41,7 @@ module Para
 
         def title
           if Symbol === identifier
-            I18n.t("forms.tabs.#{ object.class.model_name.i18n_key }.#{ identifier }")
+            ::I18n.t("forms.tabs.#{ object.class.model_name.i18n_key }.#{ identifier }")
           else
             identifier
           end

data/lib/para/generators/field_helpers.rb

@@ -10,12 +10,19 @@ module Para
         end
       end
 
-      def field_options_for(field)
-        field_options = field.field_options
+      def field_options_for(field, options = {})
+        field_options = field.field_options.merge(options)
 
         options = field_options.each_with_object([]) do |(key, value), ary|
           if writable_value?(value)
-            ary << "#{ key.inspect } => #{ value.inspect }"
+            if key.to_s.match(/^[\w\d]+/)
+              join_symbol = ': '
+            else
+              join_symbol = ' => '
+              key = key.inspect
+            end
+
+            ary << [key, join_symbol, value.inspect].join
           end
         end
 

data/lib/para/inputs/nested_many_input.rb

@@ -1,6 +1,8 @@
 module Para
   module Inputs
     class NestedManyInput < SimpleForm::Inputs::Base
+      attr_reader :resource
+
       def input(wrapper_options = nil)
         input_html_options[:class] << "nested-many"
 

data/lib/para/markup/resources_table.rb

@@ -1,6 +1,9 @@
 module Para
   module Markup
     class ResourcesTable < Para::Markup::Component
+      class_attribute :default_actions
+      self.default_actions = [:edit, :clone, :delete]
+
       attr_reader :model, :component, :orderable, :actions
 
       def container(options = {}, &block)
@@ -11,7 +14,7 @@ module Para
           @orderable = model.orderable?
         end
 
-        @actions = options.fetch(:actions, true)
+        @actions = build_actions(options.delete(:actions))
 
         merge_class!(options, 'table')
         merge_class!(options, 'para-component-relation-table')
@@ -41,7 +44,7 @@ module Para
         # Append cells
         cells << capture { block.call }
         # Append actions empty cell
-        cells << content_tag(:th, '', class: 'actions') if actions
+        cells << content_tag(:th, '', class: 'actions', width: 1) if actions
 
         # Output full header
         content_tag(:thead) do
@@ -132,11 +135,9 @@ module Para
       def actions_cell(resource)
         content_tag(:td) do
           content_tag(:div, class: 'pull-right btn-group') do
-            edit = edit_button(resource) if action?(:edit)
-            clone = clone_button(resource) if action?(:clone)
-            delete = delete_button(resource) if action?(:delete)
-
-            edit + clone + delete
+            actions.map do |type|
+              send(:"#{ type }_button", resource)
+            end.compact.join.html_safe
           end
         end
       end
@@ -174,7 +175,7 @@ module Para
         options = {
           method: :delete,
           data: {
-            confirm: I18n.t('para.list.delete_confirmation')
+            confirm: ::I18n.t('para.list.delete_confirmation')
           },
           class: 'btn btn-danger'
         }
@@ -194,8 +195,12 @@ module Para
         model.columns_hash.keys.include?(field_name.to_s)
       end
 
-      def action?(type)
-        actions == true || actions.include?(type)
+      def build_actions(actions)
+        if actions.in?([true, nil])
+          default_actions
+        else
+          actions
+        end
       end
     end
   end

data/lib/para/model_field_parsers/store.rb

@@ -4,6 +4,11 @@ module Para
       register :json, self
 
       def parse!
+        process_stored_attributes
+        process_remaining_json_fields
+      end
+
+      def process_stored_attributes
         model.stored_attributes.each do |store_key, field_names|
           fields_hash.delete(store_key)
 
@@ -15,8 +20,26 @@ module Para
         end
       end
 
+      # Duplicate fields to avoid updating the hash while iterating through it
+      # then remove remaining json fields from the hash
+      def process_remaining_json_fields
+        fields_hash.dup.each do |key, field|
+          fields_hash.delete(key) if json_field?(field)
+        end
+      end
+
       def applicable?
-        !model.stored_attributes.empty?
+        !model.stored_attributes.empty? || model_includes_json_fields?
+      end
+
+      def model_includes_json_fields?
+        fields_hash.any? do |_, field|
+          json_field?(field)
+        end
+      end
+
+      def json_field?(field)
+        field.type.to_s.in?(%w(json jsonb))
       end
     end
   end

data/lib/para/page/model.rb

@@ -0,0 +1,12 @@
+module Para
+  module Page
+    module Model
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :sections, -> { ordered }, class_name: '::Para::Page::Section', as: :page
+        accepts_nested_attributes_for :sections, allow_destroy: true
+      end
+    end
+  end
+end

data/lib/para/page.rb

@@ -0,0 +1,6 @@
+module Para
+  module Page
+  end
+end
+
+require 'para/page/model'

data/lib/para/routes.rb

@@ -1,5 +1,7 @@
 module Para
   class Routes
+    class_attribute :routes_extensions
+
     attr_reader :router
 
     def initialize(router)
@@ -15,6 +17,7 @@ module Para
 
               crud_component :crud, scope: ':model'
               singleton_resource_component :singleton, scope: ':model'
+              component :settings
             end
           end
 
@@ -22,5 +25,15 @@ module Para
         end
       end
     end
+
+    def self.extend_routes_for(component_type, &block)
+      extensions = routes_extensions_for(component_type)
+      extensions << block
+    end
+
+    def self.routes_extensions_for(component_type)
+      self.routes_extensions ||= {}
+      self.routes_extensions[component_type] ||= []
+    end
   end
 end

data/lib/para/sti/root_model.rb

@@ -0,0 +1,58 @@
+module Para
+  module Sti
+    module RootModel
+      extend ActiveSupport::Concern
+
+      included do
+        class << self
+          def descendants_with_eager_loaded_subclasses
+            eager_load!
+            descendants_without_eager_loaded_subclasses
+          end
+
+          alias_method_chain :descendants, :eager_loaded_subclasses
+        end
+      end
+
+      module ClassMethods
+        def eager_load!
+          return if @eager_loaded
+          @eager_loaded = true
+
+          models_dir = Rails.root.join('app', 'models')
+
+          Dir[models_dir.join(subclasses_dir, '*.rb')].each do |file_path|
+            file_name = File.basename(file_path, '.rb')
+
+            # Avoid Circular dependecy errors in development, when the first
+            # loaded class is not the base class. In this case, the base class
+            # loading is triggered by the child, so if we try to load that child
+            # again, Rails issues a CircularDependency error
+            file_load_path = File.join(File.dirname(file_path), file_name)
+            next if ActiveSupport::Dependencies.loading.include?(file_load_path)
+
+            # Autoload the subclass
+            require file_load_path
+          end
+        end
+
+        private
+
+        # Allows the including class to define `.subclasses_namespace` class
+        # method to override the namespace and directory used to eager load the
+        # subclasses.
+        #
+        # Note : No error is raised if target subclasses directory does not
+        #        exist.
+        #
+        def subclasses_namespace
+          @subclasses_namespace ||= name.deconstantize
+        end
+
+        def subclasses_dir
+          @subclasses_dir ||= subclasses_namespace.underscore
+        end
+      end
+    end
+  end
+end

data/lib/para/sti.rb

@@ -0,0 +1,6 @@
+module Para
+  module Sti
+  end
+end
+
+require 'para/sti/root_model'

data/lib/para/version.rb

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

data/lib/para.rb

@@ -8,6 +8,7 @@ require 'truncate_html'
 require 'cocoon'
 require 'cancan'
 require 'request_store'
+require 'roo'
 
 require 'sass-rails'
 require 'selectize-rails'
@@ -32,6 +33,8 @@ require 'para/engine'
 require 'para/components_configuration'
 require 'para/exporter'
 require 'para/importer'
+require 'para/sti'
+require 'para/page'
 
 module Para
   extend ActiveSupport::Autoload

data/lib/rails/relation_length_validator.rb

@@ -27,7 +27,7 @@ class RelationLengthValidator < ActiveModel::EachValidator
 
   def smaller_error_message
     message = options[:message] && options[:message][:minimum]
-    message || I18n.t(
+    message || ::I18n.t(
       "activerecord.errors.relation_length_is_smaller",
       minimum: minimum,
       default: "must have at least #{ minimum } elements"
@@ -36,7 +36,7 @@ class RelationLengthValidator < ActiveModel::EachValidator
 
   def greater_error_message
     message = options[:message] && options[:message][:maximum]
-    message || I18n.t(
+    message || ::I18n.t(
       "activerecord.errors.relation_length_is_greater",
       maximum: maximum,
       default: "must have at most #{ maximum } elements"

data/lib/rails/routing_mapper.rb

@@ -20,7 +20,11 @@ module ActionDispatch
         )
 
         get endpoint => "#{ controller }#show", as: as
-        scope(endpoint, as: component_name, &block) if block
+
+        scope(endpoint, as: component_name) do
+          instance_eval(&block) if block
+          add_extensions_for(:component)
+        end
       end
 
       def crud_component(component_name, options = {}, &block)
@@ -45,6 +49,7 @@ module ActionDispatch
               end
 
               instance_eval(&block) if block
+              add_extensions_for(:crud_component)
             end
           end
         end
@@ -59,6 +64,7 @@ module ActionDispatch
 
         scope endpoint, as: as do
           resource :resource, controller: controller, only: [:show, :create, :update]
+          add_extensions_for(:singleton_resource_component)
         end
       end
 
@@ -81,6 +87,12 @@ module ActionDispatch
 
         [as, controller, endpoint]
       end
+
+      def add_extensions_for(type)
+        Para.config.routes.routes_extensions_for(type).each do |extension|
+          instance_eval(&extension)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: roo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -347,6 +361,7 @@ files:
 - app/assets/stylesheets/para/admin/src/fuelux.sass
 - app/assets/stylesheets/para/admin/src/jasny.bootstrap.sass
 - app/assets/stylesheets/para/admin/src/page-loading.sass
+- app/assets/stylesheets/para/admin/src/page-top-bar.sass
 - app/assets/stylesheets/para/admin/src/redactor.sass
 - app/assets/stylesheets/para/admin/src/selectize.sass
 - app/assets/stylesheets/para/admin/src/slider.sass
@@ -379,7 +394,6 @@ files:
 - app/controllers/para/admin/main_controller.rb
 - app/controllers/para/admin/resources_controller.rb
 - app/controllers/para/admin/settings_component_controller.rb
-- app/controllers/para/admin/settings_form_controller.rb
 - app/controllers/para/admin/singleton_resources_controller.rb
 - app/controllers/para/application_controller.rb
 - app/decorators/para/component/base_decorator.rb
@@ -390,6 +404,7 @@ files:
 - app/helpers/para/admin/base_helper.rb
 - app/helpers/para/admin/component_groups_helper.rb
 - app/helpers/para/admin/components_helper.rb
+- app/helpers/para/admin/page_helper.rb
 - app/helpers/para/admin/resources_helper.rb
 - app/helpers/para/application_helper.rb
 - app/helpers/para/exports_helper.rb
@@ -410,9 +425,9 @@ files:
 - app/models/para/component/singleton_resource.rb
 - app/models/para/component_resource.rb
 - app/models/para/component_section.rb
+- app/models/para/page/section.rb
 - app/views/layouts/para/admin.html.haml
 - app/views/layouts/para/application.html.erb
-- app/views/para/admin/crud_component/show.html.haml
 - app/views/para/admin/crud_resources/index.html.haml
 - app/views/para/admin/dashboard.html.haml
 - app/views/para/admin/main/index.html.haml
@@ -451,6 +466,7 @@ files:
 - db/migrate/20150129170710_create_para_component_resources.rb
 - 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
 - lib/generators/para/admin_user/admin_user_generator.rb
 - lib/generators/para/component/component_generator.rb
 - lib/generators/para/component/crud/crud_generator.rb
@@ -475,6 +491,8 @@ files:
 - lib/generators/para/nested_fields/templates/_nested_fields.html.haml
 - lib/generators/para/orderable/orderable_generator.rb
 - lib/generators/para/orderable/templates/orderable_migration.rb
+- lib/generators/para/page/section/section_generator.rb
+- lib/generators/para/page/section/templates/section.rb.erb
 - lib/generators/para/resource/resource_generator.rb
 - lib/generators/para/resource/templates/resource_controller.rb
 - lib/generators/para/table/table_generator.rb
@@ -515,6 +533,7 @@ files:
 - lib/para/ext.rb
 - lib/para/ext/cancan.rb
 - lib/para/ext/paperclip.rb
+- lib/para/ext/simple_form_extension.rb
 - lib/para/form_builder.rb
 - lib/para/form_builder/containers.rb
 - lib/para/form_builder/field_mappings.rb
@@ -549,9 +568,13 @@ files:
 - lib/para/model_field_parsers/relations.rb
 - lib/para/model_field_parsers/store.rb
 - lib/para/orderable.rb
+- lib/para/page.rb
+- lib/para/page/model.rb
 - lib/para/plugins.rb
 - lib/para/plugins/routes.rb
 - lib/para/routes.rb
+- lib/para/sti.rb
+- lib/para/sti/root_model.rb
 - lib/para/version.rb
 - lib/rails/relation_length_validator.rb
 - lib/rails/routing_mapper.rb

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

@@ -1,21 +0,0 @@
-module Para
-  module Admin
-    class SettingsFormController < Para::Admin::BaseController
-      load_and_authorize_component
-
-      def update
-        form = SettingsRails::Form.new
-        form.settings_attributes = settings_params[:settings_attributes]
-        form.save
-        flash_message(:success, form)
-        redirect_to admin_settings_path(@component)
-      end
-
-      private
-
-      def settings_params
-        params.require(:resource).permit(settings_attributes: [:key, :_type, :value])
-      end
-    end
-  end
-end

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

@@ -1,4 +0,0 @@
-.page-title
-  %h1= @component.name
-
-= listing_for(@resources)