udongo 5.1.0 → 5.2.0

data/spec/support/concerns/seo.rb

@@ -0,0 +1,54 @@
+require 'rails_helper'
+
+shared_examples_for :seo do
+  let(:model) { described_class }
+  let(:klass) { model.to_s.underscore.to_sym }
+  let(:instance) { create(klass) }
+
+  describe '#seo' do
+    it 'always returns a meta object' do
+      expect(instance.seo(:nl).class).to eq Meta
+    end
+
+    describe 'fetch locale specific meta object' do
+      it 'new' do
+        instance.seo(:nl) == instance.seo(:nl)
+      end
+
+      it 'saved' do
+        meta = instance.meta.create(locale: 'nl', slug: 'test')
+        expect(instance.seo(:nl)).to eq meta
+      end
+    end
+  end
+
+  describe '.find_by_slug' do
+    it :result do
+      instance.meta.create!(locale: 'nl', slug: 'test')
+      expect(model.find_by_slug('test', locale: :nl)).to eq instance
+    end
+
+    it 'no result' do
+      expect(model.find_by_slug('test', locale: :nl)).to eq nil
+    end
+  end
+
+  describe '.find_by_slug!' do
+    it :result do
+      instance.meta.create!(locale: 'nl', slug: 'test')
+      expect(model.find_by_slug!('test', locale: :nl)).to eq instance
+    end
+
+    it 'no result' do
+      expect{ model.find_by_slug!('test', locale: :nl) }.to raise_exception RuntimeError
+    end
+  end
+
+  it '#respond_to?' do
+    expect(build(klass)).to respond_to(:meta, :seo)
+  end
+
+  it '.respond_to?' do
+    expect(model).to respond_to(:find_by_slug, :find_by_slug!)
+  end
+end

data/spec/support/concerns/sortable.rb

@@ -0,0 +1,67 @@
+require 'rails_helper'
+
+shared_examples_for :sortable do
+  let(:model) { described_class }
+  let(:klass) { model.to_s.underscore.to_sym }
+
+  describe 'scopes' do
+    it :default_scope do
+      a = create(klass, position: 2)
+      b = create(klass, position: 3)
+      c = create(klass, position: 1)
+      expect(model.all).to eq [c, a, b]
+    end
+
+    it 'new records' do
+      a = create(klass)
+      b = create(klass)
+      c = create(klass)
+      expect(model.all).to eq [a, b, c]
+    end
+  end
+
+  describe '#set_position' do
+    before :each do
+      @first = create klass, position: 1
+
+      if @first.scope_condition.is_a?(Hash)
+        @second = create klass, @first.scope_condition.merge!({ position: 2 })
+      else
+        @second = create klass, position: 2
+      end
+    end
+
+    it :parentable do
+      if @first.respond_to?(:parentable) && @first.parentable? && @first.scope_name == 'parent_id'
+        two = create(klass, parent_id: @first.id)
+        three = create(klass)
+
+        three.set_position 2, @first.id
+        expect(three.parent_id).to eq @first.id
+      end
+    end
+
+    context 'draggable' do
+      it :with do
+        if @first.respond_to?(:draggable)
+          @first.update_attribute :draggable, false
+          @first.set_position 2
+
+          expect(model.find(@first.id).position).to eq 1
+          expect(model.find(@second.id).position).to eq 2
+        end
+      end
+
+      # You can't test the state without draggable/parentable reliably, due
+      # to scope issues.
+    end
+  end
+
+  it '.respond_to?' do
+    expect(model).to respond_to(:acts_as_list, :sortable)
+  end
+
+  it '#respond_to?' do
+    expect(model.new).to respond_to(:set_position, :set_list_position)
+  end
+end

data/spec/support/concerns/spammable.rb

@@ -0,0 +1,53 @@
+require 'rails_helper'
+
+shared_examples_for :spammable do
+  let(:model) { described_class }
+  let(:klass) { model.to_s.underscore.to_sym }
+
+  describe 'scopes' do
+    before(:each) do
+      @a = create(klass, marked_as_spam: nil)
+      @b = create(klass, marked_as_spam: false)
+      @c = create(klass, marked_as_spam: true)
+    end
+
+    it(:spam) { expect(model.spam).to eq [@c] }
+    it(:not_spam) { expect(model.not_spam).to eq [@a, @b] }
+  end
+
+  describe 'defaults' do
+    it 'not set' do
+      expect(build(klass)).not_to be_marked_as_spam
+    end
+
+    describe 'set' do
+      it :true do
+        expect(build(klass, marked_as_spam: true)).to be_marked_as_spam
+      end
+
+      it :false do
+        expect(build(klass, marked_as_spam: false)).not_to be_marked_as_spam
+      end
+    end
+  end
+
+  it '#mark_as_spam!' do
+    object = build(klass)
+    object.mark_as_spam!
+    expect(object).to be_marked_as_spam
+  end
+
+  it '#unmark_as_spam!' do
+    object = build(klass, marked_as_spam: true)
+    object.unmark_as_spam!
+    expect(object).not_to be_marked_as_spam
+  end
+
+  it '.respond_to?' do
+    expect(model).to respond_to(:spam, :not_spam)
+  end
+
+  it '#respond_to?' do
+    expect(model.new).to respond_to(:mark_as_spam!)
+  end
+end

data/spec/support/concerns/storable.rb

@@ -0,0 +1,18 @@
+require 'rails_helper'
+
+shared_examples_for :storable do
+  let(:model) { described_class }
+  let(:klass) { model.to_s.underscore.to_sym }
+
+  it '#storable?' do
+    expect(build(klass)).to be_storable
+  end
+
+  it '#respond_to?' do
+    expect(build(klass)).to respond_to(:store, :storable?)
+  end
+
+  it '.respond_to?' do
+    expect(model).to respond_to(:storable_field, :store_config)
+  end
+end

data/spec/support/concerns/taggable.rb

@@ -0,0 +1,51 @@
+require 'rails_helper'
+
+shared_examples_for :taggable do
+  let(:model) { described_class }
+  let(:klass) { model.to_s.underscore.to_sym }
+  let(:instance) { create(klass) }
+
+  it '#tags' do
+    tag = create(:tag, locale: :nl, name: 'foo', slug: 'foo')
+    instance.tagged_items.create!(tag: tag)
+    expect(instance.tags(:nl)).to eq [tag]
+  end
+
+  it '#tags_string' do
+    tag1 = create(:tag, locale: :nl, name: 'foo', slug: 'foo')
+    tag2 = create(:tag, locale: :nl, name: 'bar', slug: 'bar')
+    instance.tagged_items.create!(tag: tag1)
+    instance.tagged_items.create!(tag: tag2)
+    expect(instance.tags_string(:nl)).to eq 'foo,bar'
+  end
+
+  describe '#related' do
+    let(:instance2) { create(klass) }
+    let(:tag1) { create(:tag, locale: :nl, name: 'foo', slug: 'foo') }
+    let(:tag2) { create(:tag, locale: :nl, name: 'bar', slug: 'bar') }
+
+    it :blank do
+      instance.tagged_items.create!(tag: tag1)
+      instance2.tagged_items.create!(tag: tag2)
+      expect(instance.related(:nl)).to eq []
+    end
+
+    it :results do
+      instance.tagged_items.create!(tag: tag1)
+      instance.tagged_items.create!(tag: tag2)
+      instance2.tagged_items.create!(tag: tag1)
+      instance2.tagged_items.create!(tag: tag2)
+      expect(instance.related(:nl)).to eq [instance2]
+      expect(instance2.related(:nl)).to eq [instance]
+    end
+  end
+
+  it '#taggable?' do
+    expect(instance).to be_taggable
+  end
+
+  it '#respond_to?' do
+    expect(model.new).to respond_to(:tagged_items, :related, :tags, :tags_string, :taggable?)
+  end
+end
+

data/spec/support/concerns/translatable.rb

@@ -0,0 +1,71 @@
+require 'rails_helper'
+
+shared_examples_for :translatable do
+  let(:model) { described_class }
+  let(:klass) { model.to_s.underscore.to_sym }
+
+  describe '#locales' do
+    it 'defaults to an empty array' do
+      expect(build(klass).locales.class).to eq Array
+    end
+
+    it 'updates when a translation is added' do
+      object = create(klass)
+      field = model.translatable_fields_list.first
+      object.translation(:nl).send("#{field}=", 'foo')
+      object.save
+
+      # 13/01 - if this is done with eq instead of include, the searchable spec
+      # fails because of the following in app/models/concerns/searchable.rb:
+      #
+      #   Udongo.config.i18n.app.locales.each do |locale|
+      #     value = translation(locale.to_sym).send(key) <---
+      #     ...
+      #   end
+      expect(object.locales).to include 'nl'
+    end
+  end
+
+  it '#translatable?' do
+    expect(build(klass)).to be_translatable
+  end
+
+  describe 'scopes' do
+    describe '.with_locale' do
+      it 'no results' do
+        expect(model.with_locale(:nl)).to eq []
+      end
+
+      it 'dutch only' do
+        field = model.translatable_fields_list.first
+
+        object = create(klass)
+        object.translation(:nl).send("#{field}=", 'foo')
+        object.save
+
+        expect(model.with_locale(:nl)).to eq [object]
+      end
+
+      it 'dutch and english' do
+        field = model.translatable_fields_list.first
+
+        object = create(klass)
+        object.translation(:nl).send("#{field}=", 'foo')
+        object.translation(:en).send("#{field}=", 'foo')
+        object.save
+
+        expect(model.with_locale(:nl)).to eq [object]
+      end
+    end
+  end
+
+  it '#respond_to?' do
+    expect(build(klass)).to respond_to(:translation, :translatable?)
+  end
+
+  it '.respond_to?' do
+    expect(model).to respond_to(
+      :translatable_field, :translatable_fields, :with_locale
+    )
+  end
+end

data/spec/support/concerns/visible.rb

@@ -0,0 +1,64 @@
+require 'rails_helper'
+
+shared_examples_for :visible do
+  let(:model) { described_class }
+  let(:klass) { model.to_s.underscore.to_sym }
+
+  describe 'scopes' do
+    it :visible do
+      a = create(klass, visible: true)
+      b = create(klass, visible: false)
+      expect(model.visible).to eq [a]
+    end
+
+    it :hidden do
+      a = create(klass, visible: true)
+      b = create(klass, visible: false)
+      expect(model.hidden).to eq [b]
+    end
+  end
+
+  context 'hidden' do
+    let(:item) { build(klass, visible: false) }
+
+    it '#hidden?' do
+      expect(item.hidden?).to be true
+    end
+
+    it '#hide!' do
+      item.hide!
+      expect(item.hidden?).to be true
+    end
+
+    it '#show!' do
+      item.show!
+      expect(item.visible?).to be true
+    end
+  end
+
+  context 'visible' do
+    let(:item) { build(klass, visible: true) }
+
+    it '#hidden?' do
+      expect(item.hidden?).to be false
+    end
+
+    it '#hide!' do
+      item.hide!
+      expect(item.hidden?).to be true
+    end
+
+    it '#show!' do
+      item.show!
+      expect(item.visible).to be true
+    end
+  end
+
+  it '.respond_to?' do
+    expect(model).to respond_to(:visible, :hidden)
+  end
+
+  it '#respond_to?' do
+    expect(model.new).to respond_to(:hidden?, :hide!, :show!)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -451,6 +451,7 @@ files:
 - app/assets/stylesheets/backend/pages/_login.scss
 - app/assets/stylesheets/backend/udongo.scss
 - app/controllers/backend/admins_controller.rb
+- app/controllers/backend/assets_controller.rb
 - app/controllers/backend/base_controller.rb
 - app/controllers/backend/content/rows/columns_controller.rb
 - app/controllers/backend/content/rows/images_controller.rb
@@ -504,6 +505,8 @@ files:
 - app/models/address.rb
 - app/models/admin.rb
 - app/models/application_record.rb
+- app/models/asset.rb
+- app/models/asset_image.rb
 - app/models/ckeditor/asset.rb
 - app/models/ckeditor/attachment_file.rb
 - app/models/ckeditor/picture.rb
@@ -517,6 +520,7 @@ files:
 - app/models/concerns/draggable.rb
 - app/models/concerns/emailable.rb
 - app/models/concerns/flexible_content.rb
+- app/models/concerns/imageable.rb
 - app/models/concerns/locale.rb
 - app/models/concerns/loggable.rb
 - app/models/concerns/notable.rb
@@ -539,6 +543,7 @@ files:
 - app/models/content_text.rb
 - app/models/email.rb
 - app/models/email_template.rb
+- app/models/image.rb
 - app/models/log.rb
 - app/models/meta.rb
 - app/models/navigation.rb
@@ -557,6 +562,7 @@ files:
 - app/models/tag.rb
 - app/models/tagged_item.rb
 - app/models/user.rb
+- app/uploaders/asset_uploader.rb
 - app/uploaders/ckeditor_attachment_file_uploader.rb
 - app/uploaders/ckeditor_picture_uploader.rb
 - app/uploaders/content_image_uploader.rb
@@ -573,6 +579,11 @@ files:
 - app/views/backend/admins/edit.html.erb
 - app/views/backend/admins/index.html.erb
 - app/views/backend/admins/new.html.erb
+- app/views/backend/assets/_filter.html.erb
+- app/views/backend/assets/_form.html.erb
+- app/views/backend/assets/edit.html.erb
+- 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/_rows.html.erb
 - app/views/backend/content/_text.html.erb
@@ -722,6 +733,8 @@ files:
 - db/migrate/20170202170310_rename_key_to_name_for_search_indices.rb
 - db/migrate/20170212150903_cleanup_user_model.rb
 - db/migrate/20170215132531_add_active_to_users.rb
+- db/migrate/20170225144523_create_assets.rb
+- db/migrate/20170228183831_create_images.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb
@@ -730,6 +743,7 @@ files:
 - lib/udongo/assets/precompiler.rb
 - lib/udongo/breadcrumb.rb
 - lib/udongo/config.rb
+- lib/udongo/configs/assets.rb
 - lib/udongo/configs/base.rb
 - lib/udongo/configs/flexible_content.rb
 - lib/udongo/configs/i18n.rb
@@ -759,6 +773,56 @@ files:
 - lib/udongo/will_paginate/options.rb
 - lib/udongo/will_paginate/renderer.rb
 - readme.md
+- spec/factories/addresses.rb
+- spec/factories/admins.rb
+- spec/factories/assets.rb
+- spec/factories/comments.rb
+- spec/factories/content_columns.rb
+- spec/factories/content_images.rb
+- spec/factories/content_rows.rb
+- spec/factories/content_texts.rb
+- spec/factories/email_templates.rb
+- spec/factories/emails.rb
+- spec/factories/images.rb
+- spec/factories/logs.rb
+- spec/factories/meta.rb
+- spec/factories/navigation_items.rb
+- spec/factories/navigations.rb
+- spec/factories/notes.rb
+- spec/factories/pages.rb
+- spec/factories/queued_tasks.rb
+- spec/factories/redirects.rb
+- spec/factories/search_indices.rb
+- spec/factories/search_modules.rb
+- spec/factories/search_synonyms.rb
+- spec/factories/settings.rb
+- spec/factories/snippets.rb
+- spec/factories/stores.rb
+- spec/factories/tagged_items.rb
+- spec/factories/tags.rb
+- spec/factories/users.rb
+- spec/support/concerns/cacheable.rb
+- spec/support/concerns/commentable.rb
+- spec/support/concerns/content_type.rb
+- spec/support/concerns/deletable.rb
+- spec/support/concerns/draggable.rb
+- spec/support/concerns/emailable.rb
+- spec/support/concerns/flexible_content.rb
+- spec/support/concerns/imageable.rb
+- spec/support/concerns/locale.rb
+- spec/support/concerns/loggable.rb
+- spec/support/concerns/notable.rb
+- spec/support/concerns/parentable.rb
+- spec/support/concerns/person.rb
+- spec/support/concerns/publishable.rb
+- spec/support/concerns/searchable.rb
+- spec/support/concerns/seo.rb
+- spec/support/concerns/sortable.rb
+- spec/support/concerns/spammable.rb
+- spec/support/concerns/storable.rb
+- spec/support/concerns/taggable.rb
+- spec/support/concerns/translatable.rb
+- spec/support/concerns/visible.rb
 - vendor/assets/images/jstree/default/32px.png
 - vendor/assets/images/jstree/default/40px.png
 - vendor/assets/images/jstree/default/throbber.gif