iron-cms 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4f1606a68161e7822f4a8d5336b58b43343429a52bd0b3f7eaa6ab424935718
-  data.tar.gz: f95582ddbb51348db5fee680404341b2efeb1c1b91a00098b098520a05378487
+  metadata.gz: aade30fddfac9c750a207836942b5fbf79b97d51f18b1458e7282c1f5aa8bf66
+  data.tar.gz: 7bcc380eb89f8d93732d03cc1871a2ab7ba7a9c240b71397a472bfb03ffed2c2
 SHA512:
-  metadata.gz: ab8f9513f63854817eb29ccc2acbcb721a3e901bc56006fcca7e7951856ff57fb6e70043a35943b5c97bb5b711b94ef91124c3ec99cea2f16d403068e628b718
-  data.tar.gz: 3bef9f1beb9bcf603b0c7b98b848438bc487f689e0671f8b15a4afa85f504fd9f173ea8382fa4fc412c0d36a15a83a79fd1ab7c4a6ddbc4a68409d1b4cae956b
+  metadata.gz: d374e972b8465cdd89c400de59283ea01e89aef7926ec661cb348db946ecdd94ef3a96d99245a9d8c87a556a68ba2a081e06e8b94ba58959ddc1f9488e83fdd5
+  data.tar.gz: 4760b6764fba0911a0f9d0becc01c2cfd4c8c02889cdfb8a1bb80866f3b24ef364520230c6ddcd2d0742899f5b2523d1368d310249eda4104fb9cefb1e4b4fe5

data/README.md

@@ -207,27 +207,21 @@ To release a new version of the Iron gem:
 1. **Update the version and changelog:**
    - Update the version number in `lib/iron/version.rb`
    - Update `CHANGELOG.md` with the changes for the new version
+   - Run `bundle install` to update the lock file with the new version
 
-2. **Commit and tag the release:**
+2. **Commit the changes:**
 
    ```bash
-   git add -A
-   git commit -m "chore: release version X.Y.Z"
-   git tag -a vX.Y.Z -m "Release version X.Y.Z"
+   git commit -am "your commit message"
    ```
 
-3. **Push to GitHub:**
+3. **Release the gem:**
 
    ```bash
-   git push origin main --tags
+   bin/rails release
    ```
 
-4. **Build and publish the gem:**
-
-   ```bash
-   gem build iron.gemspec
-   gem push iron-X.Y.Z.gem
-   ```
+   This command will build the gem, tag the commit with the version number, push to GitHub, and publish to RubyGems.
 
 ## Contributing
 

data/app/assets/builds/iron.css

@@ -1699,151 +1699,6 @@
       }
     }
   }
-  .select {
-    display: block;
-    width: 100%;
-    appearance: none;
-    border-radius: var(--radius-lg);
-    padding-block: calc(calc(var(--spacing) * 2.5) - 1px);
-    @media (width >= 40rem) {
-      padding-block: calc(calc(var(--spacing) * 1.5) - 1px);
-    }
-    padding-right: calc(calc(var(--spacing) * 4.5) - 1px);
-    padding-left: calc(calc(var(--spacing) * 3.5) - 1px);
-    @media (width >= 40rem) {
-      padding-right: calc(calc(var(--spacing) * 4) - 1px);
-    }
-    @media (width >= 40rem) {
-      padding-left: calc(calc(var(--spacing) * 3) - 1px);
-    }
-    font-size: var(--text-base);
-    line-height: calc(var(--spacing) * 6);
-    color: var(--color-stone-950);
-    &::placeholder {
-      color: var(--color-stone-500);
-    }
-    @media (width >= 40rem) {
-      font-size: var(--text-sm);
-      line-height: calc(var(--spacing) * 6);
-    }
-    @media (prefers-color-scheme: dark) {
-      color: var(--color-white);
-    }
-    border-style: var(--tw-border-style);
-    border-width: 1px;
-    border-color: color-mix(in srgb, oklch(14.7% 0.004 49.25) 10%, transparent);
-    @supports (color: color-mix(in lab, red, red)) {
-      border-color: color-mix(in oklab, var(--color-stone-950) 10%, transparent);
-    }
-    &:hover {
-      @media (hover: hover) {
-        border-color: color-mix(in srgb, oklch(14.7% 0.004 49.25) 20%, transparent);
-        @supports (color: color-mix(in lab, red, red)) {
-          border-color: color-mix(in oklab, var(--color-stone-950) 20%, transparent);
-        }
-      }
-    }
-    @media (prefers-color-scheme: dark) {
-      border-color: color-mix(in srgb, #fff 10%, transparent);
-      @supports (color: color-mix(in lab, red, red)) {
-        border-color: color-mix(in oklab, var(--color-white) 10%, transparent);
-      }
-    }
-    @media (prefers-color-scheme: dark) {
-      &:hover {
-        @media (hover: hover) {
-          border-color: color-mix(in srgb, #fff 20%, transparent);
-          @supports (color: color-mix(in lab, red, red)) {
-            border-color: color-mix(in oklab, var(--color-white) 20%, transparent);
-          }
-        }
-      }
-    }
-    background-color: var(--color-white);
-    @media (prefers-color-scheme: dark) {
-      background-color: var(--color-stone-800);
-    }
-    &:focus {
-      --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
-      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
-    }
-    &:focus {
-      --tw-ring-color: var(--color-blue-500);
-    }
-    &:focus {
-      --tw-outline-style: none;
-      outline-style: none;
-    }
-    &:focus {
-      --tw-ring-inset: inset;
-    }
-    &:disabled {
-      border-color: color-mix(in srgb, oklch(14.7% 0.004 49.25) 20%, transparent);
-      @supports (color: color-mix(in lab, red, red)) {
-        border-color: color-mix(in oklab, var(--color-stone-950) 20%, transparent);
-      }
-    }
-    &:disabled {
-      opacity: 50%;
-    }
-    @media (prefers-color-scheme: dark) {
-      &:disabled {
-        border-color: color-mix(in srgb, #fff 15%, transparent);
-        @supports (color: color-mix(in lab, red, red)) {
-          border-color: color-mix(in oklab, var(--color-white) 15%, transparent);
-        }
-      }
-    }
-    @media (prefers-color-scheme: dark) {
-      &:disabled {
-        background-color: color-mix(in srgb, #fff 2.5%, transparent);
-        @supports (color: color-mix(in lab, red, red)) {
-          background-color: color-mix(in oklab, var(--color-white) 2.5%, transparent);
-        }
-      }
-    }
-    &[multiple] {
-      padding-inline: calc(calc(var(--spacing) * 3.5) - 1px);
-      @media (width >= 40rem) {
-        padding-inline: calc(calc(var(--spacing) * 3) - 1px);
-      }
-    }
-    &[data-ui~="invalid"] {
-      border-color: var(--color-red-500);
-      &:hover {
-        @media (hover: hover) {
-          border-color: var(--color-red-500);
-        }
-      }
-      @media (prefers-color-scheme: dark) {
-        border-color: var(--color-red-500);
-      }
-      @media (prefers-color-scheme: dark) {
-        &:hover {
-          @media (hover: hover) {
-            border-color: var(--color-red-500);
-          }
-        }
-      }
-    }
-    @supports (appearance: base-select) {
-      appearance: base-select;
-      &::picker-icon {
-        color: var(--color-stone-500);
-        transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter, display, content-visibility, overlay, pointer-events;
-        transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
-        transition-duration: var(--tw-duration, var(--default-transition-duration));
-        --tw-duration: 200ms;
-        transition-duration: 200ms;
-        @media (prefers-color-scheme: dark) {
-          color: var(--color-stone-400);
-        }
-      }
-      &:open::picker-icon {
-        rotate: 180deg;
-      }
-    }
-  }
   .line-clamp-1 {
     overflow: hidden;
     display: -webkit-box;
@@ -4613,7 +4468,7 @@
         }
       }
     }
-    input[type="submit"], input[type="button"], button {
+    input[type="submit"], input[type="button"], button:not(el-select button) {
       @layer components {
         @layer components {
           @layer components {
@@ -4714,6 +4569,9 @@
         }
       }
     }
+    label + div {
+      margin-top: calc(var(--spacing) * 2);
+    }
   }
 }
 [data-controller="icon-picker"] {
@@ -5362,10 +5220,6 @@
   inherits: false;
   initial-value: solid;
 }
-@property --tw-duration {
-  syntax: "*";
-  inherits: false;
-}
 @property --tw-translate-x {
   syntax: "*";
   inherits: false;
@@ -5460,6 +5314,10 @@
   syntax: "*";
   inherits: false;
 }
+@property --tw-duration {
+  syntax: "*";
+  inherits: false;
+}
 @property --tw-ease {
   syntax: "*";
   inherits: false;
@@ -5527,7 +5385,6 @@
       --tw-drop-shadow-alpha: 100%;
       --tw-drop-shadow-size: initial;
       --tw-border-style: solid;
-      --tw-duration: initial;
       --tw-translate-x: 0;
       --tw-translate-y: 0;
       --tw-translate-z: 0;
@@ -5550,6 +5407,7 @@
       --tw-backdrop-opacity: initial;
       --tw-backdrop-saturate: initial;
       --tw-backdrop-sepia: initial;
+      --tw-duration: initial;
       --tw-ease: initial;
       --tw-scale-x: 1;
       --tw-scale-y: 1;

data/app/assets/tailwind/iron/application.css

@@ -7,7 +7,6 @@
 @import './components/input.css';
 @import './components/textarea.css';
 @import './components/button.css';
-@import './components/select.css';
 @import './components/dropdown.css';
 @import './components/fieldset.css';
 @import './components/page.css';

data/app/assets/tailwind/iron/components/form.css

@@ -7,8 +7,12 @@
     input:not([type="checkbox"]):not([type="radio"]):not([type="submit"]):not([type="button"]) {
       @apply input;
     }
-    input[type="submit"], input[type="button"], button {
+    input[type="submit"], input[type="button"], button:not(el-select button) {
       @apply btn;
     }
+
+    label + div {
+      @apply mt-2;
+    }
   }
 }

data/app/helpers/iron/form_builder.rb

@@ -43,7 +43,7 @@ module Iron
     def collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
       selected_value = object.send(method) rescue nil
 
-      @template.render partial: "iron/shared/collection_select", locals: {
+      @template.render partial: "iron/shared/select", locals: {
         field_name: "#{object_name}[#{method}]",
         select_id: html_options[:id] || "#{object_name}_#{method}",
         selected_value: selected_value,
@@ -56,7 +56,7 @@ module Iron
     end
 
     def select(method, choices = nil, options = {}, html_options = {}, &block)
-      selected_value = object.send(method) rescue nil
+      selected_value = options[:selected] || (object.send(method) rescue nil)
 
       # Convert choices to a uniform format
       collection = case choices
@@ -74,7 +74,7 @@ module Iron
         []
       end
 
-      @template.render partial: "iron/shared/collection_select", locals: {
+      @template.render partial: "iron/shared/select", locals: {
         field_name: "#{object_name}[#{method}]",
         select_id: html_options[:id] || "#{object_name}_#{method}",
         selected_value: selected_value,

data/app/views/iron/content_types/_form.html.erb

@@ -52,10 +52,7 @@
       <div class="field">
         <%= form.label :type, "Type" %>
         <div>
-          <%= form.select :type, 
-                          options_for_select(Iron::ContentType::TYPES.map { |t| [t, Iron::ContentType.classify_type(t)] }, content_type.type), 
-                          {}, 
-                          { class: "select" } %>
+          <%= form.select :type, Iron::ContentType::TYPES.map { |t| [t, Iron::ContentType.classify_type(t)] } %>
           <p class="text-sm text-stone-500 mt-1">Single entry types have only one entry, collections can have multiple entries</p>
           <%= form.error_for :type %>
         </div>
@@ -66,12 +63,11 @@
       <div class="field">
         <%= form.label :title_field_definition_id, "Title Field" %>
         <div>
-          <%= form.collection_select :title_field_definition_id, 
-                                  content_type.titlable_definitions, 
-                                  :id, 
-                                  :name, 
-                                  { include_blank: "Select a field" }, 
-                                  { class: "select" } %>
+          <%= form.collection_select :title_field_definition_id,
+                                  content_type.titlable_definitions,
+                                  :id,
+                                  :name,
+                                  { include_blank: "Select a field" } %>
           <p class="text-sm text-stone-500 mt-1">Field used for entry titles in the admin interface</p>
           <%= form.error_for :title_field_definition_id %>
         </div>
@@ -102,17 +98,13 @@
           <%= form.label :web_page_title_field_definition_id, "Web Page Title Field" %>
           <div>
             <% if content_type.titlable_definitions.any? %>
-              <%= form.collection_select :web_page_title_field_definition_id, 
-                                      content_type.titlable_definitions, 
-                                      :id, 
-                                      :name, 
-                                      { include_blank: "Select a field" }, 
-                                      { class: "select" } %>
+              <%= form.collection_select :web_page_title_field_definition_id,
+                                      content_type.titlable_definitions,
+                                      :id,
+                                      :name,
+                                      { include_blank: "Select a field" } %>
             <% else %>
-              <%= form.select :web_page_title_field_definition_id,
-                              options_for_select([["No compatible fields", ""]]),
-                              {},
-                              { class: "select", disabled: true } %>
+              <%= form.select :web_page_title_field_definition_id, [["No compatible fields", ""]], {}, { disabled: true } %>
             <% end %>
             <p class="text-sm text-stone-500 mt-1">Field used to generate the URL handle for each entry</p>
             <%= form.error_for :web_page_title_field_definition_id %>

data/app/views/iron/entries/edit.html.erb

@@ -24,8 +24,7 @@
                                  :code,
                                  :name,
                                  { selected: params[:locale] },
-                                 onchange: "this.form.requestSubmit()",
-                                 class: "select" %>
+                                 { onchange: "this.form.requestSubmit()" } %>
         <% end %>
       <% end %>
       <% if @entry.content_type.web_publishing_enabled? && !@entry.route.nil? %>

data/app/views/iron/entries/entry.html.erb

@@ -10,8 +10,7 @@
                               :code,
                               :name,
                               { selected: params[:locale] },
-                              onchange: "this.form.requestSubmit()",
-                              class: "select" %>
+                              { onchange: "this.form.requestSubmit()" } %>
       <% end %>
     <% end %>
   </div>

data/app/views/iron/entries/fields/_reference.html.erb

@@ -8,5 +8,5 @@
 
   <%= builder.label :referenced_entry_id, field.definition.name %>
   <% entries = Iron::Entry.with_content_type(field.definition.supported_content_types.pluck(:id)) %>
-  <%= builder.collection_select :referenced_entry_id, entries, :id, :title, { include_blank: "Select an entry" }, { class: "select" } %>
+  <%= builder.collection_select :referenced_entry_id, entries, :id, :title, { include_blank: "Select an entry" } %>
 </div>

data/app/views/iron/entries/fields/_reference_list.html.erb

@@ -26,7 +26,7 @@
   </div>
 
   <div>
-      <%= builder.collection_select :value_entry_id, Iron::Entry.all, :id, :title, { include_blank: "Select an entry" }, { class: "select" } if false %>
+      <%= builder.collection_select :value_entry_id, Iron::Entry.all, :id, :title, { include_blank: "Select an entry" } if false %>
 
       <div>
         <% picker_id = "picker_#{reference_list_dom_id}" %>

data/app/views/iron/entries/fields/_text_field.html.erb

@@ -15,8 +15,7 @@
   <% if field.definition.allowed_values.present? %>
     <%= builder.select :value_string,
                    field.definition.allowed_values,
-                   { include_blank: "Select #{field.definition.name}" },
-                   { class: "select" } %>
+                   { include_blank: "Select #{field.definition.name}" } %>
   <% else %>
     <%= builder.text_field :value_string %>
   <% end %>

data/app/views/iron/field_definitions/block/_form.html.erb

@@ -6,10 +6,7 @@
                 Iron::BlockDefinition.all,
                 :id, :name,
                 { prompt: "Select a block definition" },
-                {
-                  name: "field_definition[supported_block_definition_ids][]",
-                  class: "select"
-                } %>
+                { name: "field_definition[supported_block_definition_ids][]" } %>
 
     </div>
   </div>

data/app/views/iron/field_definitions/new.html.erb

@@ -8,9 +8,9 @@
     <div class="mt-6 mb-2 w-64">
       <%= form_with(method: :get) do |form| %>
         <%= form.select :type,
-          options_for_select(field_definition_type_options, @field_definition.type_handle),
-          {},
-          { onchange: "this.form.requestSubmit()", class: "select" }
+          field_definition_type_options,
+          { selected: @field_definition.type_handle },
+          { onchange: "this.form.requestSubmit()" }
         %>
       <% end %>
     </div>

data/app/views/iron/settings/show.html.erb

@@ -19,12 +19,7 @@
         <div class="field">
           <%= form.label :default_locale_id, "Default Locale" %>
           <div>
-            <%= form.collection_select :default_locale_id,
-                                   @locales,
-                                   :id,
-                                   :name,
-                                   {},
-                                   { class: "select" } %>
+            <%= form.collection_select :default_locale_id, @locales, :id, :name %>
             <%= form.error_for :default_locale_id %>
           </div>
         </div>

data/app/views/iron/shared/{_collection_select.html.erb → _select.html.erb}

@@ -1,6 +1,6 @@
 <%# locals: (field_name:, select_id:, selected_value:, collection:, value_method:, text_method:, options:, html_options:) -%>
 
-<el-select id="<%= select_id %>" name="<%= field_name %>" value="<%= selected_value %>" class="mt-2 block">
+<el-select id="<%= select_id %>" name="<%= field_name %>" value="<%= selected_value %>" class="<%= tw("block", html_options[:class]) %>">
   <button type="button" class="grid w-full cursor-default grid-cols-1 rounded-md bg-white py-1.5 pr-2 pl-3 text-left text-stone-900 outline-1 -outline-offset-1 outline-stone-400 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-sky-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:focus-visible:outline-sky-500">
     <el-selectedcontent class="col-start-1 row-start-1 truncate pr-6"></el-selectedcontent>
     <%= icon "chevrons-up-down", class: "col-start-1 row-start-1 size-5 self-center justify-self-end text-stone-500 sm:size-4 dark:text-stone-400" %>

data/app/views/iron/users/_form.html.erb

@@ -11,7 +11,7 @@
     <div class="field">
       <%= form.label :role, "User role" %>
       <div>
-        <%= form.collection_select :role, Iron::User.roles.keys, :to_s, :titleize, {}, { class: "select" } %>
+        <%= form.collection_select :role, Iron::User.roles.keys, :to_s, :titleize %>
         <%= form.error_for :role %>
       </div>
     </div>

data/app/views/iron/users/_user.html.erb

@@ -15,7 +15,7 @@
             <div class="field">
               <%= form.label :role, "User role", class: "sr-only" %>
               <div>
-                <%= form.collection_select :role, Iron::User.roles.keys, :to_s, :titleize, {}, { class: "select" } %>
+                <%= form.collection_select :role, Iron::User.roles.keys, :to_s, :titleize %>
                 <%= form.error_for :role %>
               </div>
             </div>

data/lib/iron/version.rb

@@ -1,3 +1,3 @@
 module Iron
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Massimo De Marchi
@@ -185,7 +185,6 @@ files:
 - app/assets/tailwind/iron/components/icon-picker.css
 - app/assets/tailwind/iron/components/input.css
 - app/assets/tailwind/iron/components/page.css
-- app/assets/tailwind/iron/components/select.css
 - app/assets/tailwind/iron/components/sidebar.css
 - app/assets/tailwind/iron/components/textarea.css
 - app/controllers/concerns/iron/authentication.rb
@@ -378,8 +377,8 @@ files:
 - app/views/iron/schemas/new.html.erb
 - app/views/iron/sessions/new.html.erb
 - app/views/iron/settings/show.html.erb
-- app/views/iron/shared/_collection_select.html.erb
 - app/views/iron/shared/_icon_picker.html.erb
+- app/views/iron/shared/_select.html.erb
 - app/views/iron/users/_form.html.erb
 - app/views/iron/users/_user.html.erb
 - app/views/iron/users/edit.html.erb

data/app/assets/tailwind/iron/components/select.css

@@ -1,36 +0,0 @@
-@utility select {
-  @apply block w-full rounded-lg appearance-none;
-  @apply py-[calc(--spacing(2.5)-1px)] sm:py-[calc(--spacing(1.5)-1px)];
-  @apply pl-[calc(--spacing(3.5)-1px)] pr-[calc(--spacing(4.5)-1px)]
-         sm:pl-[calc(--spacing(3)-1px)] sm:pr-[calc(--spacing(4)-1px)];
-  @apply text-base/6 sm:text-sm/6 text-stone-950 placeholder:text-stone-500
-         dark:text-white;
-  @apply border border-stone-950/10 hover:border-stone-950/20
-         dark:border-white/10 dark:hover:border-white/20;
-  @apply bg-white dark:bg-stone-800;
-  @apply focus:outline-none focus:ring-2 focus:ring-inset focus:ring-blue-500;
-  @apply disabled:opacity-50 disabled:border-stone-950/20
-         dark:disabled:border-white/15 dark:disabled:bg-white/[2.5%];
-
-  /* Multi-select needs equal padding both sides */
-  &[multiple] { @apply px-[calc(--spacing(3.5)-1px)]
-                       sm:px-[calc(--spacing(3)-1px)]; }
-
-  /* Validation error, toggled with attribute */
-  &[data-ui~="invalid"] {
-    @apply border-red-500 hover:border-red-500
-           dark:border-red-500 dark:hover:border-red-500;
-  }
-
-  @supports (appearance: base-select) {
-    appearance: base-select;
-
-    &::picker-icon {
-      @apply text-stone-500 dark:text-stone-400 transition duration-200;
-    }
-    &:open::picker-icon {
-      @apply rotate-180;
-    }
-  }
-}
-