spina 0.6.20 → 0.6.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1739d514819ce868a83fa8ba5c050c1ad5d78534
-  data.tar.gz: d28e47f54a10eb52f39c3b3f1f6b2444bdfc0346
+  metadata.gz: cde5735a143386d3b1a7d69e0e851cf67e5d02a4
+  data.tar.gz: a49ab9bb05930e02da9f23096c05acf27c4c9bb7
 SHA512:
-  metadata.gz: 132219698cc50adbb871fe12400831a3c580da75dbf142a23a2d2a9268e1e145e626839cd0cd38b30819f5bf5dfb0d2e01bced9f3fa5fd619c490e9cd7905a82
-  data.tar.gz: 3b77225751842bce8abf7073c680fb2bd0f1d81e6781dcde50eb5a2df6461ed55473878e2f49fbd7d273e024d82fafa6a789f99630166b4074d3ff65e2dd86c1
+  metadata.gz: 2284e9b1a0b9fefd6d80057554f6c3fa89e1865df39e23aef63d1a1ad5e4b4526e807869ce6c375d0fc3f8f2c70f645696e432bb6fb9645760585d54e74a3740
+  data.tar.gz: d4367e71963fa3cb5ddeec9ffebfeb374aa2080258d86c109c2654aa520f31725620da98824c9bd6787535acabfda08f9d0f469454bc48b7943a36d4f4a1d2c6

data/app/models/spina/ability.rb

@@ -8,6 +8,7 @@ module Spina
       else
         can :manage, Page
         can :manage, Photo
+        can :manage, Attachment
         can :manage, Account
         can :manage, Inquiry
 

data/app/models/spina/color.rb

@@ -0,0 +1,7 @@
+module Spina
+  class Color < ActiveRecord::Base
+    has_many :page_parts, as: :page_partable
+    has_many :layout_parts, as: :layout_partable
+    has_many :structure_parts, as: :structure_partable
+  end
+end

data/app/views/spina/admin/accounts/style.html.haml

@@ -8,7 +8,6 @@
           .select-dropdown.account-theme{data: {layout_parts: current_theme.config.layout_parts.map{|layout_part| layout_part[:name]}}}
             - options = options_for_select(Spina.themes.map { |theme| [theme.to_s, theme.to_s, {'data-layout-parts' => theme.config.layout_parts.map{|layout_part| layout_part[:name] }}] }, current_account.theme)
             = f.select :theme, options
-
       %tr
         %td
           = Spina::Account.human_attribute_name(:logo)

data/app/views/spina/admin/layout_partables/_color_form.html.haml

@@ -0,0 +1,4 @@
+= color_form.fields_for :layout_partable, color_form.object.layout_partable do |form|
+  .colorpicker
+    = form.text_field :content, placeholder: color_form.object.title
+    .colorpicker-container

data/app/views/spina/admin/layout_partables/_line_form.html.haml

@@ -1,4 +1,2 @@
 = line_form.fields_for :layout_partable, line_form.object.layout_partable do |form|
-  .colorpicker
-    = form.text_field :content, placeholder: line_form.object.title
-    .colorpicker-container
+  = form.text_field :content, placeholder: line_form.object.title

data/db/migrate/20150430085527_create_spina_colors.rb

@@ -0,0 +1,8 @@
+class CreateSpinaColors < ActiveRecord::Migration
+  def change
+    create_table :spina_colors do |t|
+      t.text :content
+      t.timestamps
+    end
+  end
+end

data/lib/spina/theme.rb

@@ -1,7 +1,7 @@
 module Spina
   class Theme
 
-    attr_accessor :name, :config
+    attr_accessor :name, :config, :public_theme
 
     def to_s
       name

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "0.6.20"
+  VERSION = "0.6.21"
 end

data/test/dummy/config/database.yml

@@ -13,14 +13,14 @@ development:
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
-test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
+# test:
+#   adapter: sqlite3
+#   database: db/test.sqlite3
+#   pool: 5
+#   timeout: 5000
 
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
+# production:
+#   adapter: sqlite3
+#   database: db/production.sqlite3
+#   pool: 5
+#   timeout: 5000

data/test/dummy/config/initializers/spina.rb

@@ -4,7 +4,9 @@ end
 
 module Spina
   module DefaultTheme
-    include Spina::Configurable
+    include ::ActiveSupport::Configurable
+
+    config_accessor :title, :page_parts, :view_templates, :layout_parts, :custom_pages, :plugins, :structures
 
     self.title = "Default theme"
 

data/test/dummy/db/migrate/20150430085614_add_robots_allowed_to_spina_accounts.spina.rb

@@ -0,0 +1,6 @@
+# This migration comes from spina (originally 20140711154425)
+class AddRobotsAllowedToSpinaAccounts < ActiveRecord::Migration
+  def change
+    add_column :spina_accounts, :robots_allowed, :boolean, default: false
+  end
+end

data/test/dummy/db/migrate/20150430085615_add_position_to_spina_photo_collections_photos.spina.rb

@@ -0,0 +1,6 @@
+# This migration comes from spina (originally 20140718095419)
+class AddPositionToSpinaPhotoCollectionsPhotos < ActiveRecord::Migration
+  def change
+    add_column :spina_photo_collections_photos, :position, :integer
+  end
+end

data/test/dummy/db/migrate/20150430085616_create_spina_colors.spina.rb

@@ -0,0 +1,9 @@
+# This migration comes from spina (originally 20150430085527)
+class CreateSpinaColors < ActiveRecord::Migration
+  def change
+    create_table :spina_colors do |t|
+      t.text :content
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150402144912) do
+ActiveRecord::Schema.define(version: 20150430085616) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -48,6 +48,12 @@ ActiveRecord::Schema.define(version: 20150402144912) do
     t.datetime "updated_at", null: false
   end
 
+  create_table "spina_colors", force: :cascade do |t|
+    t.text     "content"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "spina_inquiries", force: :cascade do |t|
     t.string   "name"
     t.string   "email"

data/test/dummy/log/development.log

@@ -89245,3 +89245,381 @@ Processing by Spina::Admin::PagesController#edit as HTML
   Rendered /Users/bram/apps/spina/app/views/spina/admin/shared/_notifications.html.haml (0.2ms)
   Rendered layouts/spina/admin/application.html.haml (18.3ms)
 Completed 200 OK in 71ms (Views: 62.1ms | ActiveRecord: 1.9ms)
+  ActiveRecord::SchemaMigration Load (30.6ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddRobotsAllowedToSpinaAccounts (20150430085614)
+   (0.2ms)  BEGIN
+   (26.7ms)  ALTER TABLE "spina_accounts" ADD "robots_allowed" boolean DEFAULT 'f'
+PG::DuplicateColumn: ERROR:  column "robots_allowed" of relation "spina_accounts" already exists
+: ALTER TABLE "spina_accounts" ADD "robots_allowed" boolean DEFAULT 'f'
+   (0.3ms)  ROLLBACK
+  SQL (13.1ms)  CREATE EXTENSION IF NOT EXISTS "plpgsql"
+   (18.8ms)  DROP TABLE "spina_accounts" CASCADE
+   (20.0ms)  CREATE TABLE "spina_accounts" ("id" serial primary key, "name" character varying, "address" character varying, "postal_code" character varying, "city" character varying, "phone" character varying, "email" character varying, "preferences" text, "logo" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "kvk_identifier" character varying, "vat_identifier" character varying, "robots_allowed" boolean DEFAULT 'f') 
+   (1.5ms)  DROP TABLE "spina_attachment_collections" CASCADE
+   (3.0ms)  CREATE TABLE "spina_attachment_collections" ("id" serial primary key, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (1.9ms)  DROP TABLE "spina_attachment_collections_attachments" CASCADE
+   (2.2ms)  CREATE TABLE "spina_attachment_collections_attachments" ("id" serial primary key, "attachment_collection_id" integer, "attachment_id" integer) 
+   (1.8ms)  DROP TABLE "spina_attachments" CASCADE
+   (2.6ms)  CREATE TABLE "spina_attachments" ("id" serial primary key, "file" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (2.7ms)  DROP TABLE "spina_inquiries" CASCADE
+   (3.0ms)  CREATE TABLE "spina_inquiries" ("id" serial primary key, "name" character varying, "email" character varying, "phone" character varying, "message" text, "archived" boolean DEFAULT 'f', "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "spam" boolean) 
+   (2.0ms)  DROP TABLE "spina_layout_parts" CASCADE
+   (3.6ms)  CREATE TABLE "spina_layout_parts" ("id" serial primary key, "title" character varying, "name" character varying, "layout_partable_id" integer, "layout_partable_type" character varying, "created_at" timestamp, "updated_at" timestamp, "account_id" integer) 
+   (2.9ms)  DROP TABLE "spina_lines" CASCADE
+   (2.7ms)  CREATE TABLE "spina_lines" ("id" serial primary key, "content" character varying, "created_at" timestamp, "updated_at" timestamp) 
+   (2.2ms)  DROP TABLE "spina_page_parts" CASCADE
+   (3.0ms)  CREATE TABLE "spina_page_parts" ("id" serial primary key, "title" character varying, "name" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "page_id" integer, "page_partable_id" integer, "page_partable_type" character varying) 
+   (2.5ms)  DROP TABLE "spina_pages" CASCADE
+   (3.9ms)  CREATE TABLE "spina_pages" ("id" serial primary key, "title" character varying, "menu_title" character varying, "description" character varying, "show_in_menu" boolean DEFAULT 't', "slug" character varying, "deletable" boolean DEFAULT 't', "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "name" character varying, "seo_title" character varying, "skip_to_first_child" boolean DEFAULT 'f', "view_template" character varying, "layout_template" character varying, "draft" boolean DEFAULT 'f', "link_url" character varying, "ancestry" character varying, "position" integer, "materialized_path" character varying, "active" boolean DEFAULT 't') 
+   (1.5ms)  DROP TABLE "spina_photo_collections" CASCADE
+   (1.9ms)  CREATE TABLE "spina_photo_collections" ("id" serial primary key, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (1.2ms)  DROP TABLE "spina_photo_collections_photos" CASCADE
+   (2.3ms)  CREATE TABLE "spina_photo_collections_photos" ("id" serial primary key, "photo_collection_id" integer, "photo_id" integer, "position" integer) 
+   (1.7ms)  DROP TABLE "spina_photos" CASCADE
+   (2.9ms)  CREATE TABLE "spina_photos" ("id" serial primary key, "file" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (2.0ms)  DROP TABLE "spina_structure_items" CASCADE
+   (1.9ms)  CREATE TABLE "spina_structure_items" ("id" serial primary key, "structure_id" integer, "position" integer, "created_at" timestamp, "updated_at" timestamp) 
+   (1.1ms)  CREATE  INDEX  "index_spina_structure_items_on_structure_id" ON "spina_structure_items" USING btree ("structure_id")
+   (2.1ms)  DROP TABLE "spina_structure_parts" CASCADE
+   (2.8ms)  CREATE TABLE "spina_structure_parts" ("id" serial primary key, "structure_item_id" integer, "structure_partable_id" integer, "structure_partable_type" character varying, "name" character varying, "title" character varying, "created_at" timestamp, "updated_at" timestamp) 
+   (1.1ms)  CREATE  INDEX  "index_spina_structure_parts_on_structure_item_id" ON "spina_structure_parts" USING btree ("structure_item_id")
+   (1.0ms)  CREATE  INDEX  "index_spina_structure_parts_on_structure_partable_id" ON "spina_structure_parts" USING btree ("structure_partable_id")
+   (2.4ms)  DROP TABLE "spina_structures" CASCADE
+   (2.2ms)  CREATE TABLE "spina_structures" ("id" serial primary key, "created_at" timestamp, "updated_at" timestamp) 
+   (3.3ms)  DROP TABLE "spina_texts" CASCADE
+   (3.5ms)  CREATE TABLE "spina_texts" ("id" serial primary key, "content" text, "created_at" timestamp, "updated_at" timestamp) 
+   (2.1ms)  DROP TABLE "spina_users" CASCADE
+   (3.4ms)  CREATE TABLE "spina_users" ("id" serial primary key, "name" character varying, "email" character varying, "password_digest" character varying, "admin" boolean DEFAULT 'f', "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "last_logged_in" timestamp) 
+   (0.3ms)  SELECT version FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddRobotsAllowedToSpinaAccounts (20150430085614)
+   (0.2ms)  BEGIN
+   (0.7ms)  ALTER TABLE "spina_accounts" ADD "robots_allowed" boolean DEFAULT 'f'
+PG::DuplicateColumn: ERROR:  column "robots_allowed" of relation "spina_accounts" already exists
+: ALTER TABLE "spina_accounts" ADD "robots_allowed" boolean DEFAULT 'f'
+   (0.2ms)  ROLLBACK
+  SQL (0.3ms)  CREATE EXTENSION IF NOT EXISTS "plpgsql"
+   (2.3ms)  DROP TABLE "spina_accounts" CASCADE
+   (5.0ms)  CREATE TABLE "spina_accounts" ("id" serial primary key, "name" character varying, "address" character varying, "postal_code" character varying, "city" character varying, "phone" character varying, "email" character varying, "preferences" text, "logo" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "kvk_identifier" character varying, "vat_identifier" character varying, "robots_allowed" boolean DEFAULT 'f') 
+   (1.0ms)  DROP TABLE "spina_attachment_collections" CASCADE
+   (2.0ms)  CREATE TABLE "spina_attachment_collections" ("id" serial primary key, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (0.9ms)  DROP TABLE "spina_attachment_collections_attachments" CASCADE
+   (2.1ms)  CREATE TABLE "spina_attachment_collections_attachments" ("id" serial primary key, "attachment_collection_id" integer, "attachment_id" integer) 
+   (1.0ms)  DROP TABLE "spina_attachments" CASCADE
+   (2.5ms)  CREATE TABLE "spina_attachments" ("id" serial primary key, "file" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (1.4ms)  DROP TABLE "spina_inquiries" CASCADE
+   (3.1ms)  CREATE TABLE "spina_inquiries" ("id" serial primary key, "name" character varying, "email" character varying, "phone" character varying, "message" text, "archived" boolean DEFAULT 'f', "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "spam" boolean) 
+   (1.2ms)  DROP TABLE "spina_layout_parts" CASCADE
+   (4.1ms)  CREATE TABLE "spina_layout_parts" ("id" serial primary key, "title" character varying, "name" character varying, "layout_partable_id" integer, "layout_partable_type" character varying, "created_at" timestamp, "updated_at" timestamp, "account_id" integer) 
+   (1.2ms)  DROP TABLE "spina_lines" CASCADE
+   (2.9ms)  CREATE TABLE "spina_lines" ("id" serial primary key, "content" character varying, "created_at" timestamp, "updated_at" timestamp) 
+   (1.0ms)  DROP TABLE "spina_page_parts" CASCADE
+   (2.8ms)  CREATE TABLE "spina_page_parts" ("id" serial primary key, "title" character varying, "name" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "page_id" integer, "page_partable_id" integer, "page_partable_type" character varying) 
+   (1.4ms)  DROP TABLE "spina_pages" CASCADE
+   (3.8ms)  CREATE TABLE "spina_pages" ("id" serial primary key, "title" character varying, "menu_title" character varying, "description" character varying, "show_in_menu" boolean DEFAULT 't', "slug" character varying, "deletable" boolean DEFAULT 't', "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "name" character varying, "seo_title" character varying, "skip_to_first_child" boolean DEFAULT 'f', "view_template" character varying, "layout_template" character varying, "draft" boolean DEFAULT 'f', "link_url" character varying, "ancestry" character varying, "position" integer, "materialized_path" character varying, "active" boolean DEFAULT 't') 
+   (1.0ms)  DROP TABLE "spina_photo_collections" CASCADE
+   (1.8ms)  CREATE TABLE "spina_photo_collections" ("id" serial primary key, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (0.8ms)  DROP TABLE "spina_photo_collections_photos" CASCADE
+   (4.2ms)  CREATE TABLE "spina_photo_collections_photos" ("id" serial primary key, "photo_collection_id" integer, "photo_id" integer, "position" integer) 
+   (1.0ms)  DROP TABLE "spina_photos" CASCADE
+   (3.1ms)  CREATE TABLE "spina_photos" ("id" serial primary key, "file" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (1.0ms)  DROP TABLE "spina_structure_items" CASCADE
+   (1.7ms)  CREATE TABLE "spina_structure_items" ("id" serial primary key, "structure_id" integer, "position" integer, "created_at" timestamp, "updated_at" timestamp) 
+   (1.2ms)  CREATE  INDEX  "index_spina_structure_items_on_structure_id" ON "spina_structure_items" USING btree ("structure_id")
+   (1.4ms)  DROP TABLE "spina_structure_parts" CASCADE
+   (2.8ms)  CREATE TABLE "spina_structure_parts" ("id" serial primary key, "structure_item_id" integer, "structure_partable_id" integer, "structure_partable_type" character varying, "name" character varying, "title" character varying, "created_at" timestamp, "updated_at" timestamp) 
+   (1.1ms)  CREATE  INDEX  "index_spina_structure_parts_on_structure_item_id" ON "spina_structure_parts" USING btree ("structure_item_id")
+   (1.0ms)  CREATE  INDEX  "index_spina_structure_parts_on_structure_partable_id" ON "spina_structure_parts" USING btree ("structure_partable_id")
+   (0.9ms)  DROP TABLE "spina_structures" CASCADE
+   (1.9ms)  CREATE TABLE "spina_structures" ("id" serial primary key, "created_at" timestamp, "updated_at" timestamp) 
+   (1.2ms)  DROP TABLE "spina_texts" CASCADE
+   (2.7ms)  CREATE TABLE "spina_texts" ("id" serial primary key, "content" text, "created_at" timestamp, "updated_at" timestamp) 
+   (1.0ms)  DROP TABLE "spina_users" CASCADE
+   (3.5ms)  CREATE TABLE "spina_users" ("id" serial primary key, "name" character varying, "email" character varying, "password_digest" character varying, "admin" boolean DEFAULT 'f', "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "last_logged_in" timestamp) 
+   (0.3ms)  SELECT version FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddRobotsAllowedToSpinaAccounts (20150430085614)
+   (0.1ms)  BEGIN
+   (0.8ms)  ALTER TABLE "spina_accounts" ADD "robots_allowed" boolean DEFAULT 'f'
+PG::DuplicateColumn: ERROR:  column "robots_allowed" of relation "spina_accounts" already exists
+: ALTER TABLE "spina_accounts" ADD "robots_allowed" boolean DEFAULT 'f'
+   (0.2ms)  ROLLBACK
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddPositionToSpinaPhotoCollectionsPhotos (20150430085615)
+   (0.3ms)  BEGIN
+   (0.7ms)  ALTER TABLE "spina_photo_collections_photos" ADD "position" integer
+PG::DuplicateColumn: ERROR:  column "position" of relation "spina_photo_collections_photos" already exists
+: ALTER TABLE "spina_photo_collections_photos" ADD "position" integer
+   (0.2ms)  ROLLBACK
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateSpinaColors (20150430085616)
+   (0.2ms)  BEGIN
+DEPRECATION WARNING: `#timestamp` was called without specifying an option for `null`. In Rails 5, this behavior will change to `null: false`. You should manually specify `null: true` to prevent the behavior of your existing migrations from changing. (called from block in change at /Users/bram/apps/spina/test/dummy/db/migrate/20150430085616_create_spina_colors.spina.rb:6)
+   (4.3ms)  CREATE TABLE "spina_colors" ("id" serial primary key, "content" text, "created_at" timestamp, "updated_at" timestamp) 
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20150430085616"]]
+   (6.7ms)  COMMIT
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.9ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_accounts'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (2.0ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_attachment_collections'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (1.7ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_attachment_collections_attachments'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (2.2ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_attachments'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (1.9ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_colors'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (1.7ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_inquiries'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (1.7ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_layout_parts'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (1.5ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_lines'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (1.5ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_page_parts'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (1.4ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_pages'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (1.4ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_photo_collections'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (1.4ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_photo_collections_photos'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (1.4ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_photos'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (1.4ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_structure_items'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (1.4ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_structure_parts'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (1.4ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_structures'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (1.4ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_texts'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+   (1.4ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+FROM pg_constraint c
+JOIN pg_class t1 ON c.conrelid = t1.oid
+JOIN pg_class t2 ON c.confrelid = t2.oid
+JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+JOIN pg_namespace t3 ON c.connamespace = t3.oid
+WHERE c.contype = 'f'
+  AND t1.relname = 'spina_users'
+  AND t3.nspname = ANY (current_schemas(false))
+ORDER BY c.conname
+
+DEPRECATION WARNING: You didn't set `secret_key_base`. Read the upgrade documentation to learn more about this new config option. (called from handle at /Users/bram/Library/Application Support/Pow/Versions/0.5.0/node_modules/nack/lib/nack/server.rb:155)
+
+
+Started GET "/admin" for 127.0.0.1 at 2015-04-30 12:52:12 +0200
+Processing by Spina::Admin::PagesController#index as HTML
+Redirected to http://dummy.dev/admin/login
+Filter chain halted as :authorize_user rendered or redirected
+Completed 302 Found in 13ms (ActiveRecord: 0.0ms)
+
+
+Started GET "/admin/login" for 127.0.0.1 at 2015-04-30 12:52:13 +0200
+Processing by Spina::Admin::SessionsController#new as HTML
+  Rendered /Users/bram/apps/spina/app/views/spina/admin/sessions/new.html.haml within layouts/spina/login (11.1ms)
+Completed 200 OK in 268ms (Views: 258.9ms | ActiveRecord: 0.0ms)
+DEPRECATION WARNING: You didn't set `secret_key_base`. Read the upgrade documentation to learn more about this new config option. (called from handle at /Users/bram/Library/Application Support/Pow/Versions/0.5.0/node_modules/nack/lib/nack/server.rb:155)
+
+
+Started POST "/admin/sessions" for 127.0.0.1 at 2015-04-30 12:52:19 +0200
+Processing by Spina::Admin::SessionsController#create as HTML
+  Parameters: {"utf8"=>"✓", "authenticity_token"=>"iBQ8p4Z2omQk0n98Gm6wmiPshYde+c1aeIJDWsHr15NAVSOTADfKSE0XWDsN6b7fHUNMO/pcinx0IH4esL8/tg==", "email"=>"mail@bramjetten.nl", "password"=>"[FILTERED]", "button"=>""}
+  Spina::User Load (1.1ms)  SELECT  "spina_users".* FROM "spina_users" WHERE "spina_users"."email" = $1  ORDER BY "spina_users"."id" ASC LIMIT 1  [["email", "mail@bramjetten.nl"]]
+  Rendered /Users/bram/apps/spina/app/views/spina/admin/sessions/new.html.haml within layouts/spina/login (1.0ms)
+Completed 200 OK in 33ms (Views: 15.3ms | ActiveRecord: 5.5ms)
+
+
+Started POST "/admin/sessions" for 127.0.0.1 at 2015-04-30 12:52:22 +0200
+Processing by Spina::Admin::SessionsController#create as HTML
+  Parameters: {"utf8"=>"✓", "authenticity_token"=>"e/VkGDhnEvtyg0RPmOAnSXx8MNb3MO5mNkerf4lT4FKztHssviZ61xtGYwiPZykMQtP5alOVqUA65ZY7+AcIdw==", "email"=>"mail@bramjetten.nl", "password"=>"[FILTERED]", "button"=>""}
+  Spina::User Load (0.3ms)  SELECT  "spina_users".* FROM "spina_users" WHERE "spina_users"."email" = $1  ORDER BY "spina_users"."id" ASC LIMIT 1  [["email", "mail@bramjetten.nl"]]
+  Rendered /Users/bram/apps/spina/app/views/spina/admin/sessions/new.html.haml within layouts/spina/login (1.1ms)
+Completed 200 OK in 16ms (Views: 14.2ms | ActiveRecord: 0.3ms)
+
+
+Started POST "/admin/sessions" for 127.0.0.1 at 2015-04-30 12:52:25 +0200
+Processing by Spina::Admin::SessionsController#create as HTML
+  Parameters: {"utf8"=>"✓", "authenticity_token"=>"qj0BP/q8m0YCxQhgUU08QjVzvp3+SzPZ2MCjeE8aBnlifB4LfP3zamsALydGyjIHC9x3IVrudP/UYp48Pk7uXA==", "email"=>"bram@denkgroot.com", "password"=>"[FILTERED]", "button"=>""}
+  Spina::User Load (0.3ms)  SELECT  "spina_users".* FROM "spina_users" WHERE "spina_users"."email" = $1  ORDER BY "spina_users"."id" ASC LIMIT 1  [["email", "bram@denkgroot.com"]]
+  Rendered /Users/bram/apps/spina/app/views/spina/admin/sessions/new.html.haml within layouts/spina/login (1.2ms)
+Completed 200 OK in 15ms (Views: 13.7ms | ActiveRecord: 0.3ms)
+
+
+Started POST "/admin/sessions" for 127.0.0.1 at 2015-04-30 12:52:30 +0200
+Processing by Spina::Admin::SessionsController#create as HTML
+  Parameters: {"utf8"=>"✓", "authenticity_token"=>"LQSYZ42xX86ZEmDSLZSqYCsTGKKN7chyofoJNoKAESnlRYdTC/A34vDXR5U6E6QlFbzRHilIj1StWDRy89T5DA==", "email"=>"bram@denkgroot.com", "password"=>"[FILTERED]", "button"=>""}
+  Spina::User Load (0.4ms)  SELECT  "spina_users".* FROM "spina_users" WHERE "spina_users"."email" = $1  ORDER BY "spina_users"."id" ASC LIMIT 1  [["email", "bram@denkgroot.com"]]
+  Rendered /Users/bram/apps/spina/app/views/spina/admin/sessions/new.html.haml within layouts/spina/login (2.2ms)
+Completed 200 OK in 32ms (Views: 20.1ms | ActiveRecord: 0.4ms)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 0.6.20
+  version: 0.6.21
 platform: ruby
 authors:
 - Bram Jetten
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -372,6 +372,7 @@ files:
 - app/models/spina/account.rb
 - app/models/spina/attachment.rb
 - app/models/spina/attachment_collection.rb
+- app/models/spina/color.rb
 - app/models/spina/inquiry.rb
 - app/models/spina/layout_part.rb
 - app/models/spina/line.rb
@@ -416,6 +417,7 @@ files:
 - app/views/spina/admin/inquiries/index.html.haml
 - app/views/spina/admin/inquiries/show.html.haml
 - app/views/spina/admin/inquiries/spam.html.haml
+- app/views/spina/admin/layout_partables/_color_form.html.haml
 - app/views/spina/admin/layout_partables/_line_form.html.haml
 - app/views/spina/admin/page_partables/_attachment_collection_form.html.haml
 - app/views/spina/admin/page_partables/_attachment_form.html.haml
@@ -525,9 +527,9 @@ files:
 - db/migrate/20140711154425_add_robots_allowed_to_spina_accounts.rb
 - db/migrate/20140718095419_add_position_to_spina_photo_collections_photos.rb
 - db/migrate/20150402144347_create_structures.rb
+- db/migrate/20150430085527_create_spina_colors.rb
 - db/seeds.rb
 - lib/spina.rb
-- lib/spina/configurable.rb
 - lib/spina/engine.rb
 - lib/spina/plugin.rb
 - lib/spina/theme.rb
@@ -606,6 +608,9 @@ files:
 - test/dummy/db/migrate/20140225151146_add_account_id_to_spina_layout_parts.rb
 - test/dummy/db/migrate/20140407095608_add_active_to_spina_pages.rb
 - test/dummy/db/migrate/20150402144912_create_structures.spina.rb
+- test/dummy/db/migrate/20150430085614_add_robots_allowed_to_spina_accounts.spina.rb
+- test/dummy/db/migrate/20150430085615_add_position_to_spina_photo_collections_photos.spina.rb
+- test/dummy/db/migrate/20150430085616_create_spina_colors.spina.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/log/development.log

data/lib/spina/configurable.rb

@@ -1,7 +0,0 @@
-module Spina
-  module Configurable
-    include ::ActiveSupport::Configurable
-
-    config_accessor :title, :page_parts, :view_templates, :layout_parts, :custom_pages, :plugins, :structures
-  end
-end