completion-kit 0.27.1 → 0.27.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38c7acaadacc7cb636ee99e3eb7e4c52f68b89ed57122487eb1591be99435716
-  data.tar.gz: 3e5f9c36019c6635ae41b913eea74607f3b8c9f21a511c5ccc3f9ff75422282d
+  metadata.gz: 7f8fdeef847d7243a665b86e111343d0255ac2eb56ba6538c56c21871de04d1c
+  data.tar.gz: 58911d7d679a943284eacaaca586c6ad375efdf674aa1604f9895ca971f80c2e
 SHA512:
-  metadata.gz: 80adc55bde36fa3ac782c213c4786e677cd27d1b85bef81c14fbd89e05a82e229681866390c34d7f17cd9d6a153bcb93da705d63a87f7aede39dcb26929e3629
-  data.tar.gz: 533ef4f6c4b29791a66ce9169ab4c980a38838f5e3a5184d0b07cf0a4276ad0fd5990fae69616a2ea43421daebab1ca1ed2f246b4a310a506403db7548935981
+  metadata.gz: fd44b864ef07239759b9211cf24dac1aad601d30bd1b92068e5e2952571e338decb85be400464c1c3a947f40040c14aeea74384512594290f79dbfddbed19555
+  data.tar.gz: ad879e8ebc9f77dab47592f23b3bf0a6ae7eb101e11dc07e43a1ed7b67caa19fde109b3dcc20ab445c3a0c4daebb843b442b1de69ec9e433a3fe5da9d7d5c661

data/app/controllers/completion_kit/api/v1/prompts_controller.rb

@@ -25,12 +25,11 @@ module CompletionKit
 
         def update
           if @prompt.runs.exists?
-            new_prompt = @prompt.build_next_version(prompt_params.except(:tag_names).to_h)
+            new_prompt = @prompt.build_next_version(prompt_params.to_h)
             if new_prompt.valid?
               CompletionKit::ApplicationRecord.transaction do
                 new_prompt.save!
                 new_prompt.publish!
-                new_prompt.update!(tag_names: prompt_params[:tag_names]) if prompt_params.key?(:tag_names)
               end
               render json: new_prompt.reload
             else

data/app/controllers/completion_kit/prompts_controller.rb

@@ -33,16 +33,15 @@ module CompletionKit
     
     def update
       if @prompt.runs.exists?
-        new_prompt = @prompt.build_next_version(prompt_params.except(:tag_names).to_h)
+        new_prompt = @prompt.build_next_version(prompt_params.to_h)
         if new_prompt.valid?
           CompletionKit::ApplicationRecord.transaction do
             new_prompt.save!
             new_prompt.publish!
-            new_prompt.update!(tag_names: prompt_params[:tag_names]) if prompt_params.key?(:tag_names)
           end
           redirect_to prompt_path(new_prompt), notice: "Saved as #{new_prompt.version_label}."
         else
-          @prompt.assign_attributes(prompt_params.except(:tag_names).to_h)
+          @prompt.assign_attributes(prompt_params.to_h)
           @prompt.errors.merge!(new_prompt.errors)
           render :edit, status: :unprocessable_entity
         end

data/app/models/concerns/completion_kit/taggable.rb

@@ -7,18 +7,42 @@ module CompletionKit
                           class_name: "CompletionKit::Tagging",
                           dependent: :destroy
       has_many :tags, through: :taggings, class_name: "CompletionKit::Tag"
+
+      validate :assigned_tag_names_are_valid, if: -> { @tag_names_assigned }
+      after_save :sync_assigned_tags, if: -> { @tag_names_assigned }
     end
 
     def tag_names
+      return @assigned_tag_names if @tag_names_assigned
+
       tags.pluck(:name)
     end
 
     def tag_names=(names)
-      resolved = Array(names)
+      @tag_names_assigned = true
+      @assigned_tag_names = Array(names)
         .map { |n| n.to_s.strip.downcase }
         .reject(&:blank?)
         .uniq
-      self.tags = resolved.map { |name| CompletionKit::Tag.find_or_create_by!(name: name) }
+    end
+
+    private
+
+    def assigned_tag_names_are_valid
+      @assigned_tag_names.each do |name|
+        next if CompletionKit::Tag.exists?(name: name)
+
+        probe = CompletionKit::Tag.new(name: name)
+        next if probe.valid?
+
+        errors.add(:base, "Tag \"#{name}\" is not allowed: #{probe.errors[:name].to_sentence}")
+      end
+    end
+
+    def sync_assigned_tags
+      self.tags = @assigned_tag_names.map { |name| CompletionKit::Tag.find_or_create_by!(name: name) }
+      @tag_names_assigned = false
+      @assigned_tag_names = nil
     end
   end
 end

data/app/views/completion_kit/tags/_picker.html.erb

@@ -2,15 +2,21 @@
   <% label_text = local_assigns[:label].presence || "#{param_namespace.to_s.titleize} tags" %>
   <%= label_tag "#{param_namespace}_tags", label_text, class: "ck-label" %>
   <% all_tags = CompletionKit::Tag.order(:name) %>
-  <% selected_ids = (record.persisted? || record.tags.loaded?) ? record.tags.map(&:id) : [] %>
+  <% selected_names = record.tag_names %>
   <div class="ck-tag-picker">
     <% all_tags.each do |tag| %>
-      <% checked = selected_ids.include?(tag.id) %>
+      <% checked = selected_names.include?(tag.name) %>
       <label class="tag-mark" style="--mark-color: var(--tag-<%= tag.color %>);">
         <%= check_box_tag "#{param_namespace}[tag_names][]", tag.name, checked, class: "ck-visually-hidden", "aria-label": "Tag: #{tag.name}" %>
         <span aria-hidden="true"><%= tag.name %></span>
       </label>
     <% end %>
+    <% (selected_names - all_tags.map(&:name)).each do |pending_name| %>
+      <label class="tag-mark" style="--mark-color: var(--ck-muted);">
+        <%= check_box_tag "#{param_namespace}[tag_names][]", pending_name, true, class: "ck-visually-hidden", "aria-label": "Tag: #{pending_name}" %>
+        <span aria-hidden="true"><%= pending_name %></span>
+      </label>
+    <% end %>
     <%= text_field_tag "#{param_namespace}[tag_names][]", "",
           id: "#{param_namespace}_tags",
           class: "ck-tag-picker__input",

data/lib/completion_kit/version.rb

@@ -1,3 +1,3 @@
 module CompletionKit
-  VERSION = "0.27.1"
+  VERSION = "0.27.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: completion-kit
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.27.2
 platform: ruby
 authors:
 - Damien Bastin