qbrick 2.6.4 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4039c7291357f0a19df1eeb7bd91a3bf1bfef68
-  data.tar.gz: 03932d27ce93a7cb5fffb49aa436c85f4659ec5b
+  metadata.gz: 5670c7eb3b792219eaffc87f89487412df39450d
+  data.tar.gz: 61888a9f1c21b859e4d8b523cd5b048b2f0be56e
 SHA512:
-  metadata.gz: cff2e82dc85540467c0c261d71d9775ab5f6845fc5d76095dc15e41ebadc2cb53f27be446efc65fb75acba4f21cd8ede77ee963df685c74bd7936bd8171822ca
-  data.tar.gz: 450e54bb31980207d060185106ac46d01975797e4f6ca1024383bc70a308d6169ae47b879b91310baa2cf48a7a42c1ea46e0b774eb9c979a916d3f50f23eea5b
+  metadata.gz: 8007150311018f10e62926597f05c6e06eaa51fcf461a8547272a8487371c1468826b5c1db7ef9ad12e8f1e0fdedf97a920a3d117eb04ba6172b9c9dda0bb07e
+  data.tar.gz: d8cddcf1416dfeb3edb283fe8f7c49c66cd95adb43e69d40790e9b520d95516591418fb5a9099c14c6b77ad034817ea03abfc4ee810f80ee504cf2608d01f543

data/app/models/qbrick/page.rb

@@ -34,6 +34,7 @@ module Qbrick
     validates :redirect_url, presence: true, if: :redirect?
     validates :title, :slug, :keywords, :page_type, length: { maximum: 255 }
     validates :identifier, uniqueness: true, allow_blank: true
+    validate :slug_uniqueness
 
     class << self
       def flat_tree
@@ -66,6 +67,26 @@ module Qbrick
       end
     end # class methods
 
+    def slug_uniqueness
+      path_field = locale_attr :path
+      slug_field = locale_attr :slug
+      [slug_field, path_field].each do |field|
+        self.class.validators_on(field).map { |v| v.validate self }
+        return true if errors[field].present?
+      end
+
+      page_with_duplicated_paths = self.class.where path_field => path
+      page_with_duplicated_paths = page_with_duplicated_paths.where.not id: id if persisted?
+      return true unless page_with_duplicated_paths.exists?
+
+      message = 'page ids: '
+      page_with_duplicated_paths.pluck(:id).each do |id|
+        message << "<a href=\"#{edit_cms_page_path id}#page-metadata\" target=\"_blank\">#{id}</a> "
+      end
+      message = I18n.t 'activerecord.errors.models.qbrick/page.attributes.slug.duplicated_slug', append: " (#{message.strip})"
+      errors.add :slug, message.html_safe
+    end
+
     def without_self
       self.class.where.not id: id
     end

data/config/locales/models/qbrick/page/de.yml

@@ -17,3 +17,10 @@ de:
         page_type: 'Seitentyp'
         parent_id: 'Übergeordnete Seite'
         parent: 'Übergeordnete Seite'
+        google_verification_key: 'Google Verification Key'
+    errors:
+      models:
+        qbrick/page:
+          attributes:
+            slug:
+              duplicated_slug: 'Der Slug ist leider schon vergeben%{append}'

data/config/locales/models/qbrick/page/en.yml

@@ -18,3 +18,9 @@ en:
         parent_id: 'Parent page'
         parent: 'Parent page'
         google_verification_key: Google Verification Key
+    errors:
+      models:
+        qbrick/page:
+          attributes:
+            slug:
+              duplicated_slug: 'Unfortunately the slug is already available%{append}'

data/lib/qbrick/version.rb

@@ -1,3 +1,3 @@
 module Qbrick
-  VERSION = '2.6.4'
+  VERSION = '2.6.5'
 end

data/spec/helpers/qbrick/cms/pages_helper_spec.rb

@@ -38,14 +38,13 @@ describe Qbrick::Cms::PagesHelper, type: :helper do
     end
 
     it 'has a redirect page' do
-      @page = create(:page, title: 'Page 1', slug: 'page1',
-                            page_type: Qbrick::PageType::REDIRECT, redirect_url: 'en/references')
-      expect(helper.hide_content_tab?(@page)).to be_truthy
+      page = create :page, title: 'Redirect', page_type: Qbrick::PageType::REDIRECT, redirect_url: 'en/foo'
+      expect(helper.hide_content_tab?(page)).to be_truthy
     end
 
     it 'has a not saved page' do
-      @page = Qbrick::Page.new
-      expect(helper.hide_content_tab?(@page)).to be_truthy
+      page = Qbrick::Page.new
+      expect(helper.hide_content_tab?(page)).to be_truthy
     end
   end
 end

data/spec/models/page_spec.rb

@@ -376,6 +376,14 @@ describe Qbrick::Page, type: :model do
   describe '#path' do
     let(:page) { create :page, slug: 'page' }
 
+    it "doesn't allow duplicated paths" do
+      expect(page).to be_valid
+      duplicated_slug_page = build :page, slug: 'page'
+      expect(page.slug).to eq duplicated_slug_page.slug
+      expect(duplicated_slug_page).to be_invalid
+      expect(duplicated_slug_page.errors[:slug]).to be_present
+    end
+
     context 'without parent' do
       it 'returns path with leading /' do
         expect(page.path).to start_with '/'
@@ -421,14 +429,14 @@ describe Qbrick::Page, type: :model do
         expect(child.path).to eq('/parent/child')
       end
     end
-  end
+  end # path
 
   describe '#translated' do
     before :each do
       I18n.with_locale(:en) do
-        @page_1 = create(:page, title: 'Page 1', slug: 'page1')
-        @page_2 = create(:page, title: 'Page 2', slug: 'page1')
-        @page_3 = create(:page, title: 'Page 3', slug: 'page1')
+        @page_1 = create(:page, title: 'Page 1')
+        @page_2 = create(:page, title: 'Page 2')
+        @page_3 = create(:page, title: 'Page 3')
       end
     end
 
@@ -456,7 +464,7 @@ describe Qbrick::Page, type: :model do
     it 'should be findable via scope' do
       expect(Qbrick::Page.by_identifier(cat_page.identifier)).to eq(cat_page)
     end
-  end
+  end # translated
 
   describe '#cloning' do
     around(:each) do |example|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qbrick
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.5
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails