spina 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3d8217bb30f0c85ecf1680a8f3d951cb2e958d993e51ad467b078ab4fda9670
-  data.tar.gz: 523554889c7c32b1e966131b377ad6004f8093248a25459fe2ae09810edc2d4b
+  metadata.gz: 4ef91e5dd1c106347beca681a8cf055e3dd9ca7753a86305e1fd7a79624b24ac
+  data.tar.gz: 63ef08f9333d470b982a23fe33f0c258d7610adbee22fd5d6f59be78d317ac1c
 SHA512:
-  metadata.gz: 6b2786876a21c1056a9f7d0dff1e3cf8eb4243b9310cbfa36fde3608a623943e199de1f1505be5bb8c61f53ad663a124dc2a914b8c1172e59d266a6747c906b7
-  data.tar.gz: ec28bbdf8802db18df4f99fab9343a309e079792fd2c1b99866bcb76db9b034c2f3cbc70aaf0827e0ced5350693aad3be12ea7a330ddcaf82f0537ae59059217
+  metadata.gz: 55001a4b71435d2cb16cca6402538e815ce165a74d983164ec35aafdf9866a3d2bea0aefecbc042c0df927f62023de652f5dd0e10040355662dd38a0eb9d7d12
+  data.tar.gz: 85032055e23c4545acdbb21ef8dbd49d8517991a88f7270bc3c59917b482f665268ed8ba880533010e68dba4a1a6c1bcea6c69110bd83ec20b3ea296a1872c84

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

@@ -17,10 +17,12 @@ module Spina
 
       def create
         @attachments = params[:attachment][:files].map do |file|
+          next if file.blank? # Skip the blank string posted by the hidden files[] field
+          
           attachment = Attachment.create(attachment_params)
           attachment.file.attach(file)
           attachment
-        end
+        end.compact
         
         respond_to do |format|
           format.turbo_stream { render turbo_stream: turbo_stream.prepend("attachments", partial: "attachment", collection: @attachments)}

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

@@ -93,12 +93,11 @@ module Spina
         end
   
         def add_index_breadcrumb
-          path = spina.admin_pages_path
           if @page.resource
-            path = spina.admin_pages_path(resource_id: @page.resource_id)
+            add_breadcrumb @page.resource.label, spina.admin_pages_path(resource_id: @page.resource_id), class: 'text-gray-400'
+          else
+            add_breadcrumb t('spina.website.pages'), spina.admin_pages_path, class: 'text-gray-400'
           end
-          
-          add_breadcrumb t('spina.website.pages'), path, class: 'text-gray-400'
         end
   
         def page_params

data/app/models/spina/resource.rb

@@ -24,6 +24,13 @@ module Spina
         ResourcePagesUpdateJob.perform_later(id)
       end
     end
+    
+    def order_by_options
+      [
+        [Spina::Page.human_attribute_name(:title), "title"], 
+        [Spina::Page.human_attribute_name(:created_at), "created_at"]
+      ]
+    end
 
   end
 end

data/app/presenters/spina/rich_text_presenter.rb

@@ -20,7 +20,7 @@ module Spina
       end
     
       def render_embeds(html)
-        doc = Nokogiri::HTML(html)
+        doc = Nokogiri::HTML.fragment(html)
         doc.css(embed_selector).each do |node|
           node.replace render_embed(node.first_element_child)
         end
@@ -42,4 +42,4 @@ module Spina
       end
 
   end
-end
+end

data/app/views/spina/admin/resources/edit.html.erb

@@ -52,7 +52,7 @@
         
         <div class="mt-5">
           <%= f.label :order_by, class: 'font-medium text-sm text-gray-700 block' %>
-          <%= f.select :order_by, [[Spina::Page.human_attribute_name(:title), "title"], [Spina::Page.human_attribute_name(:created_at), "created_at"]], {include_blank: t('spina.resources.manual_sorting')}, class: 'form-select' %>
+          <%= f.select :order_by, f.object.order_by_options, {include_blank: t('spina.resources.manual_sorting')}, class: 'form-select' %>
         </div>
       </div>
     </div>

data/config/locales/de.yml

@@ -13,6 +13,12 @@ de:
       spina/embeds/vimeo:
         url: vimeo.com/...
   activerecord:
+    errors:
+      models:
+        spina/page:
+          attributes:
+            title:
+              blank: Titel erforderlich
     attributes:
       spina/account:
         address: Adresse
@@ -277,6 +283,7 @@ de:
       save_draft: Entwurf speichern
       saved: Seite gespeichert
       saving: wird gespeichert...
+      couldnt_be_saved: Seite konnte nicht gespeichert werden
       search_engines: Suchmaschinen
       show_in_menu: unsichtbar
       skip_to_first_child: Zur ersten Unterseite weiterleiten

data/config/locales/en.yml

@@ -6,6 +6,12 @@ en:
       spina/embeds/vimeo:
         url: vimeo.com/...
   activerecord:
+    errors:
+      models:
+        spina/page:
+          attributes:
+            title:
+              blank: Title required
     attributes:
       spina/account:
         address: Address
@@ -270,6 +276,7 @@ en:
       save_draft: Save draft
       saved: Page saved
       saving: Saving...
+      couldnt_be_saved: Page couldn't be saved
       search_engines: Search engines
       show_in_menu: invisible
       skip_to_first_child: forward to first child page

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "2.9.0"
+  VERSION = "2.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Bram Jetten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails