Color model

forrestfinch · Apr 30, 2015 · 0dc4734 · 0dc4734
1 parent 2cd4f0c
commit 0dc4734
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 24 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spina (0.6.19)
+    spina (0.6.20)
       ancestry (~> 2.1, >= 2.1.0)
       bcrypt-ruby (~> 3.1)
       bourbon (~> 3.2, >= 3.2.1)
@@ -118,7 +118,7 @@ GEM
     friendly_id (5.1.0)
       activerecord (>= 4.0.0)
     gem-release (0.7.3)
-    globalid (0.3.3)
+    globalid (0.3.5)
       activesupport (>= 4.1.0)
     haml (4.0.6)
       tilt

diff --git a/app/models/spina/color.rb b/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
diff --git a/app/views/spina/admin/layout_partables/_color_form.html.haml b/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
diff --git a/app/views/spina/admin/layout_partables/_line_form.html.haml b/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
diff --git a/db/migrate/20150430085527_create_spina_colors.rb b/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
diff --git a/lib/spina/configurable.rb b/lib/spina/configurable.rb
diff --git a/test/dummy/config/database.yml b/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
diff --git a/test/dummy/config/initializers/spina.rb b/test/dummy/config/initializers/spina.rb
@@ -4,7 +4,9 @@
 
 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"
 

diff --git a/test/dummy/db/migrate/20150430085614_add_robots_allowed_to_spina_accounts.spina.rb b/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
diff --git a/test/dummy/db/migrate/20150430085615_add_position_to_spina_photo_collections_photos.spina.rb b/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
diff --git a/test/dummy/db/migrate/20150430085616_create_spina_colors.spina.rb b/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
diff --git a/test/dummy/db/schema.rb b/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 @@
     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"