spina 0.7.0 → 0.7.2

data/lib/spina/engine.rb

@@ -13,6 +13,7 @@ require 'negative_captcha'
 require 'filters_spam'
 require 'ancestry'
 require 'breadcrumbs_on_rails'
+require 'kaminari'
 
 module Spina
   class Engine < ::Rails::Engine

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "0.7.0"
+  VERSION = "0.7.2"
 end

data/test/dummy/app/assets/stylesheets/default/application.css.sass

@@ -0,0 +1,66 @@
+// require normalize.css
+
+// $color-primary: #6865b4
+$color-link: #0275d8
+
+html
+  font-size: 16px
+
+body
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif
+  font-size: 1rem
+  line-height: 1.5
+
+h1, h2, h3, h4, h5, h6
+  margin-top: 0
+  margin-bottom: 0.5rem
+
+h1
+  font-size: 2.5rem
+h2
+  font-size: 2rem
+h3
+  font-size: 1.75rem
+h4
+  font-size: 1.5rem
+h5
+  font-size: 1.25rem
+h6
+  font-size: 1rem
+
+p
+  margin-top: 0
+  margin-bottom: 1rem
+
+ul, ol
+  margin-top: 0
+  margin-bottom: 1rem
+
+img
+  vertical-align: middle
+
+a
+  color: $color-link
+  text-decoration: none
+
+  &:hover, &:focus
+    color: darken($color-link, 15%)
+    text-decoration: underline
+
+.container
+  width: 960px
+  margin: 0 auto
+
+.nav
+  padding-left: 0
+  margin-bottom: 2rem
+  list-style: none
+
+.nav-item
+  display: inline-block
+
+.nav-item + .nav-item
+  margin-left: 20px
+
+.nav-item.active > a
+  text-decoration: underline

data/test/dummy/app/views/default/pages/demo.html.haml

@@ -0,0 +1,41 @@
+%h1
+  = @page.title
+
+%h5 Line
+%p
+  = @page.content(:line)
+
+%hr
+
+%h5 Content
+= @page.content(:text).try(:html_safe)
+
+%hr
+
+%h5 Photo
+%p
+  = image_tag @page.content(:photo).try(:file_url)
+
+%hr
+
+%h5 Photo collection
+%p
+  - @page.content(:photo_collection).photos.each do |photo|
+    %span
+      = image_tag photo.file_url
+
+%hr
+
+%h5 Structure
+- if @page.content(:structure).try(:structure_items)
+  %ul
+    - @page.content(:structure).structure_items.each do |item|
+      %li
+        %h6 Title
+        %p
+          = item.content(:title)
+        %h6 Description
+        = item.content(:description).try(:html_safe)
+
+%h5 Color
+= @page.content(:color)

data/test/dummy/app/views/default/pages/homepage.html.haml

@@ -0,0 +1,2 @@
+%h1= @page.title
+= @page.content(:content).try(:html_safe)

data/test/dummy/app/views/default/pages/show.html.haml

@@ -0,0 +1,3 @@
+%h1= @page.title
+= @page.content(:content).try(:html_safe)
+

data/test/dummy/app/views/default/shared/_navigation.html.haml

@@ -0,0 +1,5 @@
+- pages = current_user.present? ? Spina::Page.active : Spina::Page.live
+- menu = Spina::Pages::MenuPresenter.new(pages.in_menu.arrange(order: :position), self, @page)
+- menu.list_class = 'nav'
+- menu.list_item_css = 'nav-item'
+= menu.to_html

data/test/dummy/app/views/layouts/default/application.html.haml

@@ -0,0 +1,11 @@
+!!!
+%html
+  %head
+    %title= current_account.name
+    = stylesheet_link_tag    'default/application', media: 'all', 'data-turbolinks-track' => true
+    = javascript_include_tag 'application', 'data-turbolinks-track' => true
+    = csrf_meta_tags
+  %body
+    .container
+      = render 'default/shared/navigation'
+      = yield

data/test/dummy/config/application.rb

@@ -44,7 +44,7 @@ module Dummy
     # config.active_record.schema_format = :sql
 
     # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    config.assets.version = '1.01'
 
     config.active_record.raise_in_transactional_callbacks = true
   end

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

@@ -1,4 +1,30 @@
 Spina::Engine.configure do
   config.NEGATIVE_CAPTCHA_SECRET = '445e0c9c0cee31f783754bc174661052d1236850da8f5f5ba5e11cbfa56cbaa8bce9260df75feaa56da91949ee4204fefac41c35b3e4f5e0d3e395b00c87781a'
+
+  # Important Note
+  # ==============
+  #
+  # You MUST restart your server before changes to this file
+  # will take effect.
+  #
+  # Storage Options
+  # ===============
+  #
+  # Please specify how you want to store photos, your logo, and
+  # other files. We use CarrierWave for storage. See
+  # https://github.com/denkGroot/Spina/tree/master/app/uploaders/spina
+  #
   config.storage = :file
+  #
+  # If you want to use s3 to store uploads (recommended)
+  #
+  # config.storage = :s3
+  # config.aws_region = "eu-west-1"
+  # config.aws_access_key_id = "abc123"
+  # config.aws_secret_key = "abc123"
+  # config.s3_bucket = "mybucket"
+  # If you want to store your files localy (not recommended for
+  # production, in large part because it's more difficult to ensure
+  # that files are backed up in sync with your database):
+
 end

data/test/dummy/config/initializers/themes/default.rb

@@ -4,61 +4,93 @@ module Spina
 
     config_accessor :title, :page_parts, :view_templates, :layout_parts, :custom_pages, :plugins, :structures
 
-    self.title = "Default theme"
+    self.title = 'Default theme'
 
-    self.page_parts = [{ 
-      name: 'content', 
-      title: 'Content', 
-      page_partable_type: "Spina::Text" 
+    self.page_parts = [{
+      name:               'line',
+      title:              'Line',
+      page_partable_type: 'Spina::Line'
     }, {
-      name: "structure",
-      title: "Structuur",
-      page_partable_type: "Spina::Structure"
+      name:               'text',
+      title:              'Text',
+      page_partable_type: 'Spina::Text'
     }, {
-      name: 'photo',
-      title: "Foto",
-      page_partable_type: "Spina::Photo"
+      name:               'photo',
+      title:              'Photo',
+      page_partable_type: 'Spina::Photo'
     }, {
-      name: 'photo_collection',
-      title: "Foto collection",
-      page_partable_type: "Spina::PhotoCollection"
+      name:               'photo_collection',
+      title:              'Photo collection',
+      page_partable_type: 'Spina::PhotoCollection'
+    }, {
+      name:               'structure',
+      title:              'Structure',
+      page_partable_type: 'Spina::Structure'
+    }, {
+      name:               'color',
+      title:              'Color',
+      page_partable_type: 'Spina::Color'
     }]
 
     self.structures = {
       'structure' => [{
-        name: 'name',
-        title: 'Naam',
-        structure_partable_type: "Spina::Line"
+        name:                     'title',
+        title:                    'Title',
+        structure_partable_type:  'Spina::Line'
       }, {
-        name: 'description',
-        title: "Description",
-        structure_partable_type: "Spina::Text"  
+        name:                     'description',
+        title:                    'Description',
+        structure_partable_type:  'Spina::Text'
       }]
     }
-    self.layout_parts = []
-    self.custom_pages = []
-    self.plugins = []
+
+    self.layout_parts = [{
+      name:               'line',
+      title:              'Line',
+      layout_partable_type: 'Spina::Line'
+    }, {
+      name:               'color',
+      title:              'Color',
+      layout_partable_type: 'Spina::Color'
+    }]
 
     self.view_templates = {
       'homepage' => {
-        title: 'Homepage',
-        page_parts: ['content']
+        title:      'Homepage',
+        page_parts: ['text']
       },
       'show' => {
-        title: 'Default',
-        description: 'A simple page',
-        usage: 'Use for your content',
-        page_parts: ['content', 'structure', 'photo', 'photo_collection']
+        title:        'Default',
+        description:  'A simple page',
+        usage:        'Use for your content',
+        page_parts:   ['text']
+      },
+      'demo' => {
+        title:        'Demo',
+        description:  'Example page',
+        usage:        'Shows the usage of several page parts',
+        page_parts:   ['line', 'text', 'photo', 'photo_collection', 'structure', 'color']
       }
     }
 
-    self.custom_pages = [
-      { name: 'homepage', title: 'Homepage', deletable: false, view_template: 'homepage' }
-    ]
+    self.custom_pages = [{
+      name:           'homepage',
+      title:          'Homepage',
+      deletable:      false,
+      view_template:  'homepage'
+    }, {
+      name:           'demo',
+      title:          'Demo',
+      deletable:      true,
+      view_template:  'demo'
+    }]
+
+    self.plugins = []
+
   end
 end
 
 theme = Spina::Theme.new
-theme.name = "default"
+theme.name = 'default'
 theme.config = Spina::DefaultTheme.config
 Spina.register_theme(theme)

data/test/dummy/db/migrate/20160114085213_create_spina_tables.spina.rb

@@ -0,0 +1,167 @@
+# This migration comes from spina (originally 20150507135428)
+class CreateSpinaTables < ActiveRecord::Migration
+  def change
+    create_table "spina_accounts", force: :cascade do |t|
+      t.string   "name"
+      t.string   "address"
+      t.string   "postal_code"
+      t.string   "city"
+      t.string   "phone"
+      t.string   "email"
+      t.text     "preferences"
+      t.string   "logo"
+      t.datetime "created_at",                     null: false
+      t.datetime "updated_at",                     null: false
+      t.string   "kvk_identifier"
+      t.string   "vat_identifier"
+      t.boolean  "robots_allowed", default: false
+    end
+
+    create_table "spina_attachment_collections", force: :cascade do |t|
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+    end
+
+    create_table "spina_attachment_collections_attachments", force: :cascade do |t|
+      t.integer "attachment_collection_id"
+      t.integer "attachment_id"
+    end
+
+    create_table "spina_attachments", force: :cascade do |t|
+      t.string   "file"
+      t.datetime "created_at", null: false
+      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"
+      t.string   "phone"
+      t.text     "message"
+      t.boolean  "archived",   default: false
+      t.datetime "created_at",                 null: false
+      t.datetime "updated_at",                 null: false
+      t.boolean  "spam"
+    end
+
+    create_table "spina_layout_parts", force: :cascade do |t|
+      t.string   "title"
+      t.string   "name"
+      t.integer  "layout_partable_id"
+      t.string   "layout_partable_type"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.integer  "account_id"
+    end
+
+    create_table "spina_lines", force: :cascade do |t|
+      t.string   "content"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    create_table "spina_page_parts", force: :cascade do |t|
+      t.string   "title"
+      t.string   "name"
+      t.datetime "created_at",         null: false
+      t.datetime "updated_at",         null: false
+      t.integer  "page_id"
+      t.integer  "page_partable_id"
+      t.string   "page_partable_type"
+    end
+
+    create_table "spina_pages", force: :cascade do |t|
+      t.string   "title"
+      t.string   "menu_title"
+      t.string   "description"
+      t.boolean  "show_in_menu",        default: true
+      t.string   "slug"
+      t.boolean  "deletable",           default: true
+      t.datetime "created_at",                          null: false
+      t.datetime "updated_at",                          null: false
+      t.string   "name"
+      t.string   "seo_title"
+      t.boolean  "skip_to_first_child", default: false
+      t.string   "view_template"
+      t.string   "layout_template"
+      t.boolean  "draft",               default: false
+      t.string   "link_url"
+      t.string   "ancestry"
+      t.integer  "position"
+      t.string   "materialized_path"
+      t.boolean  "active",              default: true
+    end
+
+    create_table "spina_photo_collections", force: :cascade do |t|
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+    end
+
+    create_table "spina_photo_collections_photos", force: :cascade do |t|
+      t.integer "photo_collection_id"
+      t.integer "photo_id"
+      t.integer "position"
+    end
+
+    create_table "spina_photos", force: :cascade do |t|
+      t.string   "file"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+    end
+
+    create_table "spina_structure_items", force: :cascade do |t|
+      t.integer  "structure_id"
+      t.integer  "position"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    add_index "spina_structure_items", ["structure_id"], name: "index_spina_structure_items_on_structure_id", using: :btree
+
+    create_table "spina_structure_parts", force: :cascade do |t|
+      t.integer  "structure_item_id"
+      t.integer  "structure_partable_id"
+      t.string   "structure_partable_type"
+      t.string   "name"
+      t.string   "title"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    add_index "spina_structure_parts", ["structure_item_id"], name: "index_spina_structure_parts_on_structure_item_id", using: :btree
+    add_index "spina_structure_parts", ["structure_partable_id"], name: "index_spina_structure_parts_on_structure_partable_id", using: :btree
+
+    create_table "spina_structures", force: :cascade do |t|
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    create_table "spina_texts", force: :cascade do |t|
+      t.text     "content"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    create_table "spina_users", force: :cascade do |t|
+      t.string   "name"
+      t.string   "email"
+      t.string   "password_digest"
+      t.boolean  "admin",           default: false
+      t.datetime "created_at",                      null: false
+      t.datetime "updated_at",                      null: false
+      t.datetime "last_logged_in"
+    end
+
+    create_table "spina_rewrite_rules", force: :cascade do |t|
+      t.string :old_path
+      t.string :new_path
+      t.timestamps
+    end
+  end
+end