robin_cms 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7496d517d8e733bc0e0876e806347a0c3670efc489d974b16718e3b015d0a8e1
-  data.tar.gz: cc6df56fde6950e75fddf3fef947e5363cdc67f506bd07c16f5bbe0f1940d629
+  metadata.gz: d3a49ee1ef9d638a300e82352bba65071dc6dfffecfb4cb409fbf8cbb8fbdd69
+  data.tar.gz: 928887dfc693144ebaaf9f2233a08b161faa7146ab7a037501098052d046fe74
 SHA512:
-  metadata.gz: 6f4c01cfe9c26b0c7e864af98d405dfe55fbe986f78a3ee9295cb20e9c6bd808bbd9473685ddd17c158574540a63535c16a783a650a937f3e6419f215a81c51f
-  data.tar.gz: 36e240374f3bcf0c564d15347b4847a6b781d7b6192b3b3214fbf35f297748415d1729773039dca5f61b00ce088d681d7b3b02ac340fc3aa1f981c2fa4dd63dc
+  metadata.gz: 17bcd5f6cc1d057c6740fb3d7cf393432cd823956fcf4e78421b085cfc1ec3ef382c40b776b5f570cfb295af6cae71fd8a0711e5accc118641509bc519947bd9
+  data.tar.gz: e7f2f736f7535dce94edbe15a41c24201959e1231d0827c542ec3b4560215d1285e49f1d94321a57bdca50c1cfd85015f8a11f74cbd952b967081e7f5b3291a3

data/lib/robin_cms/cms.rb

@@ -53,7 +53,6 @@ module RobinCMS
 
     post "/login" do
       authenticate!(params[:username], params[:password])
-
       session[:auth_user] = params[:username]
       redirect to(home_page)
     rescue AuthenticationError
@@ -83,11 +82,9 @@ module RobinCMS
       end
 
       authenticate!(session[:auth_user], params[:old_password])
-
       update_credentials(params[:new_password])
       session[:auth_user] = nil
       flash[:success] = "Password updated succesfully. Please log in with your new credentials."
-
       redirect to("/login")
     rescue AuthenticationError
       flash[:error] = "Incorrect username or password"
@@ -100,69 +97,67 @@ module RobinCMS
         published: params[:published],
         q: params[:q]
       )
-
       erb :library
     end
 
     get "/libraries/:kind/item" do
-      if params[:id]
-        @item = @library.find_one(params[:id])
-        halt 404 unless @item
-      else
-        @item = @library.blank
-      end
+      @item = @library.blank
+      erb :library_item
+    end
 
+    get "/libraries/:kind/item/:id" do
+      @item = @library.find_one(params[:id])
+      halt 404 unless @item
       erb :library_item
     end
 
     post "/libraries/:kind/item" do
-      if params[:id]
-        @item = @library.find_one(params[:id])
-        halt 404 unless @item
-
-        if params[:image]
-          filename = params[:image][:filename]
-          tempfile = params[:image][:tempfile].to_path
-
-          @library.delete_static(@item.attributes[:image_src])
-          static_path = @library.create_static(filename, tempfile)
-          params[:image_src] = "/" + static_path
-        end
-
-        @item.attributes = params
-        @library.write(@item)
-      else
-        if params[:image]
-          filename = params[:image][:filename]
-          tempfile = params[:image][:tempfile].to_path
-
-          static_path = @library.create_static(filename, tempfile)
-          params[:image_src] = "/" + static_path
-        end
-
-        @library.create(params)
+      if params[:image]
+        static_path = @library.create_static(
+          params[:image][:filename],
+          params[:image][:tempfile].to_path
+        )
+        params[:image_src] = "/" + static_path
       end
 
+      @library.create(params)
       redirect to("/libraries/#{params[:kind]}")
     rescue ItemExistsError
       flash[:error] = "An item with the same name already exists"
       redirect to("/libraries/#{params[:kind]}/item")
     end
 
-    post "/libraries/:kind/item/delete" do
-      if params[:id]
-        @item = @library.find_one(params[:id])
-        halt 404 unless @item
+    post "/libraries/:kind/item/:id" do
+      @item = @library.find_one(params[:id])
+      halt 404 unless @item
 
-        if @item.attributes[:image_src]
+      if params[:image]
+        # If there is an existing image for this item, delete it to prevent
+        # accumulation of old files.
+        if @item.attributes[:image_src] && !@item.attributes[:image_src].empty?
           @library.delete_static(@item.attributes[:image_src])
         end
+        static_path = @library.create_static(
+          params[:image][:filename],
+          params[:image][:tempfile].to_path
+        )
+        params[:image_src] = "/" + static_path
+      end
 
-        @library.delete(@item.id)
-      else
-        halt 404
+      @item.attributes = params
+      @library.write(@item)
+      redirect to("/libraries/#{params[:kind]}")
+    end
+
+    post "/libraries/:kind/item/:id/delete" do
+      @item = @library.find_one(params[:id])
+      halt 404 unless @item
+
+      if @item.attributes[:image_src]
+        @library.delete_static(@item.attributes[:image_src])
       end
 
+      @library.delete(@item.id)
       redirect to("/libraries/#{params[:kind]}")
     end
 

data/lib/robin_cms/editable.rb

@@ -4,31 +4,37 @@ module RobinCMS
   # This module provides methods for editing image files.
   # No methods are required in the base class in order to use this mixin.
   module Editable
-    def resize_image(filepath, dimensions)
+    def resize_image(filepath, to:)
       # The mogrify command edits images in place. For more info, see
       # mogrify(1).
-
-      system("mogrify -resize #{dimensions} #{filepath}")
+      system("mogrify -resize #{to} #{filepath}")
       if $?.exitstatus != 0
         raise ConversionError, "Could not resize image #{filepath}"
       end
     end
 
-    def format_image(filepath, filetype)
-      system("mogrify -format #{filetype} #{filepath}")
+    def convert_image(filepath, to:)
+      system("mogrify -format #{to} #{filepath}")
       if $?.exitstatus != 0
         raise ConversionError, "Could not format image #{filepath}"
       end
 
-      # The name of the converted file will be the same as the original but
-      # with a new file extension.
-      converted = filepath.sub(/#{File.extname(filepath)}$/, ".#{filetype}")
+      # The file created by the mogrify command will be the same as the
+      # original but with the new file extension.
+      converted = filepath.sub(/#{File.extname(filepath)}$/, ".#{to}")
 
-      # Mogrify's format command creates a new file with the new extension.
-      # Copy the contents of this file to the original, then delete the newly
-      # created file.
-      IO.copy_stream(converted, filepath)
-      File.delete(converted)
+      if converted == filepath
+        # If the converted file has the same filename as the original (i.e. no
+        # conversion happened), there is nothing more to do.
+        filepath
+      else
+        # Otherwise, copy the contents of the mogrify output file to a new
+        # tempfile and delete the mogrify output.
+        tempfile = Tempfile.new(["robin_cms" ".#{to}"])
+        IO.copy_stream(converted, tempfile)
+        File.delete(converted)
+        tempfile
+      end
     end
   end
 end

data/lib/robin_cms/library.rb

@@ -42,6 +42,7 @@ module RobinCMS
 
     def create_static(filename, tempfile)
       path = File.join(@schema[:static_location], File.basename(make_slug(filename)))
+      FileUtils.mkdir_p(File.dirname(path))
 
       if File.exist?(path)
         raise ItemExistsError, "An item with the same name already exists"
@@ -51,18 +52,24 @@ module RobinCMS
       dimensions = image_field&.dig(:dimensions)
       filetype = image_field&.dig(:filetype)
 
-      resize_image(tempfile, dimensions) if dimensions
-      format_image(tempfile, filetype) if filetype
+      resize_image(tempfile, to: dimensions) if dimensions
 
-      FileUtils.mkdir_p(File.dirname(path))
-      FileUtils.cp(tempfile, path)
+      # Only convert if the specified filetype is different to the actual
+      # filetype. Unlike resize_image which modifies the image in-pace, this
+      # function necessarily creates a new file, so we need to ensure we
+      # update the path with the new file extension.
+      if filetype && File.extname(tempfile) != ".#{filetype}"
+        tempfile = convert_image(tempfile, to: filetype)
+        path = File.join(File.dirname(path), "#{File.basename(path, '.*')}.#{filetype}")
+      end
 
+      FileUtils.cp(tempfile, path)
       path
     end
 
     def delete_static(filename)
+      return if filename.nil? || filename.empty?
       path = File.join(@schema[:static_location], File.basename(filename))
-
       return unless File.exist?(path)
 
       File.delete(path)
@@ -79,5 +86,9 @@ module RobinCMS
     def [](key)
       @schema[key]
     end
+
+    def kind
+      @schema[:id]
+    end
   end
 end

data/lib/robin_cms/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RobinCMS
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/robin_cms/views/delete_dialog.erb

@@ -9,7 +9,7 @@
       <button type="submit">Close</button>
     </form>
     <form
-      action='<%= url("/libraries/#{@library[:id]}/item/delete?id=#{@item.id}") %>'
+      action='<%= url("/libraries/#{@library.kind}/item/#{@item.id}/delete") %>'
       method="post"
     >
       <button type="submit" class="--danger">Delete</button>

data/lib/robin_cms/views/filter_form.erb

@@ -33,5 +33,5 @@
     placeholder="Search <%= @library[:label].downcase %>..."
   />
   <button type="submit">Apply</button>
-  <a href="/admin/libraries/<%= @library[:id] %>">Clear filters</a>
+  <a href="/admin/libraries/<%= @library.kind %>">Clear filters</a>
 </form>

data/lib/robin_cms/views/library.erb

@@ -6,7 +6,7 @@
     <p><%= @library[:description] %></p>
   <% end %>
   <% if @library[:can_create] %>
-    <form action='<%= url("/libraries/#{@library[:id]}/item") %>'>
+    <form action='<%= url("/libraries/#{@library.kind}/item") %>'>
       <button type="submit">
         New <%= @library[:label_singular].downcase %>
       </button>
@@ -20,8 +20,8 @@
     <br />
     <br />
     <% if @library[:can_create] %>
-      Create a <a href='<%= url("/libraries/#{@library[:id]}/item") %>'>new <%= @library[:label_singular].downcase %></a>
-      or try <a href='<%= url("/libraries/#{@library[:id]}") %>'>clearing</a> your search filters.
+      Create a <a href='<%= url("/libraries/#{@library.kind}/item") %>'>new <%= @library[:label_singular].downcase %></a>
+      or try <a href='<%= url("/libraries/#{@library.kind}") %>'>clearing</a> your search filters.
     <% end %>
   </div>
 <% else %>
@@ -40,13 +40,13 @@
       <% for item in @items %>
         <tr>
           <td>
-            <a href='<%= url("/libraries/#{@library[:id]}/item?id=#{item.id}") %>'>
+            <a href='<%= url("/libraries/#{@library.kind}/item/#{item.id}") %>'>
               <%= item.display_name %>
             </a>
           </td>
           <% if @library.drafts_enabled? %>
             <td>
-              <a href='<%= url("/libraries/#{@library[:id]}/item?id=#{item.id}") %>'>
+              <a href='<%= url("/libraries/#{@library.kind}/item/#{item.id}") %>'>
                 <span class="badge --<%= item.published? ? 'published' : 'draft' %>">
                   <%= item.published_label %>
                 </span>
@@ -54,12 +54,12 @@
             </td>
           <% end %>
           <td>
-            <a href='<%= url("/libraries/#{@library[:id]}/item?id=#{item.id}") %>'>
+            <a href='<%= url("/libraries/#{@library.kind}/item/#{item.id}") %>'>
               <%= item.created_at.strftime("%b %d, %Y") %>
             </a>
           </td>
           <td>
-            <a href='<%= url("/libraries/#{@library[:id]}/item?id=#{item.id}") %>'>
+            <a href='<%= url("/libraries/#{@library.kind}/item/#{item.id}") %>'>
               <%= item.updated_at.strftime("%b %d, %Y") %>
             </a>
           </td>

data/lib/robin_cms/views/library_actions.erb

@@ -1,5 +1,5 @@
 <span class="controls">
-  <a href='<%= url("/libraries/#{@library[:id]}") %>'>Back</a>
+  <a href='<%= url("/libraries/#{@library.kind}") %>'>Back</a>
   <button type="submit">Save</button>
   <% if has_delete %>
     <%= erb :delete_dialog %>

data/lib/robin_cms/views/library_item.erb

@@ -7,9 +7,9 @@
 <form
   class="card"
   <% if @item.id %>
-    action='<%= url("/libraries/#{@library[:id]}/item?id=#{@item.id}") %>'
+    action='<%= url("/libraries/#{@library.kind}/item/#{@item.id}") %>'
   <% else %>
-    action='<%= url("/libraries/#{@library[:id]}/item") %>'
+    action='<%= url("/libraries/#{@library.kind}/item") %>'
   <% end %>
   method="post"
   enctype="multipart/form-data"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robin_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Aron Lebani
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-22 00:00:00.000000000 Z
+date: 2025-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt