robin_cms 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a9634aa2592fdf851123491cc53c9b1b347b6e6ca3f7f37d4adbd9e0fb494c7
-  data.tar.gz: 3885036d121802207eb4ae9cf80c372211ee199f60fa30c7e11f5b916af5c570
+  metadata.gz: ee6ad0de352f4750144a35a2b258d5d2da00e8fc345f269be1aeec80a45bf5ee
+  data.tar.gz: 5bed86dbdf4f9c4041e324d60284583beb1c65551b3ff15964d3950fed8c9cd3
 SHA512:
-  metadata.gz: f38e98b366edb3294b56e2b97c80819149163020d41dd565e893ec3d4d8c84f2332f108de62858a9d55bf135176bf8f042ee28980bd1eb6f6d6ddaf7d330f210
-  data.tar.gz: 29d90d7896c8366dbe5373bdd89193d4dcd336577cd8c517d2b5b5082b1aa65ffef18c0b733b5387bb9bf53405c8fcf77b8afdb700e1a682c98bc37ae1c51540
+  metadata.gz: dc0022fb5043ef5a2a640111ca650926c542cbd0a2a39f5895e6e2f6461edb4c6e4f44d1b8a9fbab01096dfb23ded529bc1458ac6923938eed8a82bcde2e2e71
+  data.tar.gz: 7cc63df15ad7619328ac1c9cf0c45c0dddf106e724081ad49a6b60d5f61645dab33dd6d7329e4b8ff39ebbfad0188aef714952e64c100b9ad59827eb0cfc69e1

data/README.md

@@ -72,7 +72,8 @@ standalone CMS for any Static Site Generator, you can embed it in a dynamic
 Sinatra app, or you can use it as a Jekyll plugin. If you're already using
 Jekyll as your SSG, this is the simplest approach.
 
-See the [documentation](./docs/index.adoc) for further information on usage.
+See the [documentation](https://robincms.org/docs.html) for further information
+on usage.
 
 ## Configuring
 
@@ -100,8 +101,8 @@ schema for your content. An example YAML file looks like this:
           - { label: Title, id: title, type: input }
           - { label: Author, id: author_name, type: input }
 
-See the [docs](./docs/index.adoc) for more details on configuration. You can
-also find some examples [here](./examples).
+See the [docs](https://robincms.org/docs.html) for more details on
+configuration. You can also find some examples [here](./examples).
 
 ## Testing
 
@@ -109,6 +110,10 @@ Unit test are written in RSpec. To run them:
 
     rake test
 
+## Screenshot
+
+![Robin CMS screenshot](./assets/screenshot.png)
+
 ## Roadmap
 
 * [ ] Support markdown content

data/lib/robin_cms/cms.rb

@@ -37,7 +37,7 @@ module RobinCMS
     end
 
     get "/" do
-      redirect to(home_page)
+      redirect to(home)
     end
 
     get "/login" do
@@ -47,7 +47,7 @@ module RobinCMS
     post "/login" do
       authenticate!(params[:username], params[:password])
       session[:auth_user] = params[:username]
-      redirect to(home_page)
+      redirect to(home)
     rescue AuthenticationError
       flash[:error] = "Incorrect username or password"
       redirect to("/login")
@@ -154,34 +154,44 @@ module RobinCMS
       redirect to("/libraries/#{params[:kind]}")
     end
 
+    # Handle uploading attachments from the trix editor. Responds with the path
+    # of the uploaded file in JSON format.
+    post "/libraries/:kind/attachment" do
+      static_path = @library.create_static(
+        params[:key],
+        params[:file][:tempfile].to_path
+      )
+
+      { :url => "/" + static_path }.to_json
+    end
+
+    post "/libraries/:kind/attachment/delete" do
+      @library.delete_static(params[:key])
+    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(home)
     end
 
-    not_found do
-      # This is a hack for showing previews of images uploaded in libraries.
-      # It is needed because until you publish the site, the image is not
-      # copied to the site output, and therefore requests for the file will
-      # return a 404. Note that if using it as a Jekyll plugin, this is not
-      # needed as the files will be served by Jekyll's dev server.
-
-      # Need to use `PATH_INFO` for the same reason we need to use the `url`
-      # and `to` helpers - we want the request URI relative to the path that
-      # the app is mounted at i.e. the virtual location.
-      uri = env["PATH_INFO"]
-
-      library = @config[:libraries].find do |c|
-        uri.start_with?("/#{c[:static_location]}")
-      end
+    # Explicitly serve static files for previewing in the CMS. This is
+    # necessary because until you publish the site, static files are not copied
+    # to the site output, and therefore requests for the file will return a
+    # 404. Note that if using it as a Jekyll plugin, this is not needed as the
+    # files will be served by Jekyll's dev server.
+    #
+    # This route needs to be defined last since it catches a wide range of URLs.
+    get "/:static_location/:key" do
+      static_locations = @config[:libraries].map { |l| l[:static_location] }.uniq
 
-      if library
-        send_file(File.join(library[:static_location], File.basename(uri)))
+      if static_locations.include?(params[:static_location])
+        send_file(File.join(params[:static_location], params[:key]))
       else
         pass
       end

data/lib/robin_cms/configuration-schema.json

@@ -9,7 +9,7 @@
 		"build_command": { "type": "string" },
 		"accent_color": {
 			"type": "string",
-			"pattern": "^\#{1}[a-fA-F0-9]{6}"
+			"pattern": "^\\#{1}[a-fA-F0-9]{6}"
 		},
 		"libraries": {
 			"type": "array",
@@ -61,7 +61,7 @@
 							"label": { "type": "string" },
 							"type": {
 								"type": "string",
-								"enum": ["text", "richtext", "date", "hidden", "number", "color", "email", "url", "select", "image"]
+								"enum": ["text", "richtext", "date", "hidden", "number", "color", "email", "url", "select", "image", "array"]
 							},
 							"default": { "type": "string" },
 							"required": { "type": "boolean" },

data/lib/robin_cms/configuration.rb

@@ -10,9 +10,10 @@ module RobinCMS
 
     COLLECTION_DEFAULTS = {
       type: "collection",
-      location: ".",
-      static_location: "assets",
+      location: "_posts",
+      static_location: "uploads",
       filetype: "html",
+      pattern: ":year-:month-:day-:title",
       description: "",
       can_create: true,
       can_delete: true,
@@ -21,8 +22,8 @@ module RobinCMS
 
     DATA_DEFAULTS = {
       type: "data",
-      location: ".",
-      static_location: "assets",
+      location: "_data",
+      static_location: "uploads",
       filetype: "yml",
       description: "",
       can_create: true,
@@ -58,7 +59,6 @@ module RobinCMS
       label: "Published",
       id: "published",
       type: "select",
-      default: false,
       options: [{
         label: "Draft",
         value: false
@@ -94,9 +94,16 @@ module RobinCMS
         YAML.load_file(config_file, symbolize_names: true)
       end
 
+      # TODO: use a ruby schema instead of a json file. Makes it easier to
+      # reuse elements and what not.
       schema_file = File.join(__dir__, "configuration-schema.json")
       schema = JSON.parse(File.read(schema_file))
-      JSON::Validator.validate!(schema, data)
+      errors = JSON::Validator.fully_validate(schema, data)
+
+      unless errors.empty?
+        puts errors
+        raise ValidationError, "There is an error in your configuration file"
+      end
 
       config = from_h(DEFAULTS).merge_config(data).merge_automatic_fields
       config.validate!
@@ -115,10 +122,6 @@ module RobinCMS
       library[:type].nil? || library[:type] == "collection"
     end
 
-    def has_image?(library)
-      library[:fields].find { |f| f[:type] == "image" }
-    end
-
     def merge_config(config)
       merge(config, {
         libraries: config[:libraries].map do |library|
@@ -144,8 +147,11 @@ module RobinCMS
           library[:fields].append(*AUTOMATIC_DRAFT_FIELDS)
         end
 
-        if has_image?(library)
-          library[:fields].append(*AUTOMATIC_IMAGE_FIELDS)
+        # Ensure the automatic image fields are inserted directly after the
+        # declared image field.
+        image_index = library[:fields].find_index { |f| f[:type] == "image" }
+        if image_index
+          library[:fields].insert(image_index + 1, *AUTOMATIC_IMAGE_FIELDS)
         end
 
         library[:fields].uniq! { |f| f[:id] }
@@ -156,6 +162,8 @@ module RobinCMS
 
     # This method provides custom validation which can't be expressed (or is
     # too difficult to express) using the Json Schema standard.
+    #
+    # TODO: validate that options are given if the field type is select.
     def validate!
       self[:libraries].each do |library|
         next if library[:fields].nil?

data/lib/robin_cms/data_library.rb

@@ -14,10 +14,11 @@ module RobinCMS
     def all
       return [] unless File.exist?(filepath)
 
-      items = YAML.load_file(filepath, symbolize_names: true)
+      items = YAML.load_file(filepath, symbolize_names: true, permitted_classes: [Date])
 
       return [] unless items
 
+      # Use the index of the item as it's id.
       items.each_with_index.map do |attrs, i|
         Item.new(i, attrs, **@schema)
       end
@@ -29,11 +30,17 @@ module RobinCMS
 
       item.update_timestamps!
 
+      # The item's id is it's index in the YAML array. If the id is nil, we are
+      # creating a new item; append it to the end of the array. If the id is
+      # not nil, we are editing an item; swap out the item at the index
+      # corresponding to it's id.
       all_items = YAML.load_file(filepath) || []
       if item.id.nil?
-        all_items.append(item.frontmatter)
+        # Data items don't have a published state.
+        all_items.append(item.frontmatter(ignore_published: true))
       else
-        all_items[item.id.to_i] = item.frontmatter
+        # As above.
+        all_items[item.id.to_i] = item.frontmatter(ignore_published: true)
       end
 
       serialized = YAML.dump(all_items, stringify_names: true)

data/lib/robin_cms/helpers.rb

@@ -37,13 +37,70 @@ module RobinCMS
       URI.decode_www_form(request.query_string).to_h
     end
 
-    def current_page
-      _, libraries, item = request.path_info.split("/")
-      item || libraries
+    def home
+      "/libraries/#{@config[:libraries].first[:id]}"
     end
 
-    def home_page
-      "/libraries/#{@config[:libraries].first[:id]}"
+    def path(addr)
+      url(addr, absolute = false)
+    end
+
+    def root_url
+      path("/")
+    end
+
+    def home_url
+      path(home)
+    end
+
+    def profile_url
+      path("/profile")
+    end
+
+    def logout_url
+      path("/logout")
+    end
+
+    def change_password_url
+      path("/change-password")
+    end
+
+    def library_url(library)
+      path("/libraries/#{library[:id]}")
+    end
+
+    def library_item_url(library, item = nil)
+      if item
+        path("/libraries/#{library[:id]}/item/#{item.id}")
+      else
+        path("/libraries/#{library[:id]}/item")
+      end
+    end
+
+    def delete_library_item_url(library, item)
+      path("/libraries/#{library[:id]}/item/#{item.id}/delete")
+    end
+
+    def library_attachment_url(library)
+      path("/libraries/#{library[:id]}/attachment")
+    end
+
+    def delete_library_attachment_url(library)
+      path("/libraries/#{library[:id]}/attachment/delete")
+    end
+
+    def item_image_url(item)
+      path(item.image_src)
+    end
+
+    def publish_url
+      path("/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
@@ -53,6 +110,22 @@ module RobinCMS
       "__#{prefix}_#{id}"
     end
 
+    # The attachments for Trix need to be served from the admin site root
+    # (usually "/admin") in order for the catch-all route handler to be able
+    # to serve them.
+    #
+    # TODO: You can set a "preview URL" for Trix (see
+    # https://github.com/basecamp/trix#previewing-attached-files). But I
+    # couldn't get it to work.
+    def escape_for_trix(value)
+      value = value
+        .sub(""href":"/uploads", ""href":"#{root_url}uploads")
+        .sub(""url":"/uploads", ""url":"#{root_url}uploads")
+        .sub("href=\"/uploads", "href=\"#{root_url}uploads")
+        .sub("url=\"/uploads", "url=\"#{root_url}uploads")
+      CGI::escapeHTML(value)
+    end
+
     def flash
       @flash ||= Flash.new(session ? session[:flash] : {})
     end

data/lib/robin_cms/item.rb

@@ -1,13 +1,25 @@
 # frozen_string_literal: true
 
 module RobinCMS
-  class Item
-    attr_reader :id, :attributes, :schema
+  # The in-memory data model for all items.
+  #
+  # The Item objects model the domain, while the Library objects model disk
+  # IO/persistence. Since the distinction between Data and Collection items is
+  # purely a distinction of how they are written to disk, this is abstracted
+  # entirely by the Library objects and therefore Item's don't care what type
+  # they are.
+  #
+  # There are two boundaries for serialization/deserialization of items. One is
+  # to/from the file used to store the data on disk. This happens in the
+  # find_one, all, and write methods of the Library classes. The other is
+  # to/from the html representation of the item. This happens in the
+  # attributes= and field_value_or_default methods in this class.
+  class Item 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 = {}, **schema)
       if !attrs.empty? && !attrs.has_key?(:title)
@@ -17,15 +29,49 @@ module RobinCMS
       @id = id
       @schema = schema
 
-      # Be sure to use the setter here so the keys get converted to symbols.
+      # Be sure to use the setter here.
       self.attributes = attrs
     end
 
     def attributes=(attributes)
       @attributes = attributes.to_h.transform_keys(&:to_sym)
 
-      if attributes.has_key?(:published)
-        @attributes[:published] = attributes[:published].to_s == "true"
+      # Parse array fields.
+      @schema[:fields].each do |f|
+        next unless f[:type] == "array"
+
+        field_id = f[:id].to_sym
+        if @attributes[field_id] && !@attributes[field_id].is_a?(Array)
+          @attributes[field_id] = @attributes[field_id].split(",").map(&:strip)
+        end
+      end
+
+      # Parse published status. The logic here is a bit weird, but basically an
+      # item without a 'published' key is considered published. Draft times are
+      # marked with 'published: false'. This is in line with how it works in
+      # Jekyll.
+      if blank?
+        @attributes[:published] = false # New items always default to draft.
+      elsif attributes.has_key?(:published)
+        @attributes[:published] = attributes[:published].to_s != "false"
+      else
+        @attributes[:published] = true
+      end
+    end
+
+    def field_value_or_default(field_id)
+      field = @schema[:fields].find { |f| f[:id] == field_id }
+      value = @attributes[field[:id].to_sym]
+
+      # Explicitly check for nil here because a field might have a value of
+      # false.
+      value = field[:default] if value.nil?
+
+      case field[:type]
+      when "array"
+        value&.join(",")
+      else
+        value.to_s
       end
     end
 
@@ -34,11 +80,11 @@ module RobinCMS
     end
 
     def published?
-      if @attributes.has_key?(:published)
-        @attributes[:published]
-      else
-        true
-      end
+      @attributes[:published]
+    end
+
+    def blank?
+      @id.nil?
     end
 
     def published_label
@@ -73,17 +119,30 @@ module RobinCMS
     def display_name
       return @attributes[:title] unless @schema[:display_name_pattern]
 
-      @schema[:display_name_pattern].clone.tap do |name|
-        @attributes.each { |key, value| name.gsub!(":#{key}", value) }
+      @schema[:display_name_pattern].dup.tap do |name|
+        @attributes.each { |key, value| name.gsub!(":#{key}", value.to_s) }
       end
     end
 
+    def image_src
+      @attributes[:image_src]
+    end
+
+    def image_alt
+      @attributes[:image_alt]
+    end
+
+    def can_delete?
+      @id && @schema[:can_delete]
+    end
+
     # Get the frontmatter as a hash with stringified keys.
-    def frontmatter
+    def frontmatter(ignore_published: false)
       frontmatter = @attributes.clone
       FRONTMATTER_IGNORE_KEYS.each { |key| frontmatter.delete(key) }
 
-      if published?
+      # See comment in the attributes= method.
+      if ignore_published || published?
         frontmatter.delete(:published)
       else
         frontmatter[:published] = false
@@ -95,15 +154,5 @@ module RobinCMS
       # to support earlier versions of Ruby.
       frontmatter.to_h.transform_keys(&:to_s)
     end
-
-    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 && @schema[:can_delete]
-    end
   end
 end

data/lib/robin_cms/library.rb

@@ -1,6 +1,13 @@
 # frozen_string_literal: true
 
 module RobinCMS
+  # The data access layer for Items.
+  #
+  # This class implements a Data Mapper pattern for persisting items to disk.
+  # It works well for this domain because there are two ways that items are
+  # written to disk, depending on whether they are a Data or Collection item.
+  # Since the Data Mapper is independent of the in-memory representation of
+  # Items, Items don't need to know about which 'type' they are.
   class Library
     include Editable
     include Sluggable
@@ -26,7 +33,7 @@ module RobinCMS
     end
 
     def blank
-      Item.new(nil, **@schema)
+      Item.new(nil, {}, **@schema)
     end
 
     def create_static(filename, tempfile)

data/lib/robin_cms/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RobinCMS
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 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="<%= home_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/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/image_field.erb

@@ -9,10 +9,9 @@
   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') %>"

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="<%= home_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,8 +20,8 @@
     <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 %>
@@ -30,7 +30,7 @@
       <tr>
         <th>Name</th>
         <% if @library.drafts_enabled? %>
-          <th>Status</th>
+          <th class="status">Status</th>
         <% end %>
         <th class="date">Created</th>
         <th class="date">Last updated</th>
@@ -40,27 +40,27 @@
       <% 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 class="date">
-            <a href='<%= url("/libraries/#{@library.kind}/item/#{item.id}") %>'>
-              <%= item.created_at.strftime("%b %d, %Y") %>
+            <a href="<%= library_item_url(@library, item) %>">
+              <%= item.created_at&.strftime("%b %d, %Y") %>
             </a>
           </td>
           <td class="date">
-            <a href='<%= url("/libraries/#{@library.kind}/item/#{item.id}") %>'>
-              <%= item.updated_at.strftime("%b %d, %Y") %>
+            <a href="<%= library_item_url(@library, item) %>">
+              <%= item.updated_at&.strftime("%b %d, %Y") %>
             </a>
           </td>
         </tr>

data/lib/robin_cms/views/library_actions.erb

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

data/lib/robin_cms/views/library_item.erb

@@ -8,29 +8,31 @@
   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", "array"
+          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, library: @library }
+        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/new_tab.svg.erb

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <svg fill="#000000" width="12px" height="12px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
   <path fill-rule="evenodd" d="M5,2 L7,2 C7.55228475,2 8,2.44771525 8,3 C8,3.51283584 7.61395981,3.93550716 7.11662113,3.99327227 L7,4 L5,4 C4.48716416,4 4.06449284,4.38604019 4.00672773,4.88337887 L4,5 L4,19 C4,19.5128358 4.38604019,19.9355072 4.88337887,19.9932723 L5,20 L19,20 C19.5128358,20 19.9355072,19.6139598 19.9932723,19.1166211 L20,19 L20,17 C20,16.4477153 20.4477153,16 21,16 C21.5128358,16 21.9355072,16.3860402 21.9932723,16.8833789 L22,17 L22,19 C22,20.5976809 20.75108,21.9036609 19.1762728,21.9949073 L19,22 L5,22 C3.40231912,22 2.09633912,20.75108 2.00509269,19.1762728 L2,19 L2,5 C2,3.40231912 3.24891996,2.09633912 4.82372721,2.00509269 L5,2 L7,2 L5,2 Z M21,2 L21.081,2.003 L21.2007258,2.02024007 L21.2007258,2.02024007 L21.3121425,2.04973809 L21.3121425,2.04973809 L21.4232215,2.09367336 L21.5207088,2.14599545 L21.5207088,2.14599545 L21.6167501,2.21278596 L21.7071068,2.29289322 L21.7071068,2.29289322 L21.8036654,2.40469339 L21.8036654,2.40469339 L21.8753288,2.5159379 L21.9063462,2.57690085 L21.9063462,2.57690085 L21.9401141,2.65834962 L21.9401141,2.65834962 L21.9641549,2.73400703 L21.9641549,2.73400703 L21.9930928,2.8819045 L21.9930928,2.8819045 L22,3 L22,3 L22,9 C22,9.55228475 21.5522847,10 21,10 C20.4477153,10 20,9.55228475 20,9 L20,5.414 L13.7071068,11.7071068 C13.3466228,12.0675907 12.7793918,12.0953203 12.3871006,11.7902954 L12.2928932,11.7071068 C11.9324093,11.3466228 11.9046797,10.7793918 12.2097046,10.3871006 L12.2928932,10.2928932 L18.584,4 L15,4 C14.4477153,4 14,3.55228475 14,3 C14,2.44771525 14.4477153,2 15,2 L21,2 Z"/>
 </svg>

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="<%= home_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,10 +1,96 @@
 <link rel="stylesheet" type="text/css" href="https://unpkg.com/trix@2.0.8/dist/trix.css">
+
+<style>
+  <%= erb :"trix.css" %>
+</style>
+
 <script type="text/javascript" src="https://unpkg.com/trix@2.0.8/dist/trix.umd.min.js"></script>
+<script>
+  addEventListener("trix-before-initialize", function () {
+    Trix.config.attachments.preview.caption = false;
+    Trix.config.attachments.file.caption = false;
+  });
+
+  addEventListener("trix-attachment-add", function (e) {
+    if (e.attachment.file) {
+      uploadFileAttachment(e.attachment);
+    }
+  });
+
+  addEventListener("trix-attachment-remove", function (e) {
+    if (e.attachment.file) {
+      removeFile(e.attachment);
+    }
+  });
+
+  function uploadFileAttachment(attachment) {
+    uploadFile(attachment.file, setProgress, setAttributes);
+
+    function setProgress(progress) {
+      attachment.setUploadProgress(progress); 
+    }
+
+    function setAttributes(attributes) {
+      attachment.setAttributes(attributes);
+    }
+  }
+
+  function uploadFile(file, progressCallback, successCallback) {
+    var formData = new FormData();
+    formData.append("key", createStorageKey(file));
+    formData.append("Content-Type", file.type);
+    formData.append("file", file);
+
+    var xhr = new XMLHttpRequest();
+
+    xhr.open("POST", "<%= library_attachment_url(library) %>", true);
+
+    xhr.upload.addEventListener("progress", function (e) {
+      var progress = e.loaded / e.total * 100;
+      progressCallback(progress);
+    });
+
+    xhr.addEventListener("load", function (e) {
+      if (xhr.status == 200) {
+        var res = JSON.parse(xhr.response);
+        var attributes = {
+          url: res.url,
+          href: res.url + "?content-disposition=attachment"
+        };
+        successCallback(attributes);
+      }
+    });
+
+    xhr.send(formData);
+  }
+
+  function removeFile(attachment) {
+    var url = attachment.getAttribute("url");
+    var parts = url.split("/");
+    var key = parts[parts.length - 1];
+
+    var formData = new FormData();
+    formData.append("key", key);
+
+    var xhr = new XMLHttpRequest();
+
+    xhr.open("POST", "<%= delete_library_attachment_url(library) %>", true); 
+    xhr.send(formData);
+  }
+
+  function createStorageKey(file) {
+    var date = new Date();
+    var day = date.toISOString().slice(0, 10);
+    return date.getTime() + "-" + file.name;
+  }
+</script>
+
 <%= erb :field_label, locals: { field: field } %>
+<%# TODO: label for attribute doesn't reference correct id %>
 <input
   id="richtext-content"
   type="hidden"
   name="<%= field[:id] %>"
-  value="<%= @item.field_value_or_default(field[:id]) %>"
+  value="<%= escape_for_trix(@item.field_value_or_default(field[:id])) %>"
 >
-<trix-editor input="richtext-content"></trix-editor>
+<trix-editor class="trix-content" input="richtext-content"></trix-editor>

data/lib/robin_cms/views/select_field.erb

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

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

@@ -78,7 +78,9 @@ th {
 }
 
 th.date,
-td.date > * {
+td.date > *,
+th.status,
+td.status > * {
   width: 7rem;
   text-align: right;
 }
@@ -192,7 +194,7 @@ select {
 input,
 select,
 trix-toolbar,
-img#image-preview {
+img.image-preview {
   display: block;
   margin-top: var(--padding-xs);
 }
@@ -423,7 +425,6 @@ hr {
 /* trix editor overrides */
 
 trix-editor {
-  height: 16rem;
   border: 1px solid var(--border-color) !important;
   border-radius: var(--border-radius) !important;
   box-shadow: var(--box-shadow-input);
@@ -444,3 +445,4 @@ trix-editor {
 .trix-button.trix-active {
   background: var(--accent-color-light) !important;
 }
+

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

@@ -0,0 +1,75 @@
+.trix-content {
+  line-height: 1.5; }
+  .trix-content * {
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0; }
+  .trix-content h1 {
+    font-size: 1.2em;
+    line-height: 1.2; }
+  .trix-content blockquote {
+    border: 0 solid #ccc;
+    border-left-width: 0.3em;
+    margin-left: 0.3em;
+    padding-left: 0.6em; }
+  .trix-content [dir=rtl] blockquote,
+  .trix-content blockquote[dir=rtl] {
+    border-width: 0;
+    border-right-width: 0.3em;
+    margin-right: 0.3em;
+    padding-right: 0.6em; }
+  .trix-content li {
+    margin-left: 1em; }
+  .trix-content [dir=rtl] li {
+    margin-right: 1em; }
+  .trix-content pre {
+    display: inline-block;
+    width: 100%;
+    vertical-align: top;
+    font-family: monospace;
+    font-size: 0.9em;
+    padding: 0.5em;
+    white-space: pre;
+    background-color: #eee;
+    overflow-x: auto; }
+  .trix-content img {
+    max-width: 100%;
+    height: auto; }
+  .trix-content .attachment {
+    display: inline-block;
+    position: relative;
+    max-width: 100%; }
+    .trix-content .attachment a {
+      color: inherit;
+      text-decoration: none; }
+      .trix-content .attachment a:hover, .trix-content .attachment a:visited:hover {
+        color: inherit; }
+  .trix-content .attachment__caption {
+    text-align: center; }
+    .trix-content .attachment__caption .attachment__name + .attachment__size::before {
+      content: ' \2022 '; }
+  .trix-content .attachment--preview {
+    width: 50%;
+    text-align: center; }
+    .trix-content .attachment--preview .attachment__caption {
+      color: #666;
+      font-size: 0.9em;
+      line-height: 1.2; }
+  .trix-content .attachment--file {
+    color: #333;
+    line-height: 1;
+    margin: 0 2px 2px 2px;
+    padding: 0.4em 1em;
+    border: 1px solid #bbb;
+    border-radius: 5px; }
+  .trix-content .attachment-gallery {
+    display: flex;
+    flex-wrap: wrap;
+    position: relative; }
+    .trix-content .attachment-gallery .attachment {
+      flex: 1 0 33%;
+      padding: 0 0.5em;
+      max-width: 33%; }
+    .trix-content .attachment-gallery.attachment-gallery--2 .attachment, .trix-content .attachment-gallery.attachment-gallery--4 .attachment {
+      flex-basis: 50%;
+      max-width: 50%; }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robin_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Aron Lebani
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-03 00:00:00.000000000 Z
+date: 2026-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -112,6 +112,7 @@ files:
 - lib/robin_cms/views/richtext_field.erb
 - lib/robin_cms/views/select_field.erb
 - lib/robin_cms/views/stylesheet.css.erb
+- lib/robin_cms/views/trix.css.erb
 homepage: https://robincms.org
 licenses:
 - MIT
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A simple, flat-file CMS for Static Site Generators.