spina 0.12.0 → 1.0.0

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

@@ -16,7 +16,7 @@ module Spina
       end
 
       def authorize_spina_user
-        redirect_to spina.admin_login_url, flash: {information: I18n.t('spina.notifications.login')} unless current_spina_user
+        redirect_to admin_login_path, flash: {information: I18n.t('spina.notifications.login')} unless current_spina_user
       end
 
       def authorize_admin

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

@@ -7,12 +7,15 @@ module Spina
 
       def index
         add_breadcrumb I18n.t('spina.website.documents'), spina.admin_attachments_path
-        @attachments = Attachment.file_attached.sorted
-        @attachment = Attachment.new
+        @attachments = Attachment.sorted
       end
 
       def create
-        @attachment = Attachment.create(attachment_params)
+        @attachments = params[:attachment][:files].map do |file|
+          attachment = Attachment.create(attachment_params)
+          attachment.file.attach(file)
+          attachment
+        end
       end
 
       def destroy
@@ -23,17 +26,19 @@ module Spina
 
       def select
         @selected_attachment_id = Attachment.find_by(id: params[:selected_attachment_id]).try(:id)
-        @attachments = Attachment.order_by_ids(@selected_attachment_id).file_attached.sorted
+        @hidden_field_id = params[:hidden_field_id]
+        @attachments = Attachment.sorted
         @attachment = Attachment.new
       end
 
       def insert
         @attachment = Attachment.find(params[:attachment_id])
+        Rails.logger.info "HAHA HA HA #{@attachment.id}"
       end
 
       def select_collection
         @selected_attachment_ids = Attachment.where(id: params[:selected_attachment_ids]).ids
-        @attachments = Attachment.order_by_ids(@selected_attachment_ids).file_attached.sorted
+        @attachments = Attachment.sorted
         @attachment = Attachment.new
       end
 

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

@@ -0,0 +1,51 @@
+module Spina
+  module Admin
+    class ImagesController < AdminController
+      before_action :set_breadcrumbs
+
+      layout "spina/admin/media_library"
+
+      def index
+        add_breadcrumb I18n.t('spina.website.images'), admin_images_path
+        @media_folders = MediaFolder.order(:name)
+        @images = Image.sorted.where(media_folder_id: nil).with_attached_file.page(params[:page])
+      end
+
+      # There's no file validation yet in ActiveStorage
+      # We do two things to reduce errors right now:
+      # 1. We add accept="image/*" to the image form
+      # 2. We destroy the entire record if the uploaded file is not an image
+      def create
+        @images = params[:image][:files].map do |file|
+          # Create the image and attach the file
+          image = Image.create
+          image.file.attach(file)
+
+          # Was it not an image after all? DESTROY IT
+          image.destroy and next unless image.file.image?
+
+          image
+        end.compact
+      end
+
+      def destroy
+        @image = Image.find(params[:id])
+        @image.destroy
+        redirect_back fallback_location: spina.admin_images_url
+      end
+
+      def add_to_media_folder
+        @media_folder = MediaFolder.find(params[:id])
+        @media_folder.images << Image.find(params[:image_id])
+        render json: @media_folder
+      end
+
+      private
+
+        def set_breadcrumbs
+          add_breadcrumb I18n.t('spina.website.media_library'), admin_media_library_path
+        end
+
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Spina
+  module Admin
+    class MediaFoldersController < AdminController
+      layout "spina/admin/media_library"
+
+      def new
+        @media_folder = MediaFolder.new
+      end
+
+      def show
+        add_breadcrumb I18n.t('spina.website.media_library'), admin_media_library_path
+        add_breadcrumb I18n.t('spina.website.images'), spina.admin_images_path
+        @media_folder = MediaFolder.find(params[:id])
+        add_breadcrumb @media_folder.name
+        @images = @media_folder.images.sorted.page(params[:page])
+      end
+
+      def create
+        @media_folder = MediaFolder.new(media_folder_params)
+        @media_folder.save
+        redirect_to spina.admin_images_path
+      end
+
+      def destroy
+        @media_folder = MediaFolder.find(params[:id])
+        @media_folder.destroy
+        redirect_to spina.admin_images_path
+      end
+
+      private
+
+        def media_folder_params
+          params.require(:media_folder).permit(:name)
+        end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Spina
+  module Admin
+    class MediaPickerController < AdminController
+
+      def show
+        @images = Image.page(params[:page])
+
+        if params[:selected_ids].present?
+          ids = params[:selected_ids].map(&:to_i).join(', ')
+          @images = @images.order(Arel.sql("CASE WHEN id IN(#{ids}) THEN 0 ELSE 1 END, created_at DESC"))
+        else
+          @images = @images.sorted
+        end
+
+        render params[:page].present? ? :infinite_scroll : :show
+      end
+
+      def select
+        if params[:multiple]
+          @images = Image.find(params[:image_ids])
+        else 
+          @image = Image.find(params[:image_id])
+        end
+      end
+
+    end
+  end
+end

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

@@ -1,17 +1,19 @@
 module Spina
   module Admin
     class PagesController < AdminController
-      before_action :set_breadcrumb
       before_action :set_tabs, only: [:new, :create, :edit, :update]
       before_action :set_locale
 
       def index
+        add_breadcrumb I18n.t('spina.website.pages'), spina.admin_pages_path
         redirect_to admin_pages_path unless current_admin_path.starts_with?('/pages')
-        @pages = Page.active.sorted.roots
+        @pages = Page.active.sorted.roots.regular_pages
       end
 
       def new
-        @page = Page.new
+        @resource = Resource.find_by(id: params[:resource_id])
+        @page = Page.new(resource: @resource, parent: @resource&.parent_page)
+        add_index_breadcrumb
         if current_theme.new_page_templates.any? { |template| template[0] == params[:view_template] }
           @page.view_template = params[:view_template]
         end
@@ -34,6 +36,7 @@ module Spina
 
       def edit
         @page = Page.find(params[:id])
+        add_index_breadcrumb
         add_breadcrumb @page.title
         @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
         render layout: 'spina/admin/admin'
@@ -50,6 +53,9 @@ module Spina
             format.html { redirect_to spina.edit_admin_page_url(@page, params: {locale: @locale}), flash: {success: t('spina.pages.saved')} }
             format.js
           else
+            50.times do
+              Rails.logger.info @page.errors.inspect
+            end
             format.html do
               @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
               render :edit, layout: 'spina/admin/admin'
@@ -78,8 +84,12 @@ module Spina
         @locale = params[:locale] || I18n.default_locale
       end
 
-      def set_breadcrumb
-        add_breadcrumb I18n.t('spina.website.pages'), spina.admin_pages_path
+      def add_index_breadcrumb
+        if @page.resource.present?
+          add_breadcrumb @page.resource.label, spina.admin_resource_path(@page.resource)
+        else
+          add_breadcrumb I18n.t('spina.website.pages'), spina.admin_pages_path
+        end
       end
 
       def set_tabs
@@ -100,7 +110,7 @@ module Spina
       end
 
       def page_params
-        params.require(:page).permit!.merge(locale: params[:locale] || I18n.default_locale)
+        params.require(:page).permit!
       end
 
     end

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

@@ -0,0 +1,33 @@
+module Spina
+  module Admin
+    class ResourcesController < AdminController
+
+      def show
+        @resource = Resource.find(params[:id])
+        add_breadcrumb @resource.label
+      end
+
+      def edit
+        @resource = Resource.find(params[:id])
+        add_breadcrumb @resource.label, spina.admin_resource_path(@resource)
+        add_breadcrumb t('spina.edit')
+      end
+
+      def update
+        @resource = Resource.find(params[:id])
+        if @resource.update_attributes(resource_params)
+          redirect_to spina.admin_resource_path(@resource)
+        else
+          render :edit
+        end
+      end
+
+      private
+
+        def resource_params
+          params.require(:resource).permit(:label, :view_template, :order_by, :parent_page_id)
+        end
+
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+module Spina
+  module Admin
+    class SettingsController < AdminController
+
+      before_action :find_or_set_settings
+      before_action :set_breadcrumbs
+
+      def edit
+        add_breadcrumb t("spina.#{plugin.namespace}.title")
+      end
+
+      def update
+        if @setting.update_attributes(settings_params)
+          redirect_to spina.admin_edit_settings_path(plugin.namespace)
+        else
+          add_breadcrumb t("spina.#{plugin.namespace}.title")
+          render :edit
+        end
+      end
+
+      private
+
+      def setting_class
+        "spina/#{plugin.namespace}/setting".classify.constantize
+      end
+
+      def plugin
+        Spina::Plugin.find_by(namespace: params[:plugin])
+      end
+      helper_method :plugin
+
+      def find_or_set_settings
+        @setting = setting_class.first_or_create do |setting|
+          plugin.settings.each do |attribute, type|
+            setting.send("#{attribute}=", (type.is_a?(Hash) ? type.first.last : nil))
+          end
+        end
+        plugin.settings.keys.reject do |x|
+          @setting.preferences.keys.map(&:to_sym).include? x
+        end.each do |key|
+          value = plugin.settings[key].is_a?(Hash) ? plugin.settings[key].first.last : nil
+          @setting.send("#{key}=", value)
+        end
+      end
+
+      def set_breadcrumbs
+        add_breadcrumb t('spina.settings.title')
+      end
+
+      def settings_params
+        params.require(:setting).permit(plugin.settings.keys)
+      end
+
+    end
+  end
+end

data/app/controllers/spina/pages_controller.rb

@@ -2,8 +2,6 @@ module Spina
   class PagesController < Spina::ApplicationController
     include Spina::Frontend
 
-    rescue_from ActiveRecord::RecordNotFound, with: :render_404
-
     before_action :current_spina_user_can_view_page?, except: [:robots]
 
     helper_method :page
@@ -20,9 +18,5 @@ module Spina
         current_spina_user.present?
       end
 
-      def render_404
-        render file: "#{Rails.root}/public/404.html", status: 404
-      end
-
   end
 end

data/app/helpers/spina/admin/pages_helper.rb

@@ -36,8 +36,8 @@ module Spina
       end
 
       def page_ancestry_options(page)
-        pages = Spina::Page.active
-        pages = pages.where.not(id: page.subtree.ids) unless page.new_record?
+        pages = Spina::Page.active.regular_pages
+        pages = pages.where.not(id: page.subtree.ids) unless page.new_record? || !page.methods.include?(:subtree)
 
         flatten_nested_hash(pages.arrange(order: :position)).map do |page|
           next if page.depth >= Spina.config.max_page_depth - 1

data/app/helpers/spina/admin_nav_helper.rb

@@ -0,0 +1,7 @@
+module Spina
+  module AdminNavHelper
+    def spina_link
+      render 'spina/shared/spina_link'
+    end
+  end
+end

data/app/helpers/spina/files_helper.rb

@@ -0,0 +1,9 @@
+module Spina
+  module FilesHelper
+
+    def file_url(file)
+      main_app.rails_service_blob_path(file.signed_id, file.filename)
+    end
+
+  end
+end

data/app/helpers/spina/images_helper.rb

@@ -0,0 +1,17 @@
+module Spina
+  module ImagesHelper
+
+    # We wrap some Rails logic inside our own helper method
+    # because the resolve directive in ActiveStorage's routes
+    # doesn't work outside the main app in 5.2.0.rc2
+    def variant(image, options)
+      if image.attached?
+        variant = image.variant(options)
+        main_app.rails_blob_representation_path(variant.blob.signed_id, variant.variation.key, variant.blob.filename)
+      else
+        "https://placehold.it/100x100.png"
+      end
+    end
+
+  end
+end

data/app/helpers/spina/pages_helper.rb

@@ -0,0 +1,17 @@
+module Spina
+  module PagesHelper
+
+    def content(part_name)
+      current_page.content(part_name)
+    end
+
+    def has_content?(part_name)
+      current_page.has_content?(part_name)
+    end
+
+    def current_page
+      Current.page
+    end
+
+  end
+end

data/app/models/concerns/spina/image_collectable.rb

@@ -0,0 +1,23 @@
+require 'active_support/concern'
+
+module Spina
+  module ImageCollectable
+    extend ActiveSupport::Concern
+
+    included do
+      attr_reader :image_tokens, :image_positions
+    end
+
+    def image_tokens=(ids)
+      self.image_ids = ids.split(",")
+    end
+
+    def image_positions=(positions)
+      positions = positions.split(",")
+      self.image_collections_images.each do |image|
+        image.position = positions.index(image.image.try(:id).try(:to_s))
+      end
+    end
+
+  end
+end

data/app/models/concerns/spina/part.rb

@@ -9,6 +9,8 @@ module Spina
 
       validates :name, :title, :partable_type, presence: true
 
+      after_save -> { partable.try(:save) }
+
       scope :sorted, -> { order(:position) }
     end
 
@@ -17,19 +19,20 @@ module Spina
     end
 
     def content
-      self.partable.try(:content)
+      (partable || partable_type.constantize.new).content
     end
 
     def value
-      self.partable.try(:value)
+      partable.try(:value)
     end
 
     def partable_attributes=(attributes)
-      if self.partable.present?
-        self.partable.assign_attributes(attributes)
+      if partable.present?
+        partable.assign_attributes(attributes)
       else
         self.partable = self.partable_type.constantize.new(attributes)
       end
     end
+
   end
 end