robin_cms 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 667498a061c442f90e57b20fdd7a12db60e76f447e0a948be22276620c5532ef
-  data.tar.gz: 4e6317eee498285fc39f939cb86b80847ab9e5c629ad7864efe8c2761ff17bb7
+  metadata.gz: 6a9634aa2592fdf851123491cc53c9b1b347b6e6ca3f7f37d4adbd9e0fb494c7
+  data.tar.gz: 3885036d121802207eb4ae9cf80c372211ee199f60fa30c7e11f5b916af5c570
 SHA512:
-  metadata.gz: a5ae9452f1da1b65f19f21798d5036109e88114af97bdf1c3d10d453992034361cedf22805e660b380b0b2cbcd5083b2ec005ea900b4666b436e58a78078395f
-  data.tar.gz: 15395c440febd9fd0dea69bc7cf99c9338a3d97eef5a039662e46670e1d1dfe0b259a4004c3378d595d2b1398a23a860980a8476c79959696fd69edbe5471942
+  metadata.gz: f38e98b366edb3294b56e2b97c80819149163020d41dd565e893ec3d4d8c84f2332f108de62858a9d55bf135176bf8f042ee28980bd1eb6f6d6ddaf7d330f210
+  data.tar.gz: 29d90d7896c8366dbe5373bdd89193d4dcd336577cd8c517d2b5b5082b1aa65ffef18c0b733b5387bb9bf53405c8fcf77b8afdb700e1a682c98bc37ae1c51540

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

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/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
 
-    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,9 +71,9 @@ 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
@@ -96,13 +96,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.6"
 end

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/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,12 +1,12 @@
-<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"
@@ -18,6 +18,5 @@
   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/library.erb

@@ -28,12 +28,12 @@
   <table>
     <thead>
       <tr>
-        <th class="grow-column">Name</th>
+        <th>Name</th>
         <% if @library.drafts_enabled? %>
           <th>Status</th>
         <% end %>
-        <th>Created</th>
-        <th>Last updated</th>
+        <th class="date">Created</th>
+        <th class="date">Last updated</th>
       </tr>
     </thead>
     <tbody>
@@ -53,12 +53,12 @@
               </a>
             </td>
           <% end %>
-          <td>
+          <td class="date">
             <a href='<%= url("/libraries/#{@library.kind}/item/#{item.id}") %>'>
               <%= item.created_at.strftime("%b %d, %Y") %>
             </a>
           </td>
-          <td>
+          <td class="date">
             <a href='<%= url("/libraries/#{@library.kind}/item/#{item.id}") %>'>
               <%= item.updated_at.strftime("%b %d, %Y") %>
             </a>

data/lib/robin_cms/views/library_actions.erb

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

data/lib/robin_cms/views/library_item.erb

@@ -5,6 +5,7 @@
   <%= 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}") %>'

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,11 +1,8 @@
-<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
@@ -15,7 +12,7 @@
           selected
         <% end %>
       <% else %>
-        <% if option[:value].to_s == @item.field_value_or_default(field) %>
+        <% if option[:value].to_s == @item.field_value_or_default(field[:id]) %>
           selected
         <% end %>
       <% end %>

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

@@ -77,11 +77,10 @@ th {
   font-weight: 500;
 }
 
-th,
-td {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
+th.date,
+td.date > * {
+  width: 7rem;
+  text-align: right;
 }
 
 td a {
@@ -192,7 +191,8 @@ select {
 
 input,
 select,
-trix-toolbar {
+trix-toolbar,
+img#image-preview {
   display: block;
   margin-top: var(--padding-xs);
 }
@@ -412,10 +412,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.6
 platform: ruby
 authors:
 - Aron Lebani
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-30 00:00:00.000000000 Z
+date: 2025-11-03 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