udongo 1.0.3 → 1.0.4

data/config/locales/nl_backend.yml

@@ -2,6 +2,7 @@ nl:
   b:
     actions: Acties
     add: Toevoegen
+    admin: Beheerder
     admins: Beheerders
     advanced: Geavanceerd
     cancel: Annuleren
@@ -20,11 +21,13 @@ nl:
     email_templates: E-mail templates
     enabled?: Ingeschakeld?
     extra: Extra
+    filter: Filter
     first_name: Voornaam
     flexible_content: Flexibele inhoud
     forms: Formulieren
     from: Van
     general: Algemeen
+    house_number: Huisnummer
     html_content: HTML inhoud
     last_name: Achternaam
     locale: Taal
@@ -33,6 +36,7 @@ nl:
     move: Verplaatsen
     name: Naam
     navigation: Navigatie
+    navigation_item: Navigatie-item
     new: Nieuw
     none: Geen
     not_yet_sent: Nog niet verzonden
@@ -56,6 +60,7 @@ nl:
     status_code: Statuscode
     subject: Onderwerp
     tags: Tags
+    telephone: Telefoonnummer
     title: Titel
     to: Naar
     up: Omhoog
@@ -64,19 +69,17 @@ nl:
     view: Bekijk
 
     msg:
-      added: '%s werd toegevoegd.'
+      added: '%{actor} werd toegevoegd.'
       admins:
         account_details: Accountgegevens
-        added: De admin werd toegevoegd.
-        deleted: De admin werd verwijderd.
         personal_details: Persoonlijke gegevens
       changes_saved: De wijzigingen werden opgeslagen.
       confirm: Ben je zeker?
       content_types:
         image: Afbeelding
         text: Tekst
-      deleted: '%s werd verwijderd.'
-      edited: '%s werd gewijzigd.'
+      deleted: '%{actor} werd verwijderd.'
+      edited: '%{actor} werd gewijzigd.'
       flexible_content:
         add_column: Kolom toevoegen
         add_row: Rij toevoegen
@@ -85,18 +88,15 @@ nl:
         edit_column: Kolom bewerken
         edit_image: Afbeelding bewerken
         edit_text: Tekst bewerken
-        explanation: Met module kan je flexibele responsive inhoud toevoegen. Klik op onderstaande knop om een eerste rij toe te voegen.
+        explanation: Met deze module kan je flexibele, responsive inhoud toevoegen. Klik op onderstaande knop om een eerste rij toe te voegen.
       forgot_password: Wachtwoord vergeten?
       help_texts:
         status_code: Meer info over het gebruik van status codes
       incorrect_login: Ongeldige login gegevens.
       navigation:
-        added: Het navigatie item werd toegevoegd.
         custom: Op maat
-        deleted: Het navigatie item werd verwijderd.
       no_items: Er zijn geen items.
-
-      saved: '%s werd bewaard.'
+      saved: '%{actor} werd bewaard.'
       seo: SEO
       status_codes:
         '301': 301 (Moved Permanently)

data/config/routes.rb

@@ -24,6 +24,10 @@ Rails.application.routes.draw do
       member { post :tree_drag_and_drop }
     end
 
+    resources :forms do
+      resources :submissions, controller: 'forms/submissions'
+    end
+
     resources :navigations, only: [:index] do
       scope module: 'navigation' do
         resources :items, except: [:index, :show] do
@@ -57,15 +61,11 @@ Rails.application.routes.draw do
 
     namespace :content do
       resources :rows, only: [:index, :new, :destroy] do
-        member do
-          get 'move_up', 'move_down'
-        end
+        concerns :positionable
 
         scope module: 'rows' do
           resources :columns do
-            member do
-              get 'move_up', 'move_down'
-            end
+            concerns :positionable
           end
         end
       end

data/db/migrate/20160711114156_add_description_to_forms.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToForms < ActiveRecord::Migration
+  def change
+    add_column :forms, :description, :string, after: :identifier
+  end
+end

data/lib/generators/udongo/form/form_generator.rb

@@ -24,7 +24,7 @@ class Udongo::FormGenerator < Rails::Generators::Base
   end
 
   def create_database_records
-    f = ::Form.create!(locales: Udongo.config.locales, identifier: name)
+    f = Form.create!(locales: Udongo.config.locales, identifier: name)
 
     @fields.each do |field|
       field_object = f.fields.create!(locales: Udongo.config.locales, name: field.name, field_type: field.type)

data/lib/tasks/udongo_tasks.rake

@@ -16,7 +16,7 @@ namespace :udongo do
   namespace :content_images do
     desc 'Regenerate all the image versions.'
     task regenerate: :environment do
-      ::ContentImage.find_each do |i|
+      ContentImage.find_each do |i|
         if i.file?
           i.file.recreate_versions!
           i.save!

data/lib/udongo/config.rb

@@ -2,7 +2,7 @@ module Udongo
   class Config
     attr_accessor :default_locale, :locales, :prefix_routes_with_locale, :host,
                   :time_zone, :allow_new_tags, :flexible_content_types,
-                  :project_name
+                  :project_name, :forms
 
     def initialize
       @default_locale = :nl
@@ -13,6 +13,7 @@ module Udongo
       @allow_new_tags = true
       @flexible_content_types = %w(text image)
       @project_name = 'Udongo'
+      @forms = Udongo::Configs::Forms.new
     end
 
     def prefix_routes_with_locale?

data/lib/udongo/configs/forms.rb

@@ -0,0 +1,14 @@
+module Udongo
+  module Configs
+    class Forms
+      def initialize
+        @submission_datagrids = {}
+      end
+
+      def method_missing(method, *args, &block)
+        form = ::Form.find_by!(identifier: method)
+        @submission_datagrids[form.identifier.to_sym] ||= OpenStruct.new(datagrid_fields: [], filter_fields: [])
+      end
+    end
+  end
+end

data/lib/udongo/flexible_content/column_width_calculator.rb

@@ -0,0 +1,32 @@
+module Udongo
+  module FlexibleContent
+    class ColumnWidthCalculator
+      attr_reader :row
+
+      COLUMNS = %w(width_xs width_sm width_md width_lg width_xl)
+
+      def initialize(row)
+        @row = row
+      end
+
+      def calculate(field)
+        difference = 12 - total(field)
+        return 12 if difference.zero?
+        difference
+      end
+
+      def hashed_values
+        COLUMNS.inject({}) do |result, column|
+          result[column.to_sym] = calculate(column.to_sym)
+          result
+        end
+      end
+
+      def total(field)
+        sum = row.columns.sum(field.to_sym).to_i
+        return 12 if sum > 12
+        sum
+      end
+    end
+  end
+end

data/lib/udongo/form.rb

@@ -0,0 +1,36 @@
+module Udongo
+  class Form
+    include ActiveModel::Model
+    include Virtus.model
+
+    def initialize(params = {})
+      attributes.keys.each { |k| send("#{k}=", params[k]) } if params.any?
+    end
+
+    def persisted?
+      false
+    end
+
+    def save(params)
+      attributes.keys.each { |k| send("#{k}=", params[k]) }
+
+      if valid?
+        save_object
+        true
+      else
+        false
+      end
+    end
+
+    # This method only exists so the related factory tests pass
+    def save!
+      valid?
+    end
+
+    private
+
+    # Written in the subclass
+    def save_object
+    end
+  end
+end

data/lib/udongo/forms/config.rb

@@ -0,0 +1,11 @@
+module Udongo
+  module Forms
+    module Config
+      attr_reader :form
+
+      def config
+        Udongo.config.forms.send(form.identifier.to_sym)
+      end
+    end
+  end
+end

data/lib/udongo/forms/submission_datagrid.rb

@@ -0,0 +1,29 @@
+module Udongo
+  module Forms
+    class SubmissionDatagrid
+      include Udongo::Forms::Config
+      include ActionView::Helpers::TagHelper
+
+      def initialize(form)
+        @form = form
+      end
+
+      def column_values(submission)
+        map_fields { |field| content_tag(:td, submission.data_object.send(field)) }
+      end
+
+      def column_headers(filter)
+        map_fields { |field| content_tag(:th, I18n.t("b.#{field}")) }
+      end
+
+      def fields
+        return [] if config.nil?
+        config.datagrid_fields
+      end
+
+      def map_fields(&block)
+        fields.map { |field| yield(field) }.join("\n").html_safe
+      end
+    end
+  end
+end

data/lib/udongo/forms/submission_filter.rb

@@ -0,0 +1,33 @@
+module Udongo
+  module Forms
+    class SubmissionFilter
+      include Udongo::Forms::Config
+      attr_reader :params
+
+      def initialize(form, params = {})
+        @form = form
+        @params = params || {}
+      end
+
+      def fields
+        return [] if config.nil?
+        config.filter_fields
+      end
+
+      def result
+        data = FormSubmissionData.all
+
+        params.each do |key,value|
+          next if value.blank?
+          data = data.where(name: key).where('value REGEXP ?', value)
+        end
+
+        FormSubmission.where(id: data.pluck(:submission_id).uniq)
+      end
+
+      def self.search(*args)
+        new(*args)
+      end
+    end
+  end
+end

data/lib/udongo/notification.rb

@@ -0,0 +1,19 @@
+class Udongo::Notification
+  def initialize(notice)
+    @notice = notice
+  end
+
+  def build_hash(actor)
+    { actor: I18n.t("b.#{actor}") }
+  end
+
+  def label
+    "b.msg.#{@notice}"
+  end
+
+  def translate(vars = nil)
+    return I18n.t(label) if vars.blank?
+    vars = build_hash(vars) unless vars.is_a?(Hash)
+    I18n.t(label, vars)
+  end
+end

data/lib/udongo/object_path.rb

@@ -14,8 +14,6 @@ class Udongo::ObjectPath
     object.select { |o| !o.is_a?(Symbol) }
   end
 
-  private
-
   def self.cleanup(value)
     value.to_s.gsub('_decorator', '')
   end

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/lib/udongo/will_paginate/options.rb

@@ -0,0 +1,40 @@
+module Udongo
+  module WillPaginate
+    class Options
+      include ActionView::Helpers::TagHelper
+
+      def initialize(options = {})
+        @options = options || {}
+      end
+
+      def defaults
+        {
+          class: 'pagination',
+          inner_window: 1,
+          outer_window: 0,
+          renderer: Udongo::WillPaginate::Renderer,
+          previous_label: previous_label,
+          next_label: next_label
+        }
+      end
+
+      def next_label
+        nav_label('→', 'next_label')
+      end
+
+      def previous_label
+        nav_label('←', 'previous_label')
+      end
+
+      def nav_label(default_value, sr_only_value)
+        string = content_tag(:span, default_value.html_safe, aria: { hidden: true })
+        string += content_tag(:span, I18n.t("will_paginate.#{sr_only_value}"), class: 'sr-only')
+        string.html_safe
+      end
+
+      def values
+        @options.reverse_merge!(defaults)
+      end
+    end
+  end
+end

data/lib/udongo/will_paginate/renderer.rb

@@ -7,19 +7,23 @@ module Udongo
       protected
 
       def page_number(page)
-        tag :li, link(page, page, rel: rel_value(page)), class: ('current' if page == current_page)
+        list_classes = 'page-item'
+        list_classes += ' active' if page == current_page
+        tag(:li, link(page, page, class: 'page-link', rel: rel_value(page)), class: list_classes)
       end
 
       def previous_or_next_page(page, text, classname)
-        tag :li, link(text, page || '#'), class: [classname[0..3], classname, ('unavailable' unless page)].join(' ')
+        list_classes = [classname[0..3], classname, 'page-item']
+        list_classes.push('disabled') unless page
+        tag(:li, link(text, page || '#', class: 'page-link'), class: list_classes.join(' '))
       end
 
       def html_container(html)
-        tag :ul, html, container_attributes
+        tag(:nav, tag(:ul, html, container_attributes))
       end
 
       def gap
-        tag :li, link(super, '#'), class: 'unavailable'
+        tag(:li, link(super, '#', class: 'page-link'), class: 'page-item disabled')
       end
     end
   end

data/lib/udongo.rb

@@ -1,14 +1,3 @@
-require 'udongo/engine'
-require 'udongo/config'
-require 'udongo/breadcrumb'
-require 'udongo/meta_info'
-require 'udongo/object_path'
-require 'udongo/crypt'
-require 'udongo/cryptography'
-require 'udongo/active_model_simulator'
-require 'udongo/email_vars_parser'
-require 'udongo/email_vars/form_submission'
-require 'udongo/email_vars/address'
 require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'simple_form'
@@ -27,6 +16,10 @@ module Udongo
 
   class << self
     attr_writer :config
+
+    Dir.glob("#{PATH}/lib/udongo/**/*.rb").each do |file|
+      require file
+    end
   end
 
   def self.config