spina 0.12.0 → 1.0.0

data/app/models/spina/account.rb

@@ -1,10 +1,8 @@
 module Spina
   class Account < ApplicationRecord
     include Partable
-    
-    serialize :preferences
 
-    mount_uploader :logo, LogoUploader
+    serialize :preferences
 
     has_many :layout_parts, dependent: :destroy
     accepts_nested_attributes_for :layout_parts, allow_destroy: true
@@ -24,16 +22,14 @@ module Spina
 
     def self.serialized_attr_accessor(*args)
       args.each do |method_name|
-        eval "
-          def #{method_name}
-            self.preferences.try(:[], :#{method_name})
-          end
-
-          def #{method_name}=(value)
-            self.preferences ||= {}
-            self.preferences[:#{method_name}] = value
-          end
-        "
+        define_method method_name do
+          self.preferences.try(:[], method_name.to_sym)
+        end
+
+        define_method "#{method_name}=" do |value|
+          self.preferences ||= {}
+          self.preferences[method_name.to_sym] = value
+        end
       end
     end
 
@@ -44,7 +40,7 @@ module Spina
     def bootstrap_website
       theme_config = ::Spina::Theme.find_by_name(theme)
       if theme_config
-        bootstrap_pages(theme_config) 
+        bootstrap_pages(theme_config)
         bootstrap_navigations(theme_config)
       end
     end

data/app/models/spina/attachment.rb

@@ -1,18 +1,21 @@
 module Spina
   class Attachment < ApplicationRecord
+    has_one_attached :file
 
     has_one :page_part, as: :page_partable
+    has_many :structure_parts, as: :structure_partable
     has_and_belongs_to_many :attachment_collections, join_table: 'spina_attachment_collections_attachments'
 
     attr_accessor :_destroy
 
-    scope :sorted, -> { order('created_at DESC') }
-    scope :file_attached, -> { where('file IS NOT NULL') }
-
-    mount_uploader :file, FileUploader
+    scope :sorted, -> { order('file ASC') }
 
     def name
-      file.file.try(:filename)
+      file.filename.to_s
+    end
+
+    def content
+      file if file.attached?
     end
 
     alias_method :old_update_attributes, :update_attributes
@@ -24,10 +27,5 @@ module Spina
       end
     end
 
-    def self.order_by_ids(ids)
-      sql = sanitize_sql_for_assignment({id: ids})
-      order("CASE WHEN #{sql} THEN 0 ELSE 1 END")
-    end
-
   end
 end

data/app/models/spina/attachment_collection.rb

@@ -2,11 +2,16 @@ module Spina
   class AttachmentCollection < ApplicationRecord
 
     has_one :page_part, as: :page_partable
+    has_many :structure_parts, as: :structure_partable
     has_and_belongs_to_many :attachments, join_table: 'spina_attachment_collections_attachments'
 
-    attr_reader :attachment_tokens    
+    attr_reader :attachment_tokens
     accepts_nested_attributes_for :attachments, allow_destroy: true
 
+    def content
+      self
+    end
+
     def attachment_tokens=(ids)
       self.attachment_ids = ids.split(",")
     end

data/app/models/spina/current.rb

@@ -0,0 +1,5 @@
+module Spina
+  class Current < ActiveSupport::CurrentAttributes
+    attribute :page
+  end
+end

data/app/models/spina/image.rb

@@ -0,0 +1,26 @@
+module Spina
+  class Image < ApplicationRecord
+    belongs_to :media_folder, optional: true
+
+    has_one_attached :file
+
+    has_many :page_parts, as: :page_partable
+    has_many :structure_parts, as: :structure_partable
+
+    scope :sorted, -> { order('created_at DESC') }
+    scope :sorted_by_image_collection, -> { order('position') }
+
+    def name
+      file.try(:filename).to_s
+    end
+
+    def variant(options)
+      file.attached? ? file.variant(options) : ""
+    end
+
+    def content
+      self
+    end
+ 
+  end
+end

data/app/models/spina/{photo_collection.rb → image_collection.rb}

@@ -1,13 +1,13 @@
 module Spina
-  class PhotoCollection < ApplicationRecord
-    include PhotoCollectable
+  class ImageCollection < ApplicationRecord
+    include ImageCollectable
 
     has_one :page_part, as: :page_partable
-    has_many :photo_collections_photos, autosave: true
-    has_many :photos, through: :photo_collections_photos
+    has_many :image_collections_images, autosave: true
+    has_many :images, through: :image_collections_images
     has_many :structure_parts, as: :structure_partable
 
-    accepts_nested_attributes_for :photos, allow_destroy: true
+    accepts_nested_attributes_for :images, allow_destroy: true
 
     def content
       self
@@ -15,7 +15,7 @@ module Spina
 
     alias_method :old_update_attributes, :update_attributes
     def update_attributes(attributes)
-      self.photos.clear if attributes.reject{|key,value| key == "id" }.blank?
+      self.images.clear if attributes.reject{|key,value| key == "id" }.blank?
       old_update_attributes(attributes)
     end
 

data/app/models/spina/image_collections_image.rb

@@ -0,0 +1,6 @@
+module Spina
+  class ImageCollectionsImage < ApplicationRecord
+    belongs_to :image
+    belongs_to :image_collection
+  end
+end

data/app/models/spina/line.rb

@@ -1,5 +1,6 @@
 module Spina
   class Line < ApplicationRecord
+    extend Mobility
     translates :content
 
     has_many :page_parts, as: :page_partable

data/app/models/spina/media_folder.rb

@@ -0,0 +1,7 @@
+module Spina
+  class MediaFolder < ApplicationRecord
+    has_many :images, dependent: :nullify
+
+    validates :name, presence: true, uniqueness: true
+  end
+end

data/app/models/spina/navigation.rb

@@ -7,5 +7,9 @@ module Spina
 
     validates :name, :label, presence: true
     validates :name, uniqueness: true
+
+    def cache_key
+      super + "_" + Mobility.locale.to_s
+    end
   end
 end

data/app/models/spina/navigation_item.rb

@@ -1,6 +1,6 @@
 module Spina
   class NavigationItem < ApplicationRecord
-    belongs_to :navigation
+    belongs_to :navigation, touch: true
     belongs_to :page
 
     has_ancestry orphan_strategy: :adopt

data/app/models/spina/page.rb

@@ -1,5 +1,6 @@
 module Spina
   class Page < ApplicationRecord
+    extend Mobility
     include Partable
 
     # Stores the old path when generating a new materialized_path
@@ -17,6 +18,11 @@ module Spina
     has_many :navigation_items, dependent: :destroy
     has_many :navigations, through: :navigation_items
 
+    # Pages can belong to a resource
+    belongs_to :resource, optional: true
+
+    scope :regular_pages, ->  { where(resource: nil) }
+    scope :resource_pages, -> { where.not(resource: nil) }
     scope :active, -> { where(active: true) }
     scope :sorted, -> { order(:position) }
     scope :live, -> { active.where(draft: false) }
@@ -24,6 +30,8 @@ module Spina
 
     # Save children to update all materialized_paths
     after_save :save_children
+    after_save :touch_navigations
+    after_save -> { page_parts.each(&:save) }
 
     # Create a 301 redirect if materialized_path changed
     after_save :rewrite_rule
@@ -32,7 +40,8 @@ module Spina
     validates :title, presence: true
     validates :materialized_path, uniqueness: true
 
-    translates :title, :menu_title, :seo_title, :description, :materialized_path
+    translates :title, :description, :materialized_path
+    translates :menu_title, :seo_title, default: -> { title }
 
     def to_s
       name
@@ -47,15 +56,7 @@ module Spina
     end
 
     def save_children
-      self.children.each { |child| child.save }
-    end
-
-    def menu_title
-      read_attribute(:menu_title).blank? ? title : read_attribute(:menu_title)
-    end
-
-    def seo_title
-      read_attribute(:seo_title).blank? ? title : read_attribute(:seo_title)
+      self.children.each(&:save)
     end
 
     def live?
@@ -73,12 +74,12 @@ module Spina
     def set_materialized_path
       self.old_path = materialized_path
       self.materialized_path = localized_materialized_path
-      self.materialized_path += "-#{self.class.where(materialized_path: materialized_path).count}" if self.class.where(materialized_path: materialized_path).where.not(id: id).count > 0
+      self.materialized_path += "-#{self.class.i18n.where(materialized_path: materialized_path).count}" if self.class.i18n.where(materialized_path: materialized_path).where.not(id: id).count > 0
       materialized_path
     end
 
     def cache_key
-      super + "_" + Globalize.locale.to_s
+      super + "_" + Mobility.locale.to_s
     end
 
     def view_template_config(theme)
@@ -92,8 +93,12 @@ module Spina
 
     private
 
+      def touch_navigations
+        navigations.update_all(updated_at: Time.zone.now)
+      end
+
       def rewrite_rule
-        RewriteRule.create(old_path: old_path, new_path: materialized_path) if old_path != materialized_path
+        RewriteRule.where(old_path: old_path).first_or_create.update_attributes(new_path: materialized_path) if old_path != materialized_path
       end
 
       def localized_materialized_path

data/app/models/spina/page_part.rb

@@ -11,6 +11,7 @@ module Spina
     validates :name, uniqueness: {scope: :page_id}
 
     alias_attribute :partable, :page_partable
+    alias_attribute :partable_id, :page_partable_id
     alias_attribute :partable_type, :page_partable_type
     alias_method :page_partable_attributes=, :partable_attributes=
 

data/app/models/spina/resource.rb

@@ -0,0 +1,16 @@
+module Spina
+  class Resource < ApplicationRecord
+    has_many :pages, dependent: :restrict_with_exception
+
+    belongs_to :parent_page, class_name: "Spina::Page", optional: true
+
+    def pages
+      case order_by
+      when "title"
+        super.joins(:translations).where(spina_page_translations: {locale: I18n.locale}).order("spina_page_translations.title")
+      else
+        super.order(created_at: :desc)
+      end
+    end
+  end
+end

data/app/models/spina/setting.rb

@@ -0,0 +1,7 @@
+module Spina
+  class Setting < ApplicationRecord
+
+    validates :plugin, presence: true
+
+  end
+end

data/app/models/spina/structure.rb

@@ -3,6 +3,8 @@ module Spina
     has_one :page_part, as: :page_partable
     has_many :structure_items
 
+    after_save -> { structure_items.each(&:save) }
+
     accepts_nested_attributes_for :structure_items, allow_destroy: true
 
     def content

data/app/models/spina/structure_item.rb

@@ -8,6 +8,8 @@ module Spina
 
     scope :sorted_by_structure, -> { order(:position) }
 
+    after_save -> { structure_parts.each(&:save) }
+
     validates_presence_of :position
     accepts_nested_attributes_for :structure_parts, allow_destroy: true
 

data/app/models/spina/structure_part.rb

@@ -1,7 +1,7 @@
 module Spina
   class StructurePart < ApplicationRecord
     include Part
-    include PhotoCollectable
+    include ImageCollectable
     include Optionable
 
     belongs_to :structure_item, optional: true
@@ -13,6 +13,7 @@ module Spina
     validates :name, uniqueness: {scope: :structure_item_id}
 
     alias_attribute :partable, :structure_partable
+    alias_attribute :partable_id, :structure_partable_id
     alias_attribute :partable_type, :structure_partable_type
     alias_method :structure_partable_attributes=, :partable_attributes=
   end

data/app/models/spina/text.rb

@@ -1,5 +1,6 @@
 module Spina
   class Text < ApplicationRecord
+    extend Mobility
     translates :content
     
     has_many :page_parts, as: :page_partable

data/app/views/dummy/show.html.haml

@@ -0,0 +1 @@
+hoi

data/app/views/layouts/spina/admin/media_library.html.haml

@@ -1,13 +1,16 @@
 - content_for :application do
   %header#header
+    #header_actions
+      = yield(:header_actions)
+
     = render partial: 'spina/admin/shared/breadcrumbs'
 
     %nav#secondary.tabs
       %ul
-        %li{class: ('active' if controller_name == 'photos')}
-          = link_to t('spina.media_library.photos'), spina.admin_photos_path
+        %li{class: ('active' if controller_name.in? %w(images media_folders))}
+          = link_to t('spina.media_library.images'), admin_images_path
         %li{class: ('active' if controller_name == 'attachments')}
-          = link_to t('spina.media_library.attachments'), spina.admin_attachments_path
+          = link_to t('spina.media_library.attachments'), admin_attachments_path
 
   = yield
 

data/app/views/layouts/spina/admin/pages.html.haml

@@ -15,7 +15,10 @@
 
       = yield(:header_actions) if content_for?(:header_actions)
 
-    .breadcrumbs= render_breadcrumbs separator: '<div class="divider"></div>'
+    .breadcrumbs
+      = render_breadcrumbs separator: '<div class="divider"></div>'
+      = link_to '/', class: 'button button-small button-hollow', target: :blank do
+        %i.icon.icon-export{style: "margin: 0"}
 
     %nav#secondary.tabs
       %ul

data/app/views/layouts/spina/admin/resources.html.haml

@@ -0,0 +1,10 @@
+- content_for :application do
+  %header#header
+    #header_actions
+      = yield(:header_actions)
+
+    = render partial: 'spina/admin/shared/breadcrumbs'
+
+  = yield
+
+= render template: "layouts/spina/admin/admin"

data/app/views/spina/admin/accounts/style.html.haml

@@ -6,7 +6,7 @@
       %button.button.button-primary{type: 'submit', data: {icon: 'o'}}
         = icon('check')
         = t('spina.preferences.style_save')
-        
+
   .well
     .horizontal-form
       .horizontal-form-group
@@ -16,11 +16,12 @@
           .select-dropdown.account-theme{data: {layout_parts: current_theme.layout_parts.map{|layout_part| layout_part[:name]}}}
             - options = options_for_select(::Spina::Theme.all.map { |theme| [theme.name, theme.name, {'data-layout-parts' => theme.layout_parts.map{|layout_part| layout_part[:name] }}] }, current_account.theme)
             = f.select :theme, options
+            
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:logo)
         .horizontal-form-content
-          = image_tag current_account.logo
+          = image_tag current_account.logo.url if current_account.logo.present?
           = f.file_field :logo
 
       = f.fields_for :layout_parts do |ff|

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

@@ -1,7 +1,7 @@
 %tr
-  %td= link_to attachment.name, attachment.file.try(:url), target: :blank
-  %td.nowrap= number_to_human_size(attachment.file.size)
+  %td= link_to attachment.name, file_url(attachment.file), target: :blank
+  %td.nowrap= number_to_human_size(attachment.file.byte_size)
   %td.nowrap
     %small= l attachment.created_at, format: '%d %B %Y %H:%M'
-  %td.nowrap
+  %td.nowrap.text-right
     = link_to t('spina.delete'), admin_attachment_path(attachment), method: :delete, class: 'button button-link button-danger button-small', data: {confirm: t('spina.delete_confirmation', subject: attachment.name)}