qbrick 2.6.9 → 2.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49695eed4e63d6e12b907b94559efad3d8915b24
-  data.tar.gz: 489b41c0a55c4bf8b1bac5e4f102d174df924d41
+  metadata.gz: 77ffccf0af58c0baf0f3396848f8ee28716f57ae
+  data.tar.gz: 5c79d9219c79af8f7f9b93a4182b03954b23e53b
 SHA512:
-  metadata.gz: 0da33eb0ee68b0d091c01b0390fde7d63b65f5007017a42ba59afb2b55cc922aa9288ea2aab2d482388b56050a2196c8407c766f718241a1d3af572fa5989dac
-  data.tar.gz: ec2b3838042f44cd8dfdaaaf79d4227d0e250d0ef1aa17471f7dafbdcd7cf5aefe8b6d93b82481ff0303115e415ba9f2f068cbcf1a444e3c3951dd056c877d67
+  metadata.gz: f8a27fe09939893f8021db54f7087c9137475286afb9051eec17701e2457bf4cb7acf1c5144157ca054a7ba95b13ebd75d331c2f7e93898a0ff6d36c3f57de46
+  data.tar.gz: 14146aefb0457b86cfa09d357a85a068bda0f527f5a0b52897f0dca7e99913d9a872fa16783eba917685592ba39aa6918be5aecdea4294928ee17bc5e25cc293

data/app/assets/javascripts/qbrick/cms/application.js.coffee.erb

@@ -7,7 +7,7 @@
 #= require bootstrap
 #= require bootstrap-modal-v2
 #= require bootstrap-modalmanager
-#= require ckeditor-jquery
+#= require ckeditor/init
 #= require jquery.nestable
 #= require_tree .
 #

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

@@ -6,7 +6,7 @@ module Qbrick
       # GET /admins
       # GET /admins.json
       def index
-        @admins = Admin.all
+        @admins = Qbrick::Admin.all
       end
 
       # GET /admins/1
@@ -16,7 +16,7 @@ module Qbrick
 
       # GET /admins/new
       def new
-        @admin = Admin.new
+        @admin = Qbrick::Admin.new
       end
 
       # GET /admins/1/edit
@@ -26,7 +26,7 @@ module Qbrick
       # POST /admins
       # POST /admins.json
       def create
-        @admin = Admin.new(admin_params)
+        @admin = Qbrick::Admin.new(admin_params)
 
         respond_to do |format|
           if @admin.save
@@ -67,7 +67,7 @@ module Qbrick
 
       # Use callbacks to share common setup or constraints between actions.
       def set_admin
-        @admin = Admin.find(params[:id])
+        @admin = Qbrick::Admin.find params[:id]
       end
 
       # Never trust parameters from the scary internet, only allow the white list through.

data/app/helpers/cms_helper.rb

@@ -14,14 +14,17 @@ module CmsHelper
   end
 
   def cms_brick_item(brick_list, type)
-    type_name = type.class_name.constantize.model_name.human
-    link_to type_name, qbrick.new_cms_brick_path(
+    path = qbrick.new_cms_brick_path(
       brick: {
         type: type.class_name,
         brick_list_id: brick_list.id,
         brick_list_type: brick_list.brick_list_type
-      }), remote: true
-  rescue NameError
-    I18n.t type.class_name.underscore, scope: [:activerecord, :models]
+      })
+    type_name = type.class_name.constantize.model_name.human
+
+    link_to type_name, path, remote: true
+  rescue NameError => e
+    title = I18n.t(type.class_name.underscore, scope: %i(activerecord models)) + " (#{e.message})"
+    defined?(path) && path.present? ? link_to(title, path, remote: true) : title
   end
 end

data/app/helpers/qbrick/cms/admin_helper.rb

@@ -3,7 +3,7 @@ module Qbrick
   module Cms
     module AdminHelper
       def render_language_switch?
-        I18n.available_locales.size > 1
+        I18n.available_locales.many?
       end
 
       def link_to_content_locale(locale)

data/app/models/qbrick/page.rb

@@ -155,7 +155,7 @@ module Qbrick
 
     def link
       if bricks.count == 0 && children.count > 0
-        children.first.link
+        children.published.first.link
       else
         path_with_prefixed_locale
       end

data/app/views/qbrick/cms/backend/_brick_type_dropdown.html.haml

@@ -1,6 +1,6 @@
-- unless brick_list.brick_types.empty?
+- unless brick_list.brick_types.allowed.empty?
   .btn-group
-    - if brick_list.brick_types.allowed.count > 1
+    - if brick_list.brick_types.allowed.many?
       %a.btn.btn-small.btn-primary.dropdown-toggle{ 'data-toggle' => 'dropdown', 'href' => '#' }
         = t('.add_element')
         %span.caret
@@ -12,4 +12,4 @@
           .divider
     - else
       - brick_list.brick_types.allowed.each do |type|
-        = link_to t('.add_specific_element', :name => type.class_name.constantize.model_name.human), qbrick.new_cms_brick_path(:brick => { :type => type.class_name, :brick_list_id => brick_list.id, :brick_list_type => brick_list.brick_list_type }), :remote => true, :class => 'btn btn-small btn-primary'
+        = link_to t('.add_specific_element', name: type.class_name.constantize.model_name.human), qbrick.new_cms_brick_path(brick: { type: type.class_name, brick_list_id: brick_list.id, brick_list_type: brick_list.brick_list_type }), remote: true, class: 'btn btn-small btn-primary'

data/app/views/qbrick/cms/backend/_empty_state.html.haml

@@ -2,4 +2,4 @@
   .centered.empty-state
     .muted= t('.empty')
     .btn-group
-      = render 'brick_type_dropdown', :brick_list => brick
+      = render 'brick_type_dropdown', brick_list: brick

data/app/views/qbrick/cms/backend/_main_navigation.html.haml

@@ -1,9 +1,9 @@
-= link_to 'Qbrick CMS', qbrick.cms_root_path, :class => 'brand'
+= link_to 'Qbrick CMS', qbrick.cms_root_path, class: 'brand'
 
 %ul.nav.pull-right.language-navigation
   - if render_language_switch?
     - I18n.available_locales.each do |locale|
-      %li{ :class => (:active if I18n.locale.to_s == locale.to_s) }
+      %li{ class: (:active if I18n.locale.to_s == locale.to_s) }
         = link_to_content_locale(locale)
 
   %li.dropdown
@@ -12,9 +12,9 @@
       %b.caret
     %ul.dropdown-menu
       %li= link_to t('.change_password'), qbrick.edit_cms_account_path
-      %li= link_to t('.logout'), qbrick.destroy_admin_session_path, :method => :delete
+      %li= link_to t('.logout'), qbrick.destroy_admin_session_path, method: :delete
 
 %ul.nav
   %li= link_to t('.settings'), qbrick.cms_settings_collections_path
-  %li= link_to Qbrick::Page.model_name.human(:count => 2), qbrick.cms_pages_path
-  %li= link_to Qbrick::Admin.model_name.human(:count => 2), qbrick.cms_admins_path
+  %li= link_to Qbrick::Page.model_name.human(count: 2), qbrick.cms_pages_path
+  %li= link_to Qbrick::Admin.model_name.human(count: 2), qbrick.cms_admins_path

data/app/views/qbrick/cms/bricks/_brick_header.html.haml

@@ -12,9 +12,9 @@
     - if brick.persisted?
 
       - # addable child dropdown menu
-      - if brick.respond_to?(:brick_list)
+      - if brick.respond_to? :brick_list
         .btn-group
-          = render('brick_type_dropdown', brick_list: brick)
+          = render 'brick_type_dropdown', brick_list: brick
 
       - # grid selection
       - if brick.class.include? Qbrick::Gridded
@@ -24,7 +24,7 @@
             %span.caret
           %ul.dropdown-menu.pull-right
             %li
-              = form.input :col_count, collection: brick.class.available_grid_sizes, as: :radio_buttons, label_method: lambda { |col_count| t("qbrick.cms.bricks.columns", count: col_count) }
+              = form.input :col_count, collection: brick.class.available_grid_sizes, as: :radio_buttons, label_method: lambda { |col_count| t('qbrick.cms.bricks.columns', count: col_count) }
 
       - # possible styles
       - unless brick.available_display_styles.empty?

data/lib/qbrick.rb

@@ -19,6 +19,6 @@ module Qbrick
   require 'ancestry'
   require 'bootstrap-sass'
   require 'haml'
-  require 'ckeditor_rails'
+  require 'ckeditor'
   require 'inherited_resources'
 end

data/lib/qbrick/engine.rb

@@ -29,9 +29,11 @@ module Qbrick
     end
 
     def hosts
-      [Socket.gethostname].tap do |result|
+      [Socket.gethostname, 'localhost'].tap do |result|
         result.concat [app_config.hosts].flatten if app_config.respond_to? :hosts
         result.concat [app_config.host].flatten if app_config.respond_to? :host
+        result.compact!
+        result.uniq!
       end
     end
 

data/lib/qbrick/version.rb

@@ -1,3 +1,3 @@
 module Qbrick
-  VERSION = '2.6.9'
+  VERSION = '2.6.10'
 end

data/lib/templates/qbrick/assets/ck-config.js.coffee

@@ -13,7 +13,7 @@ CKEDITOR.editorConfig = (config) ->
   config.linkShowAdvancedTab = false
   config.linkShowTargetTab = false
 
-  config.removePlugins = 'link'
+  config.removePlugins = 'link,language'
   config.extraPlugins = 'adv_link'
 
   true

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

@@ -24,7 +24,7 @@ describe Qbrick::Api::PagesController, type: :controller do
 
     it 'gets specific translated pages for each locale' do
       I18n.with_locale :de do
-        @pages << @only_german = create(:page, published: true, title: 'foobar de', path: 'de/foobar-de')
+        @pages << @only_german = create(:page, published: true, title: 'foobar de 2', path_de: 'de/foobar-de-2')
         get :index
         expect(JSON.parse(response.body)).to eq([@page1, @page2, @only_german].as_json)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qbrick
 version: !ruby/object:Gem::Version
-  version: 2.6.9
+  version: 2.6.10
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -337,19 +337,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.2.2
 - !ruby/object:Gem::Dependency
-  name: ckeditor_rails
+  name: ckeditor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg_search
   requirement: !ruby/object:Gem::Requirement