robin_cms 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 667498a061c442f90e57b20fdd7a12db60e76f447e0a948be22276620c5532ef
-  data.tar.gz: 4e6317eee498285fc39f939cb86b80847ab9e5c629ad7864efe8c2761ff17bb7
+  metadata.gz: 68c3b702cf90bbb615ebeea6303a3f12e4e5da64b3360b295a198b9347ea11bb
+  data.tar.gz: d266f45a2863ee190014bcd3174f0413fb70a5f745aaef74780f0a9ca7d6b3eb
 SHA512:
-  metadata.gz: a5ae9452f1da1b65f19f21798d5036109e88114af97bdf1c3d10d453992034361cedf22805e660b380b0b2cbcd5083b2ec005ea900b4666b436e58a78078395f
-  data.tar.gz: 15395c440febd9fd0dea69bc7cf99c9338a3d97eef5a039662e46670e1d1dfe0b259a4004c3378d595d2b1398a23a860980a8476c79959696fd69edbe5471942
+  metadata.gz: 12d3f8064c84a26a3e3899ca964e411609ca03de3c193466aab157530d1022ffa0ae45237545260ad9a35377e07ff5cb09325c00c682cfd790247c1879b6dde4
+  data.tar.gz: d73739c5b1b1c83b4fc7f3d80363353318a0b69164fba07ad784a738d8e5c23c8cea6c73c1d55542279c6a38929dc65ffc673870669781cf9df2a631cb21bebd

data/lib/robin_cms/cms.rb

@@ -18,25 +18,18 @@ module RobinCMS
     set :session_secret, ENV.fetch("SESSION_SECRET", SecureRandom.hex(64))
 
     before do
-      if %w[/login /logout].include?(request.path_info)
-        pass
-      end
+      pass if %w[/login /logout].include?(request.path_info)
 
       redirect to("/login") unless session[:auth_user]
     end
 
     before /\/libraries\/(.*).*/ do
       kind = params[:captures].first.split("/").first
-      library_schema = @config.find_library(kind)
+      library_schema = @config.get_schema(kind)
 
       halt 404 unless library_schema
 
-      @library = case library_schema[:type]
-                 when "collection"
-                   CollectionLibrary.new(library_schema)
-                 when "data"
-                   DataLibrary.new(library_schema)
-                 end
+      @library = Library.new(library_schema)
     end
 
     after do
@@ -44,7 +37,7 @@ module RobinCMS
     end
 
     get "/" do
-      redirect to(home_page)
+      redirect to(root_url)
     end
 
     get "/login" do
@@ -54,7 +47,7 @@ module RobinCMS
     post "/login" do
       authenticate!(params[:username], params[:password])
       session[:auth_user] = params[:username]
-      redirect to(home_page)
+      redirect to(root_url)
     rescue AuthenticationError
       flash[:error] = "Incorrect username or password"
       redirect to("/login")
@@ -162,13 +155,14 @@ module RobinCMS
     end
 
     post "/publish" do
-      if system(@config[:build_command])
+      system(@config[:build_command])
+      if $?.exitstatus == 0
         flash[:success_dialog] = "Your site has been successfully published!"
       else
-        flash[:errors] = "There was an error publishing the site"
+        flash[:error_dialog] = "There was an error publishing the site."
       end
 
-      redirect to(home_page)
+      redirect to(root_url)
     end
 
     not_found do

data/lib/robin_cms/collection_library.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module RobinCMS
-  class CollectionLibrary < Library
+  module CollectionLibrary
     def create(attributes)
       id = make_slug(attributes[:title], @schema[:pattern])
       item = Item.new(id, attributes, **@schema)

data/lib/robin_cms/configuration.rb

@@ -107,7 +107,7 @@ module RobinCMS
       hash.each_with_object(new) { |(k, v), h| h[k] = v }
     end
 
-    def find_library(kind)
+    def get_schema(kind)
       self[:libraries].find { |library| library[:id] == kind }
     end
 

data/lib/robin_cms/data_library.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module RobinCMS
-  class DataLibrary < Library
+  module DataLibrary
     def create(attributes)
       item = Item.new(nil, attributes, **@schema)
       write(item)

data/lib/robin_cms/helpers.rb

@@ -37,13 +37,50 @@ module RobinCMS
       URI.decode_www_form(request.query_string).to_h
     end
 
-    def current_page
-      _, libraries, item = request.path_info.split("/")
-      item || libraries
+    def root_url
+      url("/libraries/#{@config[:libraries].first[:id]}")
+    end
+
+    def profile_url
+      url("/profile")
+    end
+
+    def logout_url
+      url("/logout")
+    end
+
+    def change_password_url
+      url("/change-password")
+    end
+
+    def library_url(library)
+      url("/libraries/#{library[:id]}")
     end
 
-    def home_page
-      "/libraries/#{@config[:libraries].first[:id]}"
+    def library_item_url(library, item = nil)
+      if item
+        url("/libraries/#{library[:id]}/item/#{item.id}")
+      else
+        url("/libraries/#{library[:id]}/item")
+      end
+    end
+
+    def delete_library_item_url(library, item)
+      url("/libraries/#{library[:id]}/item/#{item.id}/delete")
+    end
+
+    def item_image_url(item)
+      url(item.image_src)
+    end
+
+    def publish_url
+      url("/publish")
+    end
+
+    def current_page?(library)
+      _, libraries, item = request.path_info.split("/")
+      current_page = item || libraries
+      library[:id].to_s == current_page
     end
 
     # For generating safe id's where the id needs to be based on user

data/lib/robin_cms/item.rb

@@ -2,20 +2,20 @@
 
 module RobinCMS
   class Item
-    attr_reader :id, :attributes
+    attr_reader :id, :attributes, :schema
 
     DATETIME_FORMAT = "%Y-%m-%d"
 
     # The keys which we don't want to serialize.
-    FRONTMATTER_IGNORE_KEYS = [:id, :content, :image, :captures].freeze
+    FRONTMATTER_IGNORE_KEYS = [:id, :kind, :content, :image, :captures].freeze
 
-    def initialize(id, attrs = {}, **opts)
+    def initialize(id, attrs = {}, **schema)
       if !attrs.empty? && !attrs.has_key?(:title)
         raise TypeError, "Missing required field `title'"
       end
 
       @id = id
-      @opts = opts
+      @schema = schema
 
       # Be sure to use the setter here so the keys get converted to symbols.
       self.attributes = attrs
@@ -71,13 +71,21 @@ module RobinCMS
     end
 
     def display_name
-      return @attributes[:title] unless @opts[:display_name_pattern]
+      return @attributes[:title] unless @schema[:display_name_pattern]
 
-      @opts[:display_name_pattern].clone.tap do |name|
+      @schema[:display_name_pattern].clone.tap do |name|
         @attributes.each { |key, value| name.gsub!(":#{key}", value) }
       end
     end
 
+    def image_src
+      @attributes[:image_src]
+    end
+
+    def image_alt
+      @attributes[:image_alt]
+    end
+
     # Get the frontmatter as a hash with stringified keys.
     def frontmatter
       frontmatter = @attributes.clone
@@ -96,13 +104,14 @@ module RobinCMS
       frontmatter.to_h.transform_keys(&:to_s)
     end
 
-    def field_value_or_default(field)
+    def field_value_or_default(field_id)
+      field = @schema[:fields].find { |f| f[:id] == field_id }
       value = @attributes[field[:id].to_sym] || field[:default]
       value.to_s
     end
 
     def can_delete?
-      @id && @opts[:can_delete]
+      @id && @schema[:can_delete]
     end
   end
 end

data/lib/robin_cms/library.rb

@@ -8,38 +8,27 @@ module RobinCMS
 
     attr_reader :schema
 
+    def self.of_kind(kind, **opts)
+      config = Configuration.parse(**opts)
+      schema = config.get_schema(kind)
+      new(schema)
+    end
+
     def initialize(schema)
       @schema = schema.freeze
+
+      case schema[:type]
+      when "collection"
+        extend CollectionLibrary
+      when "data"
+        extend DataLibrary
+      end
     end
 
     def blank
       Item.new(nil, **@schema)
     end
 
-    def create(attributes)
-      raise NotImplementedError
-    end
-
-    def find_one(id)
-      raise NotImplementedError
-    end
-
-    def all
-      raise NotImplementedError
-    end
-
-    # Writes the specified item to disk.
-    #
-    # Returns the path where the item was written.
-    def write(item)
-      raise NotImplementedError
-    end
-
-    # Delete the item specified by +id+.
-    def delete(id)
-      raise NotImplementedError
-    end
-
     def create_static(filename, tempfile)
       path = File.join(@schema[:static_location], File.basename(make_slug(filename)))
       FileUtils.mkdir_p(File.dirname(path))

data/lib/robin_cms/version.rb

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

data/lib/robin_cms/views/change_password.erb

@@ -16,7 +16,7 @@
   </div>
   <%= erb :flash %>
   <footer class="controls --align-right">
-    <a href="/admin">Back</a>
+    <a href="<%= root_url %>">Back</a>
     <button type="submit">Update</button>
   </footer>
 </form>

data/lib/robin_cms/views/delete_dialog.erb

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

data/lib/robin_cms/views/field_label.erb

@@ -0,0 +1,9 @@
+<label for="<%= safe_id(field[:id], 'field') %>">
+  <%= field[:label] %>
+  <% unless field[:required] %>
+    <small>(optional)</small>
+  <% end %>
+</label>
+<% if field[:description] %>
+  <small><%= field[:description] %></small>
+<% end %>

data/lib/robin_cms/views/filter_form.erb

@@ -13,7 +13,7 @@
   </select>
   <% if @library.drafts_enabled? %>
     <select id="published" name="published">
-      <% for option in PUBLISHED_OPTIONS%>
+      <% for option in PUBLISHED_OPTIONS %>
         <option
           value="<%= option[:value] %>"
           <% if query_params["published"] == option[:value] %>
@@ -33,5 +33,5 @@
     placeholder="Search <%= @library[:label].downcase %>..."
   />
   <button type="submit">Apply</button>
-  <a href="/admin/libraries/<%= @library.kind %>">Clear filters</a>
+  <a href="<%= library_url(@library) %>">Clear filters</a>
 </form>

data/lib/robin_cms/views/hidden_field.erb

@@ -2,5 +2,5 @@
   id="<%= safe_id(field[:id], 'field') %>"
   type="hidden"
   name="<%= field[:id] %>"
-  value="<%= @item.field_value_or_default(field) %>"
+  value="<%= @item.field_value_or_default(field[:id]) %>"
 />

data/lib/robin_cms/views/image_field.erb

@@ -1,23 +1,22 @@
-<label for="<%= safe_id('image', 'field') %>"><%= field[:label] %></label>
-<% if field[:description] %>
-  <small><%= field[:description] %></small>
-<% end %>
+<%= erb :field_label, locals: { field: field } %>
 <%#
   There is a bug here where if you upload a different image with the
   same name, it shows the old image due to caching. This is a very
   low priority because a) the user should be naming things in a
   reasonable way and b) you can always just do a hard refresh.
+
+  Also required does nothing here as we're not populating the field with any
+  initial values. This one probably needs to be fixed.
 %>
 <img
   id="image-preview"
   class="image-preview"
-  src="<%= url(@item.attributes[:image_src]) %>"
-  alt="<%= @item.attributes[:image_alt] %>"
+  src="<%= item_image_url(@item) %>"
+  alt="<%= @item.image_alt %>"
 />
 <input
   id="<%= safe_id('image', 'field') %>"
   type="file"
   name="image"
-  accept="image/png, image/jpeg"
-  <% if field[:required] %>required<% end %>
+  accept="image/png,image/jpeg"
 />

data/lib/robin_cms/views/input_field.erb

@@ -1,12 +1,9 @@
-<label for="<%= safe_id(field[:id], 'field') %>"><%= field[:label] %></label>
-<% if field[:description] %>
-  <small><%= field[:description] %></small>
-<% end %>
+<%= erb :field_label, locals: { field: field } %>
 <input
   id="<%= safe_id(field[:id], 'field') %>"
   type="<%= field[:type] %>"
   name="<%= field[:id] %>"
-  value="<%= @item.field_value_or_default(field) %>"
+  value="<%= @item.field_value_or_default(field[:id]) %>"
   <% if field[:required] %>required<% end %>
   <% if field[:readonly] %>readonly<% end %>
 />

data/lib/robin_cms/views/layout.erb

@@ -9,23 +9,29 @@
       <%= erb :"stylesheet.css" %>
     </style>
   </head>
-  <body <% if flash[:success_dialog] %>onload="successdialog.showModal()"<% end %>>
+  <body
+    <% if flash[:success_dialog] %>
+      onload="successdialog.showModal()"
+    <% elsif flash[:error_dialog] %>
+      onload="errordialog.showModal()"
+    <% end %>
+  >
     <% if session[:auth_user] %>
       <header id="site-header">
         <span class="controls">
-          <h1><a href="/admin"><%= @config[:title] %> admin</a></h1>
+          <h1><a href="<%= root_url %>"><%= @config[:title] %> admin</a></h1>
         </span>
         <span class="controls --gap-md">
           <a href="<%= @config[:url] %>" target="_blank">
             <%= @config[:url] %><%= erb :"new_tab.svg" %>
           </a>
           <% if @config[:build_command] %>
-            <form id="publish-form" action="/admin/publish" method="post">
+            <form id="publish-form" action="<%= publish_url %>" method="post">
               <button type="submit" form="publish-form">Publish site</button>
             </form>
           <% end %>
-          <a href='<%= url("/profile") %>'>Account</a>
-          <a href='<%= url("/logout") %>'>Log out</a>
+          <a href="<%= profile_url %>">Account</a>
+          <a href="<%= logout_url %>">Log out</a>
         </span>
       </header>
     <% end %>
@@ -44,8 +50,17 @@
       <h2>Success!</h2>
       <p><%= flash[:success_dialog] %></p>
       <div class="controls">
-        <form id="dialog-close" method="dialog">
-          <button type="submit" form="dialog-close">Continue</button>
+        <form id="success-dialog-close" method="dialog">
+          <button type="submit" form="success-dialog-close">Continue</button>
+        </form>
+      </div>
+    </dialog>
+    <dialog id="errordialog" class="card">
+      <h2>Oops, something went wrong.</h2>
+      <p><%= flash[:error_dialog] %></p>
+      <div class="controls">
+        <form id="err-dialog-close" method="dialog">
+          <button type="submit" form="err-dialog-close">Continue</button>
         </form>
       </div>
     </dialog>

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.kind}/item") %>'>
+    <form action="<%= library_item_url(@library) %>">
       <button type="submit">
         New <%= @library[:label_singular].downcase %>
       </button>
@@ -20,46 +20,46 @@
     <br />
     <br />
     <% if @library[:can_create] %>
-      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.
+      Create a <a href="<%= library_item_url(@library) %>">new <%= @library[:label_singular].downcase %></a>
+      or try <a href="<%= library_url(@library) %>">clearing</a> your search filters.
     <% end %>
   </div>
 <% else %>
   <table>
     <thead>
       <tr>
-        <th class="grow-column">Name</th>
+        <th>Name</th>
         <% if @library.drafts_enabled? %>
-          <th>Status</th>
+          <th class="status">Status</th>
         <% end %>
-        <th>Created</th>
-        <th>Last updated</th>
+        <th class="date">Created</th>
+        <th class="date">Last updated</th>
       </tr>
     </thead>
     <tbody>
       <% for item in @items %>
         <tr>
           <td>
-            <a href='<%= url("/libraries/#{@library.kind}/item/#{item.id}") %>'>
+            <a href="<%= library_item_url(@library, item) %>">
               <%= item.display_name %>
             </a>
           </td>
           <% if @library.drafts_enabled? %>
             <td>
-              <a href='<%= url("/libraries/#{@library.kind}/item/#{item.id}") %>'>
-                <span class="badge --<%= item.published? ? 'published' : 'draft' %>">
+              <a href="<%= library_item_url(@library, item) %>">
+                <span class="badge --<%= item.published_label.downcase %>">
                   <%= item.published_label %>
                 </span>
               </a>
             </td>
           <% end %>
-          <td>
-            <a href='<%= url("/libraries/#{@library.kind}/item/#{item.id}") %>'>
+          <td class="date">
+            <a href="<%= library_item_url(@library, item) %>">
               <%= item.created_at.strftime("%b %d, %Y") %>
             </a>
           </td>
-          <td>
-            <a href='<%= url("/libraries/#{@library.kind}/item/#{item.id}") %>'>
+          <td class="date">
+            <a href="<%= library_item_url(@library, item) %>">
               <%= item.updated_at.strftime("%b %d, %Y") %>
             </a>
           </td>

data/lib/robin_cms/views/library_actions.erb

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

data/lib/robin_cms/views/library_item.erb

@@ -5,31 +5,34 @@
   <%= erb :library_actions, locals: { has_delete: @item.can_delete? } %>
 </header>
 <form
+  id="<%= safe_id(@item.id, 'edit_item') %>"
   class="card"
   <% if @item.id %>
-    action='<%= url("/libraries/#{@library.kind}/item/#{@item.id}") %>'
+    action="<%= library_item_url(@library, @item) %>"
   <% else %>
-    action='<%= url("/libraries/#{@library.kind}/item") %>'
+    action="<%= library_item_url(@library) %>"
   <% end %>
   method="post"
   enctype="multipart/form-data"
 >
   <% @library.sorted_fields.each do |field| %>
     <div class="field">
-      <% case field[:type]
-         when "text", "date", "number", "color", "email", "url" %>
-        <%= erb :input_field, locals: { field: field } %>
-      <% when "hidden" %>
-        <%= erb :hidden_field, locals: { field: field } %>
-      <% when "select" %>
-        <%= erb :select_field, locals: { field: field } %>
-      <% when "image" %>
-        <%= erb :image_field, locals: { field: field } %>
-      <% when "richtext" %>
-        <%= erb :richtext_field, locals: { field: field } %>
-      <% else %>
-        <div></div>
-      <% end %>
+      <%=
+        case field[:type]
+        when "text", "date", "number", "color", "email", "url"
+          erb :input_field, locals: { field: field }
+        when "hidden"
+          erb :hidden_field, locals: { field: field }
+        when "select"
+          erb :select_field, locals: { field: field }
+        when "image"
+          erb :image_field, locals: { field: field }
+        when "richtext"
+          erb :richtext_field, locals: { field: field }
+        else
+          ""
+        end
+      %>
     </div>
   <% end %>
   <%= erb :flash %>

data/lib/robin_cms/views/nav.erb

@@ -1,10 +1,8 @@
 <nav id="site-nav">
   <ul class="controls">
     <% for library in @config[:libraries] %>
-      <li <% if current_page == library[:id].to_s %>class="current"<% end %>>
-        <a href='<%= url("/libraries/#{library[:id]}") %>'>
-          <%= library[:label] %>
-        </a>
+      <li <% if current_page?(library) %>class="current"<% end %>>
+        <a href="<%= library_url(library) %>"><%= library[:label] %></a>
       </li>
     <% end %>
   </ul>

data/lib/robin_cms/views/profile.erb

@@ -4,8 +4,8 @@
 <section class="card">
   <p>You are currently logged in as <b><%= @username %></b>.</p>
   <div class="controls --align-right">
-    <a href="/admin">Back</a>
-    <form action="<%= url('/change-password') %>">
+    <a href="<%= root_url %>">Back</a>
+    <form action="<%= change_password_url %>">
       <button type="submit">Change password</button>
     </form>
   </div>

data/lib/robin_cms/views/richtext_field.erb

@@ -1,13 +1,10 @@
 <link rel="stylesheet" type="text/css" href="https://unpkg.com/trix@2.0.8/dist/trix.css">
 <script type="text/javascript" src="https://unpkg.com/trix@2.0.8/dist/trix.umd.min.js"></script>
-<label for="<%= safe_id(field[:id], 'field') %>"><%= field[:label] %></label>
-<% if field[:description] %>
-  <small><%= field[:description] %></small>
-<% end %>
+<%= erb :field_label, locals: { field: field } %>
 <input
   id="richtext-content"
   type="hidden"
   name="<%= field[:id] %>"
-  value="<%= @item.field_value_or_default(field) %>"
+  value="<%= @item.field_value_or_default(field[:id]) %>"
 >
 <trix-editor input="richtext-content"></trix-editor>

data/lib/robin_cms/views/select_field.erb

@@ -1,23 +1,14 @@
-<label for="<%= safe_id(field[:id], 'field') %>"><%= field[:label] %></label>
-<% if field[:description] %>
-  <small><%= field[:description] %></small>
-<% end %>
+<%= erb :field_label, locals: { field: field } %>
 <select
   id="<%= safe_id(field[:id], 'field') %>"
   name="<%= field[:id] %>"
-  value="<%= @item.field_value_or_default(field) %>"
+  value="<%= @item.field_value_or_default(field[:id]) %>"
 >
   <% for option in field[:options] %>
     <option
       value="<%= option[:value] %>"
-      <% if field[:id] == "published" %>
-        <% if option[:value] == true && @item.published? %>
-          selected
-        <% end %>
-      <% else %>
-        <% if option[:value].to_s == @item.field_value_or_default(field) %>
-          selected
-        <% end %>
+      <% if option[:value].to_s == @item.published?.to_s %>
+        selected
       <% end %>
     >
       <%= option[:label] %>

data/lib/robin_cms/views/stylesheet.css.erb

@@ -77,11 +77,12 @@ th {
   font-weight: 500;
 }
 
-th,
-td {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
+th.date,
+td.date > *,
+th.status,
+td.status > * {
+  width: 7rem;
+  text-align: right;
 }
 
 td a {
@@ -192,7 +193,8 @@ select {
 
 input,
 select,
-trix-toolbar {
+trix-toolbar,
+img#image-preview {
   display: block;
   margin-top: var(--padding-xs);
 }
@@ -412,10 +414,6 @@ hr {
   padding: 2rem;
 }
 
-.grow-column {
-  width: 100%;
-}
-
 .image-preview {
   width: 8rem;
   height: 8rem;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robin_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Aron Lebani
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-30 00:00:00.000000000 Z
+date: 2025-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -94,6 +94,7 @@ files:
 - lib/robin_cms/views/change_password.erb
 - lib/robin_cms/views/delete_dialog.erb
 - lib/robin_cms/views/error.erb
+- lib/robin_cms/views/field_label.erb
 - lib/robin_cms/views/filter_form.erb
 - lib/robin_cms/views/flash.erb
 - lib/robin_cms/views/hidden_field.erb