udongo 5.1.0 → 5.2.0

data/app/views/backend/assets/new.html.erb

@@ -0,0 +1,4 @@
+<% breadcrumb.add t('b.add') %>
+<%= render 'backend/breadcrumbs' %>
+
+<%= render 'form' %>

data/app/views/backend/snippets/edit.html.erb

@@ -3,4 +3,4 @@
 <%= render 'backend/breadcrumbs' %>
 
 <%= render 'backend/snippets/tabs', active: :general %>
-<%= render 'backend/snippets/form', identifier: false %>
+<%= render 'backend/snippets/form' %>

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

@@ -23,8 +23,8 @@
           <td><%= mail_to u.email %></td>
           <td><%= t u.active?.to_s %></td>
           <td class="text-xs-right">
-            <%= link_to icon(:pencil_square_o), edit_backend_user_path(u) %>
-            <%= link_to icon(:trash), backend_user_path(u), method: :delete, data: {confirm: t('b.msg.confirm') }%>
+            <%= link_to_edit [:backend, u] %>
+            <%= link_to_delete [:backend, u] %>
           </td>
         </tr>
       <% end %>

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

@@ -4,6 +4,7 @@
     <div class="dropdown-menu">
       <%= link_to t('b.pages'), backend_pages_path, class: 'dropdown-item' %>
       <%= link_to t('b.snippets'), backend_snippets_path, class: 'dropdown-item' %>
+      <%= link_to t('b.files'), backend_assets_path, class: 'dropdown-item' %>
     </div>
   </li>
 

data/changelog.md

@@ -1,3 +1,12 @@
+5.2.0 - 2017-03-02
+--
+* Add an assets module to manage all kinds of files.
+* Backend now loads jQuery 3 by default.
+* You can now mark a model as 'Imageable', which makes it possible to link one
+  or more images (assets) to it. These assets can be reused for other modules
+  as well.
+
+
 5.1.0 - 2017-02-15
 --
 * The users module now orders by last/first name.

data/config/locales/en.yml

@@ -106,6 +106,7 @@ en:
       equal_to: must be equal to %{count}
       even: must be even
       exclusion: is reserved
+      extension_white_list_error: 'You are not allowed to upload %{extension} files, allowed types: %{allowed_types}'
       greater_than: must be greater than %{count}
       greater_than_or_equal_to: must be greater than or equal to %{count}
       inclusion: is not included in the list
@@ -198,7 +199,7 @@ en:
   time:
     am: am
     formats:
-      default: ! '%B %d, %Y at %Hh%M'
+      default: ! '%B %-d, %Y at %Hh%M'
       timeless: ! '%d %B %Y'
       short: ! '%d %b at %Hh%M'
       time_attr: ! '%G-W%V-%uT%R%:z'

data/config/locales/en_backend.yml

@@ -1,6 +1,7 @@
 en:
   b:
     actions: Actions
+    active: Active
     add: Add
     admin: Admin
     admins: Admins
@@ -14,6 +15,7 @@ en:
     description: Description
     destination: Destination
     down: Down
+    download: Download
     edit: Edit
     email: E-mail
     emails: E-mails
@@ -21,6 +23,8 @@ en:
     email_templates: E-mail templates
     enabled?: Enabled?
     extra: Extra
+    file: File
+    files: Files
     filter: Filter
     first_name: First name
     flexible_content: Flexible content
@@ -28,6 +32,7 @@ en:
     general: General
     house_number: House number
     html_content: HTML content
+    last_changed_at: Last changed at
     last_name: Last name
     locale: Locale
     login: Login
@@ -54,6 +59,7 @@ en:
     sender: Sender
     sent_at: Sent at
     settings: Settings
+    size: Size
     snippet: Snippet
     snippets: Snippets
     source: Source

data/config/locales/en_general.yml

@@ -14,3 +14,4 @@ en:
     search: Search
     subject: Subject
     telephone: Telephone
+    type: Type

data/config/locales/fr.yml

@@ -206,7 +206,7 @@ fr:
   time:
     am: 'am'
     formats:
-      default: "%A %d %B %Y à %Hh%M"
+      default: "%A %-d %B %Y à %Hh%M"
       timeless: '%d %B %Y'
       short: "%d %b à %Hh%M"
       time_attr: ! '%G-W%V-%uT%R%:z'

data/config/locales/nl.yml

@@ -112,6 +112,7 @@ nl:
       equal_to: moet gelijk zijn aan %{count}
       even: moet even zijn
       exclusion: is niet beschikbaar
+      extension_white_list_error: 'Bestanden met de extensie %{extension} zijn niet toegestaan. Wel toegestaan zijn: %{allowed_types}'
       greater_than: moet groter zijn dan %{count}
       greater_than_or_equal_to: moet groter dan of gelijk zijn aan %{count}
       inclusion: is niet in de lijst opgenomen
@@ -204,7 +205,7 @@ nl:
   time:
     am: ! '''s ochtends'
     formats:
-      default: ! '%d %B %Y om %Hu%M'
+      default: ! '%-d %B %Y om %Hu%M'
       timeless: ! '%d %B %Y'
       short: ! '%d %b om %Hu%M'
       time_attr: ! '%FT%R%:z'

data/config/locales/nl_backend.yml

@@ -15,6 +15,7 @@ nl:
     description: Beschrijving
     destination: Bestemming
     down: Omlaag
+    download: Download
     edit: Bewerk
     email: E-mail
     emails: E-mails
@@ -22,6 +23,8 @@ nl:
     email_templates: E-mail templates
     enabled?: Ingeschakeld?
     extra: Extra
+    file: Bestand
+    files: Bestanden
     filter: Filter
     first_name: Voornaam
     flexible_content: Flexibele inhoud
@@ -29,6 +32,7 @@ nl:
     general: Algemeen
     house_number: Huisnummer
     html_content: HTML inhoud
+    last_changed_at: Laatst gewijzigd op
     last_name: Achternaam
     locale: Taal
     login: Inloggen
@@ -55,6 +59,7 @@ nl:
     sender: Afzender
     sent_at: Verzonden op
     settings: Instellingen
+    size: Grootte
     snippet: Snippet
     snippets: Snippets
     source: Bron

data/config/locales/nl_general.yml

@@ -14,3 +14,4 @@ nl:
     search: Zoeken
     subject: Onderwerp
     telephone: Telefoon
+    type: Type

data/config/routes.rb

@@ -76,6 +76,8 @@ Rails.application.routes.draw do
         end
       end
     end
+
+    resources :assets
   end
 
   get 'go/:slug' => 'redirects#go'

data/db/migrate/20170225144523_create_assets.rb

@@ -0,0 +1,14 @@
+class CreateAssets < ActiveRecord::Migration[5.0]
+  def change
+    create_table :assets do |t|
+      t.string :filename
+      t.string :content_type
+      t.integer :filesize
+      t.text :description
+
+      t.timestamps
+    end
+
+    add_index :assets, :content_type
+  end
+end

data/db/migrate/20170228183831_create_images.rb

@@ -0,0 +1,18 @@
+class CreateImages < ActiveRecord::Migration[5.0]
+  def change
+    create_table :images do |t|
+      t.integer :imageable_id
+      t.string :imageable_type
+      t.references :asset
+      t.integer :position
+      t.boolean :visible
+
+      t.timestamps
+    end
+
+    add_index :images, :imageable_id
+    add_index :images, :imageable_type
+    add_index :images, :position
+    add_index :images, :visible
+  end
+end

data/lib/udongo/configs/assets.rb

@@ -0,0 +1,10 @@
+module Udongo
+  module Configs
+    class Assets
+      include Virtus.model
+
+      attribute :image_white_list, Array, default: %w(gif jpeg jpg png)
+      attribute :file_white_list, Array, default: %w(doc docx pdf txt xls xlsx)
+    end
+  end
+end

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '5.1.0'
+  VERSION = '5.2.0'
 end

data/readme.md

@@ -61,6 +61,17 @@ Udongo.config.flexible_content.types = %w(text image)
 Udongo.config.flexible_content.allowed_breakpoints = %w(xs sm md lg xl)
 ```
 
+## Assets
+### image_white_list
+```ruby
+Udongo.config.image_white_list = %w(gif jpeg jpg png)
+```
+
+### file_white_list
+```ruby
+Udongo.config.file_white_list = %w(doc docx pdf txt xls xlsx)
+```
+
 # Concerns
 ## Storable concern
 ### Possible field types

data/spec/factories/addresses.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :address do
+    addressable_id 1
+    addressable_type 'Example'
+  end
+end

data/spec/factories/admins.rb

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  factory :admin do
+    locale 'nl'
+    first_name 'foo'
+    last_name 'bar'
+    sequence(:email) { |n| "foo-#{n}@bar.baz" }
+    password 'sekret'
+    password_confirmation 'sekret'
+  end
+end

data/spec/factories/assets.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :asset do
+    filename { fixture_file_upload 'spec/fixtures/files/example.jpg', 'application/jpeg' }
+  end
+end

data/spec/factories/comments.rb

@@ -0,0 +1,9 @@
+FactoryGirl.define do
+  factory :comment do
+    commentable_id 1
+    commentable_type 'Example'
+    author 'Foo Bar'
+    sequence(:email) { |n| "foo-#{n}@bar.baz" }
+    message 'Foo bar baz'
+  end
+end

data/spec/factories/content_columns.rb

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  factory :content_column do
+    association :row, factory: :content_row
+    width_xs { rand(1..12) }
+    width_sm { rand(1..12) }
+    width_md { rand(1..12) }
+    width_lg { rand(1..12) }
+    width_xl { rand(1..12) }
+  end
+end

data/spec/factories/content_images.rb

@@ -0,0 +1,9 @@
+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

data/spec/factories/content_rows.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :content_row do
+    locale 'nl'
+  end
+end

data/spec/factories/content_texts.rb

@@ -0,0 +1,4 @@
+FactoryGirl.define do
+  factory :content_text do
+  end
+end

data/spec/factories/email_templates.rb

@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :email_template do
+    sequence(:identifier) { |n| "foo-#{n}" }
+    description 'foo'
+    from_name 'foo'
+    from_email 'foo@bar.baz'
+  end
+end

data/spec/factories/emails.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :email do
+    from_name 'Foo Bar'
+    from_email 'foo@bar.baz'
+    to_name 'Bar Foo'
+    to_email 'bar@foo.baz'
+    subject 'foo'
+    plain_content 'foo'
+    html_content 'foo'
+  end
+end

data/spec/factories/images.rb

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

data/spec/factories/logs.rb

@@ -0,0 +1,4 @@
+FactoryGirl.define do
+  factory :log do
+  end
+end

data/spec/factories/meta.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :meta do
+    locale 'nl'
+    sequence(:slug) { |n| "foo-#{n}" }
+  end
+end
+

data/spec/factories/navigation_items.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :navigation_item do
+    navigation
+  end
+end

data/spec/factories/navigations.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :navigation do
+    sequence(:identifier) { |n| "foo-#{n}" }
+    description 'foo'
+  end
+end

data/spec/factories/notes.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :note do
+    content 'test'
+  end
+end
+

data/spec/factories/pages.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :page do
+    description 'Foo'
+  end
+end

data/spec/factories/queued_tasks.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :queued_task do
+    klass 'SomeClass'
+  end
+end

data/spec/factories/redirects.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :redirect do
+    source_uri '/nl/foo'
+    destination_uri '/nl/bar'
+    status_code 303
+  end
+end

data/spec/factories/search_indices.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :search_index do
+    locale 'nl'
+    name 'foo'
+  end
+end

data/spec/factories/search_modules.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :search_module do
+    name 'Page'
+  end
+end