spina 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce0f3a20b138822aa726b886e56ff3c317a1f615
-  data.tar.gz: 87bd0136e150c5fee8db38ad272c6c33fe496961
+  metadata.gz: c193166046b26e158282c06d5445c0178dd25c2d
+  data.tar.gz: 791216beeef68374485919c5416b0eec0dd5e739
 SHA512:
-  metadata.gz: 063a6dcd34a0909284461709b8709c6a465d66f853348114bc39a2c1425b62505e0661affe3778b73e3f5763a93f7fae0fe6f9283d679f434cbd3254066f096d
-  data.tar.gz: f493921a5890c4069a0e95b386a6b30d08e92e6605b4e585c4642dfb5ad65b2387cfa085bbfa055aa7f397f595ae4b57c30dcc68ab5d022a066f56d5b5534984
+  metadata.gz: 50b0830bd60b7f9d5f09bf4d0d26cbbb656e8af5415c688c46a68cb1934b79146966dbd1c8d3cfcc9ee9b6825c698d8480ecefeebab305f9a1abd9a9caabd1e8
+  data.tar.gz: 50ef7dea3eb8d1f06c00f189ce57493f56550619e719bfac2b5661349558882445372f193539bced3086dd6540f7a8d0b497dc3161d7d380dc5a3cd240386b46

data/README.md

@@ -26,6 +26,18 @@ The installer will help you setup your first user.
 
 Then start `rails s` and access your admin panel at `/admin`.
 
+## Upgrading from 0.7 to 0.8
+
+Spina-specific configuration moved from `Spina::Engine.config` to just `Spina.config`.
+Change the following in your initializer:
+
+```ruby
+# config/initializers/spina.rb
+
+Spina::Engine.configure do |config| # OLD
+Spina.configure do |config| # NEW
+```
+
 # Basics
 
 The installer generates a few initializers that contain necessary configuration for Spina.

data/app/assets/javascripts/spina/admin/spina.trix.js.coffee

@@ -1,8 +1,6 @@
 window.Spina = {}
 
 Trix.config.blockAttributes = $.extend Trix.config.blockAttributes, {
-  default:
-    tagName: 'p'
   h1:
     tagName: 'h1'
     singleLine: true

data/app/controllers/spina/inquiries_controller.rb

@@ -19,7 +19,7 @@ module Spina
 
     def setup_negative_captcha
       @captcha = NegativeCaptcha.new(
-        secret: Engine.config.NEGATIVE_CAPTCHA_SECRET,
+        secret: Spina.config.NEGATIVE_CAPTCHA_SECRET,
         spinner: request.remote_ip,
         fields: [:email, :message, :name],
         params: params

data/app/helpers/spina/application_helper.rb

@@ -57,7 +57,7 @@ module Spina
 
     def captcha
       NegativeCaptcha.new(
-        secret: Engine.config.NEGATIVE_CAPTCHA_SECRET,
+        secret: Spina.config.NEGATIVE_CAPTCHA_SECRET,
         spinner: request.remote_ip,
         fields: [:email, :message, :name],
         params: params

data/app/models/spina/ability.rb

@@ -12,10 +12,10 @@ module Spina
         can :manage, Account
         can :manage, Inquiry
 
-        # Engine.config.plugins.each do |plugin|
+        # Spina.config.plugins.each do |plugin|
         #   can :manage, "#{plugin.class_name}".constantize
         # end
       end
     end
   end
-end
+end

data/app/uploaders/spina/default_store_uploader.rb

@@ -2,7 +2,7 @@ module Spina
   class DefaultStoreUploader < CarrierWave::Uploader::Base
 
     def store_dir
-      case Engine.config.try(:storage)
+      case Spina.config.storage
       when :s3
         "#{mounted_as}/#{model.class.to_s.underscore}/#{model.id}"
       when :file
@@ -12,4 +12,4 @@ module Spina
       end
     end
   end
-end
+end

data/app/views/spina/admin/attachments/_select.html.haml

@@ -7,12 +7,12 @@
     -# = form_for [spina, :admin, @attachment], html: {multipart: true} do |f|
     -#   = f.file_field :file, data: {customfileinput: true}
 
-    = form_tag spina.insert_admin_attachments_path(params[:page_part_id]), remote: true, class: 'gallery-prepend-attachment' do
+    = form_tag spina.insert_admin_attachments_path(params[:page_part_id]), remote: true, class: 'gallery-prepend-attachment', style: 'margin-bottom: 0' do
       .table-container
         %table.table.table-clickable
           %thead
             %tr
-              %th 
+              %th
               %th= Spina::Attachment.human_attribute_name(:name)
           %tbody
             - @attachments.each do |attachment|

data/app/views/spina/admin/attachments/_select_collection.html.haml

@@ -7,12 +7,12 @@
     -# = form_for [spina, :admin, @attachment], html: {multipart: true} do |f|
     -#   = f.file_field :file, data: {customfileinput: true}
 
-    = form_tag spina.insert_collection_admin_attachments_path(params[:page_part_id]), remote: true, class: 'gallery-prepend-attachment' do
+    = form_tag spina.insert_collection_admin_attachments_path(params[:page_part_id]), remote: true, class: 'gallery-prepend-attachment', style: 'margin-bottom: 0' do
       .table-container
         %table.table.table-clickable
           %thead
             %tr
-              %th 
+              %th
               %th= Spina::Attachment.human_attribute_name(:name)
           %tbody
             - @attachments.each do |attachment|

data/app/views/spina/admin/attachments/index.html.haml

@@ -4,7 +4,7 @@
     .clear-input
       = icon('times-circle')
 
-  %table.table.datatable
+  %table.table
     %thead
       %tr
         %th= Spina::Attachment.human_attribute_name(:name)
@@ -17,4 +17,4 @@
             = f.file_field :file, data: {customfileinput: true}
 
     %tbody.table-prepend-document
-      = render partial: 'spina/admin/attachments/attachment', collection: @attachments
+      = render partial: 'spina/admin/attachments/attachment', collection: @attachments

data/app/views/spina/admin/page_partables/_attachment_collection_form.html.haml

@@ -8,11 +8,13 @@
 
   = attachment_collection_form.fields_for :page_partable, attachment_collection_form.object.page_partable do |form|
     = link_to select_collection_admin_attachments_path(form.object_name), remote: true, class: "media_picker" do
-      - if form.object.attachments.any?
-        - form.object.attachments.each do |attachment|
-          .attachment= attachment.name
-      - else
-        .placeholder
-          %span{data: {icon: 't'}}
+      .clearfix
+        .placeholder.pull-right
+          %span.button.button-small.button-round
+            %i.icon.icon-dots
             = t('spina.choose_from_library')
+        - if form.object.attachments.any?
+          - form.object.attachments.each do |attachment|
+            .attachment= attachment.name
+
       = form.hidden_field :attachment_tokens, value: form.object.attachment_ids.join(",")

data/app/views/spina/admin/page_partables/_attachment_form.html.haml

@@ -7,11 +7,13 @@
   = attachment_form.hidden_field :name
 
   = link_to select_admin_attachments_path(attachment_form.object_name), remote: true, class: "media_picker" do
-    - if attachment_form.object.page_partable && attachment_form.object.page_partable.file.present?
-      .attachment= attachment_form.object.page_partable.name
-    - else
-      .placeholder
-        %span{data: {icon: 't'}}
+    .clearfix
+      .placeholder.pull-right
+        %span.button.button-small.button-round
+          %i.icon.icon-dots
           = t('spina.choose_from_library')
 
-    = attachment_form.hidden_field :page_partable_id
+      - if attachment_form.object.page_partable && attachment_form.object.page_partable.file.present?
+        .attachment= attachment_form.object.page_partable.name
+
+    = attachment_form.hidden_field :page_partable_id

data/app/views/spina/admin/sessions/new.html.haml

@@ -4,6 +4,6 @@
     .notification.notification-danger
       .icon.icon-cross
       = flash[:alert]
-  = text_field_tag :email, params[:email], placeholder: Spina::User.human_attribute_name(:email)
+  = text_field_tag :email, params[:email], placeholder: Spina::User.human_attribute_name(:email), autofocus: true
   = password_field_tag :password, nil, placeholder: Spina::User.human_attribute_name(:password)
   = button_tag t('spina.login'), class: 'button button-primary', data: {icon: '3'}

data/config/routes.rb

@@ -1,7 +1,7 @@
 Spina::Engine.routes.draw do
 
   # Backend
-  namespace :admin do
+  namespace :admin, path: Spina.config.backend_path do
     root to: "pages#index"
 
     resource :account do
@@ -85,5 +85,9 @@ Spina::Engine.routes.draw do
 
   # get ':materialized_pathroot/:subpage/:id' => "pages#show", as: "third_level_page"
   # get ':root/:id' => "pages#show", as: "subpage"
-  get '/*id' => "pages#show", as: "page", controller: 'pages'
+  get '/*id' => 'pages#show', as: "page", controller: 'pages', constraints: lambda { |request|
+    !(Rails.env.development? && request.env['PATH_INFO'].starts_with?('/rails/'))
+  }
+
 end
+

data/db/seeds.rb

@@ -1,21 +1,2 @@
 puts "Seeding #{__FILE__} from Spina::Engine"
 
-current_theme = ::Spina.themes.detect{ |theme| theme.name == Spina::Account.first.theme }
-if (page = Spina::Page.find_by(name: 'demo'))
-  page.page_parts.clear
-  parts = current_theme.config.page_parts.map { |page_part| page.page_part(page_part) }
-  parts.each do |part|
-    case part.partable_type
-    when 'Spina::Line' then part.partable.content = 'This is a single line'
-    when 'Spina::Text' then part.partable.content = '<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>'
-    when 'Spina::Photo' then part.partable.remote_file_url = 'https://unsplash.it/300/200?random'
-    when 'Spina::PhotoCollection'
-      5.times { part.partable.photos.build(remote_file_url: 'https://unsplash.it/300/200?random') }
-    # when 'Spina::Structure'
-    #   part.partable.structure_items.build({ name: 'title', title: 'Title', structure_partable_type: 'Spina::Line' })
-    #   part.partable.structure_items.build({ name: 'description', title: 'Description', structure_partable_type:  'Spina::Text' })
-    when 'Spina::Color' then part.partable.content = '#6865b4'
-    end
-  end
-  page.save
-end

data/lib/generators/spina/install_generator.rb

@@ -1,13 +1,15 @@
 module Spina
   class InstallGenerator < Rails::Generators::Base
+
     source_root File.expand_path("../templates", __FILE__)
 
     def create_initializer_file
       template 'config/initializers/spina.rb'
     end
 
-    def create_theme_initializer
-      template 'config/initializers/themes/default.rb'
+    def add_route
+      return if Rails.application.routes.routes.detect { |route| route.app.app == Spina::Engine }
+      route "mount Spina::Engine => '/'"
     end
 
     def copy_migrations
@@ -18,22 +20,35 @@ module Spina
       rake 'db:migrate'
     end
 
-    def copy_views
-      template 'app/assets/stylesheets/default/application.css.sass'
-      template 'app/views/layouts/default/application.html.haml'
-      template 'app/views/default/shared/_navigation.html.haml'
-      template 'app/views/default/pages/homepage.html.haml'
-      template 'app/views/default/pages/show.html.haml'
-    end
-
     def create_account
+      return if Account.exists? && !no?('An account already exists. Skip? [Yn]')
       name = ask('What would you like to name your website?')
-      Account.create name: name, theme: 'default'
+      account = Account.first_or_create.update_attribute(:name, name)
+    end
+
+    def set_theme
+      account = Account.first
+      return if account.theme.present? && !no?("Theme '#{account.theme} is set. Skip? [Yn]")
+
+      theme = begin
+                theme = account.theme || 'default'
+                theme = ask("What theme do you want to use? (default/demo) [#{theme}]").presence || theme
+              end until theme.in? ['default', 'demo']
+
+      account.update_attribute(:theme, theme)
+
+      template "config/initializers/themes/#{theme}.rb"
+      directory "app/assets/stylesheets/#{theme}"
+      directory "app/views/#{theme}"
+      directory "app/views/layouts/#{theme}"
+      directory "app/views/layouts/#{theme}"
     end
 
+
     def create_user
+      return if User.exists? && !no?('A user already exists. Skip? [Yn]')
       email = ask('Please enter an email address for your first user:')
-      password = ask('Create a temporary password:')
+      password = ask('Create a temporary password:', echo: false)
       User.create name: 'admin', email: email, password: password, admin: true
     end
 
@@ -41,8 +56,30 @@ module Spina
       rake 'spina:bootstrap'
     end
 
-    def add_route
-      route "mount Spina::Engine => '/'"
+    def seed_demo_content
+      theme_name = Account.first.theme
+      if theme_name == 'demo' && !no?('Seed example content? [Yn]')
+
+        current_theme = ::Spina.themes.find { |theme| theme.name == theme_name }
+        if (page = Spina::Page.find_by(name: 'demo'))
+          page.page_parts.clear
+          parts = current_theme.config.page_parts.map { |page_part| page.page_part(page_part) }
+          parts.each do |part|
+            case part.partable_type
+            when 'Spina::Line' then part.partable.content = 'This is a single line'
+            when 'Spina::Text' then part.partable.content = '<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>'
+            when 'Spina::Photo' then part.partable.remote_file_url = 'https://unsplash.it/300/200?random'
+            when 'Spina::PhotoCollection'
+              5.times { part.partable.photos.build(remote_file_url: 'https://unsplash.it/300/200?random') }
+            # when 'Spina::Structure'
+            #   part.partable.structure_items.build({ name: 'title', title: 'Title', structure_partable_type: 'Spina::Line' })
+            #   part.partable.structure_items.build({ name: 'description', title: 'Description', structure_partable_type:  'Spina::Text' })
+            when 'Spina::Color' then part.partable.content = '#6865b4'
+            end
+          end
+          page.save
+        end
+      end
     end
 
   end

data/lib/generators/spina/templates/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

data/lib/generators/spina/templates/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