udongo 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abcf2f3a3fea0a5ff7a89fa8364f083c948fe8d0
-  data.tar.gz: a9cea4a94f6790316fae6a9843bf8e088a01f762
+  metadata.gz: 6ebe5d0ae0452bf3d7e74d1f177c2a6bb9573a4d
+  data.tar.gz: ee18f273a09e0fbf35d6e1ff632e4cb59e811db3
 SHA512:
-  metadata.gz: 7349c0efcab0845f8358291a103043059a46ca7314fecb33fc3ed5f092b27a209187f041f2fcb4648c9bf0745fa6ae6cea27227c6f1c71d10bcb96c73b69ed55
-  data.tar.gz: 3c4df6d375c5cac2ca2f9b2f8e48c8ba73d8756e6145b58f6f4044685d79e00b130842f801bf215a362ba8367b9ee772be6969bfb64aa4b5e460c9356d74874b
+  metadata.gz: 20d5a992a3ca9f53d8637140f1077e06abcc04603fc79a76719f4dc670e9554a4a47f76650331206b9a5c588bcf2e30f049e4a52f45a730e1c9e17fcbd2cedcf
+  data.tar.gz: c382e849537dbecc8b893c0d77def603691d843b070587035da5885d43a8e5ecfd25fb22f2552c0ceac421859aa9a0a32e7fc12045e8f87eabbd5d9c7b392c0e

data/app/controllers/backend/content/duplicate_controller.rb

@@ -0,0 +1,47 @@
+class Backend::Content::DuplicateController < Backend::BaseController
+  before_action :find_model
+
+  def execute
+    duplicate
+    redirect_back_to_edit_translation
+  end
+
+  private
+
+  def find_model
+    begin
+      @model = params[:model].to_s.camelcase.constantize.find(params[:id])
+    rescue
+      redirect_to backend_path
+    end
+  end
+
+  def source_locale
+    if Udongo.config.i18n.app.locales.include?(params[:source_locale].to_s)
+      params[:source_locale].to_s
+    else
+      raise "No valid source locale provided (#{params[:source_locale]})"
+    end
+  end
+
+  def destination_locale
+    if Udongo.config.i18n.app.locales.include?(params[:destination_locale].to_s)
+      params[:destination_locale].to_s
+    else
+      raise "No valid destination locale provided (#{params[:destination_locale]})"
+    end
+  end
+
+  def duplicate
+    Udongo::FlexibleContent::DuplicateLocale.new(
+      @model,
+      source_locale,
+      destination_locale
+    ).execute!
+  end
+
+  def redirect_back_to_edit_translation
+    path = "edit_translation_backend_#{@model.class.name.downcase}_path"
+    redirect_to send(path, @model, destination_locale), notice: t('b.msg.flexible_content.duplicated')
+  end
+end

data/app/helpers/flexible_content_helper.rb

@@ -0,0 +1,7 @@
+module FlexibleContentHelper
+  def importable_locales(model, current_locale)
+    Udongo.config.i18n.app.locales.select do |lo|
+      lo.to_s != current_locale.to_s && model.content_rows.by_locale(lo).any?
+    end
+  end
+end

data/app/models/concerns/flexible_content.rb

@@ -6,10 +6,8 @@ module Concerns
       has_many :content_rows, as: :rowable, dependent: :destroy
     end
 
-    module ClassMethods
-      def flexible_content?
-        true
-      end
+    def flexible_content?
+      true
     end
   end
 end

data/app/models/concerns/searchable.rb

@@ -93,7 +93,7 @@ module Concerns
           translatable_fields_list.each { |f| result << f }
         end
 
-        result << :flexible_content if respond_to?(:flexible_content?)
+        result << :flexible_content if new.respond_to?(:flexible_content?)
         result
       end
     end

data/app/models/concerns/seo.rb

@@ -13,6 +13,12 @@ module Concerns
         ).where('slug IS NOT NULL OR slug != ""').pluck(:locale).uniq
 
         update_column :seo_locales, locales
+
+        # This is a bit of a long story. For some reason when you save the
+        # parent object, the SEO info is -not always- saved. At the moment I'm
+        # unable to reproduce it consistently. Therefor I've added some extra
+        # code to manually loop the seo collections and save them.
+        @seo_collections.keys.each { |l| seo(l).save } if @seo_collections
       end
 
       scope :with_seo, ->(locale) { where('seo_locales LIKE ?', "%#{locale}%")}

data/app/views/backend/_seo_form.html.erb

@@ -1,6 +1,7 @@
 <% javascript 'backend/seo' %>
 
 <% sluggable_field ||= 'title' %>
+<% slug ||= nil %>
 
 <%= content_tag :div, class: 'card', data: { seo: true, path: backend_seo_slugify_path, sluggable_input: "##{f.object_name}_#{sluggable_field}" } do %>
   <div class="card-header">
@@ -8,7 +9,12 @@
   </div>
 
   <div class="card-block">
-    <%= f.input :seo_slug, as: :string %>
+    <% if slug.present? %>
+      <%= f.input :seo_slug, as: :string, input_html: { value: slug } %>
+    <% else %>
+      <%= f.input :seo_slug, as: :string %>
+    <% end %>
+
     <%= f.input :seo_title, as: :string %>
     <%= f.input :seo_description, as: :string %>
     <%= f.input :seo_keywords, as: :string %>

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

@@ -12,7 +12,23 @@
         </div>
 
         <div class="card-block">
-          <%= t 'b.msg.flexible_content.explanation' %>
+          <p>
+            <%= t 'b.msg.flexible_content.explanation' %><br>
+          </p>
+
+          <% import_locales = importable_locales(model, params[:translation_locale])%>
+
+          <% if import_locales.any? %>
+            <p>
+              <%= t('b.msg.flexible_content.duplicate_from_other_locales').html_safe %>
+
+              <%=
+                import_locales.map do |lo|
+                  link_to lo.upcase, backend_content_duplicate_path(model.class.name.underscore.gsub('_decorator', ''), model.id, lo, params[:translation_locale]), data: { confirm: t('b.msg.confirm') }
+                end.join(', ').html_safe
+              %>
+          <% end %>
+          </p>
         </div>
       </div>
     <% end %>

data/changelog.md

@@ -1,3 +1,14 @@
+7.0.1 - 2017-09-21
+--
+* Removed some unused translations.
+* The backend/seo_form partial now accepts a hard slug value so prefills are
+  possible on other locations.
+* Cleanup the #flexible_content? check to be an instance method instead of a
+  class method.
+* Make sure the SEO concern saves when you save its parent object.
+* You can import the flexible content from another locale.
+
+
 7.0.0 - 2017-07-28
 --
 * It's now possible to use the scope .with_seo(:nl) to fetch models that actually

data/config/locales/en_backend.yml

@@ -118,7 +118,6 @@ en:
       confirm: Are you sure?
       content_types:
         form: Form
-        image: Image (deprecated!)
         picture: Picture
         slideshow: Slideshow
         text: Text
@@ -136,6 +135,8 @@ en:
         align_vertical_bottom: Align vertical bottom
         align_vertical_center: Align vertically
         align_vertical_top: Align vertical top
+        duplicate_from_other_locales: 'Would you rather copy the content from another language?<br>Click your preferred language and the content will be duplicated.'
+        duplicated: The flexible content has been duplicated.
         explanation: With this module you can create flexible responsive content. Click the button below to create the first row.
         full_width: Full width
         margin_explanation: Margin is the whitespace above and below this row.

data/config/locales/nl_backend.yml

@@ -120,7 +120,6 @@ nl:
       confirm: Ben je zeker?
       content_types:
         form: Formulier
-        image: Afbeelding (niet meer gebruiken!)
         picture: Foto
         slideshow: Slideshow
         text: Tekst
@@ -138,6 +137,8 @@ nl:
         align_vertical_bottom: Vertikaal onderaan uitlijnen
         align_vertical_center: Vertikaal centreren
         align_vertical_top: Vertikaal bovenaan uitlijnen
+        duplicate_from_other_locales: 'Wil je de inhoud liever overnemen van een andere taal?<br>Klik op de gewenste taal en de inhoud wordt gedupliceerd:'
+        duplicated: De flexibele inhoud werd gedupliceerd.
         explanation: Met deze module kan je flexibele, responsive inhoud toevoegen. Klik op onderstaande knop om een eerste rij toe te voegen.
         full_width: Volledige breedte
         margin_explanation: Marge is de witruimte boven en onder je rij.

data/config/routes.rb

@@ -90,6 +90,8 @@ Rails.application.routes.draw do
     end
 
     namespace :content do
+      get 'duplicate/:model/:id/:source_locale/:destination_locale' => 'duplicate#execute', as: :duplicate
+
       resources :rows, only: [:index, :new, :edit, :update, :destroy] do
         member do
           get :horizontal_alignment, :vertical_alignment, :toggle_full_width

data/db/migrate/20170919135942_add_external_reference_to_content_column.rb

@@ -0,0 +1,6 @@
+class AddExternalReferenceToContentColumn < ActiveRecord::Migration[5.0]
+  def change
+    add_column :content_columns, :external_reference, :string, after: 'content_id'
+    add_index :content_columns, :external_reference
+  end
+end

data/lib/udongo/flexible_content/duplicate_locale.rb

@@ -0,0 +1,86 @@
+class Udongo::FlexibleContent::DuplicateLocale
+  def initialize(object, source_locale, destination_locale)
+    @object = object
+    @source_locale = source_locale
+    @destination_locale = destination_locale
+  end
+
+  def execute!
+    check_for_flexible_content!
+    check_for_different_locales!
+
+    ActiveRecord::Base.transaction do
+      clear_destination_content!
+
+      @object.content_rows.by_locale(@source_locale).each do |source_row|
+        new_row = duplicate_row(source_row)
+
+        source_row.columns.each do |source_column|
+          duplicate_column(new_row, source_column)
+        end
+      end
+    end
+  end
+
+  private
+
+  def check_for_flexible_content!
+    return if @object.respond_to?(:flexible_content?) && @object.flexible_content?
+    raise 'The object you provided does not have the FlexibleContent concern included.'
+  end
+
+  def check_for_different_locales!
+    if @source_locale.to_s == @destination_locale.to_s
+      raise "The source and destination locale are the same (#{@source_locale})"
+    end
+  end
+
+  def clear_destination_content!
+    @object.content_rows.by_locale(@destination_locale).destroy_all
+  end
+
+  def duplicate_row(source)
+    @object.content_rows.create!(
+      locale: @destination_locale,
+      full_width: source.full_width?,
+      horizontal_alignment: source.horizontal_alignment,
+      vertical_alignment: source.vertical_alignment,
+      background_color: source.background_color,
+      no_gutters: source.no_gutters?,
+      padding_top: source.padding_top,
+      padding_bottom: source.padding_bottom,
+      margin_top: source.margin_top,
+      margin_bottom: source.margin_bottom,
+      position: source.position
+    )
+  end
+
+  def duplicate_column(new_row, source_column)
+    widget = duplicate_widget(source_column.content)
+
+    new_row.columns.create!(
+      width_xs: source_column.width_xs,
+      width_sm: source_column.width_sm,
+      width_md: source_column.width_md,
+      width_lg: source_column.width_lg,
+      width_xl: source_column.width_xl,
+      position: source_column.position,
+      content: widget,
+      external_reference: source_column.id
+    )
+  end
+
+  def duplicate_widget(source)
+    source.class.create!(
+      widget_attributes(source)
+    )
+  end
+
+  def widget_attributes(widget)
+    attributes = widget.attributes
+    attributes.delete('id')
+    attributes.delete('created_at')
+    attributes.delete('updated_at')
+    attributes
+  end
+end

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '7.0.0'
+  VERSION = '7.0.1'
 end

data/spec/support/concerns/flexible_content.rb

@@ -5,18 +5,12 @@ shared_examples_for :flexible_content do
   let(:klass) { model.to_s.underscore.to_sym }
 
   it '.flexible_content?' do
-    expect(model.flexible_content?).to be true
-  end
-
-  it '.respond_to?' do
-    expect(model).to respond_to(
-      :flexible_content?
-    )
+    expect(model.new).to be_flexible_content
   end
 
   it '#respond_to?' do
     expect(model.new).to respond_to(
-      :content_rows
+      :content_rows, :flexible_content?
     )
   end
 end

data/spec/support/concerns/seo.rb

@@ -91,6 +91,13 @@ shared_examples_for :seo do
     end
   end
 
+  it 'autosave when the parent is saved' do
+    instance.seo(:en).title = 'some foo'
+    instance.save
+
+    expect(model.find(instance.id).seo(:en).title).to eq 'some foo'
+  end
+
   it '#respond_to?' do
     expect(build(klass)).to respond_to(:meta, :seo)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -462,6 +462,7 @@ files:
 - app/controllers/backend/articles_controller.rb
 - app/controllers/backend/assets_controller.rb
 - app/controllers/backend/base_controller.rb
+- app/controllers/backend/content/duplicate_controller.rb
 - app/controllers/backend/content/rows/columns_controller.rb
 - app/controllers/backend/content/rows/forms_controller.rb
 - app/controllers/backend/content/rows/pictures_controller.rb
@@ -528,6 +529,7 @@ files:
 - app/helpers/backend/form_helper.rb
 - app/helpers/backend/pagination_helper.rb
 - app/helpers/collection_helper.rb
+- app/helpers/flexible_content_helper.rb
 - app/helpers/icon_helper.rb
 - app/helpers/link_helper.rb
 - app/helpers/navigation_helper.rb
@@ -854,6 +856,7 @@ files:
 - db/migrate/20170623124218_add_caption_to_content_video.rb
 - db/migrate/20170728094909_add_seo_locales_to_models_with_seo.rb
 - db/migrate/20170728125838_remove_content_images.rb
+- db/migrate/20170919135942_add_external_reference_to_content_column.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb
@@ -880,6 +883,7 @@ files:
 - lib/udongo/email_vars_parser.rb
 - lib/udongo/engine.rb
 - lib/udongo/flexible_content/column_width_calculator.rb
+- lib/udongo/flexible_content/duplicate_locale.rb
 - lib/udongo/form.rb
 - lib/udongo/image_manipulation/base.rb
 - lib/udongo/image_manipulation/resize_and_pad.rb