hiiro 0.1.321 → 0.1.322

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 155f21221068bb182837aa80c7b920edfb592d46003cc697761441fca7e104d4
-  data.tar.gz: c911e69d3f63924790edd1103f299450ee19bbf70587f54ab205817a0ed9956b
+  metadata.gz: e9afb3fb676cd088cb19aeeaa944954a58fa3b10de8b9bbcd5e320ddcba8ee51
+  data.tar.gz: 1566f46fdbb10c362ecd8a6b7418350720c432d5822b9682464dc6336f73eb98
 SHA512:
-  metadata.gz: e7f3f13b81a41a625160d27c7e90a093f20678cd835f5ef1eadc95999fa00c17b41eaac793135389573746e233120b41f94363f87e59bbffac1357c9a573db47
-  data.tar.gz: 195f053e63a71b2975b4fb29addb85893e91012b1482e08547169e762d4651d9397c0a228b9e29735b3e16928d37f2cee906281ed0e674155366806590e7bdaa
+  metadata.gz: 84565259d3a19aae0295a8fa8d5adca7b28d5d834962a39a8d9965eb99ec5130d9e7c4a24bb44b1965e915f0c8bed9f56b9639c0370611f546849e55f431dcf7
+  data.tar.gz: fc8c1f1d6ea48a3399d3a7a1187800b96982b2aff2918753f31dd2fcc2aa2c4ea64395cf4cae3467b7cd5d554fa9e9e75b29ec23e268a850c0f147f89b93b7b5

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.1.322] - 2026-04-01
+
+### Changed
+- Refactor `h link tags` filtering logic to use new `Hiiro::Tag.tags_by_type` helper
+- Simplify tag query to use `Hiiro::Link.where(id:)` instead of manual filtering
+- Extract `tags_by_type(type)` singleton method to `Hiiro::Tag` for code reuse
+
 ## [0.1.321] - 2026-04-01
 
 ### Changed
@@ -271,4 +278,4 @@
 ## [0.1.295]
 
 ### Changed
-- Filter logic changes for PR management
+- Filter logic changes for PR management

data/bin/h-link

@@ -528,35 +528,21 @@ Hiiro.run(*ARGV, plugins: [Pins], links_file: lm.links_file) do
   end
 
   add_subcmd(:tags) do |*tag_args|
-    all_known = Hiiro::Tag.where(taggable_type: 'Link').distinct.pluck(:name).sort
+    all_known = Hiiro::Tag.tags_by_type('Link')
+    filtered = all_known.select{|t|
+      tag_args.any?{|ta| t.start_with?(ta) }
+    }
 
-    if tag_args.empty?
-      if all_known.empty?
-        puts "No tags found."
-      else
-        all_known.each { |t| puts t }
-      end
-      next
-    end
-
-    # Prefix-match the given args against known tags
-    matched_tags = tag_args.flat_map { |arg|
-      all_known.select { |t| t.start_with?(arg) }
-    }.uniq
-
-    if matched_tags.empty?
-      puts "No tags match: #{tag_args.join(', ')}"
-      next
-    end
-
-    # Batch-load all link tags to avoid N+1
-    tagged_ids = Hiiro::Tag.where(taggable_type: 'Link', name: matched_tags).map { |t| t.taggable_id.to_i }.uniq
-    links = lm.load_links.select { |link| tagged_ids.include?(link.id) }
-
-    if links.empty?
-      puts "No links tagged with: #{matched_tags.join(', ')}"
+    if filtered.empty?
+      puts "No tags found."
     else
-      links.each_with_index { |link, idx| puts link.display_string(idx) }
+      filtered.each do |tag_name|
+        ids = Hiiro::Tag.where(taggable_type: 'Link', name: tag_name).select(:taggable_id).map(&:taggable_id).map(&:to_i)
+        # links = lm.load_links.select  |link| tagged_ids.include?(link.id) }
+        links = Hiiro::Link.where(id: ids)
+        puts "#{tag_name}:"
+        links.each { |link| puts "  #{link.display_string(exclude_tags: [tag_name])}" }
+      end
     end
   end
 

data/lib/hiiro/link.rb

@@ -40,11 +40,11 @@ class Hiiro
       terms.all? { |term| searchable.include?(term.downcase) }
     end
 
-    def display_string(index = nil)
+    def display_string(index = nil, exclude_tags: [])
       num = index ? "#{(index + 1).to_s.rjust(3)}." : ""
       shorthand_str = shorthand ? " [#{shorthand}]" : ""
       desc_str = description.to_s.empty? ? "" : " - #{description}"
-      link_tags = tags
+      link_tags = tags - Array(exclude_tags)
       tags_str = link_tags.any? ? " \e[30;104m#{link_tags.join(' ')}\e[0m" : ""
       "#{num}#{shorthand_str} #{url}#{desc_str}#{tags_str}".strip
     end

data/lib/hiiro/tags.rb

@@ -21,6 +21,11 @@ class Hiiro
       klass&.[](taggable_id)
     end
 
+    # Returns all Tag rows for a given object
+    def self.tags_by_type(type)
+      where(taggable_type: type.to_s).select(:name).distinct.map(&:name).sort
+    end
+
     # Returns all Tag rows for a given object
     def self.for(obj)
       t = obj.class.name.split('::').last

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.321"
+  VERSION = "0.1.322"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.321
+  version: 0.1.322
 platform: ruby
 authors:
 - Joshua Toyota