searchlink 2.3.80 → 2.3.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 040bc3ed8a6923d3918ae560c892bbabc0fa3a8a226ec218482f524784c0a8a4
-  data.tar.gz: 5c61240d61bf69657b4ccea5f8dceb30fe4320f87badf805d89e378570ce59cf
+  metadata.gz: ce66d54f12c512c8e3e4508cf86d9dfde5e0be920a7bfe30bdc6071caceba54d
+  data.tar.gz: 744eb155302ed0901f3eba23ed8c50b73e8834040389662cfd4ae715843041e3
 SHA512:
-  metadata.gz: 386cc4c402d41b7a5f1f7cf95d3dac34bc5f2b94391d359ee70e54e289ff7b03d44f12527ad5cc11162a5118543e296cd1677b574e8a0e8918cbb5727ee267af
-  data.tar.gz: cb4d2facc9641b35c15e13d3df91948fa807072fd6f141340beb15f798e22ffab8c5d686e20389f04816dca8df557e7da86c222fda05e70fda18899e9f758728
+  metadata.gz: c9210886c698b4e82e7bb6d5b56732febef66c612ebe90351e66e0a4fcd9b6494ecac4b2bac5422b288bde4b25ba2d40b7bcb8737af467e757fafc19c8827a69
+  data.tar.gz: a36ba8e0be0f29f3f4cc31558ecdc0ba76b35e48cd2ecdd1a0ff35b9ce014dbfcc5063084111b1b26694e335b82ba86e391d63a855623cb6297c00e6560c3324

data/lib/searchlink/curl/html.rb

@@ -411,7 +411,7 @@ module Curl
           m = Regexp.last_match
           headers[m[1]] = m[2]
         else
-          source = lines[idx..-1].join("\n")
+          source = lines[idx..].join("\n")
           break
         end
       end

data/lib/searchlink/curl/json.rb

@@ -75,7 +75,7 @@ module Curl
           m = Regexp.last_match
           headers[m[1]] = m[2]
         else
-          source = lines[idx..-1].join("\n")
+          source = lines[idx..].join("\n")
           break
         end
       end

data/lib/searchlink/parse.rb

@@ -151,7 +151,7 @@ module SL
             end
             terms_p = search_terms.split(/ +/)
             if terms_p.length > highest_token
-              remainder = terms_p[highest_token - 1..-1].join(" ")
+              remainder = terms_p[highest_token - 1..].join(" ")
               terms_p = terms_p[0..highest_token - 2]
               terms_p.push(remainder)
             end
@@ -252,6 +252,24 @@ module SL
         end
       end
 
+      if input =~ /\[\n(.*?\n)+\]\((.*?)?\)/
+        input.gsub!(/\[\n(((\s*(?:[-+*]|\d+\.)?\s+)*(!\S+ +)?(.*?))\n)+\]\((!\S+.*?)?\)/) do
+          m = Regexp.last_match
+          lines = m[0].split(/\n/)
+          lines = lines[1..-2]
+          lines.map do |l|
+            el_rx = /(\s*(?:[-+*]|\d+\.)?\s+)?(!\S+ )?(\w.*?)$/
+            if l =~ el_rx
+              els = l.match(el_rx)
+              search = els[2] ? els[2].strip : (m[6] ? m[6] : "!g")
+              "#{els[1]}[#{els[3].strip}](#{search})"
+            else
+              l
+            end
+          end.join("\n")
+        end
+      end
+
       if input =~ /\[(.*?)\]\((.*?)\)/
         lines = input.split(/\n/)
         out = []
@@ -263,11 +281,11 @@ module SL
           SL.line_num = num - line_difference
           @cursor_difference = 0
           # ignore links in code blocks
-          if line =~ /^( {4,}|\t+)[^*+\-]/
+          if line =~ /^(( {4,}|\t+)[^*+-])/
             out.push(line)
             next
           end
-          if line =~ /^[~`]{3,}/
+          if line =~ /^\s*[~`]{3,}/
             if in_code_block
               in_code_block = false
               out.push(line)
@@ -605,7 +623,7 @@ module SL
                     end
                     terms_p = terms.split(/ +/)
                     if terms_p.length > highest_token
-                      remainder = terms_p[highest_token - 1..-1].join(" ")
+                      remainder = terms_p[highest_token - 1..].join(" ")
                       terms_p = terms_p[0..highest_token - 2]
                       terms_p.push(remainder)
                     end

data/lib/searchlink/plist.rb

@@ -65,18 +65,17 @@ module Plist
 
     def parse
       plist_tags = PTag.mappings.keys.join("|")
-      start_tag  = /<(#{plist_tags})([^>]*)>/i
-      end_tag    = %r{</(#{plist_tags})[^>]*>}i
+      start_tag = /<(#{plist_tags})([^>]*)>/i
+      end_tag = %r{</(#{plist_tags})[^>]*>}i
 
       require "strscan"
 
       @scanner = StringScanner.new(@xml)
       until @scanner.eos?
-        if @scanner.scan(COMMENT_START)
-          @scanner.scan(COMMENT_END)
-        elsif @scanner.scan(XMLDECL_PATTERN)
-        elsif @scanner.scan(DOCTYPE_PATTERN)
-        elsif @scanner.scan(start_tag)
+        next unless @scanner.scan(COMMENT_START)
+
+        @scanner.scan(COMMENT_END)
+        if @scanner.scan(start_tag)
           @listener.tag_start(@scanner[1], nil)
           @listener.tag_end(@scanner[1]) if @scanner[2] =~ %r{/$}
         elsif @scanner.scan(TEXT)
@@ -88,117 +87,121 @@ module Plist
         end
       end
     end
-  end
 
-  class PTag
-    @@mappings = {}
-    def self.mappings
-      @@mappings
-    end
+    class PTag
+      @@mappings = {}
+      def self.mappings
+        @@mappings
+      end
 
-    def self.inherited(sub_class)
-      key = sub_class.to_s.downcase
-      key.gsub!(/^plist::/, "")
-      key.gsub!(/^p/, "") unless key == "plist"
+      def self.inherited(sub_class)
+        key = sub_class.to_s.downcase
+        key.gsub!(/^plist::/, "")
+        key.gsub!(/^p/, "") unless key == "plist"
 
-      @@mappings[key] = sub_class
-    end
+        @@mappings[key] = sub_class
+        super
+      end
 
-    attr_accessor :text, :children
-    def initialize
-      @children = []
-    end
+      attr_accessor :text, :children
+
+      def initialize
+        @children = []
+      end
 
-    def to_ruby
-      raise "Unimplemented: " + self.class.to_s + "#to_ruby on #{inspect}"
+      def to_ruby
+        raise "Unimplemented: #{self.class}#to_ruby on #{inspect}"
+      end
     end
-  end
 
-  class PList < PTag
-    def to_ruby
-      children.first&.to_ruby
+    class PList < PTag
+      def to_ruby
+        children.first&.to_ruby
+      end
     end
-  end
 
-  class PDict < PTag
-    def to_ruby
-      dict = {}
-      key = nil
+    class PDict < PTag
+      def to_ruby
+        dict = {}
+        key = nil
 
-      children.each do |c|
-        if key.nil?
-          key = c.to_ruby
-        else
-          dict[key] = c.to_ruby
-          key = nil
+        children.each do |c|
+          if key.nil?
+            key = c.to_ruby
+          else
+            dict[key] = c.to_ruby
+            key = nil
+          end
         end
-      end
 
-      dict
+        dict
+      end
     end
-  end
 
-  class PKey < PTag
-    def to_ruby
-      CGI.unescapeHTML(text || "")
+    class PKey < PTag
+      def to_ruby
+        CGI.unescapeHTML(text || "")
+      end
     end
-  end
 
-  class PString < PTag
-    def to_ruby
-      CGI.unescapeHTML(text || "")
+    class PString < PTag
+      def to_ruby
+        CGI.unescapeHTML(text || "")
+      end
     end
-  end
 
-  class PArray < PTag
-    def to_ruby
-      children.collect(&:to_ruby)
+    class PArray < PTag
+      def to_ruby
+        children.collect(&:to_ruby)
+      end
     end
-  end
 
-  class PInteger < PTag
-    def to_ruby
-      text.to_i
+    class PInteger < PTag
+      def to_ruby
+        text.to_i
+      end
     end
-  end
 
-  class PTrue < PTag
-    def to_ruby
-      true
+    class PTrue < PTag
+      def to_ruby
+        true
+      end
     end
-  end
 
-  class PFalse < PTag
-    def to_ruby
-      false
+    class PFalse < PTag
+      def to_ruby
+        false
+      end
     end
-  end
 
-  class PReal < PTag
-    def to_ruby
-      text.to_f
+    class PReal < PTag
+      def to_ruby
+        text.to_f
+      end
     end
-  end
 
-  require "date"
-  class PDate < PTag
-    def to_ruby
-      DateTime.parse(text)
+    require "date"
+
+    class PDate < PTag
+      def to_ruby
+        DateTime.parse(text)
+      end
     end
-  end
 
-  require "base64"
-  class PData < PTag
-    def to_ruby
-      data = Base64.decode64(text.gsub(/\s+/, ""))
-
-      begin
-        Marshal.load(data)
-      rescue Exception
-        io = StringIO.new
-        io.write data
-        io.rewind
-        io
+    require "base64"
+
+    class PData < PTag
+      def to_ruby
+        data = Base64.decode64(text.gsub(/\s+/, ""))
+
+        begin
+          Marshal.load(data)
+        rescue Exception
+          io = StringIO.new
+          io.write data
+          io.rewind
+          io
+        end
       end
     end
   end

data/lib/searchlink/searches/github.rb

@@ -216,7 +216,7 @@ module SL
         else
           if terms.split(/ +/).count > 1
             parts = terms.split(/ +/)
-            gist = search_user_gists(parts[0], parts[1..-1].join(" "))
+            gist = search_user_gists(parts[0], parts[1..].join(" "))
 
             if gist
               url = gist[:url]

data/lib/searchlink/searches/isgd.rb

@@ -30,15 +30,15 @@ module SL
 
         data = Curl::Json.new("https://is.gd/create.php?format=json&url=#{CGI.escape(long_url)}", symbolize_names: true)
 
-        if data.json.key?('errorcode')
-          SL.add_error('Error creating is.gd url', data.json[:errorcode])
+        if data.json.key?("errorcode")
+          SL.add_error("Error creating is.gd url", data.json[:errorcode])
           return [false, title, link_text]
         end
 
         link = data.json[:shorturl]
         rtitle = SL::URL.title(long_url)
         title = rtitle
-        link_text = rtitle if link_text == '' && !SL.titleize
+        link_text = rtitle if link_text == "" && !SL.titleize
         [link, title, link_text]
       end
     end

data/lib/searchlink/searches/itunes.rb

@@ -49,7 +49,6 @@ module SL
         aff ||= SL.config["itunes_affiliate"]
 
         url = "https://itunes.apple.com/search?term=#{terms.url_encode}&country=#{SL.config['country_code']}&entity=#{entity}&limit=1"
-        puts url
         begin
           page = Curl::Json.new(url, compressed: true)
           json = page.json

data/lib/searchlink/searches/pinboard.rb

@@ -9,8 +9,8 @@ module SL
         {
           trigger: "pb",
           searches: [
-            ["pb", "Pinboard Bookmark Search"]
-          ]
+            ["pb", "Pinboard Bookmark Search"],
+          ],
         }
       end
 
@@ -26,7 +26,6 @@ module SL
         end
 
         bookmarks.gsub!(/[\u{1F600}-\u{1F6FF}]/, "")
-
         bookmarks = JSON.parse(bookmarks)
         updated = Time.now
         { "update_time" => updated, "bookmarks" => bookmarks }
@@ -100,8 +99,8 @@ module SL
       def search(_, search_terms, link_text)
         unless SL.config["pinboard_api_key"]
           SL.add_error("Missing Pinboard API token",
-                       'Find your api key at https://pinboard.in/settings/password and add it
-                        to your configuration (pinboard_api_key: YOURKEY)')
+                       "Find your api key at https://pinboard.in/settings/password and add it
+                        to your configuration (pinboard_api_key: YOURKEY)")
           return false
         end
 
@@ -149,14 +148,14 @@ module SL
           full_text = [bm["description"], bm["extended"], bm["tags"]].join(" ")
 
           score = if title_tags.matches_exact(search_terms)
-                    14.0
-                  elsif full_text.matches_exact(search_terms)
-                    13.0
-                  elsif full_text.matches_any(search_terms)
-                    full_text.matches_score(search_terms)
-                  else
-                    0
-                  end
+              14.0
+            elsif full_text.matches_exact(search_terms)
+              13.0
+            elsif full_text.matches_any(search_terms)
+              full_text.matches_score(search_terms)
+            else
+              0
+            end
 
           return [bm["href"], bm["description"]] if score == 14
 
@@ -166,7 +165,7 @@ module SL
                          score: score,
                          href: bm["href"],
                          title: bm["description"],
-                         date: bm["time"]
+                         date: bm["time"],
                        })
         end
 

data/lib/searchlink/searches/youtube.rb

@@ -3,7 +3,7 @@
 module SL
   # YouTube Search/Linking
   class YouTubeSearch
-    YOUTUBE_RX = %r{(?:youtu\.be/|youtube\.com/watch\?v=)?(?<id>[a-z0-9_\-]+)$}i.freeze
+    YOUTUBE_RX = %r{(?:youtu\.be/|youtube\.com/watch\?v=)?(?<id>[a-z0-9_-]+)$}i.freeze
 
     class << self
       def settings
@@ -19,7 +19,7 @@ module SL
       def search(search_type, search_terms, link_text)
         if SL::URL.url?(search_terms) && search_terms =~ YOUTUBE_RX
           url = search_terms
-        elsif search_terms =~ /^[a-z0-9_\-]+$/i
+        elsif search_terms =~ /^[a-z0-9_-]+$/i
           url = "https://youtube.com/watch?v=#{search_terms}"
         else
           url, title = SL.ddg("site:youtube.com #{search_terms}", link_text)

data/lib/searchlink/searches.rb

@@ -53,7 +53,7 @@ module SL
         searches.each do |s|
           out << "<tr>
           <td>
-          <code>!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][1..-1].join(',')})" : s[0]}
+          <code>!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][1..].join(',')})" : s[0]}
           </code>
           </td><td>#{s[1]}</td></tr>"
         end
@@ -72,7 +72,7 @@ module SL
 
         searches.each do |s|
           shortcut = if s[0].is_a?(Array)
-                       "#{s[0][0]} (#{s[0][1..-1].join(',')})"
+                       "#{s[0][0]} (#{s[0][1..].join(',')})"
                      else
                        s[0]
                      end
@@ -100,13 +100,13 @@ module SL
 
       def valid_searches
         searches = []
-        plugins[:search].each { |_, plugin| searches.push(plugin[:trigger]) }
+        plugins[:search].each_value { |plugin| searches.push(plugin[:trigger]) }
         searches
       end
 
       def valid_search?(term)
         valid = false
-        valid = true if term =~ /^(#{valid_searches.join("|")})$/
+        valid = true if term =~ /^(#{valid_searches.join('|')})$/
         valid = true if SL.config["custom_site_searches"].keys.include? term
         # SL.notify("Invalid search#{did_you_mean(term)}", term) unless valid
         valid
@@ -166,7 +166,7 @@ module SL
       end
 
       def do_search(search_type, search_terms, link_text, timeout: SL.config["timeout"])
-        plugins[:search].each do |_title, plugin|
+        plugins[:search].each_value do |plugin|
           trigger = plugin[:trigger].gsub(/(^\^|\$$)/, "")
           if search_type =~ /^#{trigger}$/
             search = proc { plugin[:class].search(search_type, search_terms, link_text) }

data/lib/searchlink/string.rb

@@ -91,7 +91,7 @@ module SL
     ## @return     { description_of_the_return_value }
     ##
     def fix_gist_file
-      sub(/^file-/, "").sub(/-([^\-]+)$/, '.\1')
+      sub(/^file-/, "").sub(/-([^-]+)$/, '.\1')
     end
 
     # Turn a string into a slug, removing spaces and
@@ -160,7 +160,7 @@ module SL
       # force trailing slash
       path.sub!(%r{/?$}, "/")
       # remove last path element
-      path.sub!(%r{/[^/]+[.\-][^/]+/$}, "")
+      path.sub!(%r{/[^/]+[.-][^/]+/$}, "")
       # remove starting/ending slashes
       path.gsub!(%r{(^/|/$)}, "")
       # split at slashes, delete sections that are shorter
@@ -277,7 +277,7 @@ module SL
 
             next if parts.length == 1
 
-            remaining_separators = seo_title_separators[i..-1].map { |s| Regexp.escape(s) }.join("")
+            remaining_separators = seo_title_separators[i..].map { |s| Regexp.escape(s) }.join("")
             seps = Regexp.new("^[^#{remaining_separators}]+$")
 
             longest = parts.longest_element.strip

data/lib/searchlink/tokens.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Secrets
+  GH_AUTH_TOKEN = "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"
+end

data/lib/searchlink/url.rb

@@ -5,6 +5,22 @@ module SL
   # URL module
   module URL
     class << self
+      def follow_redirects(url, limit = 5)
+        return url if limit.zero?
+
+        uri = URI.parse(url)
+        response = Net::HTTP.get_response(uri)
+
+        case response
+        when Net::HTTPSuccess
+          response.uri.to_s
+        when Net::HTTPRedirection
+          follow_redirects(response["location"], limit - 1)
+        else
+          url
+        end
+      end
+
       # Validates that a link exists and returns 200
       def valid_link?(uri_str, limit = 5)
         return false unless uri_str
@@ -130,6 +146,17 @@ module SL
         # end
 
         begin
+          if url =~ %r{https://(amzn.to|(www\.)?amazon\.com)/}
+            final_url = follow_redirects(url)
+            m = final_url.match(%r{https://www.amazon.com/(.*?)/dp/})
+            title = if m
+                m[1].gsub(/-/, " ")
+              else
+                url.remove_protocol
+              end
+            return title
+          end
+
           page = Curl::Html.new(url)
 
           title = page.title || nil
@@ -146,7 +173,6 @@ module SL
           title.remove_protocol
         rescue StandardError
           SL.add_error("Error retrieving title", "Error determining title for #{url.strip}")
-          warn "Error retrieving title for #{url.strip}"
           url.remove_protocol
         end
       end

data/lib/searchlink/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SL
-  VERSION = '2.3.80'
+  VERSION = "2.3.81"
 end
 
 # Main module
@@ -44,7 +44,11 @@ module SL
         "Accept" => "application/vnd.github+json",
         "X-GitHub-Api-Version" => "2022-11-28",
       }
-      headers["Authorization"] = "Bearer #{Secrets::GH_AUTH_TOKEN}" if defined? Secrets::GH_AUTH_TOKEN
+      if defined? Secrets::GH_AUTH_TOKEN
+        headers["Authorization"] = "Bearer #{Secrets::GH_AUTH_TOKEN}"
+      elsif SL.config['github_token']
+        headers["Authorization"] = "Bearer #{SL.settings["github_token"]}"
+      end
 
       url = "https://api.github.com/repos/ttscoff/searchlink/releases/latest"
       page = Curl::Json.new(url, headers: headers)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: searchlink
 version: !ruby/object:Gem::Version
-  version: 2.3.80
+  version: 2.3.81
 platform: ruby
 authors:
 - Brett Terpstra
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-19 00:00:00.000000000 Z
+date: 2025-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -248,6 +247,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.5
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: macOS System Service for inline web searches
 email:
 - me@brettterpstra.com
@@ -301,6 +314,7 @@ files:
 - lib/searchlink/searches/youtube.rb
 - lib/searchlink/semver.rb
 - lib/searchlink/string.rb
+- lib/searchlink/tokens.rb
 - lib/searchlink/url.rb
 - lib/searchlink/util.rb
 - lib/searchlink/version.rb
@@ -309,7 +323,6 @@ homepage: https://github.com/ttscoff/searchlink
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -324,8 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Create Markdown links from web searches without leaving your editor.
 test_files: []