qbrick 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc399634917aca2db211deb27063aa7711c7b1bc
-  data.tar.gz: 9d8d3256e5bd97d3775680d7766cc6c55219d7ad
+  metadata.gz: b4f3ceb72b5a03c06f602281f41bcc750f8d49ce
+  data.tar.gz: 4618b777f6e1a6151b95a1e17d6894aa158ac42c
 SHA512:
-  metadata.gz: 672f482f10108c98212b8f997ce8b2971d128e6e4da394e09882d4984f0c5349b1f7a7f8dfb6b9c1fa0c736490ae2d8df41546b846f78ef285d88b08789f722d
-  data.tar.gz: 0a7af236fd18bdb10ce18bbc1b4eaf57229f5cbddcbebaeeec3df3fe28e8fa81478fc27c58ed9838fb65bf64e1547c52e0336611485d5847c12ed4a054d6cda1
+  metadata.gz: c779195400c460314f4d37a8a6796637e043427dd6643c9d4aea53be22fa0c35914926e8177e10093cab10e9b28f3924e4746ce8147790196d04c3d51aad0383
+  data.tar.gz: bd0e378f688977977cb1dde7512f59ad11c6111a238fd56c1767343692be81f07d2fb6d7fb9332b9352b3321b77a948c38c4cafbbbf9aed4d8cd27a01dc0ad31

data/app/controllers/qbrick/pages_controller.rb

@@ -13,9 +13,8 @@ module Qbrick
 
     def show
       if redirect_page?
-        redirect_url = @page.redirect_url.sub(%r{\A\/+}, '') # remove all preceding slashes
         session[:qbrick_referrer] = @page.id
-        redirect_to "/#{redirect_url}"
+        redirect_to @page.redirect_url
       elsif @page.present?
         respond_with @page
       elsif @page.blank? && respond_to?(:handle_404)

data/app/helpers/qbrick/admin_helper.rb

@@ -8,8 +8,12 @@ module Qbrick
     #
     def method_missing(method, *args, &block)
       main_app.send(method, *args, &block)
-    rescue NoMethodError
-      super
+    rescue NoMethodError => exception
+      bc = ::ActiveSupport::BacktraceCleaner.new
+      bc.add_silencer { |l| l =~ /^#{__FILE__}.+#{__method__}'?$/ }
+      exception.set_backtrace bc.clean(exception.backtrace)
+
+      raise exception
     end
 
     def sublime_video_include_tag

data/app/models/qbrick/page.rb

@@ -27,6 +27,7 @@ module Qbrick
 
     before_validation :create_slug, :create_path
     after_save :update_child_paths
+    validate :remove_preceding_slashes, if: :redirect?
 
     validates :title, presence: true
     validates :slug, presence: true
@@ -81,6 +82,29 @@ module Qbrick
       page_type == Qbrick::PageType::REDIRECT || page_type == Qbrick::PageType::CUSTOM
     end
 
+    def internal_redirect?
+      return false unless redirect?
+
+      scheme = URI.parse(redirect_url).scheme
+      return true if scheme.nil?
+
+      internal_redirect = Qbrick::Engine.hosts.find do |h|
+        URI.parse("#{scheme}://#{h}").route_to(redirect_url).host.nil?
+      end
+
+      internal_redirect.present?
+    end
+
+    def external_redirect?
+      redirect? && !internal_redirect?
+    end
+
+    def remove_preceding_slashes
+      return if redirect_url.blank?
+
+      redirect_url.sub!(%r{^/+}, '/')
+    end
+
     def navigation?
       page_type == Qbrick::PageType::NAVIGATION
     end

data/db/migrate/24_localize_publish_column.rb

@@ -10,7 +10,7 @@ class LocalizePublishColumn < ActiveRecord::Migration
 
     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)]
+      page.update_columns Hash[new_translations.zip([page.published_en] * new_translations.count)]
     end
   end
 

data/lib/qbrick/engine.rb

@@ -11,7 +11,7 @@ module Qbrick
     isolate_namespace Qbrick
 
     config.i18n.fallbacks = [:de]
-    config.i18n.load_path += Dir[Qbrick::Engine.root.join('config', 'locales', '**', '*.{yml}').to_s]
+    config.i18n.load_path += Dir[Qbrick::Engine.root.join('config/locales/**/*.{yml}').to_s]
 
     # defaults to nil
     config.sublime_video_token = nil
@@ -23,5 +23,11 @@ module Qbrick
       require 'action_view/dependency_tracker'
       ActionView::DependencyTracker.register_tracker :haml, ActionView::DependencyTracker::ERBTracker
     end
+
+    def hosts
+      [Socket.gethostname].tap do |result|
+        result.concat [Rails.application.config.hosts].flatten if Rails.application.config.respond_to? :hosts
+      end
+    end
   end
 end

data/lib/qbrick/version.rb

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

data/spec/controllers/qbrick/pages_controller_spec.rb

@@ -60,7 +60,7 @@ describe Qbrick::PagesController, type: :controller do
 
       context 'when page is a redirect page' do
         it 'redirects to the redirected url' do
-          page = FactoryGirl.create :page, page_type: 'redirect', slug: 'dumdidum', redirect_url: 'de/redirect_page'
+          page = FactoryGirl.create :page, page_type: 'redirect', slug: 'dumdidum', redirect_url: '/de/redirect_page'
           get :show, url: page.slug
           expect(response).to redirect_to('/de/redirect_page')
         end

data/spec/models/page_spec.rb

@@ -537,4 +537,44 @@ describe Qbrick::Page, type: :model do
       expect(child_page.create_path).to eq '/le_parent/le_child'
     end
   end
+
+  context 'when it is a redirect page' do
+    let(:page) { build :page, page_type: Qbrick::PageType::REDIRECT }
+
+    describe '#internal_redirect?' do
+      it 'returns false for non redirect pages' do
+        expect(build(:page).internal_redirect?).to be_falsey
+      end
+
+      it 'returns false for external redirects' do
+        page.redirect_url = 'http://google.de'
+        expect(page.internal_redirect?).to be_falsey
+      end
+
+      it 'returns true for internal redirects' do
+        page.redirect_url = '/huhu'
+        expect(page.internal_redirect?).to be_truthy
+        page.redirect_url = "http://#{Socket.gethostname}/huhu"
+        expect(page.internal_redirect?).to be_truthy
+      end
+    end
+
+    describe '#external_redirect?' do
+      it 'returns false for non redirect pages' do
+        expect(build(:page).external_redirect?).to be_falsey
+      end
+
+      it 'returns true for external redirects' do
+        page.redirect_url = 'http://google.de'
+        expect(page.external_redirect?).to be_truthy
+      end
+
+      it 'returns false for internal redirects' do
+        page.redirect_url = '/huhu'
+        expect(page.external_redirect?).to be_falsey
+        page.redirect_url = "http://#{Socket.gethostname}/huhu"
+        expect(page.external_redirect?).to be_falsey
+      end
+    end
+  end
 end

metadata

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