spina 0.7.3 → 0.8.0

data/lib/generators/spina/templates/app/views/demo/pages/homepage.html.haml

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

data/lib/generators/spina/templates/app/views/demo/pages/show.html.haml

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

data/lib/generators/spina/templates/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/lib/generators/spina/templates/config/initializers/spina.rb

@@ -1,23 +1,26 @@
-Spina::Engine.configure do
-  config.NEGATIVE_CAPTCHA_SECRET = '<%= SecureRandom.hex(64) %>'
+Spina.configure do |config|
+  config.NEGATIVE_CAPTCHA_SECRET = '<%= Spina.config.try(:NEGATIVE_CAPTCHA_SECRET) || SecureRandom.hex(64) %>'
 
   # 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/lib/generators/spina/templates/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/lib/generators/spina/templates/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/lib/spina.rb

@@ -1,2 +1,49 @@
-require "spina/engine"
-require "spina/template"
+require 'spina/engine'
+require 'spina/template'
+
+module Spina
+
+  include ActiveSupport::Configurable
+
+  config_accessor :backend_path, :storage
+
+  self.backend_path = 'admin'
+
+  self.storage = :file
+
+  class << self
+
+    @@themes = []
+    @@plugins = []
+
+    def register_theme(theme)
+      @@themes << theme
+    end
+
+    def theme(theme_name)
+      @@themes.find { |theme| theme.name == theme_name }
+    end
+
+    def themes
+      @@themes
+    end
+
+    def register_plugin(plugin)
+      @@plugins << plugin
+    end
+
+    def plugin(plugin_name)
+      @@plugins.find { |plugin| plugin.name == plugin_name }
+    end
+
+    def plugins(plugin_type = :all)
+      case plugin_type
+      when :website_resource
+        @@plugins.find_all { |plugin| plugin.config.plugin_type == 'website_resource' }
+      else
+        @@plugins
+      end
+    end
+
+  end
+end

data/lib/spina/engine.rb

@@ -20,35 +20,22 @@ module Spina
 
     isolate_namespace Spina
 
-    def self.require_decorators
-      [Rails.root].flatten.map { |p| Dir[p.join('app', 'decorators', '**', '*_decorator.rb')]}.flatten.uniq.each do |decorator|
-        Rails.configuration.cache_classes ? require(decorator) : load(decorator)
-      end
-    end
-
-    initializer "spina.configure_carrierwave" do
-      configure_carrierwave
-    end
-
-    config.to_prepare &method(:require_decorators).to_proc
     config.autoload_paths += %W( #{config.root}/lib )
     config.assets.paths << config.root.join('vendor', 'assets')
 
-    private
-
-    def configure_carrierwave
+    initializer 'spina.configure_carrierwave' do
       CarrierWave.configure do |cfg|
-        if Engine.config.try(:storage) == :s3
+        if Spina.config.storage == :s3
           cfg.storage = :fog
           cfg.fog_credentials = {
-            provider: 'AWS',
-            region: Engine.config.aws_region,
-            aws_access_key_id: Engine.config.aws_access_key_id,
-            aws_secret_access_key: Engine.config.aws_secret_key
+            provider:               'AWS',
+            region:                 Spina.config.aws_region,
+            aws_access_key_id:      Spina.config.aws_access_key_id,
+            aws_secret_access_key:  Spina.config.aws_secret_key
           }
-          cfg.fog_directory  = Engine.config.s3_bucket
+          cfg.fog_directory  = Spina.config.s3_bucket
           cfg.fog_public     = true
-          cfg.fog_attributes = {'Cache-Control'=>'max-age=315576000'}
+          cfg.fog_attributes = { 'Cache-Control' => 'max-age=315576000' }
         else
           cfg.storage = :file
         end
@@ -56,39 +43,12 @@ module Spina
         cfg.enable_processing = !Rails.env.test?
       end
     end
-  end
-
-  class << self
-    @@themes = []
-    @@plugins = []
-
-    def register_theme(theme)
-      @@themes << theme
-    end
 
-    def theme(theme_name)
-      @@themes.find { |theme| theme.name == theme_name }
-    end
-
-    def themes
-      @@themes
-    end
-
-    def register_plugin(plugin)
-      @@plugins << plugin
-    end
-
-    def plugin(plugin_name)
-      @@plugins.find { |plugin| plugin.name == plugin_name }
-    end
-
-    def plugins(plugin_type = :all)
-      case plugin_type
-      when :website_resource
-        @@plugins.find_all { |plugin| plugin.config.plugin_type == 'website_resource' }
-      else
-        @@plugins
+    config.to_prepare do
+      [Rails.root].flatten.map { |p| Dir[p.join('app', 'decorators', '**', '*_decorator.rb')]}.flatten.uniq.each do |decorator|
+        Rails.configuration.cache_classes ? require(decorator) : load(decorator)
       end
     end
+
   end
 end

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

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

@@ -1,66 +0,0 @@
-// 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