spina 0.7.3 → 0.8.0

data/test/dummy/app/assets/stylesheets/demo/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 → demo}/pages/demo.html.haml

@@ -4,27 +4,19 @@
 %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
+- if @page.content(:photo_collection).try(:photos)
+  %ul
+    - @page.content(:photo_collection).photos.each do |photo|
+      %li
+        = image_tag photo.file_url
 
 %h5 Structure
 - if @page.content(:structure).try(:structure_items)
@@ -36,6 +28,3 @@
           = item.content(:title)
         %h6 Description
         = item.content(:description).try(:html_safe)
-
-%h5 Color
-= @page.content(:color)

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

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

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

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

data/test/dummy/app/views/demo/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/demo/application.html.haml

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

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

@@ -1,23 +1,26 @@
-Spina::Engine.configure do
+Spina.configure do |config|
   config.NEGATIVE_CAPTCHA_SECRET = '445e0c9c0cee31f783754bc174661052d1236850da8f5f5ba5e11cbfa56cbaa8bce9260df75feaa56da91949ee4204fefac41c35b3e4f5e0d3e395b00c87781a'
 
   # Important Note
   # ==============
-  #
+
   # You MUST restart your server before changes to this file
   # will take effect.
-  #
+
+  # Specify a backend path. Defaults to /admin.
+  # config.backend_path = 'admin'
+
   # 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
-  #
+
+  # 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"

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

@@ -7,52 +7,14 @@ module Spina
     self.title = 'Default theme'
 
     self.page_parts = [{
-      name:               'line',
-      title:              'Line',
-      page_partable_type: 'Spina::Line'
-    }, {
       name:               'text',
       title:              'Text',
       page_partable_type: 'Spina::Text'
-    }, {
-      name:               'photo',
-      title:              'Photo',
-      page_partable_type: 'Spina::Photo'
-    }, {
-      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:                     'title',
-        title:                    'Title',
-        structure_partable_type:  'Spina::Line'
-      }, {
-        name:                     'description',
-        title:                    'Description',
-        structure_partable_type:  'Spina::Text'
-      }]
-    }
+    self.structures = {}
 
-    self.layout_parts = [{
-      name:               'line',
-      title:              'Line',
-      layout_partable_type: 'Spina::Line'
-    }, {
-      name:               'color',
-      title:              'Color',
-      layout_partable_type: 'Spina::Color'
-    }]
+    self.layout_parts = []
 
     self.view_templates = {
       'homepage' => {
@@ -64,12 +26,6 @@ module Spina
         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']
       }
     }
 
@@ -78,11 +34,6 @@ module Spina
       title:          'Homepage',
       deletable:      false,
       view_template:  'homepage'
-    }, {
-      name:           'demo',
-      title:          'Demo',
-      deletable:      true,
-      view_template:  'demo'
     }]
 
     self.plugins = []

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

@@ -0,0 +1,103 @@
+module Spina
+  module DemoTheme
+    include ::ActiveSupport::Configurable
+
+    config_accessor :title, :page_parts, :view_templates, :layout_parts, :custom_pages, :plugins, :structures
+
+    self.title = 'Demo theme'
+
+    self.page_parts = [{
+      name:               'line',
+      title:              'Line',
+      page_partable_type: 'Spina::Line'
+    }, {
+      name:               'text',
+      title:              'Text',
+      page_partable_type: 'Spina::Text'
+    }, {
+      name:               'photo',
+      title:              'Photo',
+      page_partable_type: 'Spina::Photo'
+    }, {
+      name:               'photo_collection',
+      title:              'Photo collection',
+      page_partable_type: 'Spina::PhotoCollection'
+    }, {
+      name:               'attachment',
+      title:              'Attachment',
+      page_partable_type: 'Spina::Attachment'
+    }, {
+      name:               'attachment_collection',
+      title:              'Attachment collection',
+      page_partable_type: 'Spina::AttachmentCollection'
+    }, {
+      name:               'structure',
+      title:              'Structure',
+      page_partable_type: 'Spina::Structure'
+    }, {
+      name:               'color',
+      title:              'Color',
+      page_partable_type: 'Spina::Color'
+    }]
+
+    self.structures = {
+      'structure' => [{
+        name:                     'title',
+        title:                    'Title',
+        structure_partable_type:  'Spina::Line'
+      }, {
+        name:                     'description',
+        title:                    'Description',
+        structure_partable_type:  'Spina::Text'
+      }]
+    }
+
+    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: ['text']
+      },
+      'show' => {
+        title:        'Default',
+        description:  'A simple page',
+        usage:        'Use for your content',
+        page_parts:   ['text']
+      },
+      'demo' => {
+        title:      'Demo',
+        description: 'Contains examples of every page part',
+        page_parts: ['line', 'text', 'photo', 'photo_collection', 'attachment', 'attachment_collection', 'structure', 'color']
+      }
+    }
+
+    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 = 'demo'
+theme.config = Spina::DemoTheme.config
+Spina.register_theme(theme)

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: 20160108105712) do
+ActiveRecord::Schema.define(version: 20160114085213) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Bram Jetten
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -427,13 +427,18 @@ files:
 - db/seeds.rb
 - lib/generators/spina/install_generator.rb
 - lib/generators/spina/templates/app/assets/stylesheets/default/application.css.sass
-- lib/generators/spina/templates/app/views/default/pages/demo.html.haml
+- lib/generators/spina/templates/app/assets/stylesheets/demo/application.css.sass
 - lib/generators/spina/templates/app/views/default/pages/homepage.html.haml
 - lib/generators/spina/templates/app/views/default/pages/show.html.haml
-- lib/generators/spina/templates/app/views/default/shared/_navigation.html.haml
+- lib/generators/spina/templates/app/views/demo/pages/demo.html.haml
+- lib/generators/spina/templates/app/views/demo/pages/homepage.html.haml
+- lib/generators/spina/templates/app/views/demo/pages/show.html.haml
+- lib/generators/spina/templates/app/views/demo/shared/_navigation.html.haml
 - lib/generators/spina/templates/app/views/layouts/default/application.html.haml
+- lib/generators/spina/templates/app/views/layouts/demo/application.html.haml
 - lib/generators/spina/templates/config/initializers/spina.rb
 - lib/generators/spina/templates/config/initializers/themes/default.rb
+- lib/generators/spina/templates/config/initializers/themes/demo.rb
 - lib/spina.rb
 - lib/spina/carrierwave.rb
 - lib/spina/engine.rb
@@ -445,14 +450,19 @@ files:
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/default/application.css.sass
+- test/dummy/app/assets/stylesheets/demo/application.css.sass
 - test/dummy/app/assets/stylesheets/fonts.css.sass
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/default/pages/demo.html.haml
 - test/dummy/app/views/default/pages/homepage.html.haml
 - test/dummy/app/views/default/pages/show.html.haml
 - test/dummy/app/views/default/shared/_navigation.html.haml
+- test/dummy/app/views/demo/pages/demo.html.haml
+- test/dummy/app/views/demo/pages/homepage.html.haml
+- test/dummy/app/views/demo/pages/show.html.haml
+- test/dummy/app/views/demo/shared/_navigation.html.haml
 - test/dummy/app/views/layouts/default/application.html.haml
+- test/dummy/app/views/layouts/demo/application.html.haml
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/application.yml
@@ -468,6 +478,7 @@ files:
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/spina.rb
 - test/dummy/config/initializers/themes/default.rb
+- test/dummy/config/initializers/themes/demo.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/locales/nl.yml
@@ -481,6 +492,7 @@ files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
+- test/dummy/tmp/restart.txt
 - test/fixtures/spina/accounts.yml
 - test/fixtures/spina/pages.yml
 - test/fixtures/spina/users.yml