jekyll-url-metadata 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cc9f88ea850dad060ca2bc836bdd131eef66684aa373048cdabd8246c16953d
-  data.tar.gz: 8b93797dc82baa3a114ea8243dde0bc9489cb085d8dc62510a2ffd583433a019
+  metadata.gz: 3a4e00283a626aebd4b4b3f50efb40d8365e5b2c4b76a6dbb6865c63bfbc16bf
+  data.tar.gz: 4ca146d90db461cc10f3ab91d5e70165c1fbcdb2e7d17ceb98c6299ef0829526
 SHA512:
-  metadata.gz: 15857ed5557ecb5fc3026561be968f64d98f4b39b55a9b3234b2c956b58b3434c570da016de87756911ce3d2d8c1ead5a525aacceff4c5810d60afaf9819d5ed
-  data.tar.gz: 7213d51daac4c4037a279c07f818cafdfdfa60a31fac4c324e91ed643905cae1b86202bc29cce86dc355404e4b16ab8904e7d3e35bfb484b014d77f3284ab8d8
+  metadata.gz: 76e514cf41b909a6dff7c905e3dd2fa379d814d245f2300a750ede5e142ce8343c34aba16629ac1710f186745e5be2a83aca6b157a7b948afb4650a16ee98eb8
+  data.tar.gz: 9c036325a0c1bc2fd03f1421c83e5e426d37f9f5c9474a7a3a9b96da52a49aef703801ffacd85495d41488e6dcaa9aeae84605b8008ba652f6e7affb1be2c56c

data/jekyll-url-metadata.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |spec|
   # Dependencies
   spec.add_runtime_dependency "jekyll", ">= 3.0.0"
   spec.add_runtime_dependency "nokogiri", ">= 1.10.0"
-
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "minitest", "~> 5.14"
 end

data/lib/jekyll-url-metadata/main.rb

@@ -5,8 +5,12 @@ module Jekyll
   module URLMetadata
 
     def url_config
-      @@url_config ||= @context.registers[:site].config['url_metadata'].nil? ? {} : 
-        @context.registers[:site].config['url_metadata']
+      begin
+        @@url_config ||= @context.registers[:site].config['url_metadata'].nil? ? {} : 
+          @context.registers[:site].config['url_metadata']
+      rescue
+        {}
+      end
     end
 
     def cache
@@ -14,43 +18,27 @@ module Jekyll
     end
 
     def metadata(input)
-      if !input.is_a?(String)
-        log("Expected input type \"String\". Got \"#{input.class}\".")
-        return
-      end
-
-      if input.nil? || input == ""
-        log("Empty input string.")
-        return
-      end
-
-      if !url_config["open_timeout"].nil? && !url_config["open_timeout"].is_a?(Integer)
-        log("Expected an \"Integer\" value for config \"open_timeout\". Got #{url_config["open_timeout"]}.")
-
-        return
-      end
-
-      if !url_config["read_timeout"].nil? && !url_config["read_timeout"].is_a?(Integer)
-        log("Expected an \"Integer\" value for config \"read_timeout\". Got #{url_config["read_timeout"]}.")
-
-        return
-      end
+      return if !is_input_valid(input) || !is_config_valid()
 
-      # The getset() API implements a cache first strategy
-      cache.getset(input) do
+      if Jekyll::VERSION.to_i >= 4
+        # The getset() API implements a cache first strategy
+        cache.getset(input) do
+          generate_hashmap(input)
+        end
+      else
         generate_hashmap(input)
       end
     end
 
-    def generate_hashmap(input)
+    def generate_hashmap(input, testCase = false)
       # parse HTML from URL
-      doc = Nokogiri::HTML(URI.open(input, { 
-        :open_timeout => url_config["open_timeout"].nil? ? 1 : url_config["open_timeout"],
-        :read_timeout => url_config["read_timeout"].nil? ? 1 : url_config["read_timeout"]
-      }))
-
-      if !doc
-        log("Failed to parse HTML from #{input}. Please double check for URL validity.")
+      begin
+        doc = Nokogiri::HTML(URI.open(input, { 
+          :open_timeout => url_config["open_timeout"].nil? ? 1 : url_config["open_timeout"],
+          :read_timeout => url_config["read_timeout"].nil? ? 1 : url_config["read_timeout"]
+        }))
+      rescue
+        log("Failed to parse HTML from '#{input}'. Please double check for URL validity.") if !testCase
         return
       end
 
@@ -86,8 +74,46 @@ module Jekyll
       hash
     end
 
-    def log(msg)
-      Jekyll.logger.error "URL Metadata:", msg
+    def is_input_valid(input, testCase = false)
+      if !input.is_a?(String)
+        log("Expected input type 'String'. Got '#{input.class}'.") if !testCase
+
+        return false
+      end
+
+      if input.nil? || input == ""
+        log("Empty input string.") if !testCase
+
+        return false
+      end
+
+      begin
+        if URI.parse(input).kind_of?(URI::HTTP)
+          return true
+        else
+          log("'#{input}' does not seem to be a valid URL.") if !testCase
+        end
+      rescue
+        log("'#{input}' does not seem to be a valid URL.") if !testCase
+      end
+
+      false
+    end
+
+    def is_config_valid()
+      if !url_config["open_timeout"].nil? && !url_config["open_timeout"].is_a?(Integer)
+        log("Expected an 'Integer' value for config 'open_timeout'. Got '#{url_config["open_timeout"].class}'.")
+
+        return false
+      end
+
+      if !url_config["read_timeout"].nil? && !url_config["read_timeout"].is_a?(Integer)
+        log("Expected an 'Integer' value for config 'read_timeout'. Got '#{url_config["read_timeout"].class}'.")
+
+        return false
+      end
+
+      true
     end
 
     def exists(obj)
@@ -98,6 +124,10 @@ module Jekyll
       obj.get_attribute(attr)
     end
 
+    def log(msg)
+      Jekyll.logger.error "URL Metadata:", msg
+    end
+
   end # module Jekyll
 end # module URLMetadata
 

data/lib/jekyll-url-metadata/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module URLMetadata
-    VERSION = "1.0.2"
+    VERSION = "1.0.4"
   end # module Jekyll
 end # module URLMetadata

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-url-metadata
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Gourav Khunger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2023-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.14'
 description: A plugin to expose meta data information from the head tag of a webapge
   to liquid variables just from its url string.
 email:
@@ -70,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: Extract all kind of meta data from a url string