hiiro 0.1.320 → 0.1.322

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac5dd6b23a9eb04c9cb6594be7dd68811fd4852b59939505e14e74d8b1f50baf
-  data.tar.gz: fa1d62dee0b0dcaaa845c2f1814de85f0bd5ddd69506267e2b8407384a045ec0
+  metadata.gz: e9afb3fb676cd088cb19aeeaa944954a58fa3b10de8b9bbcd5e320ddcba8ee51
+  data.tar.gz: 1566f46fdbb10c362ecd8a6b7418350720c432d5822b9682464dc6336f73eb98
 SHA512:
-  metadata.gz: 38db0092aeed1d9fe80b6ef6d5750bbe88a1c1ea9296b2c4ad6d3434b43a4770b6e9708dba9177d9defeed239a4b524425aceb6636ba186c3aea80761ad042ee
-  data.tar.gz: 86ba0fd4e1e23f04adaa0dfce69400baac5adc05f1121c7910e9b872c67190bd8eea68e95da0470d5dd4a04d7695171660cb3ea24a20bfdd04e20cbad472f5d6
+  metadata.gz: 84565259d3a19aae0295a8fa8d5adca7b28d5d834962a39a8d9965eb99ec5130d9e7c4a24bb44b1965e915f0c8bed9f56b9639c0370611f546849e55f431dcf7
+  data.tar.gz: fc8c1f1d6ea48a3399d3a7a1187800b96982b2aff2918753f31dd2fcc2aa2c4ea64395cf4cae3467b7cd5d554fa9e9e75b29ec23e268a850c0f147f89b93b7b5

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # 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
+- Extract `open_config` to `Hiiro::Config.open` singleton method; simplify parameter order from `dir:, file:` to positional `file, dir: nil`
+- Update all config subcommands to use new `Hiiro::Config.open` interface
+
 ## [0.1.320] - 2026-04-01
 
 ### Changed

data/bin/h-config

@@ -6,43 +6,43 @@ Hiiro.run(*ARGV) {
   add_subcmd(:vim) {
     dir = '~/.config/nvim'
     file = File.exist?(File.expand_path('~/.config/nvim/init.lua')) ? 'init.lua' : 'init.vim'
-    open_config(dir: dir, file: file)
+    open_config(file, dir: dir)
   }
 
   add_subcmd(:git) {
     make_child(subcmd, *args) {
       add_subcmd(:global) {
-        open_config(dir: '~', file: '.gitconfig')
+        open_config('.gitconfig', dir: '~')
       }
 
       add_subcmd(:ignore) {
-        open_config(dir: '~/.config/git', file: 'ignore')
+        open_config('ignore', dir: '~/.config/git')
       }
 
       add_subcmd(:local) {
         root = `git rev-parse --show-toplevel`.chomp
-        open_config(dir: root, file: '.git/config')
+        open_config('.git/config', dir: root)
       }
     }.run
   }
 
   add_subcmd(:tmux) {
-    open_config(dir: '~', file: '.tmux.conf')
+    open_config('.tmux.conf', dir: '~')
   }
 
   add_subcmd(:zsh) {
-    open_config(dir: '~', file: '.zshrc')
+    open_config('.zshrc', dir: '~')
   }
 
   add_subcmd(:profile) {
-    open_config(dir: '~', file: '.zprofile')
+    open_config('.zprofile', dir: '~')
   }
 
   add_subcmd(:starship) {
-    open_config(dir: '~/.config/starship', file: 'starship.toml')
+    open_config('starship.toml', dir: '~/.config/starship')
   }
 
   add_subcmd(:claude) {
-    open_config(dir: '~/.claude', file: 'settings.json')
+    open_config('settings.json', dir: '~/.claude')
   }
 }

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/config.rb

@@ -4,6 +4,13 @@ class Hiiro
     DATA_DIR = File.join(Dir.home, '.local/share/hiiro')
 
     class << self
+      def open(file, dir: nil)
+        dir_path = File.expand_path(dir || '~')
+        full_path = File.expand_path(file, dir_path)
+        Dir.chdir(dir_path)
+        system(ENV['EDITOR'] || 'vim', full_path)
+      end
+
       def path(relpath='')
         File.join(BASE_DIR, relpath)
       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.320"
+  VERSION = "0.1.322"
 end

data/lib/hiiro.rb

@@ -221,10 +221,8 @@ class Hiiro
     end
   end
 
-  def open_config(dir:, file:)
-    full_path = File.expand_path(File.join(dir, file))
-    Dir.chdir(File.expand_path(dir))
-    edit_files(full_path)
+  def open_config(file, dir: nil)
+    Hiiro::Config.open(file, dir: dir)
   end
 
   def tmux_client

metadata

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