spina 0.11.1 → 0.12.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Bram Jetten
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -137,20 +137,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cancancan
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: ancestry
   requirement: !ruby/object:Gem::Requirement
@@ -213,14 +199,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta1
+        version: 5.1.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta1
+        version: 5.1.0.beta2
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
   requirement: !ruby/object:Gem::Requirement
@@ -236,33 +222,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
-  name: bourbon
+  name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: neat
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '4.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 description: CMS
 email:
 - bram@denkgroot.com
@@ -312,6 +284,7 @@ files:
 - app/assets/icons/spina/large-check.svg
 - app/assets/icons/spina/link.svg
 - app/assets/icons/spina/list-ul.svg
+- app/assets/icons/spina/lock.svg
 - app/assets/icons/spina/mail-outline.svg
 - app/assets/icons/spina/mail.svg
 - app/assets/icons/spina/media-library.svg
@@ -341,11 +314,8 @@ files:
 - app/assets/images/spina/danger-zone-ribbon.png
 - app/assets/images/spina/datepicker.png
 - app/assets/images/spina/divider.png
-- app/assets/images/spina/marker.png
-- app/assets/images/spina/mask.png
 - app/assets/images/spina/spina.png
 - app/assets/images/spina/spina_small.png
-- app/assets/images/spina/wheel.png
 - app/assets/javascripts/spina/admin/account.coffee
 - app/assets/javascripts/spina/admin/application.coffee.erb
 - app/assets/javascripts/spina/admin/confirm_delete.coffee.erb
@@ -364,16 +334,15 @@ files:
 - app/assets/stylesheets/spina.sass
 - app/assets/stylesheets/spina/_admin_editing.sass
 - app/assets/stylesheets/spina/_buttons.sass
-- app/assets/stylesheets/spina/_cards.sass
 - app/assets/stylesheets/spina/_configuration.sass
 - app/assets/stylesheets/spina/_custom_animations.sass
-- app/assets/stylesheets/spina/_farbtastic.sass
 - app/assets/stylesheets/spina/_fonts.sass
 - app/assets/stylesheets/spina/_forms.sass
 - app/assets/stylesheets/spina/_gallery.sass
 - app/assets/stylesheets/spina/_ics_spina.scss
 - app/assets/stylesheets/spina/_labels.sass
 - app/assets/stylesheets/spina/_login.sass
+- app/assets/stylesheets/spina/_mixins.sass
 - app/assets/stylesheets/spina/_modal.sass
 - app/assets/stylesheets/spina/_normalize.scss
 - app/assets/stylesheets/spina/_notifications.sass
@@ -381,17 +350,15 @@ files:
 - app/assets/stylesheets/spina/_tables.sass
 - app/assets/stylesheets/spina/_trix.sass
 - app/assets/stylesheets/spina/_wizard.sass
-- app/assets/stylesheets/spina/_wysihtml5.sass
 - app/assets/stylesheets/spina/admin/application.sass
 - app/assets/stylesheets/spina/application.sass
-- app/assets/stylesheets/spina/wysihtml5_textarea.sass
 - app/controllers/concerns/spina/frontend.rb
 - app/controllers/spina/admin/accounts_controller.rb
 - app/controllers/spina/admin/admin_controller.rb
 - app/controllers/spina/admin/attachments_controller.rb
 - app/controllers/spina/admin/navigations_controller.rb
-- app/controllers/spina/admin/page_parts_controller.rb
 - app/controllers/spina/admin/pages_controller.rb
+- app/controllers/spina/admin/password_resets_controller.rb
 - app/controllers/spina/admin/photos_controller.rb
 - app/controllers/spina/admin/sessions_controller.rb
 - app/controllers/spina/admin/users_controller.rb
@@ -400,19 +367,20 @@ files:
 - app/controllers/spina/sitemaps_controller.rb
 - app/helpers/spina/admin/admin_helper.rb
 - app/helpers/spina/admin/pages_helper.rb
-- app/helpers/spina/application_helper.rb
+- app/mailers/spina/user_mailer.rb
+- app/models/concerns/spina/optionable.rb
 - app/models/concerns/spina/part.rb
 - app/models/concerns/spina/partable.rb
-- app/models/spina/ability.rb
+- app/models/concerns/spina/photo_collectable.rb
 - app/models/spina/account.rb
 - app/models/spina/application_record.rb
 - app/models/spina/attachment.rb
 - app/models/spina/attachment_collection.rb
-- app/models/spina/color.rb
 - app/models/spina/layout_part.rb
 - app/models/spina/line.rb
 - app/models/spina/navigation.rb
 - app/models/spina/navigation_item.rb
+- app/models/spina/option.rb
 - app/models/spina/page.rb
 - app/models/spina/page_part.rb
 - app/models/spina/photo.rb
@@ -424,7 +392,6 @@ files:
 - app/models/spina/structure_part.rb
 - app/models/spina/text.rb
 - app/models/spina/user.rb
-- app/presenters/spina/pages/breadcrumb.rb
 - app/presenters/spina/pages/menu_presenter.rb
 - app/uploaders/spina/default_store_uploader.rb
 - app/uploaders/spina/file_uploader.rb
@@ -433,8 +400,8 @@ files:
 - app/views/layouts/spina/admin/admin.html.haml
 - app/views/layouts/spina/admin/media_library.html.haml
 - app/views/layouts/spina/admin/pages.html.haml
-- app/views/layouts/spina/email.html.erb
 - app/views/layouts/spina/login.html.haml
+- app/views/layouts/spina/mail.html.erb
 - app/views/spina/admin/accounts/_form.html.haml
 - app/views/spina/admin/accounts/analytics.html.haml
 - app/views/spina/admin/accounts/edit.html.haml
@@ -451,7 +418,6 @@ files:
 - app/views/spina/admin/attachments/insert_collection.js.coffee
 - app/views/spina/admin/attachments/select.js.erb
 - app/views/spina/admin/attachments/select_collection.js.erb
-- app/views/spina/admin/layout_partables/colors/_form.html.haml
 - app/views/spina/admin/layout_partables/lines/_form.html.haml
 - app/views/spina/admin/navigations/_navigation_item_nested_list.html.haml
 - app/views/spina/admin/navigations/_page.html.haml
@@ -459,15 +425,12 @@ files:
 - app/views/spina/admin/navigations/show.html.haml
 - app/views/spina/admin/page_partables/attachment_collections/_form.html.haml
 - app/views/spina/admin/page_partables/attachments/_form.html.haml
-- app/views/spina/admin/page_partables/colors/_form.html.haml
 - app/views/spina/admin/page_partables/lines/_form.html.haml
+- app/views/spina/admin/page_partables/options/_form.html.haml
 - app/views/spina/admin/page_partables/photo_collections/_form.html.haml
 - app/views/spina/admin/page_partables/photos/_form.html.haml
 - app/views/spina/admin/page_partables/structures/_form.html.haml
 - app/views/spina/admin/page_partables/texts/_form.html.haml
-- app/views/spina/admin/page_parts/_wysihtml5_link.html.haml
-- app/views/spina/admin/page_parts/insert_wysihtml5_link.js
-- app/views/spina/admin/page_parts/wysihtml5_link.js
 - app/views/spina/admin/pages/_form.html.haml
 - app/views/spina/admin/pages/_form_advanced.html.haml
 - app/views/spina/admin/pages/_form_page_content.html.haml
@@ -479,6 +442,8 @@ files:
 - app/views/spina/admin/pages/index.html.haml
 - app/views/spina/admin/pages/new.html.haml
 - app/views/spina/admin/pages/update.js.coffee
+- app/views/spina/admin/password_resets/edit.html.haml
+- app/views/spina/admin/password_resets/new.html.haml
 - app/views/spina/admin/photos/_photo.html.haml
 - app/views/spina/admin/photos/_photo_collection.html.haml
 - app/views/spina/admin/photos/_photo_collection_select.html.haml
@@ -487,10 +452,8 @@ files:
 - app/views/spina/admin/photos/_photo_select.html.haml
 - app/views/spina/admin/photos/_photo_single_picker.html.haml
 - app/views/spina/admin/photos/_photo_uploaded.html.haml
-- app/views/spina/admin/photos/_wysihtml5_select.html.haml
+- app/views/spina/admin/photos/_trix_select.html.haml
 - app/views/spina/admin/photos/create.js.erb
-- app/views/spina/admin/photos/create_and_select.js.erb
-- app/views/spina/admin/photos/create_multiple.js.erb
 - app/views/spina/admin/photos/index.html.haml
 - app/views/spina/admin/photos/index.js.erb
 - app/views/spina/admin/photos/insert_photo.js.erb
@@ -500,9 +463,9 @@ files:
 - app/views/spina/admin/photos/photo_collection_select.js.erb
 - app/views/spina/admin/photos/photo_select.js.erb
 - app/views/spina/admin/photos/single_picker_infinite_scroll.js.erb
-- app/views/spina/admin/photos/wysihtml5_infinite_scroll.js.erb
-- app/views/spina/admin/photos/wysihtml5_insert.js.coffee
-- app/views/spina/admin/photos/wysihtml5_select.js.erb
+- app/views/spina/admin/photos/trix_infinite_scroll.js.erb
+- app/views/spina/admin/photos/trix_insert.js.erb
+- app/views/spina/admin/photos/trix_select.js.erb
 - app/views/spina/admin/sessions/new.html.haml
 - app/views/spina/admin/shared/_breadcrumbs.html.haml
 - app/views/spina/admin/shared/_notifications.html.haml
@@ -510,6 +473,7 @@ files:
 - app/views/spina/admin/shared/_rich_text_field.html.haml
 - app/views/spina/admin/structure_items/_fields.html.haml
 - app/views/spina/admin/structure_partables/lines/_form.html.haml
+- app/views/spina/admin/structure_partables/options/_form.html.haml
 - app/views/spina/admin/structure_partables/photo_collections/_form.html.haml
 - app/views/spina/admin/structure_partables/photos/_form.html.haml
 - app/views/spina/admin/structure_partables/texts/_form.html.haml
@@ -524,6 +488,8 @@ files:
 - app/views/spina/shared/_navigation.html.haml
 - app/views/spina/shared/_social.html.haml
 - app/views/spina/sitemaps/show.xml.builder
+- app/views/spina/user_mailer/forgot_password.html.erb
+- app/views/spina/user_mailer/forgot_password.txt.erb
 - config/fontcustom.yml
 - config/initializers/assets.rb
 - config/initializers/spina.rb
@@ -542,6 +508,9 @@ files:
 - db/migrate/1_create_spina_tables.rb
 - db/migrate/2_create_spina_translation_tables.rb
 - db/migrate/3_create_spina_navigations.rb
+- db/migrate/4_add_password_reset_token_to_spina_users.rb
+- db/migrate/5_remove_translated_columns.rb
+- db/migrate/6_create_spina_options.rb
 - db/seeds.rb
 - lib/generators/spina/install_generator.rb
 - lib/generators/spina/templates/app/assets/stylesheets/default/application.css.sass
@@ -569,17 +538,11 @@ files:
 - lib/spina/version.rb
 - lib/tasks/spina_tasks.rake
 - vendor/assets/javascripts/spina/jquery.customfileinput.js
-- vendor/assets/javascripts/spina/jquery.farbtastic.js
 - vendor/assets/javascripts/spina/jquery.nestable.js
 - vendor/assets/javascripts/spina/jquery.ui.js
-- vendor/assets/javascripts/spina/morris.js
-- vendor/assets/javascripts/spina/raphael.js
 - vendor/assets/javascripts/spina/sortable.js
 - vendor/assets/javascripts/spina/trix.js
-- vendor/assets/javascripts/spina/wysihtml5.js
-- vendor/assets/javascripts/spina/wysihtml5_parser_rules.js
 - vendor/assets/stylesheets/spina/_animate.scss
-- vendor/assets/stylesheets/spina/_morris.scss
 - vendor/assets/stylesheets/spina/_normalize.scss
 homepage: http://www.denkgroot.com
 licenses:
@@ -601,7 +564,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Spina

data/app/assets/stylesheets/spina/_cards.sass

@@ -1,54 +0,0 @@
-.card
-  background: #fff
-  border: 1px solid #e9e9e9
-  border-radius: 3px
-  display: inline-block
-  margin: 0 28px 30px 0
-  text-align: center
-  width: 225px
-
-  .card-heading
-    color: #333
-    font-size: 12px
-    font-weight: 600
-    line-height: 24px
-    padding: 12px
-    text-transform: uppercase
-
-  .card-content
-    padding: 12px 12px 24px 12px
-
-  .card-footer
-    border-top: 1px solid #e9e9e9
-    color: #999
-    font-size: 16px
-    font-weight: 400
-    line-height: 28px
-    padding: 4px 12px
-
-  .card-score
-    color: #666
-    font-size: 64px
-    font-weight: bold
-    margin: 12px 0
-
-    &.card-score-a
-      color: #00c309
-
-    &.card-score-b
-      color: #8dbe50
-
-    &.card-score-c
-      color: #f3e64c
-
-    &.card-score-d
-      color: #f0aa50
-
-    &.card-score-f
-      color: #e62f36
-
-    small
-      color: #666
-      display: block
-      font-size: 13px
-      font-weight: 400

data/app/assets/stylesheets/spina/_farbtastic.sass

@@ -1,37 +0,0 @@
-.farbtastic
-  background: #fff
-  border-radius: 100px
-  box-shadow: 0 1px 2px rgba(0, 0, 0, .25)
-  display: none
-  position: absolute
-  z-index: 3
-
-  *
-    cursor: crosshair
-    position: absolute
-
-  .color, .overlay
-    height: 101px
-    left: 47px
-    top: 47px
-    width: 101px
-
-  .wheel
-    background: url(asset-path('spina/wheel.png'))
-    height: 195px
-    width: 195px
-
-  .overlay
-    background: url(asset-path('spina/mask.png'))
-
-  .marker
-    background: url(asset-path('spina/marker.png'))
-    height: 17px
-    margin: -8px 0 0 -8px
-    overflow: hidden
-    width: 17px
-
-.farbtastic, .farbtastic .wheel
-  height: 195px
-  width: 195px
-

data/app/assets/stylesheets/spina/_wysihtml5.sass

@@ -1,79 +0,0 @@
-textarea.wysihtml5
-  font-size: 14px
-  height: 225px
-  padding-top: 50px
-  padding-right: 125px
-  resize: none
-
-  &:focus
-    border: 1px solid $primary-color
-
-.wysihtml5-container
-  overflow: hidden
-  position: relative
-
-  .toolbar
-    border-bottom: 1px solid #e9e9e9
-    top: 1px
-    left: 1px
-    line-height: 40px
-    position: absolute
-    width: 100%
-
-    a.command
-      border-right: 1px solid #e9e9e9
-      color: #999
-      display: block
-      float: left
-      height: 40px
-      text-align: center
-      width: 40px
-
-    a.command i
-      vertical-align: middle
-
-    a.command i:before
-      line-height: 40px
-
-    a.wysihtml5-command-active, a.command:hover
-      color: #333
-
-    .command-bold, .command-italic, .command-insert-unordered-list, .command-link, .action-change-view
-      font-size: 12px
-      line-height: 43px
-
-    .command.action-change-view
-      border: none
-      float: right
-
-    .choose-text-type
-      border-left: 1px solid #e9e9e9
-      display: none
-      height: 183px
-      padding-top: 6px
-      position: absolute
-      right: 0
-      top: 40px
-      width: 115px
-
-      a
-        color: #999
-        display: block
-        line-height: 40px
-        padding: 0 16px
-
-      a:hover
-        color: #333
-
-      ul li a
-        color: #999
-        line-height: 30px
-        text-align: left
-
-        &.wysihtml5-command-active
-          color: $primary-color
-
-        &.wysihtml5-command-active:hover
-          background: none
-          color: $primary-color
-          cursor: default

data/app/assets/stylesheets/spina/wysihtml5_textarea.sass

@@ -1,14 +0,0 @@
-h1, h2, h3
-  font-weight: 600
-
-img
-  border-radius: 3px
-  display: block
-  height: auto
-  margin: 13px 0
-  max-height: 100px
-  max-width: 100px
-  width: auto
-
-img:first-child
-  margin-top: 0

data/app/controllers/spina/admin/page_parts_controller.rb

@@ -1,11 +0,0 @@
-module Spina
-  module Admin
-    class PagePartsController < AdminController
-      def wysihtml5_link
-      end
-
-      def insert_wysihtml5_link
-      end
-    end
-  end
-end

data/app/helpers/spina/application_helper.rb

@@ -1,30 +0,0 @@
-module Spina
-  module ApplicationHelper
-
-    def current_account
-      @current_account ||= Account.first
-    end
-
-    def image_tag_with_at2x(name_at_1x, options={})
-      name_at_2x = name_at_1x.gsub(%r{\.\w+$}, '@2x\0')
-      image_tag(name_at_1x, options.merge("data-at2x" => asset_path(name_at_2x)))
-    end
-
-    def error_explanation!(resource)
-      return "" if resource.errors.empty?
-
-      messages = resource.errors.full_messages.map { |msg| content_tag(:li, msg) }.join
-      sentence = I18n.t("errors.messages.not_saved", count: resource.errors.count, resource: resource.class.model_name.human.downcase)
-
-      html = <<-HTML
-      <div id="error_explanation" class="notification notification-error" data-icon='m'>
-        <p>#{sentence}</p>
-        <ul>#{messages}</ul>
-      </div>
-      HTML
-
-      html.html_safe
-    end
-
-  end
-end

data/app/models/spina/ability.rb

@@ -1,20 +0,0 @@
-module Spina
-  class Ability
-    include CanCan::Ability
-
-    def initialize(user)
-      if user.admin?
-        can :manage, :all
-      else
-        can :manage, Page
-        can :manage, Photo
-        can :manage, Attachment
-        can :manage, Account
-
-        # Spina.config.plugins.each do |plugin|
-        #   can :manage, "#{plugin.class_name}".constantize
-        # end
-      end
-    end
-  end
-end

data/app/models/spina/color.rb

@@ -1,7 +0,0 @@
-module Spina
-  class Color < ApplicationRecord
-    has_many :page_parts, as: :page_partable
-    has_many :layout_parts, as: :layout_partable
-    has_many :structure_parts, as: :structure_partable
-  end
-end

data/app/presenters/spina/pages/breadcrumb.rb

@@ -1,102 +0,0 @@
-# require 'active_support/core_ext/string'
-require 'active_support/configurable'
-require 'action_view/helpers/tag_helper'
-require 'action_view/helpers/url_helper'
-
-module Spina
-  module Pages
-    class Breadcrumb
-      include ActionView::Helpers::TagHelper
-      include ActionView::Helpers::UrlHelper
-      include ActiveSupport::Configurable
-
-      config_accessor :list_tag, :list_class, :li, :list_wrapper, :list_item_tag, :list_item_css, :last_item_css
-
-      self.list_tag = :ul
-      self.list_class = 'breadcrumb'
-      self.list_item_tag = :li
-      self.list_item_css = nil
-      self.last_item_css = 'active'
-      self.list_wrapper = false
-
-      attr_accessor :context, :current_page, :include_homepage, :breadcrumb_items, :homepage
-      delegate :output_buffer, :output_buffer=, to: :context
-
-      def initialize(page, context, include_homepage = true)
-        @current_page = page
-        @include_homepage = include_homepage
-        @context = context
-        @breadcrumb_items = Array.new()
-        @homepage = Page.find_by(name: :homepage)
-
-        build_breadcrumb(page) unless @homepage.id == @current_page.id
-      end
-
-      def to_html
-        render_breadcrumb_wrapper(@breadcrumb_items)
-      end
-
-      private
-
-      def build_breadcrumb(page)
-        if !page.nil?
-          @breadcrumb_items.push(page)
-
-          build_breadcrumb(page.parent)
-        else
-          # Manually insert homepage and reverse the breadcrumb items once you hit the latest parent
-          @breadcrumb_items.push(homepage) if @include_homepage
-          @breadcrumb_items = @breadcrumb_items.reverse unless @breadcrumb_items.empty?
-        end
-      end
-
-      def render_breadcrumb_wrapper(items)
-        if items.any?
-          if list_wrapper
-            content_tag(:div) do
-              render_breadcrumb_items(items)
-            end
-          else
-            render_breadcrumb_items(items)
-          end
-        end
-      end
-
-      def render_breadcrumb_items(items)
-        content_tag(list_tag, class: breadcrumb_list_css) do
-          items.each_with_index.inject(ActiveSupport::SafeBuffer.new) do |buffer, (item, index)|
-            buffer << render_breadcrumb_item(item, index, items.length)
-          end
-        end
-      end
-
-      def render_breadcrumb_item(item, index, items_length)
-        content_tag(list_item_tag, class: breadcrumb_item_css(item, index, items_length)) do
-          buffer = ActiveSupport::SafeBuffer.new
-          if index + 1 == items_length
-            buffer << item.title
-          else
-            buffer << link_to(item.title, item.full_materialized_path)
-          end
-          buffer
-        end
-      end
-
-      def breadcrumb_list_css
-        css = []
-        css << list_class
-
-        css.reject(&:blank?).presence
-      end
-
-      def breadcrumb_item_css(item, index, items_length)
-        css = []
-        css << list_item_css
-        css << last_item_css if index + 1 == items_length
-
-        css.reject(&:blank?).presence
-      end
-
-    end
-  end
-end