qbrick 2.6.0 → 2.6.1

data/spec/models/page_spec.rb

@@ -32,10 +32,10 @@ describe Qbrick::Page, type: :model do
     end
   end
 
-  describe '.find_by_url' do
+  describe '.find_by_path' do
     it 'should find its translated content by url' do
       page = create(:page)
-      expect(Qbrick::Page.find_by_url(page.url)).to eq(page)
+      expect(Qbrick::Page.find_by_path(page.path)).to eq(page)
     end
   end
 
@@ -253,7 +253,7 @@ describe Qbrick::Page, type: :model do
       it 'returns the concatenated slug of the whole child/parent tree' do
         page = create(:page, slug: 'parent-slug')
         child = create(:page, slug: 'child-slug', parent: page)
-        expect(child.url).to eq('en/parent-slug/child-slug')
+        expect(child.path).to eq('/parent-slug/child-slug')
       end
     end
 
@@ -261,21 +261,25 @@ describe Qbrick::Page, type: :model do
       it 'returns without the parent page slug' do
         page = create(:page, slug: 'parent-slug', page_type: Qbrick::PageType::NAVIGATION)
         child = create(:page, slug: 'child-slug', parent: page)
-        expect(child.url).to eq('en/child-slug')
+        expect(child.path).to eq('/child-slug')
       end
     end
 
     context 'when it is a redirect? page' do
       it 'returns the absolute url' do
-        page = create(:page, page_type: Qbrick::PageType::REDIRECT, redirect_url: 'en/references', slug: 'news')
-        expect(page.link).to eq('/en/news')
+        I18n.with_locale(:en) do
+          page = create(:page, page_type: Qbrick::PageType::REDIRECT, redirect_url: 'en/references', slug: 'news')
+          expect(page.link).to eq('/en/news')
+        end
       end
     end
 
     context 'when url part is empty' do
       it 'strips the trailing slash' do
-        page = create(:page, page_type: Qbrick::PageType::NAVIGATION)
-        expect(page.link).to eq('/en')
+        I18n.with_locale(:en) do
+          page = create(:page, page_type: Qbrick::PageType::NAVIGATION)
+          expect(page.link).to eq('/en')
+        end
       end
     end
   end
@@ -324,14 +328,14 @@ describe Qbrick::Page, type: :model do
 
   describe '#translated?' do
     it 'returns true when page is translated' do
-      @page = create(:page, title: 'Page 1', slug: 'page1')
-      expect(@page.translated?).to be_truthy
+      page = create(:page, title: 'Page 1', slug: 'page1')
+      expect(page.translated?).to be_truthy
     end
 
     it 'returns false when page has no translation' do
-      @page = create(:page, title: 'Page 1', slug: 'page1')
+      page = I18n.with_locale(:en) { create :page, title: 'Page 1', slug: 'page1' }
       I18n.with_locale :de do
-        expect(@page.translated?).to be_falsey
+        expect(page.translated?).to be_falsey
       end
     end
   end
@@ -361,46 +365,24 @@ describe Qbrick::Page, type: :model do
   end
 
   describe '#before_validation' do
-    it 'generates url automatically' do
+    it 'generates path automatically' do
       page = Qbrick::Page.new slug: 'slug'
-      expect(page.url).to be_nil
+      expect(page.path).to be_nil
       page.valid?
-      expect(page.url).to be_present
+      expect(page.path).to be_present
     end
   end
 
-  describe '#after_save' do
-    context 'when updating a parents page type' do
-      it 'updates the child pages url if parent is changed to navigation' do
-        @parent_page = FactoryGirl.create(:page, slug: 'le_parent')
-        @child_page = FactoryGirl.create(:page, slug: 'le_child', parent: @parent_page)
-
-        @parent_page.update_attributes(page_type: Qbrick::PageType::NAVIGATION)
-        expect(@child_page.reload.url).to eq("#{I18n.locale}/le_child")
-      end
-
-      it 'updates the child pages url if parent is changed to content' do
-        @parent_page = FactoryGirl.create(:page, slug: 'le_parent', page_type: Qbrick::PageType::NAVIGATION)
-        @child_page = FactoryGirl.create(:page, slug: 'le_child', parent: @parent_page)
-
-        @parent_page.update_attributes(page_type: Qbrick::PageType::CONTENT)
-        expect(@child_page.reload.url).to eq("#{I18n.locale}/le_parent/le_child")
-      end
-    end
-  end
-
-  describe '#url_without_locale' do
-    let :page do
-      create(:page, slug: 'page')
-    end
+  describe '#path' do
+    let(:page) { create :page, slug: 'page' }
 
     context 'without parent' do
-      it 'returns url without leading /' do
-        expect(page.url_without_locale).not_to start_with '/'
+      it 'returns path with leading /' do
+        expect(page.path).to start_with '/'
       end
 
       it 'returns a single slug' do
-        expect(page.url_without_locale).to eq('page')
+        expect(page.path).to eq('/page')
       end
     end
 
@@ -413,12 +395,12 @@ describe Qbrick::Page, type: :model do
         create(:page, slug: 'child', parent: parent)
       end
 
-      it 'returns url without leading /' do
-        expect(child.url_without_locale).not_to start_with '/'
+      it 'returns path with leading /' do
+        expect(child.path).to start_with '/'
       end
 
       it 'does not concatenate the parent slug' do
-        expect(child.url_without_locale).to eq('child')
+        expect(child.path).to eq('/child')
       end
     end
 
@@ -431,25 +413,29 @@ describe Qbrick::Page, type: :model do
         create(:page, slug: 'child', parent: parent)
       end
 
-      it 'returns url without leading /' do
-        expect(child.url_without_locale).not_to start_with '/'
+      it 'returns path with leading /' do
+        expect(child.path).to start_with '/'
       end
 
       it 'does not concatenate the parent slug' do
-        expect(child.url_without_locale).to eq('parent/child')
+        expect(child.path).to eq('/parent/child')
       end
     end
   end
 
   describe '#translated' do
     before :each 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')
+      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')
+      end
     end
 
     it 'returns all pages that have a translation' do
-      expect(Qbrick::Page.translated).to eq [@page_1, @page_2, @page_3]
+      I18n.with_locale(:en) do
+        expect(Qbrick::Page.translated).to eq [@page_1, @page_2, @page_3]
+      end
     end
 
     it 'does not return untranslated pages' do
@@ -512,4 +498,43 @@ describe Qbrick::Page, type: :model do
       expect(@page.bricks.unscoped.where(locale: :en).count).to eq(3)
     end
   end
+
+  describe '#create_path' do
+    context 'when parent was saved' do
+      it 'updates the child pages url if parent is changed to navigation' do
+        parent_page = create :page, slug: 'le_parent'
+        child_page = create :page, slug: 'le_child', parent: parent_page
+        parent_page.save
+        expect(child_page.reload.path).to eq '/le_parent/le_child'
+
+        parent_page.update_attributes page_type: Qbrick::PageType::NAVIGATION
+        expect(child_page.reload.path).to eq '/le_child'
+      end
+
+      it 'updates the child pages url if parent is changed to content' do
+        parent_page = create(:page, slug: 'le_parent', page_type: Qbrick::PageType::NAVIGATION)
+        child_page = create(:page, slug: 'le_child', parent: parent_page)
+
+        parent_page.update_attributes(page_type: Qbrick::PageType::CONTENT)
+        expect(child_page.reload.path).to eq '/le_parent/le_child'
+      end
+    end
+
+    it 'creates a root path' do
+      root_page = Qbrick::Page.new slug: 'ruth', page_type: Qbrick::PageType::NAVIGATION
+      expect(root_page.create_path).to eq ''
+    end
+
+    it 'creates a content page path' do
+      content_page = Qbrick::Page.new slug: 'meersaeuli', page_type: Qbrick::PageType::CONTENT
+      expect(content_page.create_path).to eq '/meersaeuli'
+    end
+
+    it 'creates a path with children' do
+      parent = create :page, slug: 'le_parent'
+      child_page = Qbrick::Page.new slug: 'le_child', parent: parent
+
+      expect(child_page.create_path).to eq '/le_parent/le_child'
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -72,7 +72,7 @@ RSpec.configure do |config|
   # config.mock_with :rr
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  config.fixture_path = ::Rails.root.join('spec/fixtures').to_s
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false

data/spec/views/qbrick/sitemaps/index.xml.haml_spec.rb

@@ -1,11 +1,12 @@
 require 'spec_helper'
 include SitemapsHelper
 
-describe 'qbrick/sitemaps/index.xml.haml', :type => :view do
+describe 'qbrick/sitemaps/index.xml.haml', type: :view do
   describe 'structure' do
+    let(:page) { create :page }
+
     before :each do
-      @page = create(:page)
-      @pages = [@page]
+      @pages = [page]
       render
     end
 
@@ -18,11 +19,11 @@ describe 'qbrick/sitemaps/index.xml.haml', :type => :view do
     end
 
     it 'includes the loc tag content' do
-      expect(rendered).to include "<loc>http://#{@request.host}/#{@page.url}</loc>"
+      expect(rendered).to include "<loc>http://#{@request.host}#{page.path_with_prefixed_locale}</loc>"
     end
 
     it 'includes the lastmod tag content' do
-      expect(rendered).to include "<lastmod>#{@page.created_at.utc}</lastmod>"
+      expect(rendered).to include "<lastmod>#{page.created_at.utc}</lastmod>"
     end
 
     it 'includes the changefreq tag content' do
@@ -39,7 +40,7 @@ describe 'qbrick/sitemaps/index.xml.haml', :type => :view do
       allow(I18n).to receive(:available_locales).and_return([:de, :en])
 
       I18n.with_locale(:de) do
-        @page    = create(:page, title: 'Dummy Page 1 DE')
+        @page    = create(:page, title: 'Dummy Page 1 DE', published_de: 1, published_en: 1)
         @page_de = create(:page, title: 'German Page')
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qbrick
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -745,6 +745,7 @@ files:
 - db/migrate/23_add_metadata_to_asset.rb
 - db/migrate/23_devise_create_qbrick_admins.rb
 - db/migrate/24_localize_publish_column.rb
+- db/migrate/25_rename_qbrick_pages_url_to_path.rb
 - db/seeds.rb
 - lib/generators/qbrick/assets/install_generator.rb
 - lib/generators/qbrick/custom_model_generator.rb
@@ -885,7 +886,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: qbrick
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A tool that helps you to manage your content within your app.