qbrick 2.5.2 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b059ac46e947e3b2a4defd38d5f4c5b2ceccdd0f
-  data.tar.gz: a40b7e8ae32963620770c0aeb3a7f72a235c9812
+  metadata.gz: 3c9cc5b026051806ef35cb0e40a3e8d7d2075802
+  data.tar.gz: aed46d071929a30222d47dd1c8a2b62da1a8532e
 SHA512:
-  metadata.gz: a2dacd142a4fb962b783997fe17fe52b07b581ae99cf3343c9a22ab2e686581b259ff93ffff04523cf62218bfa88be212e1d91d02d212ec3fecb34e5914a4a2f
-  data.tar.gz: eece466ba49673881fa0b92620af9a6ffb5d56c9e4a8ce6594268670211673f1aba62ef972956d9bcf28b4d2b114a07d39364d259ee4f8d47398a93b618bd49f
+  metadata.gz: 84f5765abf6f575c7f134983463b72dd46f5b5bd8ae96b5985b585ca444f9c48dc44072f45535b0c3a4a3504beca0f8990612e8b96e565457fc7ff4448aeccd3
+  data.tar.gz: a9a58904375ed0e74816d4123a2ae63fa3732e40455324c58f169ad2c567d62a2184a257a83b145cd04c03927f3778bb756dea4134eccf196b5b1cfcd8f85b88

data/app/controllers/qbrick/api/pages_controller.rb

@@ -7,6 +7,7 @@ module Qbrick
       def index
         I18n.locale = params[:locale]
         @pages = Qbrick::Page.unscoped.published.content_page.translated.order(position: :asc)
+
         render json: @pages.as_json
       end
     end

data/app/controllers/qbrick/cms/backend_controller.rb

@@ -4,6 +4,7 @@ module Qbrick
       respond_to :html
       layout 'qbrick/cms/application'
       before_action :set_content_locale, :authenticate_admin!
+      after_action :reset_remembered_locale
 
       def set_content_locale
         # this was taken from: https://github.com/screenconcept/hieronymus_shop/pull/218/files
@@ -14,9 +15,17 @@ module Qbrick
         new_locale = params[:content_locale] || session['backend_locale'] || I18n.locale
         session['backend_locale'] = new_locale.to_s
         return if I18n.locale == new_locale || !I18n.locale_available?(new_locale)
+
+        session['remembered_locale'] = I18n.locale
         I18n.locale = new_locale
       end
 
+      def reset_remembered_locale
+        return if session['remembered_locale'].blank?
+
+        I18n.locale = session.delete 'remembered_locale'
+      end
+
       def default_url_options
         { content_locale: I18n.locale }.merge(super)
       end

data/app/controllers/qbrick/pages_controller.rb

@@ -1,6 +1,7 @@
 module Qbrick
   class PagesController < ::ApplicationController
     respond_to :html
+    before_action :set_locale
     before_action :find_page_by_url, only: :show
 
     def index
@@ -30,14 +31,24 @@ module Qbrick
 
     private
 
+    def set_locale
+      new_locale = params[:locale] || session['frontend_locale'] || I18n.locale
+
+      return I18n.locale if I18n.locale == new_locale || !I18n.locale_available?(new_locale)
+
+      session['frontend_locale'] = new_locale.to_s
+      I18n.locale = new_locale
+    end
+    alias frontend_locale set_locale
+
     def redirect_page?
       @page.present? && @page.redirect? && @page.redirect_url.present?
     end
 
     def find_page_by_url
-      url = locale.to_s
+      url = frontend_locale.to_s
       url += "/#{params[:url]}" if params[:url].present?
-      @page = Qbrick::Page.find_by_url(url)
+      @page = Qbrick::Page.published.find_by_url(url)
     end
   end
 end

data/app/controllers/qbrick/sitemaps_controller.rb

@@ -3,6 +3,7 @@ module Qbrick
     def index
       last_page = Qbrick::Page.published.last
       return unless stale?(etag: last_page, last_modified: last_page.updated_at.utc)
+
       respond_to do |format|
         format.html
         format.xml { @pages = Qbrick::Page.published }

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
+              :body, :redirect_url, :url, :published
 
     default_scope { order 'position ASC' }
 
-    scope :published, -> { where published: Qbrick::PublishState::PUBLISHED }
-    scope :translated, -> { where "url_#{I18n.locale.to_s.underscore} is not null" }
+    scope :published, -> { where locale_attr(:published) => Qbrick::PublishState::PUBLISHED }
+    scope :translated, -> { where.not locale_attr(:url) => nil }
 
     scope :content_page, -> { where page_type: Qbrick::PageType::CONTENT }
 
@@ -62,7 +62,7 @@ module Qbrick
     end
 
     def without_self
-      self.class.where 'id != ?', id
+      self.class.where.not id: id
     end
 
     def published?

data/db/migrate/24_localize_publish_column.rb

@@ -0,0 +1,25 @@
+class LocalizePublishColumn < ActiveRecord::Migration
+  def up
+    rename_column :qbrick_pages, :published, :published_en
+    add_column :qbrick_pages, :published_de, :integer, default: 0
+
+    I18n.available_locales.each do |locale|
+      column_name = :"published_#{locale.to_s.underscore}"
+      add_column :qbrick_pages, column_name, :integer, default: 0 unless column_exists? :qbrick_pages, column_name
+    end
+
+    new_translations = Qbrick::Page.translated_columns_for(:published) - %w(published_en)
+    Qbrick::Page.all.each do |page|
+      page.update Hash[new_translations.zip([page.published_en] * new_translations.count)]
+    end
+  end
+
+  def down
+    translated_columns = Qbrick::Page.translated_columns_for(:published) - %w(published_en)
+    rename_column :qbrick_pages, :published_en
+
+    translated_columns.each do |column|
+      remove_column :qbrick_pages, column
+    end
+  end
+end

data/lib/qbrick/translatable.rb

@@ -45,7 +45,11 @@ module Qbrick
       end
 
       def locale_attr(attr_name)
-        "#{attr_name}_#{I18n.locale.to_s.underscore}"
+        "#{attr_name}_#{locale_for_attr_name}"
+      end
+
+      def translated_columns_for(attr_name)
+        column_names & I18n.available_locales.map { |l| "#{attr_name}_#{l.to_s.underscore}" }
       end
     end
 

data/lib/qbrick/version.rb

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

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

@@ -4,9 +4,9 @@ describe Qbrick::Api::PagesController, type: :controller do
   describe '#index' do
     before do
       @pages = []
-      @pages << @page1 = create(:page, published: true, title_de: 'foobar de',
+      @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')
-      @pages << @page2 = create(:page, published: true, title_de: 'barfoo de',
+      @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')
       @pages << @unpublished = create(:page, published: false, title_de: 'unpublished de',
                                              url_de: 'de/unpublished-de', title_en: 'unpublished en',
@@ -36,13 +36,13 @@ describe Qbrick::Api::PagesController, type: :controller do
 
   describe 'expected json format of a page' do
     before 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')
-      @pages << @page2 = create(:page, published: true, title_de: 'barfoo de',
-                                       url_de: 'de/barfoo-de', title_en: 'barfoo en', url_en: 'en/barfoo-en')
-
       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')
+        @pages << @page2 = create(:page, published: true, title_de: 'barfoo de',
+                                         url_de: 'de/barfoo-de', title_en: 'barfoo en', url_en: 'en/barfoo-en')
+
         get :index, use_route: :qbrick
         @json = JSON.parse(response.body)
         @page_hash = @json.first

data/spec/controllers/qbrick/pages_controller_spec.rb

@@ -6,8 +6,8 @@ describe Qbrick::PagesController, type: :controller do
   describe '#index' do
     before do
       @pages = [
-        create(:page, published: true, fulltext_de: 'foobar'),
-        create(:page, published: true, fulltext_de: 'barfoo')
+        create(:page, published_de: true, fulltext_de: 'foobar'),
+        create(:page, published_de: true, fulltext_de: 'barfoo')
       ]
     end
 
@@ -22,16 +22,23 @@ describe Qbrick::PagesController, type: :controller do
   end
 
   describe '#show' do
+    it "doesn't show unpublished pages" do
+      I18n.with_locale(:de) do
+        unpublished_page = FactoryGirl.create :page, url_de: 'de', published_de: false
+        expect { get :show, url: unpublished_page.slug, use_route: :qbrick }.to raise_error(ActionController::RoutingError)
+      end
+    end
+
     describe 'routing' do
       context 'without url' do
         before do
-          @page = FactoryGirl.create(:page, url_de: 'de')
+          @page = FactoryGirl.create(:page, url_de: 'de', published_de: true)
         end
 
         context 'with matching locale' do
           it 'sets the corresponding page' do
             I18n.with_locale(:de) do
-              get(:show,   use_route: :qbrick)
+              get :show, use_route: :qbrick
             end
             expect(assigns(:page)).to eq(@page)
           end
@@ -56,7 +63,7 @@ describe Qbrick::PagesController, type: :controller do
         it 'responds with page' do
           page = FactoryGirl.create(:page, slug: 'dumdidum',
                                            url: 'de/dumdidum')
-          get :show,   url: page.slug, use_route: :qbrick
+          get :show, url: page.slug, use_route: :qbrick
           expect(assigns(:page)).to eq(page)
         end
       end
@@ -65,21 +72,21 @@ describe Qbrick::PagesController, type: :controller do
         it 'redirects to the redirected url' do
           page = FactoryGirl.create(:page, page_type: 'redirect', slug: 'dumdidum',
                                            url: 'de/dumdidum', redirect_url: 'de/redirect_page')
-          get :show,   url: page.slug, use_route: :qbrick
+          get :show, url: page.slug, use_route: :qbrick
           expect(response).to redirect_to('/de/redirect_page')
         end
 
         it 'redirects to invalid redirect urls with too many preceding slashes' do
           page = FactoryGirl.create(:page, page_type: 'redirect', slug: 'dumdidum',
                                            url: 'de/dumdidum', redirect_url: '///de/redirect_page')
-          get :show,   url: page.slug, use_route: :qbrick
+          get :show, url: page.slug, use_route: :qbrick
           expect(response).to redirect_to('/de/redirect_page')
         end
 
         it 'redirects to root' do
           page = FactoryGirl.create(:page, page_type: 'redirect', slug: 'dumdidum',
                                            url: 'de/dumdidum', redirect_url: '/')
-          get :show,   url: page.slug, use_route: :qbrick
+          get :show, url: page.slug, use_route: :qbrick
           expect(response).to redirect_to('/')
         end
       end

data/spec/controllers/qbrick/sitemaps_controller_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe Qbrick::SitemapsController, type: :controller do
   describe '#index' do
     before do
-      @page = FactoryGirl.create(:page)
+      @page = FactoryGirl.create :page
     end
 
     it 'should be able to send a xml file' do
-      get(:index,  use_route: :qbrick, format: 'xml')
+      get :index, use_route: :qbrick, format: 'xml'
     end
   end
 end

data/spec/models/brick_spec.rb

@@ -36,10 +36,12 @@ describe Qbrick::Brick, type: :model do
 
   describe '#parents' do
     it 'returns the chain of parents' do
-      item1, item2, item3 = double, double, Qbrick::Brick.new
-      allow(item2).to receive(:brick_list).and_return(item1)
-      allow(item3).to receive(:brick_list).and_return(item2)
-      expect(item3.parents).to eq([item1, item2])
+      grandparent = double
+      parent = double
+      child = Qbrick::Brick.new
+      allow(parent).to receive(:brick_list).and_return grandparent
+      allow(child).to receive(:brick_list).and_return parent
+      expect(child.parents).to eq [grandparent, parent]
     end
   end
 
@@ -56,11 +58,13 @@ describe Qbrick::Brick, type: :model do
     end
 
     it 'returns true if the brick has siblings' do
-      item1, item2, item3 = double, double, Qbrick::Brick.new
-      allow(item1).to receive(:bricks).and_return([item2, item3])
-      allow(item2).to receive(:brick_list).and_return(item1)
-      allow(item3).to receive(:brick_list).and_return(item1)
-      expect(item3.has_siblings?).to be_truthy
+      parent = double
+      sibling1 = double
+      sibling2 = Qbrick::Brick.new
+      allow(parent).to receive(:bricks).and_return([sibling1, sibling2])
+      allow(sibling1).to receive(:brick_list).and_return(parent)
+      allow(sibling2).to receive(:brick_list).and_return(parent)
+      expect(sibling2.has_siblings?).to be_truthy
     end
   end
 

data/spec/models/page_spec.rb

@@ -68,9 +68,12 @@ describe Qbrick::Page, type: :model do
 
   describe '#published' do
     it 'returns only published pages' do
-      _p1, p2, _p3 = 3.times.map { create(:page) }
-      p2.update_attribute :published, Qbrick::PublishState::UNPUBLISHED
-      expect(Qbrick::Page.published).to be_all { |p| expect(p.published?).to be_truthy }
+      unpublished_page = 3.times.map { create :page }.last
+      unpublished_page.update_attribute :published, Qbrick::PublishState::UNPUBLISHED
+
+      published_pages = Qbrick::Page.published
+      expect(published_pages).to be_all { |p| expect(p.published?).to be_truthy }
+      expect(published_pages).not_to include unpublished_page
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qbrick
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.6.0
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -202,14 +202,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.31.0
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -744,6 +744,7 @@ files:
 - db/migrate/22_create_settings_collections.rb
 - db/migrate/23_add_metadata_to_asset.rb
 - db/migrate/23_devise_create_qbrick_admins.rb
+- db/migrate/24_localize_publish_column.rb
 - db/seeds.rb
 - lib/generators/qbrick/assets/install_generator.rb
 - lib/generators/qbrick/custom_model_generator.rb
@@ -884,7 +885,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: qbrick
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A tool that helps you to manage your content within your app.