udongo 1.0.3 → 1.0.4

data/app/decorators/page_decorator.rb

@@ -1,8 +1,8 @@
-class PageDecorator < Draper::Decorator
+class PageDecorator < ApplicationDecorator
   delegate_all
 
   def options_for_parents
-    ::Page.flat_tree.map do |p|
+    Page.flat_tree.map do |p|
       ["#{'-' * p.depth} #{p.description}".strip, p.id]
     end
   end

data/app/decorators/pagination_decorator.rb

@@ -0,0 +1,4 @@
+class PaginationDecorator < Draper::CollectionDecorator
+  # support for will_paginate
+  delegate :current_page, :total_entries, :total_pages, :per_page, :offset
+end

data/app/decorators/redirect_decorator.rb

@@ -1,4 +1,4 @@
-class RedirectDecorator < Draper::Decorator
+class RedirectDecorator < ApplicationDecorator
   delegate_all
 
   def status_code_collection

data/app/decorators/snippet_decorator.rb

@@ -1,4 +1,4 @@
-class SnippetDecorator < Draper::Decorator
+class SnippetDecorator < ApplicationDecorator
   def title
     string = object.title.to_s
     object.allow_html_in_title? ? string.html_safe : string

data/app/forms/backend/snippet_form.rb

@@ -1,7 +1,4 @@
-class Backend::SnippetForm
-  include ActiveModel::Model
-  include Virtus.model
-
+class Backend::SnippetForm < Udongo::Form
   attr_reader :snippet
 
   attribute :identifier, String
@@ -18,28 +15,17 @@ class Backend::SnippetForm
   end
 
   def self.model_name
-    ::Snippet.model_name
+    Snippet.model_name
   end
 
   def persisted?
     !@snippet.new_record?
   end
 
-  def save(params)
-    attributes.keys.each { |k| send("#{k}=", params[k]) }
-
-    if valid?
-      save_snippet
-      true
-    else
-      false
-    end
-  end
-
   private
 
   def unique_identifier
-    qry = ::Snippet.unscoped
+    qry = Snippet.unscoped
     qry = qry.where.not(identifier: @snippet.identifier) if persisted?
 
     if qry.exists?(identifier: identifier)
@@ -47,7 +33,7 @@ class Backend::SnippetForm
     end
   end
 
-  def save_snippet
+  def save_object
     attributes.each { |k, v| @snippet.send("#{k}=", v) }
     @snippet.save!
   end

data/app/helpers/backend/pagination_helper.rb

@@ -1,17 +1,7 @@
 module Backend
   module PaginationHelper
-
     def udongo_paginate(collection, options = {})
-      options.merge!(
-        class: 'pagination',
-        inner_window: 1,
-        outer_window: 0,
-        renderer: Udongo::WillPaginate::Renderer,
-        previous_label: '<'.html_safe,
-        next_label: '>'.html_safe
-      )
-
-      will_paginate collection, options
+      will_paginate(collection, Udongo::WillPaginate::Options.new(options).values)
     end
   end
 end

data/app/helpers/icon_helper.rb

@@ -1,6 +1,6 @@
 module IconHelper
   def icon(name, label = nil)
-    markup = content_tag :i, nil, class: "fa fa-#{name.to_s.gsub('_', '-')}"
+    markup = content_tag :i, nil, class: "fa fa-#{name.to_s.tr('_', '-')}"
     label ? "#{markup} #{label}".html_safe : markup
   end
 end

data/app/helpers/snippet_helper.rb

@@ -1,5 +1,5 @@
 module SnippetHelper
   def snippet(identifier)
-    ::Snippet.find_in_cache(identifier).decorate
+    Snippet.find_in_cache(identifier).decorate
   end
 end

data/app/models/concerns/storable/collection.rb

@@ -4,52 +4,74 @@ module Concerns
       def initialize(parent, category, config)
         @parent = parent
         @category = category
+        @config = config
 
-        init_attributes(config)
-        init_values(config)
+        init_attributes
+        init_values
+      end
+
+      def delete
+        stores.each { |s| s.destroy }
+        reset_values
       end
 
       def save
         attributes.each do |name,value|
-          tmp = ::Store.find_or_initialize_by(
-            collection: @category,
-            storable_type: @parent.class.name,
-            storable_id: @parent.id,
-            name: name
-          )
-
+          tmp = store(name)
           tmp.value = value
           tmp.save!
         end
       end
 
-      def delete
-        ::Store.where(
-          storable_type: @parent.class,
-          storable_id: @parent.id,
-          collection: @category,
-        ).each { |s| s.destroy }
+      def store(name, file: false)
+        stores(file: file).find_or_initialize_by(name: name)
+      end
 
-        reset_values
+      # You'll find that mounting an uploader on Store will prevent
+      # the saving of other attributes.
+      def stores(file: false)
+        klass = file ? StoreWithFile : Store
+        klass.where(storable: @parent, collection: @category)
+      end
+
+      def define_reader_method_for_uploader_field(field, options)
+        self.class.send(:define_method, field) do
+          StoreWithFile.mount_uploader :value, options[:type]
+          store(field, file: true).value
+        end
+      end
+
+      def define_writer_method_for_uploader_field(field, options)
+        self.class.send(:define_method, "#{field}=") do |value|
+          # Right now, when we save a form with a filefield, you will
+          # notice in the database that the store value keeps updating
+          # with a new filename hash. It always "reuploads" the file.
+          s = store(field, file: true)
+          s.value = value
+          s.save
+        end
       end
 
       private
 
-      def init_attributes(config)
+      def init_attributes
         extend(Virtus.model)
 
-        config.fields.each do |field,options|
-          attribute field, options[:type], default: options[:default], lazy: true
+        @config.fields.each do |field,options|
+          if options[:type].to_s.include?('Uploader')
+            define_reader_method_for_uploader_field(field, options)
+            define_writer_method_for_uploader_field(field, options)
+          else
+            attribute field, options[:type], default: options[:default], lazy: true
+          end
         end
       end
 
-      def init_values(config)
-        ::Store.where(
-          storable_type: @parent.class,
-          storable_id: @parent.id,
-          collection: @category,
-        ).pluck(:name, :value).each do |field, value|
-          send "#{field}=", value if config.allowed?(field)
+      def init_values
+        stores.pluck(:name, :value).each do |field, value|
+          next unless @config.allowed?(field)
+          next if @config.fields[field.to_sym][:type].to_s.include?('Uploader')
+          send "#{field}=", value
         end
       end
 

data/app/models/concerns/translatable.rb

@@ -9,7 +9,7 @@ module Concerns
       serialize :locales, Array
 
       after_save do
-        locales = ::Store.where(
+        locales = Store.where(
           storable_type: self.class,
           storable_id: self.id,
           name: self.class.translatable_fields_list

data/app/models/content_row.rb

@@ -8,4 +8,8 @@ class ContentRow < ActiveRecord::Base
   has_many :columns, class_name: 'ContentColumn', foreign_key: :row_id, dependent: :destroy
 
   validates :locale, presence: true
+
+  def column_width_calculator
+    @column_width_calculator ||= Udongo::FlexibleContent::ColumnWidthCalculator.new(self)
+  end
 end

data/app/models/form.rb

@@ -4,6 +4,7 @@ class Form < ActiveRecord::Base
 
   has_many :fields, class_name: 'FormField', dependent: :destroy
   has_many :submissions, class_name: 'FormSubmission', dependent: :destroy
+  has_many :data, through: :submissions
 
   validates :identifier, presence: true
 end

data/app/models/store_with_file.rb

@@ -0,0 +1,2 @@
+class StoreWithFile < Store
+end

data/app/views/backend/content/_image.html.erb

@@ -1,13 +1,6 @@
 <% if object.present? && object.file.present? %>
 
-  <% if object.url.present? %>
-    <%= link_to object.url do %>
-      <%= image_tag object.file.size_1024x640.url, alt: '', class: 'img-fluid' %>
-    <% end %>
-
-  <% else %>
-    <%= image_tag object.file.size_1024x640.url, alt: '', class: 'img-fluid' %>
-  <% end %>
+  <%= image_tag object.file.size_1024x640.url, alt: '', class: 'img-fluid' %>
 
   <% if object.caption.present? %>
     <div class="text-center">

data/app/views/backend/content/_rows.html.erb

@@ -1,63 +1,66 @@
+<% javascript 'backend/sortable' %>
+<% javascript 'backend/flexible_content' %>
+
 <div id="content-rows">
-  <% rows = model.content_rows.where(locale: locale) %>
+  <div class="cards">
+    <% rows = model.content_rows.where(locale: locale) %>
 
-  <% if rows.empty? %>
-    <div class="card">
-      <div class="card-header">
-        <%= t 'b.flexible_content' %>
-      </div>
+    <% if rows.empty? %>
+      <div class="card">
+        <div class="card-header">
+          <%= t 'b.flexible_content' %>
+        </div>
 
-      <div class="card-block">
-        <%= t 'b.msg.flexible_content.explanation' %>
+        <div class="card-block">
+          <%= t 'b.msg.flexible_content.explanation' %>
+        </div>
       </div>
-    </div>
-  <% end %>
-
-  <% rows.each do |row| %>
-    <div class="card" id="content-row-<%= row.id %>">
-      <div class="card-header">
-        <div class="btn-group" role="group">
-          <% unless row.first? %>
-            <%= link_to icon(:arrow_up, t('b.up')), move_up_backend_content_row_path(row), class: 'btn btn-info-outline' %>
-          <% end %>
+    <% end %>
 
-          <% unless row.last? %>
-            <%= link_to icon(:arrow_down, t('b.down')), move_down_backend_content_row_path(row), class: 'btn btn-info-outline' %>
-          <% end %>
-
-          <%= link_to icon(:plus, t('b.msg.flexible_content.add_column')), new_backend_content_row_column_path(row), class: 'btn btn-info-outline' %>
-          <%= link_to icon(:trash, t('b.msg.flexible_content.delete_row')), backend_content_row_path(row), class: 'btn btn-info-outline', method: :delete, data: { confirm: t('b.msg.confirm') } %>
+    <% rows.decorate.each do |row| %>
+      <div id="content-row-<%= row.id %>" class="card content-row" data-update-position="<%= update_position_backend_content_row_path(row) %>">
+        <div class="card-header handle">
+          <div class="btn-group" role="group">
+            <%= link_to icon(:trash, t('b.msg.flexible_content.delete_row')), backend_content_row_path(row), class: 'btn btn-secondary', method: :delete, data: { confirm: t('b.msg.confirm') } %>
+          </div>
         </div>
-      </div>
 
-      <div class="row card-block">
-        <% row.columns.each do |column| %>
-          <div class="col-xs-<%= column.width_xs %> col-sm-<%= column.width_sm %> col-md-<%= column.width_md %> col-lg-<%= column.width_lg %> col-xl-<%= column.width_xl %>">
+        <div class="row content-columns card-block">
+          <% row.columns.each do |column| %>
             <% content = column.content.decorate %>
 
-            <% Udongo.config.flexible_content_types.each do |content_type| %>
-              <%= render("backend/content/#{content_type}", object: content) if content.content_type_is?(content_type)  %>
-            <% end %>
-
-            <div class="btn-group" role="group">
-              <% unless column.first? %>
-                <%= link_to icon(:arrow_left), move_up_backend_content_row_column_path(row, column), class: 'btn btn-secondary btn-sm' %>
-              <% end %>
-
-              <% edit_link = send("edit_backend_content_#{content.content_type}_path", content) %>
-              <%= link_to icon(:pencil_square_o), edit_link, class: 'btn btn-secondary btn-sm' %>
-              <%= link_to icon(:trash), backend_content_row_column_path(row, column), class: 'btn btn-secondary btn-sm', method: :delete, data: { confirm: t('b.msg.confirm') } %>
-              <%= link_to icon(:wrench), edit_backend_content_row_column_path(row, column), class: 'btn btn-secondary btn-sm' %>
+            <div class="content-column col-xs-<%= column.width_xs %> col-sm-<%= column.width_sm %> col-md-<%= column.width_md %> col-lg-<%= column.width_lg %> col-xl-<%= column.width_xl %>" data-update-position="<%= update_position_backend_content_row_column_path(row, column) %>">
+              <div class="card handle">
+                <div class="card-block">
+                  <% Udongo.config.flexible_content_types.each do |content_type| %>
+                    <%= render("backend/content/#{content_type}", object: content) if content.content_type_is?(content_type)  %>
+                  <% end %>
+                </div>
 
-              <% unless column.last? %>
-                <%= link_to icon(:arrow_right), move_down_backend_content_row_column_path(row, column), class: 'btn btn-secondary btn-sm' %>
-              <% end %>
+                <div class="card-footer">
+                  <div class="btn-group" role="group">
+                    <% edit_link = send("edit_backend_content_#{content.content_type}_path", content) %>
+                    <%= link_to icon(:pencil_square_o), edit_link, class: 'btn btn-secondary btn-sm' %>
+                    <%= link_to icon(:trash), backend_content_row_column_path(row, column), class: 'btn btn-secondary btn-sm', method: :delete, data: { confirm: t('b.msg.confirm') } %>
+                    <%= link_to icon(:wrench), edit_backend_content_row_column_path(row, column), class: 'btn btn-secondary btn-sm' %>
+                  </div>
+                </div>
+              </div>
             </div>
-          </div>
-        <% end %>
+          <% end %>
+
+          <% unless row.column_limit_reached? %>
+            <% if row.columns.blank? %>
+              <%= link_to icon(:plus, t('b.msg.flexible_content.add_column')), new_backend_content_row_column_path(row), class: 'btn btn-secondary btn-block' %>
+            <% else %>
+              <%= link_to icon(:plus, t('b.msg.flexible_content.add_column')), new_backend_content_row_column_path(row), class: 'btn btn-secondary hidden-xl-up full-width' %>
+              <%= link_to icon(:plus), new_backend_content_row_column_path(row), class: 'btn btn-secondary hidden-lg-down block' %>
+            <% end %>
+          <% end %>
+        </div>
       </div>
-    </div>
-  <% end %>
+    <% end %>
+  </div>
 
-  <%= link_to icon(:plus, t('b.msg.flexible_content.add_row')), new_backend_content_row_path(klass: @model.class, id: @model.id, locale: locale), class: 'btn btn-info btn-sm' %>
+  <%= link_to icon(:plus, t('b.msg.flexible_content.add_row')), new_backend_content_row_path(klass: @model.class, id: @model.id, locale: locale), class: 'btn btn-secondary btn-block' %>
 </div>

data/app/views/backend/emails/index.html.erb

@@ -33,18 +33,10 @@
         </tr>
       <% end %>
     </tbody>
-
-    <% if will_paginate %>
-      <tfoot>
-        <tr>
-          <td colspan="6">
-            <%= will_paginate %>
-          </td>
-        </tr>
-      </tfoot>
-    <% end  %>
   </table>
 
+  <%= udongo_paginate @emails %>
+
 <% else %>
   <p><%= t 'b.msg.no_items' %></p>
 <% end %>

data/app/views/backend/forms/index.html.erb

@@ -0,0 +1,27 @@
+<%= render 'backend/breadcrumbs' %>
+
+<% if @forms.any? %>
+  <table class="table table-striped table-hover">
+    <thead class="thead-inverse">
+      <tr>
+        <th><%= t 'b.description' %></th>
+        <th>&nbsp;</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @forms.each do |f| %>
+        <tr>
+          <td><%= f.description %></td>
+          <td class="text-xs-right">
+            <%= link_to_edit [:backend, f] %>
+            <%= link_to icon(:list), backend_form_submissions_path(f) %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+<% else %>
+  <p><%= t 'b.msg.no_items' %></p>
+<% end %>

data/app/views/backend/forms/submissions/_filter.html.erb

@@ -0,0 +1,16 @@
+<% if @filter.fields.any? %>
+  <div class="filter">
+    <%= form_for :filter, url: backend_form_submissions_path, method: 'get', html: { class: 'form-inline' } do |f| %>
+      <div class="card">
+        <div class="card-block">
+          <% @filter.fields.each do |field| %>
+            <div class="form-group">
+              <%= text_field_tag "q[#{field.to_sym}]", @filter.params[field.to_sym], placeholder: t("b.#{field}"), class: 'form-control' %>
+            </div>
+          <% end %>
+          <%= button_tag t('b.filter'), class: 'btn btn-primary' %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+<% end %>

data/app/views/backend/forms/submissions/index.html.erb

@@ -0,0 +1,34 @@
+<%= render 'backend/breadcrumbs' %>
+<%= render 'filter' %>
+
+<% if @submissions.any? %>
+  <table class="table table-striped table-hover">
+    <thead class="thead-inverse">
+      <tr>
+        <% if @form.email_present? %>
+          <th><%= t('b.email') %></th>
+        <% end %>
+        <%= @form.datagrid.column_headers(@filter) %>
+        <th>&nbsp;</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @submissions.each do |s| %>
+        <tr>
+          <% if @form.email_present? %>
+            <td><%= mail_to s.data_object.email %></td>
+          <% end %>
+          <%= @form.datagrid.column_values(s) %>
+          <td class="text-xs-right">
+            <%= link_to icon(:pencil_square_o), edit_backend_form_submission_path(@form, s) %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+  <%= udongo_paginate @submissions %>
+<% else %>
+  <p><%= t 'b.msg.no_items' %></p>
+<% end %>

data/app/views/backend/redirects/index.html.erb

@@ -34,17 +34,9 @@
         </tr>
       <% end %>
     </tbody>
-
-    <% if will_paginate %>
-      <tfoot>
-        <tr>
-          <td colspan="6">
-            <%= will_paginate %>
-          </td>
-        </tr>
-      </tfoot>
-    <% end  %>
   </table>
+
+  <%= udongo_paginate @redirects %>
 <% else %>
   <p><%= t 'b.msg.no_items' %></p>
 <% end %>

data/app/views/layouts/backend/_top_navigation.html.erb

@@ -3,6 +3,7 @@
     <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false"><%= icon(:list, t('b.content')) %></a>
     <div class="dropdown-menu">
       <%= link_to t('b.pages'), backend_pages_path, class: 'dropdown-item' %>
+      <%= link_to t('b.forms'), backend_forms_path, class: 'dropdown-item' %>
       <%= link_to t('b.snippets'), backend_snippets_path, class: 'dropdown-item' %>
     </div>
   </li>

data/changelog.md

@@ -1,3 +1,17 @@
+1.0.4 - 2016-07-23
+--
+* Add spec for the SnippetForm class.
+* Add Udongo::Notification and use it in BackendController#translate_notice.
+* Fix issue with storable config fields that are present in the DB, but are no
+  longer in the storable class.
+* Flexible image preview no longer makes the URL previewable.
+* Classes in lib/udongo/**/* are now loaded automatically.
+* Restyled flexible content widget.
+* You now get a suggested width when adding a new content column in the
+  flexible content widget. Values are based on previously set column widths.
+* The codebase had a lot of useless double semicolons, which have been removed.
+
+
 1.0.3 - 2016-06-06
 --
 * Bugfix: fix link to non existing css file.
@@ -47,7 +61,6 @@
 * Fix nasty bug in the storable concern which made it impossible to work with
   the << operator for strings and arrays.
 * Bugfix: the link helpers can now also work with decorated objects.
-* Upgrade to rails 4.2.6
 
 
 0.0.13 - 2016-05-02

data/config/locales/en_backend.yml

@@ -2,6 +2,7 @@ en:
   b:
     actions: Actions
     add: Add
+    admin: Admin
     admins: Admins
     advanced: Advanced
     cancel: Cancel
@@ -20,11 +21,13 @@ en:
     email_templates: E-mail templates
     enabled?: Enabled?
     extra: Extra
+    filter: Filter
     first_name: First name
     flexible_content: Flexible content
     forms: Forms
     from: From
     general: General
+    house_number: House number
     html_content: HTML content
     last_name: Last name
     locale: Locale
@@ -33,6 +36,7 @@ en:
     move: Move
     name: Name
     navigation: Navigation
+    navigation_item: Navigation item
     new: New
     none: None
     not_yet_sent: Not yet sent
@@ -56,6 +60,7 @@ en:
     status_code: Status code
     subject: Subject
     tags: Tags
+    telephone: Telephone
     title: Title
     to: To
     up: Up
@@ -67,8 +72,6 @@ en:
       added: '%s was added.'
       admins:
         account_details: Account details
-        added: The admin was added.
-        deleted: The admin was deleted.
         personal_details: Personal details
       changes_saved: The changes have been saved.
       confirm: Are you sure?
@@ -91,11 +94,8 @@ en:
         status_code: More info about the use of status codes.
       incorrect_login: Incorret login credentials.
       navigation:
-        added: The navigation item was added.
         custom: Custom
-        deleted: The navigation item was deleted.
       no_items: There are no items.
-
       saved: '%s was saved.'
       seo: SEO
       status_codes: