searchlink 2.3.84 → 2.3.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78ae4255b0a3a287ce3ccf4b84db34597f8c2a566bf4e7cb0b4939a28f62cca1
-  data.tar.gz: f654c706f574f6c23dca1a6714b2b52177944379fb1df00d34d9bac22e14104b
+  metadata.gz: c00e022d8b8155db4e6fd3acd6ccaa69be955a316774be41747cce0e476f0df6
+  data.tar.gz: 8487fcec9ab7d7830c467e5bfa2ed4008104a2363cb776b18864848891a7d98b
 SHA512:
-  metadata.gz: ecccb8b8f87a8aa891c9bbafffd7e40f9ecee5ee8042326fe8e0151d52e225797bcff745c7ec67b7f7dd8010fd5e32330673b3fe062c378873a74407b666205a
-  data.tar.gz: 6a4ada563e8488646f0cc4fe5ab8c5414c906ead7560cafaf3e6b68fcdf9292a37c04ab8261970de6d5a3a3224dc135a3dba7bc2b2abc60160ca6181dbec512c
+  metadata.gz: 66ee6b30d332f4047f4f1528a8f39b6eb51cbb0b6ef0f3abd5b546ea3dd4433ec212c4b72c9d46a680c65e69078afc617caf8d5d7da757181281bb5c16518ad8
+  data.tar.gz: 7b29d19cdddbc9c6ecbe07ecaf7cc23e685da82fd03fe16645a4775ee0aa15ca96bc859da6bc38725fdd074642fa986a396bd745e4af87379bfbfd17f60e83b2

data/lib/searchlink/config.rb

@@ -82,6 +82,11 @@ module SL
           # E.g. [](!g Search Text)
           empty_uses_page_title: false
 
+          # If confirm is true, then a popup dialog will be displayed
+          # showing the destination of each found link. Hitting cancel
+          # will leave the link unchanged.
+          confirm: false
+
           # To create custom abbreviations for Google Site Searches,
           # add to (or replace) the hash below.
           # "abbreviation" => "site.url",
@@ -168,6 +173,9 @@ module SL
       #    amazon_partner: "bretttercom-20"
       config["amazon_partner"] ||= ""
 
+      # display a popup dialog confirmation
+      config["confirm"] ||= false
+
       # To create custom abbreviations for Google Site Searches,
       # add to (or replace) the hash below.
       # "abbreviation" => "site.url",
@@ -176,7 +184,7 @@ module SL
       # hash can override existing search triggers.
       config["custom_site_searches"] ||= {
         "bt" => "brettterpstra.com",
-        "imdb" => "imdb.com"
+        "imdb" => "imdb.com",
       }
 
       # confirm existence of links generated from custom search replacements

data/lib/searchlink/curl/html.rb

@@ -90,7 +90,7 @@ module Curl
           tag: tag,
           source: tag_source,
           attrs: attrs,
-          content: contents
+          content: contents,
         }
       end
 
@@ -147,7 +147,7 @@ module Curl
         output << {
           type: "opengraph",
           attrs: nil,
-          src: @meta[src]
+          src: @meta[src],
         }
       end
       images = tags(%w[img source])
@@ -162,21 +162,21 @@ module Curl
                 image, media = s.split(/ /)
                 srcset << {
                   src: image,
-                  media: media
+                  media: media,
                 }
               end
             end
             output << {
               type: "srcset",
               attrs: img[:attrs],
-              images: srcset
+              images: srcset,
             }
           end
         when /img/
           output << {
             type: "img",
             src: img[:attrs].filter { |a| a[:key] =~ /src/i }.first[:value],
-            attrs: img[:attrs]
+            attrs: img[:attrs],
           }
         end
       end
@@ -189,7 +189,7 @@ module Curl
       links = @links.nil? ? 0 : @links.count
       [
         %(<HTMLCurl: @code="#{@code}" @url="#{@url}" @title="#{@title}"),
-        %(@description=#{@description} @headers:#{headers} @meta:#{meta} @links:#{links}>)
+        %(@description=#{@description} @headers:#{headers} @meta:#{meta} @links:#{links}>),
       ].join(" ")
     end
 
@@ -253,14 +253,22 @@ module Curl
           attrs = tag["attrs"].strip.to_enum(:scan, /(?ix)
                                              (?<key>[@a-z0-9-]+)(?:=(?<quot>["'])
                                              (?<value>[^"']+)\k<quot>|[ >])?/i).map { Regexp.last_match }
-          attrs.map! { |a| { key: a["key"], value: a["key"] =~ /^(class|rel)$/ ? a["value"].split(/ /) : a["value"] } }
+
+          attrs.map! do |a|
+            val = if a["key"] =~ /^(class|rel)$/
+                a["value"].nil? ? "" : a["value"].split(/ /)
+              else
+                a["value"]
+              end
+            { key: a["key"], value: val }
+          end
         end
         {
           tag: tag["tag"],
           source: tag.to_s,
           attrs: attrs,
           content: tag["content"],
-          tags: content_tags(tag["content"])
+          tags: content_tags(tag["content"]),
         }
       end
     end
@@ -351,7 +359,7 @@ module Curl
           title: title,
           rel: rel,
           text: text,
-          class: link_class
+          class: link_class,
         }
         links << link
       end

data/lib/searchlink/output.rb

@@ -3,7 +3,8 @@
 module SL
   class << self
     attr_writer :titleize, :clipboard, :output, :footer, :line_num,
-                :match_column, :match_length, :originput, :errors, :report, :printout
+                :match_column, :match_length, :originput, :errors, :report, :printout,
+                :shortener
 
     # Whether or not to add a title to the output
     def titleize
@@ -60,6 +61,16 @@ module SL
       @errors ||= {}
     end
 
+    # Stores query parameters
+    def query
+      @query ||= {}
+    end
+
+    # The shortener to use
+    def shortener
+      @shortener ||= :none
+    end
+
     # Posts macOS notifications
     #
     # @param      title     [String]   The title of the notification
@@ -102,6 +113,10 @@ module SL
 
       title = title.gsub(/[ \t]+/, " ")
 
+      url.add_query_string!
+
+      url = SL::Shortener.shorten(url, SL.shortener)
+
       case type.to_sym
       when :ref_title
         %(\n[#{text}]: #{url}#{title})
@@ -141,7 +156,6 @@ module SL
     #
     def print_footer
       unless SL.footer.empty?
-
         footnotes = []
         SL.footer.delete_if do |note|
           note.strip!
@@ -202,6 +216,14 @@ module SL
       SL.errors[type].push("(#{position}): #{str}")
     end
 
+    # Add to query string
+    # @param      hsh   [Hash] The queries to add
+    # @return     [nil]
+    def add_query(hsh)
+      SL.query ||= {}
+      SL.query.merge!(hsh)
+    end
+
     # Prints the report.
     #
     # @return     [String] The report.
@@ -226,10 +248,10 @@ module SL
 
       out = ""
       inline = if SL.originput.split(/\n/).length > 1
-                 false
-               else
-                 SL.config["inline"] || SL.originput.split(/\n/).length == 1
-               end
+          false
+        else
+          SL.config["inline"] || SL.originput.split(/\n/).length == 1
+        end
 
       SL.errors.each do |k, v|
         next if v.empty?
@@ -237,10 +259,10 @@ module SL
         v.each_with_index do |err, i|
           out += "(#{k}) #{err}"
           out += if inline
-                   i == v.length - 1 ? " | " : ", "
-                 else
-                   "\n"
-                 end
+              i == v.length - 1 ? " | " : ", "
+            else
+              "\n"
+            end
         end
       end