searchlink 2.3.66 → 2.3.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa9aabec2e7d1931101ac46101f40dfd391812cb95a979ea4cc66ec2fa274c86
-  data.tar.gz: 3bea7117898d5c0ed25c449e8c8d016e2bfbc022719ab090593b337c32d182b1
+  metadata.gz: 2bb82b5a1651a62b1e08835d66262ba2c7f14a1549645bdfa30f6a182dbfb4f1
+  data.tar.gz: e2e5f2f4585673720b2e54c86b30c73a900f2fe9405ae27668368d62543c4d40
 SHA512:
-  metadata.gz: 1de6a3c466edc14a877a7214fa28b146cbb6398d11de8b5e188dc753f22c9cb541f73a20b86a9d616c5dd4ad26042bd014fe6b377c7564a57eddc44da2edf87d
-  data.tar.gz: 18e990d232f170d225f82140f2678a141ecc3c6a142331e24d3f924a33dfdee671c23c1807bd66dd392cd0bf0f04a6c3dcd17816b8cf658b7d6032a9ac43aed9
+  metadata.gz: 80c086ce264c18182ddad89a8b7c8a677b32d685232d571736e767c3fb4f27bc43451c0ab32ba2e68d5a6d0e4226a7634346833875759994fc921b807678d194
+  data.tar.gz: a00fdb7d2371b187e2a1159bd48cade34fe53f0fcf14dd0b1fbb4948e35a17303aab5ea47779d790769bbe70497897b68ff83015f088a7e480f923be42c3c0f9

data/lib/searchlink/array.rb

@@ -1,11 +1,15 @@
+# frozen_string_literal: true
+
 # Array helpers
 class ::Array
-  # Finds the longest element in an array of strings
+  # This method takes an array and returns the longest element of that array.
+  #
+  # @return [String] Longest string in array
   #
-  # @return [String] first element among longest elements
   def longest_element
     longest_elements[0]
   end
+
   # Finds the longest elements and returns an Array
   #
   # @return [Array] array of longest elements

data/lib/searchlink/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   class << self
     attr_writer :config, :prev_config

data/lib/searchlink/curl/html.rb

@@ -375,8 +375,6 @@ module Curl
       images
     end
 
-
-
     ##
     ## Curls the html for the page
     ##
@@ -396,7 +394,9 @@ module Curl
       headers = headers.nil? ? '' : headers.map { |h, v| %(-H "#{h}: #{v}") }.join(' ')
       compress = compressed ? '--compressed' : ''
       source = `#{@curl} -#{flags} #{compress} #{headers} '#{url}' 2>/dev/null`
-      source = `#{@curl} -#{flags} #{compress} -A "#{agent}" #{headers} '#{url}' 2>/dev/null` if source.nil? || source.empty?
+      if source.nil? || source.empty?
+        source = `#{@curl} -#{flags} #{compress} -A "#{agent}" #{headers} '#{url}' 2>/dev/null`
+      end
 
       return false if source.nil? || source.empty?
 
@@ -411,7 +411,7 @@ module Curl
           m = Regexp.last_match
           headers[m[1]] = m[2]
         else
-          source = lines[idx..].join("\n")
+          source = lines[idx..-1].join("\n")
           break
         end
       end

data/lib/searchlink/curl/json.rb

@@ -27,11 +27,11 @@ module Curl
       parts = path.split(/./)
       target = json
       parts.each do |part|
-        if part =~ /(?<key>[^\[]+)\[(?<int>\d+)\]/
-          target = target[key][int.to_i]
-        else
-          target = target[part]
-        end
+        target = if part =~ /(?<key>[^\[]+)\[(?<int>\d+)\]/
+                   target[key][int.to_i]
+                 else
+                   target[part]
+                 end
       end
 
       target
@@ -56,7 +56,9 @@ module Curl
       headers = headers.nil? ? '' : headers.map { |h, v| %(-H "#{h}: #{v}") }.join(' ')
       compress = compressed ? '--compressed' : ''
       source = `#{@curl} -#{flags} #{compress} #{headers} '#{url}' 2>/dev/null`
-      source = `#{@curl} -#{flags} #{compress} -A "#{agent}" #{headers} '#{url}' 2>/dev/null` if source.nil? || source.empty?
+      if source.nil? || source.empty?
+        source = `#{@curl} -#{flags} #{compress} -A "#{agent}" #{headers} '#{url}' 2>/dev/null`
+      end
 
       return false if source.nil? || source.empty?
 
@@ -71,7 +73,7 @@ module Curl
           m = Regexp.last_match
           headers[m[1]] = m[2]
         else
-          source = lines[idx..].join("\n")
+          source = lines[idx..-1].join("\n")
           break
         end
       end

data/lib/searchlink/help.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   class SearchLink
     def help_css
@@ -65,7 +67,7 @@ module SL
 
       if SL.config['custom_site_searches']
         text += "\n-- [Custom Searches] ----------------------\n"
-        SL.config['custom_site_searches'].sort_by { |l, s| l }.each { |label, site| text += "!#{label}#{label.spacer} #{site}\n" }
+        SL.config['custom_site_searches'].sort_by { |l, _s| l }.each { |label, site| text += "!#{label}#{label.spacer} #{site}\n" }
       end
       text
     end

data/lib/searchlink/output.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   class << self
     attr_writer :titleize, :clipboard, :output, :footer, :line_num,
@@ -95,7 +97,7 @@ module SL
       text = text ? text.strip : title
       title = title && (SL.config['include_titles'] || force_title) ? %( "#{title.clean}") : ''
 
-      title.gsub!(/[ \t]+/, ' ')
+      title = title.gsub(/[ \t]+/, ' ')
 
       case type.to_sym
       when :ref_title

data/lib/searchlink/parse.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   class SearchLink
     # Parse arguments in the input string
@@ -8,9 +10,9 @@ module SL
     # @option opt [Boolean] :no_restore (false) whether to restore previous config
     # @return     [String] the parsed string
     #
-    def parse_arguments(string, opt={})
+    def parse_arguments(string, opt = {})
       input = string.dup
-      return "" if input.nil?
+      return '' if input.nil?
 
       skip_flags = opt[:only_meta] || false
       no_restore = opt[:no_restore] || false
@@ -279,7 +281,11 @@ module SL
               if link_info =~ /^(?:[!\^](\S+))\s*(.*)$/
                 m = Regexp.last_match
 
-                search_type = m[1].nil? ? (SL::GoogleSearch.test_for_key ? 'gg' : 'g') : m[1]
+                search_type = if m[1].nil?
+                                SL::GoogleSearch.test_for_key ? 'gg' : 'g'
+                              else
+                                m[1]
+                              end
 
                 search_terms = m[2].gsub(/(^["']|["']$)/, '')
                 search_terms.strip!
@@ -301,7 +307,7 @@ module SL
                 # if the end of input contains "!!", only print the url
                 link_only = true if search_terms =~ /!!\^?$/
 
-                search_terms.sub!(/(!!)?\^?(!!)?$/,"")
+                search_terms.sub!(/(!!)?\^?(!!)?$/, '')
 
               elsif link_info =~ /^!/
                 search_word = link_info.match(/^!(\S+)/)
@@ -389,7 +395,7 @@ module SL
 
               if (search_type && search_terms) || url
                 # warn "Searching #{search_type} for #{search_terms}"
-                if (!url)
+                unless url
                   search_count += 1
                   url, title, link_text = do_search(search_type, search_terms, link_text, search_count)
                 end
@@ -433,7 +439,7 @@ module SL
                     res
                   end
                 else
-                   SL.add_error('No results', "#{search_terms} (#{match_string})")
+                  SL.add_error('No results', "#{search_terms} (#{match_string})")
                   counter_errors += 1
                   match
                 end
@@ -564,7 +570,7 @@ module SL
                     end
                     terms_p = terms.split(/ +/)
                     if terms_p.length > highest_token
-                      remainder = terms_p[highest_token - 1..].join(' ')
+                      remainder = terms_p[highest_token - 1..-1].join(' ')
                       terms_p = terms_p[0..highest_token - 2]
                       terms_p.push(remainder)
                     end
@@ -619,14 +625,11 @@ module SL
         # Social handle expansion
         when /^([tfilm])?@(\S+)\s*$/
           type = Regexp.last_match(1)
-          unless type
-            # If contains @ mid-handle, use Mastodon
-            if Regexp.last_match(2) =~ /[a-z0-9_]@[a-z0-9_.]+/i
-              type = 'm'
-            else
-              type = 't'
-            end
-          end
+          type ||= if Regexp.last_match(2) =~ /[a-z0-9_]@[a-z0-9_.]+/i
+                     'm'
+                   else
+                     't'
+                   end
           link_text = input.sub(/^[tfilm]/, '')
           url, title = SL::SocialSearch.social_handle(type, link_text)
           link_text = title

data/lib/searchlink/plist.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 # = plist
 #
 # Copyright 2006-2010 Ben Bleything and Patrick May
 # Distributed under the MIT License
-module Plist ; end
+module Plist; end
 
 # === Load a plist file
 # This is the main point of the library:
 #
 #   r = Plist::parse_xml( filename_or_xml )
 module Plist
-  def Plist::parse_xml( filename_or_xml )
+  def self.parse_xml(filename_or_xml)
     listener = Listener.new
     parser = StreamParser.new(filename_or_xml, listener)
     parser.parse
@@ -21,18 +23,18 @@ module Plist
 
     def initialize
       @result = nil
-      @open = Array.new
+      @open = []
     end
 
-    def tag_start(name, attributes)
-      @open.push PTag::mappings[name].new
+    def tag_start(name, _attributes)
+      @open.push PTag.mappings[name].new
     end
 
-    def text( contents )
+    def text(contents)
       @open.last.text = contents if @open.last
     end
 
-    def tag_end(name)
+    def tag_end(_name)
       last = @open.pop
       if @open.empty?
         @result = last.to_ruby
@@ -43,28 +45,28 @@ module Plist
   end
 
   class StreamParser
-    def initialize( plist_data_or_file, listener )
-      if plist_data_or_file.respond_to? :read
-        @xml = plist_data_or_file.read
-      elsif File.exists? plist_data_or_file
-        @xml = File.read( plist_data_or_file )
-      else
-        @xml = plist_data_or_file
-      end
+    def initialize(plist_data_or_file, listener)
+      @xml = if plist_data_or_file.respond_to? :read
+               plist_data_or_file.read
+             elsif File.exist? plist_data_or_file
+               File.read(plist_data_or_file)
+             else
+               plist_data_or_file
+             end
 
       @listener = listener
     end
 
-    TEXT       = /([^<]+)/
-    XMLDECL_PATTERN = /<\?xml\s+(.*?)\?>*/um
-    DOCTYPE_PATTERN = /\s*<!DOCTYPE\s+(.*?)(\[|>)/um
-    COMMENT_START = /\A<!--/u
-    COMMENT_END = /.*?-->/um
+    TEXT = /([^<]+)/.freeze
+    XMLDECL_PATTERN = /<\?xml\s+(.*?)\?>*/um.freeze
+    DOCTYPE_PATTERN = /\s*<!DOCTYPE\s+(.*?)(\[|>)/um.freeze
+    COMMENT_START = /\A<!--/u.freeze
+    COMMENT_END = /.*?-->/um.freeze
 
     def parse
-      plist_tags = PTag::mappings.keys.join('|')
+      plist_tags = PTag.mappings.keys.join('|')
       start_tag  = /<(#{plist_tags})([^>]*)>/i
-      end_tag    = /<\/(#{plist_tags})[^>]*>/i
+      end_tag    = %r{</(#{plist_tags})[^>]*>}i
 
       require 'strscan'
 
@@ -76,53 +78,51 @@ module Plist
         elsif @scanner.scan(DOCTYPE_PATTERN)
         elsif @scanner.scan(start_tag)
           @listener.tag_start(@scanner[1], nil)
-          if (@scanner[2] =~ /\/$/)
-            @listener.tag_end(@scanner[1])
-          end
+          @listener.tag_end(@scanner[1]) if @scanner[2] =~ %r{/$}
         elsif @scanner.scan(TEXT)
           @listener.text(@scanner[1])
         elsif @scanner.scan(end_tag)
           @listener.tag_end(@scanner[1])
         else
-          raise "Unimplemented element"
+          raise 'Unimplemented element'
         end
       end
     end
   end
 
   class PTag
-    @@mappings = { }
-    def PTag::mappings
+    @@mappings = {}
+    def self.mappings
       @@mappings
     end
 
-    def PTag::inherited( sub_class )
+    def self.inherited(sub_class)
       key = sub_class.to_s.downcase
-      key.gsub!(/^plist::/, '' )
-      key.gsub!(/^p/, '')  unless key == "plist"
+      key.gsub!(/^plist::/, '')
+      key.gsub!(/^p/, '') unless key == 'plist'
 
       @@mappings[key] = sub_class
     end
 
     attr_accessor :text, :children
     def initialize
-      @children = Array.new
+      @children = []
     end
 
     def to_ruby
-      raise "Unimplemented: " + self.class.to_s + "#to_ruby on #{self.inspect}"
+      raise 'Unimplemented: ' + self.class.to_s + "#to_ruby on #{inspect}"
     end
   end
 
   class PList < PTag
     def to_ruby
-      children.first.to_ruby if children.first
+      children.first&.to_ruby
     end
   end
 
   class PDict < PTag
     def to_ruby
-      dict = Hash.new
+      dict = {}
       key = nil
 
       children.each do |c|
@@ -140,21 +140,19 @@ module Plist
 
   class PKey < PTag
     def to_ruby
-      CGI::unescapeHTML(text || '')
+      CGI.unescapeHTML(text || '')
     end
   end
 
   class PString < PTag
     def to_ruby
-      CGI::unescapeHTML(text || '')
+      CGI.unescapeHTML(text || '')
     end
   end
 
   class PArray < PTag
     def to_ruby
-      children.collect do |c|
-        c.to_ruby
-      end
+      children.collect(&:to_ruby)
     end
   end
 
@@ -195,19 +193,17 @@ module Plist
       data = Base64.decode64(text.gsub(/\s+/, ''))
 
       begin
-        return Marshal.load(data)
+        Marshal.load(data)
       rescue Exception
         io = StringIO.new
         io.write data
         io.rewind
-        return io
+        io
       end
     end
   end
 end
 
-
 # module Plist
 #   VERSION = '3.1.0'
 # end
-

data/lib/searchlink/search.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Main SearchLink class
 module SL
   include URL

data/lib/searchlink/searches/amazon.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   # Amazon Search
   class AmazonSearch

data/lib/searchlink/searches/applemusic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # title: Apple Music Search
 # description: Search Apple Music
 module SL

data/lib/searchlink/searches/bitly.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   # Bit.ly link shortening
   class BitlySearch

data/lib/searchlink/searches/definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   # Dictionary Definition Search
   class DefinitionSearch

data/lib/searchlink/searches/duckduckgo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   # DuckDuckGo Search
   class DuckDuckGoSearch
@@ -36,36 +38,34 @@ module SL
 
         # return SL.ddg(search_terms, link_text) if search_type == 'g' && SL::GoogleSearch.test_for_key
 
-        begin
-          terms = "%5C#{search_terms.url_encode}"
-          page = Curl::Html.new("https://duckduckgo.com/?q=#{terms}", compressed: true)
+        terms = "%5C#{search_terms.url_encode}"
+        page = Curl::Html.new("https://duckduckgo.com/?q=#{terms}", compressed: true)
 
-          locs = page.meta['refresh'].match(%r{/l/\?uddg=(.*?)$})
-          locs = page.body.match(%r{/l/\?uddg=(.*?)'}) if locs.nil?
-          locs = page.body.match(/url=(.*?)'/) if locs.nil?
+        locs = page.meta['refresh'].match(%r{/l/\?uddg=(.*?)$})
+        locs = page.body.match(%r{/l/\?uddg=(.*?)'}) if locs.nil?
+        locs = page.body.match(/url=(.*?)'/) if locs.nil?
 
-          return false if locs.nil?
+        return false if locs.nil?
 
-          url = locs[1].url_decode.sub(/&rut=\w+/, '')
+        url = locs[1].url_decode.sub(/&rut=\w+/, '')
 
-          result = url.strip.url_decode || false
-          return false unless result
+        result = url.strip.url_decode || false
+        return false unless result
 
-          return false if result =~ /internal-search\.duckduckgo\.com/
+        return false if result =~ /internal-search\.duckduckgo\.com/
 
-          # output_url = CGI.unescape(result)
-          output_url = result
+        # output_url = CGI.unescape(result)
+        output_url = result
 
-          output_title = if SL.config['include_titles'] || SL.titleize
-                           SL::URL.title(output_url) || ''
-                         else
-                           ''
-                         end
+        output_title = if SL.config['include_titles'] || SL.titleize
+                         SL::URL.title(output_url) || ''
+                       else
+                         ''
+                       end
 
-          output_url = SL.first_image(output_url) if search_type =~ /img$/
+        output_url = SL.first_image(output_url) if search_type =~ /img$/
 
-          [output_url, output_title, link_text]
-        end
+        [output_url, output_title, link_text]
       end
 
       # Searches DuckDuckGo for the given search terms and

data/lib/searchlink/searches/github.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   # GitHub search
   class GitHubSearch
@@ -59,6 +61,11 @@ module SL
 
         res = Curl::Json.new(url, headers: headers).json
 
+        if res.is_a?(Hash) && res['status'].to_i == 401
+          SL.notify('Error', 'Bad GitHub credentials')
+          return nil
+        end
+
         best = nil
         best = filter_gists(res, search_terms) if res
 
@@ -209,7 +216,7 @@ module SL
         else
           if terms.split(/ +/).count > 1
             parts = terms.split(/ +/)
-            gist = search_user_gists(parts[0], parts[1..].join(' '))
+            gist = search_user_gists(parts[0], parts[1..-1].join(' '))
 
             if gist
               url = gist[:url]

data/lib/searchlink/searches/google.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   # Google Search
   class GoogleSearch

data/lib/searchlink/searches/helpers/chromium.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ##
 ## Chromium (Chrome, Arc, Brave, Edge) search methods
 ##
@@ -273,7 +275,7 @@ module SL
           if json.key? 'children'
             urls = extract_chrome_bookmarks(json['children'], urls, term)
           elsif json['type'] == 'url'
-            date = Time.at(json['date_added'].to_i / 1000000 + (Time.new(1601, 01, 01).strftime('%s').to_i))
+            date = Time.at(json['date_added'].to_i / 1_000_000 + Time.new(1601, 0o1, 0o1).strftime('%s').to_i)
             url = { url: json['url'], title: json['name'], date: date }
             score = score_mark(url, term)
 
@@ -299,7 +301,7 @@ module SL
       def score_mark(mark, terms)
         return 0 unless mark[:url]
 
-        score = if mark[:title] && mark[:title].matches_exact(terms)
+        score = if mark[:title]&.matches_exact(terms)
                   12 + mark[:url].matches_score(terms, start_word: false)
                 elsif mark[:url].matches_exact(terms)
                   11

data/lib/searchlink/searches/helpers/firefox.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   class HistorySearch
     class << self
@@ -56,12 +58,11 @@ module SL
 
           marks.map! do |bm|
             date = Time.parse(bm['datum'])
-            score = score_mark({url: bm['url'], title: bm['title']}, term)
+            score = score_mark({ url: bm['url'], title: bm['title'] }, term)
             { url: bm['url'], title: bm['title'], date: date, score: score }
           end
 
-
-          m = marks.sort_by { |m| [m[:url].length * -1, m[:score]] }.last
+          m = marks.max_by { |m| [m[:url].length * -1, m[:score]] }
 
           [m[:url], m[:title], m[:date]]
         else
@@ -124,7 +125,7 @@ module SL
           bm = JSON.parse(most_recent)[0]
 
           date = Time.parse(bm['datum'])
-          score = score_mark({url: bm['url'], title: bm['title']}, term)
+          score = score_mark({ url: bm['url'], title: bm['title'] }, term)
           [bm['url'], bm['title'], date, score]
         else
           false

data/lib/searchlink/searches/helpers/safari.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   class HistorySearch
     class << self

data/lib/searchlink/searches/history.rb

@@ -1,10 +1,12 @@
-#import
+# frozen_string_literal: true
+
+# import
 require_relative 'helpers/chromium'
 
-#import
+# import
 require_relative 'helpers/firefox'
 
-#import
+# import
 require_relative 'helpers/safari'
 
 module SL
@@ -48,7 +50,7 @@ module SL
         str = search_type.match(/^h(([scfabe])([hb])?)*$/)[1]
 
         types = []
-        while str && str.length.positive?
+        while str&.length&.positive?
           if str =~ /^s([hb]*)/
             t = Regexp.last_match(1)
             if t.length > 1 || t.empty?

data/lib/searchlink/searches/hook.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   #
   # Hookmark String helpers

data/lib/searchlink/searches/itunes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # title: iTunes Search
 # description: Search iTunes
 module SL

data/lib/searchlink/searches/lastfm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   class LastFMSearch
     class << self

data/lib/searchlink/searches/lyrics.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Always start with module SL
 module SL
   # Give it a unique class name

data/lib/searchlink/searches/pinboard.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   class PinboardSearch
     PINBOARD_CACHE = SL::Util.cache_file_for('pinboard')

data/lib/searchlink/searches/social.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   class SocialSearch
     class << self

data/lib/searchlink/searches/software.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   # Software Search
   class SoftwareSearch

data/lib/searchlink/searches/spelling.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   # Spelling Search
   class SpellSearch

data/lib/searchlink/searches/spotlight.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   # Spotlight file search
   class SpotlightSearch
@@ -14,7 +16,7 @@ module SL
       def search(_, search_terms, link_text)
         query = search_terms.gsub(/%22/, '"')
         matches = `mdfind '#{query}' 2>/dev/null`.strip.split(/\n/)
-        res = matches.sort_by { |r| File.basename(r).length }.first
+        res = matches.min_by { |r| File.basename(r).length }
         return [false, query, link_text] if res.strip.empty?
 
         title = File.basename(res)

data/lib/searchlink/searches/stackoverflow.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   # Stack Overflow search
   class StackOverflowSearch

data/lib/searchlink/searches/tmdb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   # The Movie Database search
   class TMDBSearch

data/lib/searchlink/searches/twitter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   class TwitterSearch
     class << self
@@ -10,7 +12,7 @@ module SL
         }
       end
 
-      def search(search_type, search_terms, link_text)
+      def search(_search_type, search_terms, link_text)
         if SL::URL.url?(search_terms) && search_terms =~ %r{^https://twitter.com/}
           url, title = twitter_embed(search_terms)
         else
@@ -37,7 +39,7 @@ module SL
         else
           return [false, 'Error retrieving tweet']
         end
-        return [url, title]
+        [url, title]
       end
     end
 

data/lib/searchlink/searches/wikipedia.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   class WikipediaSearch
     class << self

data/lib/searchlink/searches/youtube.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   # YouTube Search/Linking
   class YouTubeSearch

data/lib/searchlink/searches.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   module Searches
     class << self
@@ -14,7 +16,7 @@ module SL
       #
       # @param [String, Array] title title or array of titles
       # @param [Symbol] type plugin type (:search)
-      # @param [Class] klass class that handles plugin actions. Search plugins 
+      # @param [Class] klass class that handles plugin actions. Search plugins
       #                must have a #settings and a #search method
       #
       def register(title, type, klass)
@@ -48,7 +50,7 @@ module SL
                '<tbody>']
 
         searches.each do |s|
-          out << "<tr><td><code>!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][1..].join(',')})" : s[0]}</code></td><td>#{s[1]}</td></tr>"
+          out << "<tr><td><code>!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][1..-1].join(',')})" : s[0]}</code></td><td>#{s[1]}</td></tr>"
         end
         out.concat(['</tbody>', '</table>']).join("\n")
       end
@@ -63,7 +65,7 @@ module SL
         plugins[:search].each { |_, plugin| searches.concat(plugin[:searches].delete_if { |s| s[1].nil? }) }
         out = []
         searches.each do |s|
-          out += "!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][1..].join(',')})" : s[0]}#{s[0].spacer}#{s[1]}"
+          out += "!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][1..-1].join(',')})" : s[0]}#{s[0].spacer}#{s[1]}"
         end
         out.join("\n")
       end

data/lib/searchlink/semver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   # Semantic versioning library
   class SemVer

data/lib/searchlink/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SL
   # String helpers
   class ::String
@@ -275,7 +277,7 @@ module SL
 
             next if parts.length == 1
 
-            remaining_separators = seo_title_separators[i..].map { |s| Regexp.escape(s) }.join('')
+            remaining_separators = seo_title_separators[i..-1].map { |s| Regexp.escape(s) }.join('')
             seps = Regexp.new("^[^#{remaining_separators}]+$")
 
             longest = parts.longest_element.strip
@@ -396,24 +398,25 @@ module SL
     end
 
     def distance(t)
-      s = self.dup
+      s = dup
       m = s.length
       n = t.length
-      return m if n == 0
-      return n if m == 0
-      d = Array.new(m+1) {Array.new(n+1)}
+      return m if n.zero?
+      return n if m.zero?
+
+      d = Array.new(m + 1) { Array.new(n + 1) }
 
-      (0..m).each {|i| d[i][0] = i}
-      (0..n).each {|j| d[0][j] = j}
+      (0..m).each { |i| d[i][0] = i }
+      (0..n).each { |j| d[0][j] = j }
       (1..n).each do |j|
         (1..m).each do |i|
-          d[i][j] = if s[i-1] == t[j-1]  # adjust index into string
-                      d[i-1][j-1]       # no operation required
+          d[i][j] = if s[i - 1] == t[j - 1] # adjust index into string
+                      d[i - 1][j - 1]       # no operation required
                     else
-                      [ d[i-1][j]+1,    # deletion
-                        d[i][j-1]+1,    # insertion
-                        d[i-1][j-1]+1,  # substitution
-                      ].min
+                      [d[i - 1][j] + 1, # deletion
+                       d[i][j - 1] + 1, # insertion
+                       d[i - 1][j - 1] + 1 # substitution
+].min
                     end
         end
       end

data/lib/searchlink/url.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
+
+# Main module
 module SL
+  # URL module
   module URL
     class << self
       # Validates that a link exists and returns 200

data/lib/searchlink/util.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module SL
+  # Utilities
   module Util
     class << self
       ## Execute system command with deadman's switch

data/lib/searchlink/version.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module SL
-  VERSION = '2.3.66'
+  VERSION = '2.3.68'
 end
 
+# Main module
 module SL
   class << self
     def version_check
@@ -68,7 +71,7 @@ module SL
     end
 
     def update_searchlink
-      if %x{uname}.strip !~ /Darwin/
+      if `uname`.strip !~ /Darwin/
         add_output('Auto updating only available on macOS')
         return
       end

data/lib/searchlink/which.rb

@@ -5,171 +5,166 @@
 
 module TTY
   module Which
-    VERSION = "0.5.0"
-  end # Which
-end # TTY
+    VERSION = '0.5.0'
+  end
+end
 
 module TTY
   # A class responsible for finding an executable in the PATH
   module Which
-    # Find an executable in a platform independent way
-    #
-    # @param [String] cmd
-    #   the command to search for
-    # @param [Array<String>] paths
-    #   the paths to look through
-    #
-    # @example
-    #   which("ruby")                 # => "/usr/local/bin/ruby"
-    #   which("/usr/local/bin/ruby")  # => "/usr/local/bin/ruby"
-    #   which("foo")                  # => nil
-    #
-    # @example
-    #   which("ruby", paths: ["/usr/locale/bin", "/usr/bin", "/bin"])
-    #
-    # @return [String, nil]
-    #   the absolute path to executable if found, `nil` otherwise
-    #
-    # @api public
-    def which(cmd, paths: search_paths)
-      if file_with_path?(cmd)
-        return cmd if executable_file?(cmd)
+    class << self
+      # Find an executable in a platform independent way
+      #
+      # @param [String] cmd
+      #   the command to search for
+      # @param [Array<String>] paths
+      #   the paths to look through
+      #
+      # @example
+      #   which("ruby")                 # => "/usr/local/bin/ruby"
+      #   which("/usr/local/bin/ruby")  # => "/usr/local/bin/ruby"
+      #   which("foo")                  # => nil
+      #
+      # @example
+      #   which("ruby", paths: ["/usr/locale/bin", "/usr/bin", "/bin"])
+      #
+      # @return [String, nil]
+      #   the absolute path to executable if found, `nil` otherwise
+      #
+      # @api public
+      def which(cmd, paths: search_paths)
+        if file_with_path?(cmd)
+          return cmd if executable_file?(cmd)
 
-        extensions.each do |ext|
-          exe = "#{cmd}#{ext}"
-          return ::File.absolute_path(exe) if executable_file?(exe)
+          extensions.each do |ext|
+            exe = "#{cmd}#{ext}"
+            return ::File.absolute_path(exe) if executable_file?(exe)
+          end
+          return nil
         end
-        return nil
-      end
 
-      paths.each do |path|
-        if file_with_exec_ext?(cmd)
-          exe = ::File.join(path, cmd)
-          return ::File.absolute_path(exe) if executable_file?(exe)
-        end
-        extensions.each do |ext|
-          exe = ::File.join(path, "#{cmd}#{ext}")
-          return ::File.absolute_path(exe) if executable_file?(exe)
+        paths.each do |path|
+          if file_with_exec_ext?(cmd)
+            exe = ::File.join(path, cmd)
+            return ::File.absolute_path(exe) if executable_file?(exe)
+          end
+          extensions.each do |ext|
+            exe = ::File.join(path, "#{cmd}#{ext}")
+            return ::File.absolute_path(exe) if executable_file?(exe)
+          end
         end
+        nil
       end
-      nil
-    end
-    module_function :which
 
-    # Check if executable exists in the path
-    #
-    # @param [String] cmd
-    #   the executable to check
-    #
-    # @param [Array<String>] paths
-    #   paths to check
-    #
-    # @return [Boolean]
-    #
-    # @api public
-    def exist?(cmd, paths: search_paths)
-      !which(cmd, paths: paths).nil?
-    end
-    module_function :exist?
+      # Check if executable exists in the path
+      #
+      # @param [String] cmd
+      #   the executable to check
+      #
+      # @param [Array<String>] paths
+      #   paths to check
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def exist?(cmd, paths: search_paths)
+        !which(cmd, paths: paths).nil?
+      end
 
-    # Find default system paths
-    #
-    # @param [String] path
-    #   the path to search through
-    #
-    # @example
-    #   search_paths("/usr/local/bin:/bin")
-    #   # => ["/bin"]
-    #
-    # @return [Array<String>]
-    #   the array of paths to search
-    #
-    # @api private
-    def search_paths(path = ENV["PATH"])
-      paths = if path && !path.empty?
-                path.split(::File::PATH_SEPARATOR)
-              else
-                %w[/usr/local/bin /usr/ucb /usr/bin /bin /opt/homebrew/bin]
-              end
-      paths.select(&Dir.method(:exist?))
-    end
-    module_function :search_paths
+      # Find default system paths
+      #
+      # @param [String] path
+      #   the path to search through
+      #
+      # @example
+      #   search_paths("/usr/local/bin:/bin")
+      #   # => ["/bin"]
+      #
+      # @return [Array<String>]
+      #   the array of paths to search
+      #
+      # @api private
+      def search_paths(path = ENV['PATH'])
+        paths = if path && !path.empty?
+                  path.split(::File::PATH_SEPARATOR)
+                else
+                  %w[/usr/local/bin /usr/ucb /usr/bin /bin /opt/homebrew/bin]
+                end
+        paths.select(&Dir.method(:exist?))
+      end
 
-    # All possible file extensions
-    #
-    # @example
-    #   extensions(".exe;cmd;.bat")
-    #   # => [".exe", ".bat"]
-    #
-    # @param [String] path_ext
-    #   a string of semicolon separated filename extensions
-    #
-    # @return [Array<String>]
-    #   an array with valid file extensions
-    #
-    # @api private
-    def extensions(path_ext = ENV["PATHEXT"])
-      return [""] unless path_ext
+      # All possible file extensions
+      #
+      # @example
+      #   extensions(".exe;cmd;.bat")
+      #   # => [".exe", ".bat"]
+      #
+      # @param [String] path_ext
+      #   a string of semicolon separated filename extensions
+      #
+      # @return [Array<String>]
+      #   an array with valid file extensions
+      #
+      # @api private
+      def extensions(path_ext = ENV['PATHEXT'])
+        return [''] unless path_ext
 
-      path_ext.split(::File::PATH_SEPARATOR).select { |part| part.include?(".") }
-    end
-    module_function :extensions
+        path_ext.split(::File::PATH_SEPARATOR).select { |part| part.include?('.') }
+      end
 
-    # Determines if filename is an executable file
-    #
-    # @example Basic usage
-    #   executable_file?("/usr/bin/less") # => true
-    #
-    # @example Executable in directory
-    #   executable_file?("less", "/usr/bin") # => true
-    #   executable_file?("less", "/usr") # => false
-    #
-    # @param [String] filename
-    #   the path to file
-    # @param [String] dir
-    #   the directory within which to search for filename
-    #
-    # @return [Boolean]
-    #
-    # @api private
-    def executable_file?(filename, dir = nil)
-      path = ::File.join(dir, filename) if dir
-      path ||= filename
-      ::File.file?(path) && ::File.executable?(path)
-    end
-    module_function :executable_file?
+      # Determines if filename is an executable file
+      #
+      # @example Basic usage
+      #   executable_file?("/usr/bin/less") # => true
+      #
+      # @example Executable in directory
+      #   executable_file?("less", "/usr/bin") # => true
+      #   executable_file?("less", "/usr") # => false
+      #
+      # @param [String] filename
+      #   the path to file
+      # @param [String] dir
+      #   the directory within which to search for filename
+      #
+      # @return [Boolean]
+      #
+      # @api private
+      def executable_file?(filename, dir = nil)
+        path = ::File.join(dir, filename) if dir
+        path ||= filename
+        ::File.file?(path) && ::File.executable?(path)
+      end
 
-    # Check if command itself has executable extension
-    #
-    # @param [String] filename
-    #   the path to executable file
-    #
-    # @example
-    #   file_with_exec_ext?("file.bat")
-    #   # => true
-    #
-    # @return [Boolean]
-    #
-    # @api private
-    def file_with_exec_ext?(filename)
-      extension = ::File.extname(filename)
-      return false if extension.empty?
+      # Check if command itself has executable extension
+      #
+      # @param [String] filename
+      #   the path to executable file
+      #
+      # @example
+      #   file_with_exec_ext?("file.bat")
+      #   # => true
+      #
+      # @return [Boolean]
+      #
+      # @api private
+      def file_with_exec_ext?(filename)
+        extension = ::File.extname(filename)
+        return false if extension.empty?
 
-      extensions.any? { |ext| extension.casecmp(ext).zero? }
-    end
-    module_function :file_with_exec_ext?
+        extensions.any? { |ext| extension.casecmp(ext).zero? }
+      end
 
-    # Check if executable file is part of absolute/relative path
-    #
-    # @param [String] cmd
-    #   the executable to check
-    #
-    # @return [Boolean]
-    #
-    # @api private
-    def file_with_path?(cmd)
-      ::File.expand_path(cmd) == cmd
+      # Check if executable file is part of absolute/relative path
+      #
+      # @param [String] cmd
+      #   the executable to check
+      #
+      # @return [Boolean]
+      #
+      # @api private
+      def file_with_path?(cmd)
+        ::File.expand_path(cmd) == cmd
+      end
     end
-    module_function :file_with_path?
-  end # Which
-end # TTY
+  end
+end

data/lib/searchlink.rb

@@ -4,7 +4,6 @@
 # MIT License, please maintain attribution
 require 'net/https'
 require 'uri'
-require 'rexml/document'
 require 'shellwords'
 require 'yaml'
 require 'cgi'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchlink
 version: !ruby/object:Gem::Version
-  version: 2.3.66
+  version: 2.3.68
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -292,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Create Markdown links from web searches without leaving your editor.