udongo 5.7.0 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a533eec4e517a96747f4933567fc71892c76c25f
-  data.tar.gz: bf6fe21d215d9f065081c836b344afffcf04b2da
+  metadata.gz: e012e2dccbe75d74ea00c84ab30ae20423be0be1
+  data.tar.gz: b7b476f535941b05b5b7d857f15819af1c5f2753
 SHA512:
-  metadata.gz: 3334640c6d1adcaf63ba4133e1f7f1c3f32e5c0f646bf6a74630d13bdaeff8b7efd356a2c55e93376e34f1de3c1e2b4f4e48a306bda89b3fd79779cb02a718f9
-  data.tar.gz: 4ae9622b209f8d27bb14c896a2c2f7603dad8db21a5dd39eef42102aee5424150b69a9dbbc66bfec39112f5a5bfa9c547de4beef0b9bb524702c53eb109be94a
+  metadata.gz: e1e04b226920a07f783df0bd889920bc137905ce349df750acd05f9b056462cf55addd1f357e6b966cb200a0b65cb6fe585a40a4d398572a751bd94d1be7e047
+  data.tar.gz: 90bed388b48beb7a0e1a19b44209558cfc01928b112490064f251dfade8204bbd2065995f6c612d96bf9c9a9362c9f7fd40204c5011e33df480a76df022ffaaa

data/app/controllers/backend/content/rows/pictures_controller.rb

@@ -0,0 +1,51 @@
+class Backend::Content::Rows::PicturesController < Backend::BaseController
+  include Concerns::Backend::ContentTypeController
+  before_action :redirect_unless_has_asset, only: [:edit, :update]
+  before_action :redirect_if_has_asset, only: [:link_or_upload, :link, :upload]
+  before_action :prepare_upload, only: [:link_or_upload, :upload]
+
+  model ContentPicture
+  allowed_params :caption, :url
+
+  def link
+    @model.asset = Asset.find params[:asset_id]
+    @model.save!
+
+    redirect_to edit_backend_content_picture_path
+  end
+
+  def upload
+    @asset.filename = params[:asset][:filename]
+    @asset.description = params[:asset][:description]
+
+    if @asset.filename && @asset.filename.content_type.to_s.include?('image') && @asset.save
+      @model.asset = @asset
+      @model.save
+
+      redirect_to edit_backend_content_picture_path(@model)
+    else
+      @asset.errors.add :filename, t('b.msg.please_select_a_valid_image')
+      render :link_or_upload
+    end
+  end
+
+  private
+
+  def redirect_unless_has_asset
+    unless @model.asset
+      redirect_to link_or_upload_backend_content_picture_path(@model)
+    end
+  end
+
+  def redirect_if_has_asset
+    if @model.asset
+      redirect_to edit_backend_content_picture_path(@model)
+    end
+  end
+
+  def prepare_upload
+    @asset = Asset.new
+    @search = Asset.ransack params[:q]
+    @assets = @search.result(distinct: true).image.where.not(id: @model.asset_id).order('id DESC')
+  end
+end

data/app/decorators/content_image_decorator.rb

@@ -1,7 +1,3 @@
 class ContentImageDecorator < ApplicationDecorator
   delegate_all
-
-  def content_type_is?(value)
-    value.to_sym == :image
-  end
 end

data/app/decorators/content_picture_decorator.rb

@@ -0,0 +1,3 @@
+class ContentPictureDecorator < ApplicationDecorator
+  delegate_all
+end

data/app/decorators/content_text_decorator.rb

@@ -4,8 +4,4 @@ class ContentTextDecorator < ApplicationDecorator
   def render
     content.to_s.html_safe
   end
-
-  def content_type_is?(value)
-    value.to_sym == :text
-  end
 end

data/app/helpers/backend/dropdown_helper.rb

@@ -5,5 +5,11 @@ module Backend
         [I18n.t("b.msg.content_types.#{content_type}"), "Content#{content_type.to_s.camelcase}"]
       end
     end
+
+    def options_for_column_widths
+      (1..12).to_a.reverse.map do |i|
+        ["#{(i.to_f / 12.0 * 100).to_i}%", i]
+      end
+    end
   end
 end

data/app/models/asset.rb

@@ -4,6 +4,7 @@ class Asset < ApplicationRecord
   mount_uploader :filename, AssetUploader
 
   has_many :images, dependent: :destroy
+  has_many :content_pictures, dependent: :destroy
 
   scope :image, -> { where(content_type: %w(image/gif image/jpeg image/png)) }
 
@@ -24,7 +25,7 @@ class Asset < ApplicationRecord
   end
 
   def deletable?
-    images.empty?
+    images.empty? && content_pictures.empty?
   end
 
   private

data/app/models/concerns/content_type.rb

@@ -13,5 +13,9 @@ module Concerns
     def parent
       column.row.rowable
     end
+
+    def content_type_is?(value)
+      value.to_sym == content_type.to_sym
+    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 flexible_content?
+        result << :flexible_content if respond_to?(:flexible_content?)
         result
       end
     end

data/app/models/content_picture.rb

@@ -0,0 +1,9 @@
+class ContentPicture < ApplicationRecord
+  include Concerns::ContentType
+
+  belongs_to :asset
+
+  def content_type
+    :picture
+  end
+end

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

@@ -3,7 +3,7 @@
   <%= image_tag object.file.size_1024x640.url, alt: '', class: 'img-fluid' %>
 
   <% if object.caption.present? %>
-    <div class="text-center">
+    <div class="text-xs-center">
       <%= object.caption.html_safe %>
     </div>
   <% end %>

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

@@ -0,0 +1,13 @@
+<% if object.present? && object.asset.present? %>
+
+  <%= image_tag object.asset.image.url(1100, 1100, quality: 65), alt: '', class: 'img-fluid' %>
+
+  <% if object.caption.present? %>
+    <div class="text-xs-center">
+      <%= object.caption.html_safe %>
+    </div>
+  <% end %>
+
+<% else %>
+  <%= t 'b.msg.flexible_content.no_picture_present' %>
+<% end %>

data/app/views/backend/content/rows/columns/_dimension_fields.html.erb

@@ -1,3 +1,11 @@
 <% Udongo::Configs::FlexibleContent::BREAKPOINTS.each do |bp| %>
-  <%= form.input "width_#{bp}", as: :integer, wrapper_html: { hidden: !Udongo.config.flexible_content.allowed_breakpoint?(bp) } %>
+  <%=
+    form.input(
+      "width_#{bp}",
+      as: :select,
+      collection: options_for_column_widths,
+      include_blank: false,
+      wrapper_html: { hidden: !Udongo.config.flexible_content.allowed_breakpoint?(bp) }
+    )
+  %>
 <% end %>

data/app/views/backend/content/rows/pictures/_filter.html.erb

@@ -0,0 +1,10 @@
+<%= search_form_for @search, url: link_or_upload_backend_content_picture_path(@model) do |f| %>
+  <div class="row m-b-2">
+    <div class="col-md-6">
+      <%= f.search_field :description_cont, placeholder: t('b.description'), class: 'form-control' %>
+    </div>
+    <div class="col-md-6">
+      <%= f.submit class: 'btn btn-sn' %>
+    </div>
+  </div>
+<% end %>

data/app/views/backend/content/rows/pictures/edit.html.erb

@@ -0,0 +1,17 @@
+<%= render 'backend/general_form_error', object: @model %>
+
+<div class="card">
+  <div class="card-header">
+    <%= t 'b.msg.flexible_content.edit_picture' %>
+  </div>
+
+  <div class="card-block">
+    <%= image_tag @model.asset.image.url(1700, 1700, quality: 65), alt: '', class: 'img-fluid' %>
+
+    <%= simple_form_for [:backend, @model] do |f| %>
+      <%= f.input :url, as: :string %>
+      <%= f.input :caption, as: :text %>
+      <%= render 'backend/form_actions', cancel_url: content_path %>
+    <% end %>
+  </div>
+</div>

data/app/views/backend/content/rows/pictures/link_or_upload.html.erb

@@ -0,0 +1,34 @@
+<%= simple_form_for @asset, url: upload_backend_content_picture_path(@model) do |f| %>
+  <div class="card">
+    <div class="card-header">
+      <%= t 'b.upload_a_new_image' %>
+    </div>
+
+    <div class="card-block">
+      <%= f.input :filename, as: :file, label: false, required: false %>
+      <%= f.input :description, as: :text, required: false %>
+
+      <%= render 'backend/form_actions', cancel_url: content_path %>
+    </div>
+  </div>
+<% end %>
+
+<div class="card">
+  <div class="card-header">
+    <%= t 'b.choose_an_existing_image' %>
+  </div>
+
+  <div class="card-block">
+    <%= render 'filter' %>
+
+    <div class="row">
+      <% @assets.each do |a| %>
+        <div class="col-sm-6 col-md-4 col-lg-3 col-xl-2">
+          <%= link_to link_backend_content_picture_path(@model, asset_id: a.id), style: '' do %>
+            <%= image_tag a.image.url(550, 550, action: :resize_and_pad, background: :white), alt: '', class: 'img-fluid' %>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

data/changelog.md

@@ -1,8 +1,21 @@
+5.8.0 - 2017-04-12
+--
+* Add missing ```author``` key to form translations.
+* The ContentImage/Text decorators have been simplified.
+* Fixed bug where you couldn't include ```Concerns::Searchable``` on models
+  without flexible content without getting an unknown method error.
+* The column widths for flexible content are displayed in percentages.
+* An extra widget ```ContentPicture``` has been added. This is the replacement
+  for the ````ContentImage```` which has now been deprecated.
+
+
 5.7.0 - 2017-03-22
 --
 * The ```Navigation``` model now includes the cacheable concern.
 * A ```NavigationHelper``` module was added which makes it easier to fetch a
   navigation by identifier.
+* You can now include ```Concerns::Searchable``` on models without flexible
+  content and not receive errors as a result.
 
 
 5.6.0 - 2017-03-18

data/config/locales/en_backend.yml

@@ -98,7 +98,8 @@ en:
       changes_saved: The changes have been saved.
       confirm: Are you sure?
       content_types:
-        image: Image
+        image: Image (deprecated!)
+        picture: Picture
         text: Text
       deleted: '%{actor} was deleted.'
       dirty_inputs_warning: "You are about to leave the page but your changes aren't saved yet.\nDo you still want to leave the page?"
@@ -110,8 +111,10 @@ en:
         delete_row: Delete row
         edit_column: Edit column
         edit_image: Edit image
+        edit_picture: Edit picture
         edit_text: Edit text
         explanation: With this module you can create flexible responsive content. Click the button below to create the first row.
+        no_picture_present: No picture has been uploaded/linked yet.
       forgot_password: Forgot password?
       general_form_error: Something went wrong. Please check the marked fields.
       help_texts:

data/config/locales/en_forms.yml

@@ -14,6 +14,7 @@ en:
     labels:
       defaults:
         active: Active
+        author: Author
         bcc: BCC
         caption: Caption
         category: Category

data/config/locales/nl_backend.yml

@@ -98,7 +98,8 @@ nl:
       changes_saved: De wijzigingen werden opgeslagen.
       confirm: Ben je zeker?
       content_types:
-        image: Afbeelding
+        image: Afbeelding (niet meer gebruiken!)
+        picture: Foto
         text: Tekst
       deleted: '%{actor} werd verwijderd.'
       dirty_inputs_warning: "Je gaat de pagina verlaten maar je aanpassingen zijn nog niet bewaard.\nWil je nog steeds de pagina verlaten?"
@@ -110,8 +111,10 @@ nl:
         delete_row: Rij verwijderen
         edit_column: Kolom bewerken
         edit_image: Afbeelding bewerken
+        edit_picture: Foto bewerken
         edit_text: Tekst bewerken
         explanation: Met deze module kan je flexibele, responsive inhoud toevoegen. Klik op onderstaande knop om een eerste rij toe te voegen.
+        no_picture_present: Er werd nog geen foto geüpload of gelinkt.
       forgot_password: Wachtwoord vergeten?
       general_form_error: Er trad een fout op. Controleer de gemarkeerde velden.
       help_texts:

data/config/locales/nl_forms.yml

@@ -14,6 +14,7 @@ nl:
     labels:
       defaults:
         active: Actief
+        author: Auteur
         bcc: BCC
         caption: Beschrijving
         category: Categorie

data/config/routes.rb

@@ -83,8 +83,16 @@ Rails.application.routes.draw do
 
       scope module: 'rows' do
         Udongo.config.flexible_content.types.each do |content_type|
+          next if content_type == 'picture'
           resources content_type.to_s.pluralize.to_sym, only: [:edit, :update]
         end
+
+        resources :pictures, only: [:edit, :update] do
+          member do
+            get :link_or_upload, :link
+            post :upload
+          end
+        end
       end
     end
 

data/db/migrate/20170412074304_create_content_pictures.rb

@@ -0,0 +1,11 @@
+class CreateContentPictures < ActiveRecord::Migration[5.0]
+  def change
+    create_table :content_pictures do |t|
+      t.references :asset
+      t.text :caption
+      t.text :url
+
+      t.timestamps
+    end
+  end
+end

data/lib/udongo/configs/flexible_content.rb

@@ -5,7 +5,7 @@ module Udongo
 
       BREAKPOINTS = %w(xs sm md lg xl)
 
-      attribute :types, Array, default: %w(text image)
+      attribute :types, Array, default: %w(text picture image)
       attribute :allowed_breakpoints, Array, default: BREAKPOINTS
 
       def allowed_breakpoint?(value)

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '5.7.0'
+  VERSION = '5.8.0'
 end

data/readme.md

@@ -116,7 +116,7 @@ You can also override the default message with your own:
 ## Flexible content
 ### types
 ```ruby
-Udongo.config.flexible_content.types = %w(text image)
+Udongo.config.flexible_content.types = %w(text picture)
 ```
 
 ### allowed_breakpoints

data/spec/factories/content_pictures.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :content_picture do
+    asset
+  end
+end

data/spec/support/concerns/content_type.rb

@@ -15,6 +15,6 @@ shared_examples_for :content_type do
   end
 
   it '#respond_to?' do
-    expect(build(klass)).to respond_to(:column)
+    expect(build(klass)).to respond_to(:column, :parent, :content_type_is?)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 5.7.0
+  version: 5.8.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -460,6 +460,7 @@ files:
 - app/controllers/backend/base_controller.rb
 - app/controllers/backend/content/rows/columns_controller.rb
 - app/controllers/backend/content/rows/images_controller.rb
+- app/controllers/backend/content/rows/pictures_controller.rb
 - app/controllers/backend/content/rows/texts_controller.rb
 - app/controllers/backend/content/rows_controller.rb
 - app/controllers/backend/dashboard_controller.rb
@@ -486,6 +487,7 @@ files:
 - app/controllers/redirects_controller.rb
 - app/decorators/application_decorator.rb
 - app/decorators/content_image_decorator.rb
+- app/decorators/content_picture_decorator.rb
 - app/decorators/content_row_decorator.rb
 - app/decorators/content_text_decorator.rb
 - app/decorators/navigation_item_decorator.rb
@@ -549,6 +551,7 @@ files:
 - app/models/concerns/visible.rb
 - app/models/content_column.rb
 - app/models/content_image.rb
+- app/models/content_picture.rb
 - app/models/content_row.rb
 - app/models/content_text.rb
 - app/models/email.rb
@@ -602,12 +605,16 @@ files:
 - app/views/backend/assets/index.html.erb
 - app/views/backend/assets/new.html.erb
 - app/views/backend/content/_image.html.erb
+- app/views/backend/content/_picture.html.erb
 - app/views/backend/content/_rows.html.erb
 - app/views/backend/content/_text.html.erb
 - app/views/backend/content/rows/columns/_dimension_fields.html.erb
 - app/views/backend/content/rows/columns/edit.html.erb
 - app/views/backend/content/rows/columns/new.html.erb
 - app/views/backend/content/rows/images/edit.html.erb
+- app/views/backend/content/rows/pictures/_filter.html.erb
+- app/views/backend/content/rows/pictures/edit.html.erb
+- app/views/backend/content/rows/pictures/link_or_upload.html.erb
 - app/views/backend/content/rows/texts/edit.html.erb
 - app/views/backend/dashboard/show.html.erb
 - app/views/backend/email_templates/_form.html.erb
@@ -756,6 +763,7 @@ files:
 - db/migrate/20170228183831_create_images.rb
 - db/migrate/20170305125627_create_articles.rb
 - db/migrate/20170318184654_add_title_and_content_disabled_to_snippet.rb
+- db/migrate/20170412074304_create_content_pictures.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb
@@ -808,6 +816,7 @@ files:
 - spec/factories/comments.rb
 - spec/factories/content_columns.rb
 - spec/factories/content_images.rb
+- spec/factories/content_pictures.rb
 - spec/factories/content_rows.rb
 - spec/factories/content_texts.rb
 - spec/factories/email_templates.rb