qbrick 2.6.10 → 2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77ffccf0af58c0baf0f3396848f8ee28716f57ae
-  data.tar.gz: 5c79d9219c79af8f7f9b93a4182b03954b23e53b
+  metadata.gz: a4a7a8140be43d0e7d62d35acc326f6e21c8908b
+  data.tar.gz: 4e6a28e356fe3faaca9df4c83004dabe902d0a61
 SHA512:
-  metadata.gz: f8a27fe09939893f8021db54f7087c9137475286afb9051eec17701e2457bf4cb7acf1c5144157ca054a7ba95b13ebd75d331c2f7e93898a0ff6d36c3f57de46
-  data.tar.gz: 14146aefb0457b86cfa09d357a85a068bda0f527f5a0b52897f0dca7e99913d9a872fa16783eba917685592ba39aa6918be5aecdea4294928ee17bc5e25cc293
+  metadata.gz: a4c3805524f4bc8d16a131ebbc283da844f54a79555651be867be95ab3defade6e4d46cae21ab4f773799d7c2c90f83efdf95812fe98e7186ca943e797e1569a
+  data.tar.gz: 7dfffed96761598156d00d841105eba80682be2d7586c2f716a883210ae9a142e7ef810a66b5c9fca86b31ac21e0c61e4b414f9defe4b512dcf55b1da3c5c285

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

@@ -1,7 +1,7 @@
 module Qbrick
   module Cms
     class AdminsController < BackendController
-      before_action :set_admin, only: [:show, :edit, :update, :destroy]
+      before_action :set_admin, only: %i(show edit update destroy)
 
       # GET /admins
       # GET /admins.json

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

@@ -0,0 +1,20 @@
+module Qbrick
+  module Cms
+    class SettingsController < RailsSettingsUi::SettingsController
+      def update_all
+        if @casted_settings[:errors].any?
+          render :index
+        else
+          @casted_settings.map { |setting| RailsSettingsUi.settings_klass[setting[0]] = setting[1] if setting[0] != 'errors' }
+          redirect_to qbrick.url_for(action: :index)
+        end
+      end
+
+      private
+
+      def cast_settings_params
+        @casted_settings = RailsSettingsUi::TypeConverter.cast params[:settings]
+      end
+    end
+  end
+end

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

@@ -14,8 +14,7 @@ module Qbrick
           action = 'edit'
         end
 
-        link_to locale.to_s.upcase, url_for(
-          action: action, content_locale: locale)
+        link_to locale.to_s.upcase, qbrick.url_for(action: action, content_locale: locale)
       end
 
       def model_attribute_field(resource, column_name, f)

data/app/models/qbrick/admin.rb

@@ -1,5 +1,7 @@
 module Qbrick
   class Admin < ActiveRecord::Base
+    include ::RailsSettings::Extend
+
     # Include default devise modules. Others available are:
     # :confirmable, :lockable, :timeoutable and :omniauthable
     devise :database_authenticatable,

data/app/models/qbrick/brick.rb

@@ -1,7 +1,8 @@
-require_relative '../../../lib/qbrick/brick_list'
+require_relative '../concerns/brick_list'
 
 module Qbrick
   class Brick < ActiveRecord::Base
+    include ::RailsSettings::Extend
     include Qbrick::BrickList
 
     belongs_to :brick_list, polymorphic: true, touch: true
@@ -32,7 +33,7 @@ module Qbrick
 
     after_initialize do
       self.position ||= has_siblings? ? brick_list.bricks.maximum(:position).to_i + 1 : 1
-      self.image_size ||= ImageSize.all.first.name.to_s
+      self.image_size ||= Qbrick::ImageSize.all.first.name.to_s if Qbrick::ImageSize.all.first.present?
     end
 
     after_save do

data/app/models/qbrick/page.rb

@@ -1,5 +1,6 @@
 module Qbrick
   class Page < ActiveRecord::Base
+    include ::RailsSettings::Extend
     include Qbrick::Engine.routes.url_helpers
     include Qbrick::Orderable
     include Qbrick::Translatable
@@ -144,21 +145,17 @@ module Qbrick
     end
 
     def translated_link_for(locale)
-      if translated_to? locale
-        I18n.with_locale locale do
-          path_with_prefixed_locale
-        end
-      else
-        Qbrick::Page.roots.first.link
+      return Qbrick::Page.roots.first.link unless translated_to? locale
+
+      I18n.with_locale locale do
+        path_with_prefixed_locale
       end
     end
 
     def link
-      if bricks.count == 0 && children.count > 0
-        children.published.first.link
-      else
-        path_with_prefixed_locale
-      end
+      return children.published.first.link if bricks.empty? && children.any?
+
+      path_with_prefixed_locale
     end
 
     def path_segments

data/app/models/qbrick/settings.rb

@@ -0,0 +1,28 @@
+RailsSettings::Settings.table_name = 'qbrick_settings'
+
+module Qbrick
+  class Settings < ::RailsSettings::CachedSettings
+    scope :ordered, -> { order :var }
+    alias_attribute :key, :var
+
+    class << self
+      def vars
+        pluck :var
+      end
+      alias keys vars
+
+      def all_object_hash(starting_with = nil)
+        vars = thing_scoped.ordered
+        vars = vars.where "var LIKE '#{starting_with}%'" if starting_with
+
+        Hash[vars.map { |record| [record.var, record] }].with_indifferent_access.tap do |result|
+          @@defaults.slice(*(@@defaults.keys - result.keys)).each do |key, value|
+            next if starting_with.present? && !key.start_with?(starting_with)
+
+            result[key] = Qbrick::Settings.new var: key, value: value
+          end
+        end
+      end
+    end
+  end
+end

data/app/views/devise/sessions/new.html.haml

@@ -2,8 +2,8 @@
   %h1 Sign in
   .form
     = simple_form_for(resource, as: resource_name, url: session_path(resource_name), wrapper: :bootstrap) do |f|
-      = f.input :email, :required => false, :autofocus => true
-      = f.input :password, :required => false
+      = f.input :email, required: false, autofocus: true
+      = f.input :password, required: false
 
       - if devise_mapping.rememberable?
         = f.input :remember_me, as: :boolean, wrapper_html: { class: 'checkbox-wrapper' }

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

@@ -15,6 +15,6 @@
       %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 t('.settings'), qbrick.cms_settings_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/new.js.erb

@@ -4,7 +4,7 @@
 
 $("#brick-form").empty();
 
-$("#brick-form").append(<%= render('qbrick/cms/bricks/new', :brick => @brick, :format => :html).to_json.html_safe %>);
+$("#brick-form").append(<%= render('qbrick/cms/bricks/new', brick: @brick, format: :html).to_json.html_safe %>);
 
 $("#brick-form").find('textarea.ckeditor').each(function (index, elem) { initCKEditor(elem.id) });
 

data/app/views/qbrick/cms/settings/index.html.haml

@@ -0,0 +1,24 @@
+%h1= t 'qbrick.cms.settings.index.title'
+
+- if @casted_settings && @casted_settings[:errors].any?
+  .alert.alert-danger= t('settings.index.settings_include_errors')
+
+= form_tag qbrick.update_all_cms_settings_path, method: :put, class: 'form' do
+  %table.table.table-striped
+    %thead
+      %tr
+        %th= t('settings.index.description')
+        %th= t('settings.index.value')
+    %tbody
+      - @settings.each do |name, value|
+      - next if name == :errors
+        %tr{ data: { name: name } }
+          %td= I18n.t("settings.attributes.#{name}.name")
+          %td.setting-value
+            - setting_with_error = @casted_settings && @casted_settings[:errors].include?(name)
+            %div{ class: "form-group #{ setting_with_error ? 'has-error' : ''}" }
+              = setting_field(name, value, @settings)
+              - if setting_with_error
+                %span.help-block= @casted_settings[:errors][name]
+
+  = submit_tag t('settings.index.save_all'), class: 'btn btn-primary btn-lg'

data/config/initializers/rails_settings_ui.rb

@@ -0,0 +1,10 @@
+RailsSettingsUi.parent_controller = 'Qbrick::Cms::BackendController'
+RailsSettingsUi::ApplicationController.layout 'qbrick/cms/application'
+
+RailsSettingsUi.setup do |config|
+  config.settings_class = 'Qbrick::Settings'
+end
+
+Rails.application.config.to_prepare do
+  RailsSettingsUi.inline_main_app_routes!
+end

data/config/locales/views/qbrick/cms/{settings_collection → settings}/de.yml

@@ -1,9 +1,10 @@
 de:
   qbrick:
     cms:
-      settings_collections:
+      settings:
+        none_available: Derzeit sind leider keine Einstellungen verfügbar
         index:
-          title: Settings
+          title: Einstellungen
         form:
           save: Speichern
           site_title: Seitentitel

data/config/locales/views/qbrick/cms/{settings_collection → settings}/en.yml

@@ -1,7 +1,8 @@
 en:
   qbrick:
     cms:
-      settings_collections:
+      settings:
+        none_available: Currently are no settings defined
         index:
           title: Settings
         form:

data/config/routes.rb

@@ -2,7 +2,9 @@ Qbrick::Engine.routes.draw do
   devise_for :admins, class_name: 'Qbrick::Admin', module: :devise
 
   namespace :cms do
-    resources :settings_collections, only: %i(update index)
+    resources :settings, only: %i(update_all index) do
+      put :update_all, on: :collection
+    end
     resources :pages, except: :show do
       post :sort, on: :collection
       get :mirror
@@ -16,9 +18,7 @@ Qbrick::Engine.routes.draw do
     resources :ckimages, only: %i(create index destroy)
 
     resource :account, only: :edit do
-      collection do
-        patch 'update_password'
-      end
+      patch :update_password, on: :collection
     end
 
     resources :admins
@@ -31,9 +31,7 @@ Qbrick::Engine.routes.draw do
       resources :pages, only: :index
     end
 
-    resources :pages,
-              only: %i(index),
-              defaults: { locale: I18n.locale }
+    resources :pages, only: %i(index), defaults: { locale: I18n.locale }
     get '(*url)' => 'pages#show', as: :page
   end
 

data/db/migrate/26_change_settings.rb

@@ -0,0 +1,18 @@
+class ChangeSettings < ActiveRecord::Migration
+  def change
+    remove_index :qbrick_settings, :key
+    rename_column :qbrick_settings, :key, :var
+    remove_column :qbrick_settings, :settings_collection_id
+
+    change_table :qbrick_settings do |t|
+      t.change :var, :string, null: false
+      t.change :value, :text, null: false
+
+      t.integer :thing_id, null: true
+      t.string :thing_type, limit: 30, null: true
+      t.timestamps
+    end
+
+    add_index :qbrick_settings, %i(thing_type thing_id var), unique: true
+  end
+end

data/db/seeds.rb

@@ -18,26 +18,6 @@ brick_types.each do |bt|
   brick_type.update! bt
 end
 
-# Add default settings
-
-site_collection = Qbrick::SettingsCollection.find_or_create_by(collection_type: 'site')
-page_collection = Qbrick::SettingsCollection.find_or_create_by(collection_type: 'page')
-global_collection = Qbrick::SettingsCollection.find_or_create_by(collection_type: 'global')
-
-settings = [
-  { key: 'site_title', value: 'Default Site Title', settings_collection_id: site_collection.id },
-  { key: 'site_description', value: 'Default Site Description', settings_collection_id: site_collection.id },
-  { key: 'default_page_title', value: 'Default Page Title', settings_collection_id: page_collection.id },
-  { key: 'default_page_description', value: 'Default Page Description', settings_collection_id: page_collection.id },
-  { key: 'google_analytics_key', value: 'UA-xxxx-x', settings_collection_id: global_collection.id },
-  { key: 'typekit_id', value: 'xxxxxxx', settings_collection_id: global_collection.id }
-]
-
-settings.each do |s|
-  setting = Qbrick::Setting.find_or_create_by(key: s[:key])
-  setting.update! s
-end
-
 unless  Qbrick::Admin.any?
   Qbrick::Admin.create(email: 'admin@admin.com', password: 'change-me-soon!')
 end

data/lib/qbrick.rb

@@ -1,4 +1,5 @@
 module Qbrick
+  require 'rails-settings-cached'
   require 'devise'
   require 'qbrick/engine'
   require 'qbrick/orderable'
@@ -6,7 +7,6 @@ module Qbrick
   require 'qbrick/translatable'
   require 'qbrick/searchable'
   require 'qbrick/gridded'
-  require 'qbrick/brick_list'
   require 'qbrick/partial_extractor'
   require 'qbrick/touch_placeholders'
   require 'simple_form'
@@ -21,4 +21,5 @@ module Qbrick
   require 'haml'
   require 'ckeditor'
   require 'inherited_resources'
+  require 'rails-settings-ui'
 end

data/lib/qbrick/version.rb

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

data/spec/controllers/qbrick/cms/settings_controller_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Qbrick::Cms::SettingsController, type: :controller do
+  render_views
+  routes { Qbrick::Engine.routes }
+
+  before do
+    admin = double 'admin'
+    allow_message_expectations_on_nil
+    allow(request.env['warden']).to receive(:authenticate!) { admin }
+    allow(controller).to receive(:current_admin) { admin }
+  end
+
+  describe 'GET index' do
+    it 'renders saved settings' do
+      Qbrick::Settings.highlighting_font = 'Comic Sans'
+      get :index
+      expect(response).to be_success
+      expect(response.body).to include(I18n.t 'settings.attributes.highlighting_font.name')
+    end
+
+    it 'renders default settings' do
+      Qbrick::Settings.defaults[:highlighting_font] = 'Comic Sans'
+      get :index
+      expect(response).to be_success
+      expect(response.body).to include(I18n.t 'settings.attributes.highlighting_font.name')
+    end
+  end
+
+  describe 'POST update_all' do
+    it 'updates settings' do
+      Qbrick::Settings.defaults[:highlighting_font] = 'Comic Sans'
+      post :update_all, settings: { 'highlighting_font' => 'Comic Sans Neue' }
+      expect(response).to redirect_to("#{Qbrick::Engine.routes.url_helpers.cms_settings_path}?content_locale=#{I18n.locale}")
+      setting = Qbrick::Settings.find_by var: 'highlighting_font'
+      expect(setting.value).to eq 'Comic Sans Neue'
+    end
+  end
+end

data/spec/factories.rb

@@ -35,11 +35,6 @@ FactoryGirl.define do
     a.file File.open("#{Qbrick::Engine.root}/spec/dummy/app/assets/images/spec-image.png")
   end
 
-  factory :setting, class: Qbrick::Setting do |s|
-    s.key 'code'
-    s.value 'SomeValue'
-  end
-
   factory :admin, class: Qbrick::Admin do
     email 'test@test.com'
     password 'somel33tPW'

data/spec/models/settings_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+module Qbrick
+  describe Settings, type: :model do
+    context 'setting exists' do
+      it 'returns the set value' do
+        Settings.code = 'SomeValue'
+        expect(Settings.code).to eq('SomeValue')
+      end
+
+      it 'keeps the value' do
+        [42, '23', [3, 4], nil].each do |value|
+          Settings.stuff = value
+          expect(Settings.stuff).to eq value
+        end
+      end
+    end
+
+    context "setting doesn't exist" do
+      it 'returns nil for a call on a non-present setting' do
+        expect(Settings.does_not_exist).to be_nil
+      end
+    end
+
+    context 'on an admin' do
+      it 'can be set on an instance' do
+        admin = create :admin
+        admin.settings.locale = 'cn'
+        admin.reload
+        expect(admin.settings.locale).to eq 'cn'
+      end
+    end
+
+    context 'on a brick' do
+      it 'can be set on an instance' do
+        brick = create :text_brick, brick_list: (Qbrick::Page.first || create(:page))
+        brick.settings.color = 'infrared'
+        brick.reload
+        expect(brick.settings.color).to eq 'infrared'
+      end
+    end
+
+    context 'on a page' do
+      it 'can be set on an instance' do
+        page = Qbrick::Page.first || create(:page)
+        page.settings.heisen = 'berg'
+        page.reload
+
+        expect(page.settings.heisen).to eq 'berg'
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qbrick
 version: !ruby/object:Gem::Version
-  version: 2.6.10
+  version: '2.7'
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -504,6 +504,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-settings-cached
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-settings-ui
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 description: Qbrick is a Rails engine that offers a simple CMS.
 email: developers@screenconcept.ch
 executables: []
@@ -536,7 +564,7 @@ files:
 - app/controllers/qbrick/cms/bricks_controller.rb
 - app/controllers/qbrick/cms/ckimages_controller.rb
 - app/controllers/qbrick/cms/pages_controller.rb
-- app/controllers/qbrick/cms/settings_collections_controller.rb
+- app/controllers/qbrick/cms/settings_controller.rb
 - app/controllers/qbrick/pages_controller.rb
 - app/controllers/qbrick/sitemaps_controller.rb
 - app/helpers/cms_helper.rb
@@ -545,6 +573,7 @@ files:
 - app/helpers/qbrick/cms/admin_helper.rb
 - app/helpers/qbrick/cms/pages_helper.rb
 - app/helpers/sitemaps_helper.rb
+- app/models/concerns/brick_list.rb
 - app/models/qbrick/accordion_brick.rb
 - app/models/qbrick/accordion_item_brick.rb
 - app/models/qbrick/admin.rb
@@ -566,8 +595,7 @@ files:
 - app/models/qbrick/partition.rb
 - app/models/qbrick/placeholder_brick.rb
 - app/models/qbrick/publish_state.rb
-- app/models/qbrick/setting.rb
-- app/models/qbrick/settings_collection.rb
+- app/models/qbrick/settings.rb
 - app/models/qbrick/slider_brick.rb
 - app/models/qbrick/text_brick.rb
 - app/models/qbrick/two_column_brick.rb
@@ -635,8 +663,7 @@ files:
 - app/views/qbrick/cms/pages/new.html.haml
 - app/views/qbrick/cms/pages/show.html.haml
 - app/views/qbrick/cms/pages/sort.js.erb
-- app/views/qbrick/cms/settings_collections/_form.html.haml
-- app/views/qbrick/cms/settings_collections/index.html.haml
+- app/views/qbrick/cms/settings/index.html.haml
 - app/views/qbrick/column_bricks/_column_brick.html.haml
 - app/views/qbrick/column_bricks/column_brick/_edit.html.haml
 - app/views/qbrick/image_bricks/_image_brick.html.haml
@@ -661,6 +688,7 @@ files:
 - app/views/qbrick/video_bricks/_video_brick.html.haml
 - app/views/qbrick/video_bricks/video_brick/_edit.html.haml
 - config/initializers/devise.rb
+- config/initializers/rails_settings_ui.rb
 - config/initializers/simple_form.rb
 - config/initializers/simple_form_bootstrap.rb
 - config/locales/cms.de.yml
@@ -708,8 +736,8 @@ files:
 - config/locales/views/qbrick/cms/navigation.yml
 - config/locales/views/qbrick/cms/pages/de.yml
 - config/locales/views/qbrick/cms/pages/en.yml
-- config/locales/views/qbrick/cms/settings_collection/de.yml
-- config/locales/views/qbrick/cms/settings_collection/en.yml
+- config/locales/views/qbrick/cms/settings/de.yml
+- config/locales/views/qbrick/cms/settings/en.yml
 - config/locales/views/qbrick/image_brick/de.yml
 - config/locales/views/qbrick/image_brick/en.yml
 - config/locales/views/qbrick/search/de.yml
@@ -746,12 +774,12 @@ files:
 - 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/migrate/26_change_settings.rb
 - db/seeds.rb
 - lib/generators/qbrick/assets/install_generator.rb
 - lib/generators/qbrick/custom_model_generator.rb
 - lib/generators/qbrick/translations/add_generator.rb
 - lib/qbrick.rb
-- lib/qbrick/brick_list.rb
 - lib/qbrick/engine.rb
 - lib/qbrick/gridded.rb
 - lib/qbrick/image_uploader_mounting.rb
@@ -777,6 +805,7 @@ files:
 - spec/command_wrapper_helper.rb
 - spec/controllers/qbrick/api/pages_controller_spec.rb
 - spec/controllers/qbrick/cms/pages_controller_spec.rb
+- spec/controllers/qbrick/cms/settings_controller_spec.rb
 - spec/controllers/qbrick/pages_controller_spec.rb
 - spec/controllers/qbrick/sitemaps_controller_spec.rb
 - spec/dummy/Rakefile
@@ -850,7 +879,7 @@ files:
 - spec/models/page_spec.rb
 - spec/models/placeholder_brick_spec.rb
 - spec/models/publish_state_spec.rb
-- spec/models/setting_spec.rb
+- spec/models/settings_spec.rb
 - spec/models/slider_brick_spec.rb
 - spec/models/text_brick_spec.rb
 - spec/models/two_column_brick_spec.rb
@@ -894,6 +923,7 @@ test_files:
 - spec/command_wrapper_helper.rb
 - spec/controllers/qbrick/api/pages_controller_spec.rb
 - spec/controllers/qbrick/cms/pages_controller_spec.rb
+- spec/controllers/qbrick/cms/settings_controller_spec.rb
 - spec/controllers/qbrick/pages_controller_spec.rb
 - spec/controllers/qbrick/sitemaps_controller_spec.rb
 - spec/dummy/Rakefile
@@ -967,7 +997,7 @@ test_files:
 - spec/models/page_spec.rb
 - spec/models/placeholder_brick_spec.rb
 - spec/models/publish_state_spec.rb
-- spec/models/setting_spec.rb
+- spec/models/settings_spec.rb
 - spec/models/slider_brick_spec.rb
 - spec/models/text_brick_spec.rb
 - spec/models/two_column_brick_spec.rb

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

@@ -1,26 +0,0 @@
-module Qbrick
-  module Cms
-    class SettingsCollectionsController < BackendController
-      def index
-        @settings_collections = [
-          Qbrick::SettingsCollection.find_by(collection_type: 'site'),
-          Qbrick::SettingsCollection.find_by(collection_type: 'page'),
-          Qbrick::SettingsCollection.find_by(collection_type: 'global')
-        ]
-      end
-
-      def update
-        @settings_collection = Qbrick::SettingsCollection.find(params[:id])
-        @settings_collection.update_attributes(settings_collection_params)
-
-        respond_with @settings_collection, location: cms_settings_collections_path
-      end
-
-      private
-
-      def settings_collection_params
-        params.require(:settings_collection).permit(settings_attributes: [:value, :id])
-      end
-    end
-  end
-end

data/app/models/qbrick/setting.rb

@@ -1,13 +0,0 @@
-module Qbrick
-  class Setting < ActiveRecord::Base
-    belongs_to :settings_collection
-
-    default_scope { order('id ASC') }
-
-    class << self
-      def [](key)
-        find_by_key(key.to_s).try(:value) || ''
-      end
-    end
-  end
-end

data/app/models/qbrick/settings_collection.rb

@@ -1,10 +0,0 @@
-module Qbrick
-  class SettingsCollection < ActiveRecord::Base
-    has_many :settings
-
-    accepts_nested_attributes_for :settings
-
-    # TODO: handle localized settings
-    # TODO: Settings attached to page/etc
-  end
-end

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

@@ -1,8 +0,0 @@
-= simple_form_for settings, url: cms_settings_collection_path(settings), method: :patch, wrapper: :bootstrap, html: { class: 'form-horizontal' } do |f|
-
-  .form-inputs
-    = f.simple_fields_for :settings do |nf|
-      = nf.input :value, label: t(".#{nf.object.key}"), as: :string
-
-  .form-actions
-    = f.button :submit, t('.save')

data/app/views/qbrick/cms/settings_collections/index.html.haml

@@ -1,6 +0,0 @@
-- @settings_collections.each do |sc|
-  - if sc.present?
-    %h3= "#{sc.collection_type.capitalize} #{t('.title')}"
-    %hr
-
-    = render 'form', settings: sc

data/spec/models/setting_spec.rb

@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-module Qbrick
-  describe Setting, type: :model do
-    before do
-      create(:setting)
-      create(:setting, key: 'stuff', value: nil)
-    end
-
-    describe '[](key)' do
-      context 'setting exists' do
-        it 'returns the set value' do
-          expect(Setting[:code]).to eq('SomeValue')
-        end
-
-        it 'returns empty string for empty setting' do
-          expect(Setting[:stuff]).to eq('')
-        end
-      end
-
-      context "setting doesn't exist" do
-        it 'returns empty string for a call on a non-present setting' do
-          expect(Setting[:does_not_exist]).to eq('')
-        end
-      end
-    end
-  end
-end