udongo 6.6.3 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ff48699ed24cd0d6a47d7664715dc25e295870d
-  data.tar.gz: dd2bcd1439eedfd64b9c672a058982a68332ee3e
+  metadata.gz: abcf2f3a3fea0a5ff7a89fa8364f083c948fe8d0
+  data.tar.gz: a9cea4a94f6790316fae6a9843bf8e088a01f762
 SHA512:
-  metadata.gz: 7612ca40dce54f6be375ece36aa3ab28dda8cba3788c545a24ef30fc00575b14df317d3912b410d2d25557631822dddb74722205025f4f82c85838f3e1f1da0c
-  data.tar.gz: 0a1626023ad6cb728aa880d581bfd23d953bd60688efa14f425c8b69b4b6daf6658200c9e9b99e6c89f105605c72fb91e1b8e7f2294d4ae516a11adaed4b90b5
+  metadata.gz: 7349c0efcab0845f8358291a103043059a46ca7314fecb33fc3ed5f092b27a209187f041f2fcb4648c9bf0745fa6ae6cea27227c6f1c71d10bcb96c73b69ed55
+  data.tar.gz: 3c4df6d375c5cac2ca2f9b2f8e48c8ba73d8756e6145b58f6f4044685d79e00b130842f801bf215a362ba8367b9ee772be6969bfb64aa4b5e460c9356d74874b

data/app/models/concerns/seo.rb

@@ -3,7 +3,19 @@ module Concerns
     extend ActiveSupport::Concern
 
     included do
+      serialize :seo_locales, Array
       has_many :meta, as: :sluggable, dependent: :destroy
+
+      after_save do
+        locales = Meta.where(
+          sluggable_type: self.class.to_s,
+          sluggable_id: self.id
+        ).where('slug IS NOT NULL OR slug != ""').pluck(:locale).uniq
+
+        update_column :seo_locales, locales
+      end
+
+      scope :with_seo, ->(locale) { where('seo_locales LIKE ?', "%#{locale}%")}
     end
 
     module ClassMethods

data/changelog.md

@@ -1,3 +1,12 @@
+7.0.0 - 2017-07-28
+--
+* It's now possible to use the scope .with_seo(:nl) to fetch models that actually
+  have a slug in that locale. You used to have to do some nasty manual things to
+  work around this issue, but no more!
+* After being deprecated for some time, ```ContentImage``` has finally been
+  removed from the system.
+
+
 6.6.3 - 2017-07-27
 --
 * Bugfix: the cacheable concern #find_in_cache method has been tweaked to make
@@ -140,7 +149,7 @@
   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.
+  for the ```ContentImage``` which has now been deprecated.
 
 
 5.7.0 - 2017-03-22

data/db/migrate/20170728094909_add_seo_locales_to_models_with_seo.rb

@@ -0,0 +1,6 @@
+class AddSeoLocalesToModelsWithSeo < ActiveRecord::Migration[5.0]
+  def change
+    add_column :pages, :seo_locales, :text, after: 'locales'
+    add_column :articles, :seo_locales, :text, after: 'locales'
+  end
+end

data/db/migrate/20170728125838_remove_content_images.rb

@@ -0,0 +1,5 @@
+class RemoveContentImages < ActiveRecord::Migration[5.0]
+  def change
+    drop_table :content_images
+  end
+end

data/lib/tasks/udongo_tasks.rake

@@ -13,18 +13,6 @@ namespace :udongo do
     end
   end
 
-  namespace :content_images do
-    desc 'Regenerate all the image versions.'
-    task regenerate: :environment do
-      ContentImage.find_each do |i|
-        if i.file?
-          i.file.recreate_versions!
-          i.save!
-        end
-      end
-    end
-  end
-
   namespace :queue do
     desc 'Checks the queue for tasks and executes at most 3 of them'
     task process: :environment do

data/lib/udongo/configs/flexible_content.rb

@@ -6,7 +6,7 @@ module Udongo
       BREAKPOINTS = %w(xs sm md lg xl)
       DEFAULT_BREAKPOINT = 'md'
 
-      attribute :types, Array, default: %w(text picture video slideshow form image)
+      attribute :types, Array, default: %w(text picture video slideshow form)
       attribute :picture_caption_editor, Axiom::Types::Boolean, default: false
       attribute :video_caption_editor, Axiom::Types::Boolean, default: false
 

data/lib/udongo/version.rb

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

data/readme.md

@@ -173,6 +173,22 @@ class Document < ApplicationRecord
 end
 ```
 
+It also allows you to do something like this ```Page.with_locale(:nl)``` which
+will then fetch all pages that have the translatable fields in :nl avaialble.
+
+## Seo concern
+This concern is used if you want to attach (seo) meta details to your model. In
+order to use this, you need to add a text colun 'seo_locales' to your model.
+
+```ruby
+class Document < ApplicationRecord
+  include Concerns::Seo
+end
+```
+
+This will then allow you to fetch all documents that have seo (with slug!) in
+a certain locale. ```Document.with_seo(:nl)```
+
 ## Searchable concern
 Include this in your model if you want its records to appear in search autocompletes.
 

data/spec/support/concerns/seo.rb

@@ -5,6 +5,28 @@ shared_examples_for :seo do
   let(:klass) { model.to_s.underscore.to_sym }
   let(:instance) { create(klass) }
 
+  describe '#seo_locales' do
+    it 'defaults to an empty array' do
+      expect(build(klass).seo_locales.class).to eq Array
+    end
+
+    it 'updates when a slug is present' do
+      object = create(klass)
+      object.seo(:nl).slug = 'foo'
+      object.save
+
+      expect(object.seo_locales).to include 'nl'
+    end
+
+    it 'does not update unless a slug is present' do
+      object = create(klass)
+      object.seo(:nl).slug = nil
+      object.save
+
+      expect(object.seo_locales).to eq []
+    end
+  end
+
   describe '#seo' do
     it 'always returns a meta object' do
       expect(instance.seo(:nl).class).to eq Meta
@@ -22,6 +44,31 @@ shared_examples_for :seo do
     end
   end
 
+  describe 'scopes' do
+    describe '.with_seo' do
+      it 'no results' do
+        expect(model.with_seo(:nl)).to eq []
+      end
+
+      it 'dutch only' do
+        object = create(klass)
+        object.seo(:nl).slug = 'foo'
+        object.save
+
+        expect(model.with_seo(:nl)).to eq [object]
+      end
+
+      it 'dutch and english' do
+        object = create(klass)
+        object.seo(:nl).slug = 'foo'
+        object.seo(:en).slug = 'foo'
+        object.save
+
+        expect(model.with_seo(:nl)).to eq [object]
+      end
+    end
+  end
+
   describe '.find_by_slug' do
     it :result do
       instance.meta.create!(locale: 'nl', slug: 'test')
@@ -49,6 +96,6 @@ shared_examples_for :seo do
   end
 
   it '.respond_to?' do
-    expect(model).to respond_to(:find_by_slug, :find_by_slug!)
+    expect(model).to respond_to(:find_by_slug, :find_by_slug!, :with_seo)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 6.6.3
+  version: 7.0.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -464,7 +464,6 @@ files:
 - app/controllers/backend/base_controller.rb
 - app/controllers/backend/content/rows/columns_controller.rb
 - app/controllers/backend/content/rows/forms_controller.rb
-- app/controllers/backend/content/rows/images_controller.rb
 - app/controllers/backend/content/rows/pictures_controller.rb
 - app/controllers/backend/content/rows/slideshows_controller.rb
 - app/controllers/backend/content/rows/texts_controller.rb
@@ -504,7 +503,6 @@ files:
 - app/controllers/redirects_controller.rb
 - app/decorators/application_decorator.rb
 - app/decorators/content_form_decorator.rb
-- app/decorators/content_image_decorator.rb
 - app/decorators/content_picture_decorator.rb
 - app/decorators/content_row_decorator.rb
 - app/decorators/content_slideshow_decorator.rb
@@ -576,7 +574,6 @@ files:
 - app/models/concerns/visible.rb
 - app/models/content_column.rb
 - app/models/content_form.rb
-- app/models/content_image.rb
 - app/models/content_picture.rb
 - app/models/content_row.rb
 - app/models/content_slideshow.rb
@@ -611,7 +608,6 @@ files:
 - app/uploaders/asset_uploader.rb
 - app/uploaders/ckeditor_attachment_file_uploader.rb
 - app/uploaders/ckeditor_picture_uploader.rb
-- app/uploaders/content_image_uploader.rb
 - app/validators/email_validator.rb
 - app/validators/url_validator.rb
 - app/views/backend/_breadcrumbs.html.erb
@@ -639,7 +635,6 @@ files:
 - app/views/backend/assets/index.html.erb
 - app/views/backend/assets/new.html.erb
 - app/views/backend/content/_form.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/_slideshow.html.erb
@@ -651,7 +646,6 @@ files:
 - app/views/backend/content/rows/columns/new.html.erb
 - app/views/backend/content/rows/edit.html.erb
 - app/views/backend/content/rows/forms/edit.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
@@ -858,6 +852,8 @@ files:
 - db/migrate/20170616114757_add_external_ref_to_form_field.rb
 - db/migrate/20170623121241_add_no_gutters_to_content_row.rb
 - 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
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb
@@ -912,7 +908,6 @@ files:
 - spec/factories/comments.rb
 - spec/factories/content_columns.rb
 - spec/factories/content_forms.rb
-- spec/factories/content_images.rb
 - spec/factories/content_pictures.rb
 - spec/factories/content_rows.rb
 - spec/factories/content_slideshows.rb

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

@@ -1,6 +0,0 @@
-class Backend::Content::Rows::ImagesController < Backend::BaseController
-  include Concerns::Backend::ContentTypeController
-
-  model ContentImage
-  allowed_params :file, :caption, :url
-end

data/app/decorators/content_image_decorator.rb

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

data/app/models/content_image.rb

@@ -1,9 +0,0 @@
-class ContentImage < ApplicationRecord
-  include Concerns::ContentType
-
-  mount_uploader :file, ContentImageUploader
-
-  def content_type
-    :image
-  end
-end

data/app/uploaders/content_image_uploader.rb

@@ -1,52 +0,0 @@
-class ContentImageUploader < CarrierWave::Uploader::Base
-  include CarrierWave::RMagick
-
-  storage :file
-
-  def filename
-    @name ||= "#{secure_token}-#{model.id}.#{file.extension.downcase}" if original_filename
-  end
-
-  private
-
-  def secure_token
-    ivar = "@#{mounted_as}_secure_token"
-    token = model.instance_variable_get(ivar)
-    token ||= model.instance_variable_set(ivar, SecureRandom.hex(4))
-  end
-
-  def store_dir
-    main_dir = Digest::MD5.hexdigest(model.id.to_s)[0,2]
-    "uploads/flexible_content/images/#{main_dir}"
-  end
-
-  def extension_white_list
-    %w(jpg jpeg gif png)
-  end
-
-  process resize_to_limit: [2560, 1440]
-
-  version :size_800x600 do
-    process resize_to_limit: [800, 600]
-  end
-
-  version :size_1024x640 do
-    process resize_to_limit: [1024, 640]
-  end
-
-  version :size_1280x800 do
-    process resize_to_limit: [1280, 800]
-  end
-
-  version :size_1440x900 do
-    process resize_to_limit: [1440, 900]
-  end
-
-  version :size_1680x1050 do
-    process resize_to_limit: [1680, 1050]
-  end
-
-  version :size_1920x1200 do
-    process resize_to_limit: [1920, 1200]
-  end
-end

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

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

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

@@ -1,16 +0,0 @@
-<%= render 'backend/general_form_error', object: @model %>
-
-<% if @model.file.present? %>
-  <div class="row">
-    <div class="col-lg-8 col-lg-offset-2">
-      <%= image_tag(@model.file.url, alt: '', class: 'img-fluid') %>
-    </div>
-  </div>
-<% end %>
-
-<%= simple_form_for [:backend, @model] do |f| %>
-  <%= f.input :file, as: :file %>
-  <%= f.input :url, as: :string %>
-  <%= f.input :caption, as: :text %>
-  <%= render 'backend/form_actions', cancel_url: '#lity-close' %>
-<% end %>

data/spec/factories/content_images.rb

@@ -1,9 +0,0 @@
-FactoryGirl.define do
-  factory :content_image do
-    file { fixture_file_upload 'spec/fixtures/files/example.jpg', 'application/jpeg' }
-
-    after(:create) do |file, proxy|
-      proxy.file.close
-    end
-  end
-end