qbrick 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c9cc5b026051806ef35cb0e40a3e8d7d2075802
-  data.tar.gz: aed46d071929a30222d47dd1c8a2b62da1a8532e
+  metadata.gz: fc399634917aca2db211deb27063aa7711c7b1bc
+  data.tar.gz: 9d8d3256e5bd97d3775680d7766cc6c55219d7ad
 SHA512:
-  metadata.gz: 84f5765abf6f575c7f134983463b72dd46f5b5bd8ae96b5985b585ca444f9c48dc44072f45535b0c3a4a3504beca0f8990612e8b96e565457fc7ff4448aeccd3
-  data.tar.gz: a9a58904375ed0e74816d4123a2ae63fa3732e40455324c58f169ad2c567d62a2184a257a83b145cd04c03927f3778bb756dea4134eccf196b5b1cfcd8f85b88
+  metadata.gz: 672f482f10108c98212b8f997ce8b2971d128e6e4da394e09882d4984f0c5349b1f7a7f8dfb6b9c1fa0c736490ae2d8df41546b846f78ef285d88b08789f722d
+  data.tar.gz: 0a7af236fd18bdb10ce18bbc1b4eaf57229f5cbddcbebaeeec3df3fe28e8fa81478fc27c58ed9838fb65bf64e1547c52e0336611485d5847c12ed4a054d6cda1

data/app/controllers/qbrick/pages_controller.rb

@@ -2,11 +2,12 @@ module Qbrick
   class PagesController < ::ApplicationController
     respond_to :html
     before_action :set_locale
-    before_action :find_page_by_url, only: :show
+    before_action :find_page_by_path, only: :show
 
     def index
       @search = params[:search]
       return if @search.blank?
+
       @pages = Qbrick::Page.unscoped.published.content_page.search(@search)
     end
 
@@ -45,10 +46,8 @@ module Qbrick
       @page.present? && @page.redirect? && @page.redirect_url.present?
     end
 
-    def find_page_by_url
-      url = frontend_locale.to_s
-      url += "/#{params[:url]}" if params[:url].present?
-      @page = Qbrick::Page.published.find_by_url(url)
+    def find_page_by_path
+      @page = Qbrick::Page.published.find_by_path params[:url].to_s
     end
   end
 end

data/app/controllers/qbrick/sitemaps_controller.rb

@@ -6,7 +6,7 @@ module Qbrick
 
       respond_to do |format|
         format.html
-        format.xml { @pages = Qbrick::Page.published }
+        format.xml { @pages = Qbrick::Page.all }
       end
     end
   end

data/app/helpers/sitemaps_helper.rb

@@ -1,11 +1,8 @@
 module SitemapsHelper
-  def locales_with_block(page)
+  def with_every_locale(page)
     I18n.available_locales.each do |locale|
       I18n.with_locale locale do
-        if page.url.present?
-          url = "http://#{request.host_with_port}/#{page.url}"
-          yield(url)
-        end
+        yield "http://#{request.host_with_port}#{page.path_with_prefixed_locale}" if page.path.present? && page.published?
       end
     end
   end

data/app/models/qbrick/page.rb

@@ -10,12 +10,12 @@ module Qbrick
     acts_as_brick_list
 
     translate :title, :page_title, :slug, :keywords, :description,
-              :body, :redirect_url, :url, :published
+              :body, :redirect_url, :path, :published
 
     default_scope { order 'position ASC' }
 
     scope :published, -> { where locale_attr(:published) => Qbrick::PublishState::PUBLISHED }
-    scope :translated, -> { where.not locale_attr(:url) => nil }
+    scope :translated, -> { where.not locale_attr(:path) => nil }
 
     scope :content_page, -> { where page_type: Qbrick::PageType::CONTENT }
 
@@ -25,8 +25,8 @@ module Qbrick
         locale_attr(:page_type) => Qbrick::PageType::NAVIGATION)
     }
 
-    before_validation :create_slug, :create_url
-    after_save :update_child_urls
+    before_validation :create_slug, :create_path
+    after_save :update_child_paths
 
     validates :title, presence: true
     validates :slug, presence: true
@@ -55,11 +55,15 @@ module Qbrick
         find_by(identifier: identifier)
       end
 
-      def all_urls
-        url_columns = column_names.select { |col| col.start_with? 'url_' }
-        pluck(*url_columns).flatten.compact.sort.uniq.map { |r| "/#{r}" }
+      def all_paths
+        path_columns = column_names.select { |col| col.start_with? 'path_' }
+        pluck(*path_columns).flatten.compact.sort.uniq.map(&:path)
       end
-    end
+
+      def find_by_path(given_path)
+        find_by locale_attr(:path) => given_path.blank? ? '' : "/#{given_path.sub(%r{^/+}, '')}"
+      end
+    end # class methods
 
     def without_self
       self.class.where.not id: id
@@ -86,18 +90,18 @@ module Qbrick
     end
 
     def translated?
-      url.present? && title.present? && slug.present?
+      path.present? && title.present? && slug.present?
     end
 
     def translated_to?(raw_locale)
       locale = raw_locale.to_s.underscore
-      send("url_#{locale}").present? && send("title_#{locale}").present? && send("slug_#{locale}").present?
+      send("path_#{locale}").present? && send("title_#{locale}").present? && send("slug_#{locale}").present?
     end
 
     def translated_link_for(locale)
       if translated_to? locale
         I18n.with_locale locale do
-          url_with_locale
+          path_with_prefixed_locale
         end
       else
         Qbrick::Page.roots.first.link
@@ -108,30 +112,26 @@ module Qbrick
       if bricks.count == 0 && children.count > 0
         children.first.link
       else
-        url_with_locale
+        path_with_prefixed_locale
       end
     end
 
-    # TODO: needs naming and routing refactoring (url/locale/path/slug)
     def path_segments
       paths = parent.present? ? parent.path_segments : []
       paths << slug unless navigation?
       paths
     end
 
-    def url_without_locale
-      path_segments.join('/')
+    def path_with_prefixed_locale(locale = I18n.locale)
+      "/#{locale}#{send self.class.attr_name_for_locale(:path, locale)}"
     end
 
-    def url_with_locale
+    def create_path
       opts = { locale: I18n.locale }
-      url = url_without_locale
-      opts[:url] = url if url.present?
-      page_path(opts)
-    end
+      path = path_segments.join '/'
+      opts[:url] = path if path.present?
 
-    def create_url
-      self.url = url_with_locale[1..-1]
+      self.path = page_path(opts).sub(%r{^/#{I18n.locale}}, '')
     end
 
     def create_slug
@@ -142,9 +142,10 @@ module Qbrick
       end
     end
 
-    def update_child_urls
-      return unless children.any?
-      children.each { |child| child.update_attribute(:url, child.create_url) }
+    def update_child_paths
+      children.each do |child|
+        child.update_attribute :path, child.create_path
+      end
     end
 
     def nesting_name
@@ -170,11 +171,7 @@ module Qbrick
     end
 
     def as_json
-      {}.tap do |json|
-        json['title'] = send("title_#{I18n.locale.to_s.underscore}")
-        json['pretty_url'] = '/' + send("url_#{I18n.locale.to_s.underscore}")
-        json['url'] = "/pages/#{id}"
-      end
+      { 'title' => title, 'pretty_url' => path, 'url' => "/pages/#{id}" }
     end
 
     def clear_bricks_for_locale(locale)

data/app/views/qbrick/cms/pages/_form.html.haml

@@ -6,11 +6,11 @@
       = link_to t('.tab_content'), '#page-content', 'data-toggle' => :tab
 
   - I18n.available_locales.reverse.each do |locale|
-    %li.pull-right{ :class => (:active if I18n.locale.to_s == locale.to_s) }
+    %li.pull-right{ class: (:active if I18n.locale.to_s == locale.to_s) }
       - if @page.translated_to?(locale)
         = link_to_content_locale(locale)
       - else
-        = link_to locale.to_s.upcase, url_for(:action => params[:action], :content_locale => locale), 'data-toggle' => 'tooltip', 'title' => t('.not_translated'), :class => 'not-translated'
+        = link_to locale.to_s.upcase, url_for(action: params[:action], content_locale: locale), 'data-toggle' => 'tooltip', title: t('.not_translated'), class: 'not-translated'
 
 .tab-content
   #page-metadata.tab-pane{ class: metadata_tab_active(@page) }
@@ -21,7 +21,7 @@
       = form.input :parent_id, collection: Qbrick::Page.flat_tree, label_method: :nesting_name, selected: params[:parent_id].presence || @page.parent_id.presence, prompt: t('.none'), input_html: { class: :span3 }
       = form.input :page_type, collection: Qbrick::PageType.all, prompt: false, default: Qbrick::PageType::CONTENT, input_html: { class: :span3 }
       = form.input :redirect_url, as: :string
-      = form.input :url, as: :string, input_html: { disabled: 'disabled' }
+      = form.input :path_with_prefixed_locale, as: :string, input_html: { disabled: 'disabled' }
       = form.input :keywords, input_html: { class: :span5 }, hint: t('.hint_keywords').html_safe
       - if @page == homepage
         = form.input :google_verification_key
@@ -32,7 +32,7 @@
         = form.button :submit, class: 'btn btn-primary'
 
   - unless hide_content_tab?(@page)
-    #brick-form.modal.hide.fade{ :tabindex => '-1', :role => 'dialog' }
+    #brick-form.modal.hide.fade{ tabindex: '-1', role: 'dialog' }
     #page-content.tab-pane{ class: content_tab_active(@page) }
       - if @page.persisted?
         .clearfix
@@ -47,8 +47,8 @@
                 = t('.collapse_all')
 
             = render 'brick_clone_menu'
-            = render 'brick_type_dropdown', :brick_list => @page
+            = render 'brick_type_dropdown', brick_list: @page
 
-        = render 'qbrick/cms/bricks/brick_list', :brick_list => @page
+        = render 'qbrick/cms/bricks/brick_list', brick_list: @page
 
 = render 'qbrick/cms/bricks/sort_form'

data/app/views/qbrick/search/_results_entry.html.haml

@@ -1,7 +1,7 @@
 .link
   = link_to page.link do
     %h4= page.title
-  %h5= qbrick.page_url(:url => page.url_without_locale)
+  %h5= qbrick.page_path url: page.path
 .summary
   -if page.excerpt.present?
     .excerpt!= page.excerpt

data/app/views/qbrick/sitemaps/index.xml.haml

@@ -1,7 +1,7 @@
 !!! XML
 %urlset{xmlns: "http://www.sitemaps.org/schemas/sitemap/0.9"}
   - for page in @pages
-    - locales_with_block page do |url|
+    - with_every_locale page do |url|
       %url
         %loc= url
         %lastmod= page.updated_at.utc

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

@@ -10,4 +10,4 @@ de:
     models:
       qbrick/admin:
         one: Administrator
-        other: Administartoren
+        other: Administratoren

data/config/routes.rb

@@ -2,18 +2,18 @@ Qbrick::Engine.routes.draw do
   devise_for :admins, class_name: 'Qbrick::Admin', module: :devise
 
   namespace :cms do
-    resources :settings_collections, only: [:update, :index]
+    resources :settings_collections, only: %i(update index)
     resources :pages, except: :show do
       post :sort, on: :collection
       get :mirror
     end
 
-    resources :bricks, except: [:edit, :index] do
+    resources :bricks, except: %i(edit index) do
       post :sort, on: :collection
     end
 
     resources :assets
-    resources :ckimages, only: [:create, :index, :destroy]
+    resources :ckimages, only: %i(create index destroy)
 
     resource :account, only: :edit do
       collection do
@@ -26,13 +26,13 @@ Qbrick::Engine.routes.draw do
     root to: 'pages#index'
   end
 
-  scope ':locale', locale: /#{I18n.available_locales.join('|')}/ do
+  scope '(:locale)', locale: /#{I18n.available_locales.join('|')}/, defaults: { locale: -> { I18n.default_locale } } do
     namespace :api, defaults: { format: :json } do
       resources :pages, only: :index
     end
 
     resources :pages,
-              only: [:index],
+              only: %i(index),
               defaults: { locale: I18n.locale }
     get '(*url)' => 'pages#show', as: :page
   end

data/db/migrate/25_rename_qbrick_pages_url_to_path.rb

@@ -0,0 +1,33 @@
+class RenameQbrickPagesUrlToPath < ActiveRecord::Migration
+  def up
+    I18n.available_locales.each do |locale|
+      rename_column :qbrick_pages, :"url_#{locale.to_s.underscore}", :"path_#{locale.to_s.underscore}"
+    end
+
+    pages = Qbrick::Page.unscoped.all
+
+    I18n.available_locales.each do |locale|
+      I18n.with_locale(locale) do
+        pages.each do |page|
+          page.update_attribute :path, page.create_path
+        end
+      end
+    end
+  end
+
+  def down
+    I18n.available_locales.each do |locale|
+      rename_column :qbrick_pages, :"path_#{locale.to_s.underscore}", :"url_#{locale.to_s.underscore}"
+    end
+
+    pages = Qbrick::Page.unscoped.all
+
+    I18n.available_locales.each do |locale|
+      I18n.with_locale(locale) do
+        pages.each do |page|
+          page.update_attribute :url, page.create_path
+        end
+      end
+    end
+  end
+end

data/lib/qbrick/brick_list.rb

@@ -60,6 +60,7 @@ module Qbrick
     #
     def collect_fulltext
       return '' unless respond_to?(:bricks)
+
       bricks.localized.reduce('') do |text, brick|
         text << brick.collect_fulltext
       end

data/lib/qbrick/translatable.rb

@@ -48,8 +48,12 @@ module Qbrick
         "#{attr_name}_#{locale_for_attr_name}"
       end
 
+      def attr_name_for_locale(attr_name, locale)
+        "#{attr_name}_#{locale.to_s.underscore}"
+      end
+
       def translated_columns_for(attr_name)
-        column_names & I18n.available_locales.map { |l| "#{attr_name}_#{l.to_s.underscore}" }
+        column_names & I18n.available_locales.map { |l| attr_name_for_locale attr_name, l }
       end
     end
 

data/lib/qbrick/version.rb

@@ -1,3 +1,3 @@
 module Qbrick
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'
 end

data/lib/tasks/qbrick_tasks.rake

@@ -1,7 +1,7 @@
 namespace :qbrick do
   namespace :db do
-    desc "Load qbrick seeds"
-    task :seed => :environment do
+    desc 'Load qbrick seeds'
+    task seed: :environment do
       Qbrick::Engine.load_seed
     end
   end
@@ -14,6 +14,7 @@ task "assets:precompile" do
   fingerprint = /\-[0-9a-f]{32}\./
   for file in Dir["public/assets/qbrick/cms/ck-config*"]
     next unless file =~ fingerprint
+
     nondigest = file.sub fingerprint, '.'
     if !File.exist?(nondigest) or File.mtime(file) > File.mtime(nondigest)
       FileUtils.cp file, nondigest, verbose: true

data/spec/controllers/qbrick/api/pages_controller_spec.rb

@@ -1,34 +1,36 @@
 require 'spec_helper'
 
 describe Qbrick::Api::PagesController, type: :controller do
+  routes { Qbrick::Engine.routes }
+
   describe '#index' do
     before do
       @pages = []
       @pages << @page1 = create(:page, published_de: true, published_en: true, title_de: 'foobar de',
-                                       url_de: 'de/foobar-de', title_en: 'foobar en', url_en: 'en/foobar-en')
+                                       path_de: 'de/foobar-de', title_en: 'foobar en', path_en: 'en/foobar-en')
       @pages << @page2 = create(:page, published_de: true, published_en: true, title_de: 'barfoo de',
-                                       url_de: 'de/barfoo-de', title_en: 'barfoo en', url_en: 'en/barfoo-en')
+                                       path_de: 'de/barfoo-de', title_en: 'barfoo en', path_en: 'en/barfoo-en')
       @pages << @unpublished = create(:page, published: false, title_de: 'unpublished de',
-                                             url_de: 'de/unpublished-de', title_en: 'unpublished en',
-                                             url_en: 'en/unpublished-en')
+                                             path_de: 'de/unpublished-de', title_en: 'unpublished en',
+                                             path_en: 'en/unpublished-en')
     end
 
     it 'gets only published pages' do
       I18n.with_locale :de do
-        get :index, use_route: :qbrick
+        get :index
         expect(JSON.parse(response.body)).to eq([@page1, @page2].as_json)
       end
     end
 
     it 'gets specific translated pages for each locale' do
       I18n.with_locale :de do
-        @pages << @only_german = create(:page, published: true, title: 'foobar de', url: 'de/foobar-de')
-        get :index, use_route: :qbrick
+        @pages << @only_german = create(:page, published: true, title: 'foobar de', path: 'de/foobar-de')
+        get :index
         expect(JSON.parse(response.body)).to eq([@page1, @page2, @only_german].as_json)
       end
 
       I18n.with_locale :en do
-        get :index, use_route: :qbrick
+        get :index
         expect(JSON.parse(response.body)).to eq([@page1, @page2].as_json)
       end
     end
@@ -39,11 +41,11 @@ describe Qbrick::Api::PagesController, type: :controller do
       I18n.with_locale :de do
         @pages = []
         @pages << @page1 = create(:page, published: true, title_de: 'foobar de',
-                                         url_de: 'de/foobar-de', title_en: 'foobar en', url_en: 'en/foobar-en')
+                                         path_de: 'de/foobar-de', title_en: 'foobar en', path_en: 'en/foobar-en')
         @pages << @page2 = create(:page, published: true, title_de: 'barfoo de',
-                                         url_de: 'de/barfoo-de', title_en: 'barfoo en', url_en: 'en/barfoo-en')
+                                         path_de: 'de/barfoo-de', title_en: 'barfoo en', path_en: 'en/barfoo-en')
 
-        get :index, use_route: :qbrick
+        get :index
         @json = JSON.parse(response.body)
         @page_hash = @json.first
       end