jekyll-linkpreview 0.6.0.rc1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c51945d7da1fdd7145948dffd3f991f1675a1c8dc0f64f3a44d19afc700fd3f
-  data.tar.gz: e18b2a9aa699e6d6208343790cf7e548fee7942f51cb197f87e8db36077b4394
+  metadata.gz: dd45369b38e2a2121de3c5a1b4af6c1096fe0649ad5d3e0c06fbc34ceb17634f
+  data.tar.gz: 2bfd854068e9ded58f9eb4dfbc22ac714608d99db457d1af78f0c741858f4b27
 SHA512:
-  metadata.gz: b73fa9cdc4ef0ef09906df15b56563f7c048af2c5ade7e78a87d1938f4654022f3073d243a32b4d5d11a62ba50622d9914b26a0cabe14a98156e08285452e8ea
-  data.tar.gz: 654a1d448bc7c74785beba8c6cfb1e2d6303e7e4db63b341955ee029ec10309334cbc03297b93666b55d804d4a8e9540968041437c8825f656e1f60040f0814e
+  metadata.gz: 444a4327a8c79d4a5847d74dba86dbda7dae27226e33c5831dda8f73ae4bb495964a8b8c2e0d1080904e0064c2c65483c95b14e746a38a061f7c8aa8df47371c
+  data.tar.gz: 9cd54f69288be12b24e395a6fc71b5ba637cca3f937c014e72dbb3f76defef256bc6c7ca167ba7b782a7f795b74f8469bd0373bfd47da5f73d4446fddef458e2

data/.github/workflows/release.yaml

@@ -15,6 +15,9 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 2
+      # See https://github.com/actions/runner-images/issues/6775.
+      - name: Suppress 'detected dubious ownership' error.
+        run: git config --global --add safe.directory /__w/jekyll-linkpreview/jekyll-linkpreview
       - id: check-release
         name: Decide whether to release
         run: |
@@ -34,6 +37,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      # See https://github.com/actions/runner-images/issues/6775.
+      - name: Suppress 'detected dubious ownership' error.
+        run: git config --global --add safe.directory /__w/jekyll-linkpreview/jekyll-linkpreview
       - env:
           RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
         name: Set credentials for RubyGems

data/.github/workflows/test.yaml

@@ -1,5 +1,11 @@
 name: Test
-on: [push]
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
 jobs:
   test:
     container:
@@ -31,6 +37,15 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - if: matrix.ruby == '2.7'
+        name: Update RubyGems version
+        # sass-embedded 1.57.1, which is one of dependencies of jekyll-sass-converter 3.0,
+        # requires rubygems version >= 3.3.22
+        # (see https://jekyllrb.com/news/2022/12/21/jekyll-sass-converter-3.0-released/
+        #  for the jekyll-sass-converter 3.0 release).
+        # Just running `gem update --system` upgrades rubygems version to '>= 2.4',
+        # which appraisal 2.4.1 can't work with.
+        run: gem update --system 3.3.22
       - name: Install dependencies
         run: bundle install
       - name: Install dependencies for each appraisal

data/README.md

@@ -56,6 +56,7 @@ You can override the default templates used for generating previews, both in cas
  2. Use built-in variables to extract data which you would like to render. Available variables are:
   * **link_url** i.e. `{{ link_url }}`
   * **link_title** i.e. `{{ link_title }}`
+  * **link_type** i.e. `{{ link_type }}`
   * **link_image** i.e. `{{ link_image }}`
   * **link_description** i.e. `{{ link_description }}`
   * **link_domain** i.e. `{{ link_domain }}`

data/jekyll-linkpreview.gemspec

@@ -20,10 +20,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "jekyll", ">= 3.5", "< 5.0"
   spec.add_dependency "metainspector", "~> 5.9"
-  spec.add_development_dependency "bundler", "~> 2.0"
+  # appraisal 2.4.1, which is the latest version as of Jan 2023, doesn't work with bundler >= 2.4.
+  # See https://github.com/thoughtbot/appraisal/issues/199 for details.
+  spec.add_development_dependency "bundler", ">= 2.0", "< 2.4"
   spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-parameterized", "~> 0.5.2"
-  spec.add_development_dependency "appraisal", "~> 2.2.0"
+  spec.add_development_dependency "appraisal", "~> 2.0"
   spec.add_development_dependency "wwtd", "~> 1.4.1"
 end

data/lib/jekyll-linkpreview/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Linkpreview
-    VERSION = "0.6.0.rc1"
+    VERSION = "0.6.0"
   end
 end

data/lib/jekyll-linkpreview.rb

@@ -10,8 +10,9 @@ module Jekyll
     class OpenGraphProperties
       @@template_file = 'linkpreview.html'
 
-      def initialize(title, url, image, description, domain)
+      def initialize(title, type, url, image, description, domain)
         @title = title
+        @type = type
         @url = url
         @image = image
         @description = description
@@ -21,6 +22,7 @@ module Jekyll
       def to_hash()
         {
           'title' => @title,
+          'type' => @type,
           'url' => @url,
           'image' => @image,
           'description' => @description,
@@ -31,6 +33,7 @@ module Jekyll
       def to_hash_for_custom_template()
         {
           'link_title' => @title,
+          'link_type' => @type,
           'link_url' => @url,
           'link_image' => @image,
           'link_description' => @description,
@@ -48,16 +51,17 @@ module Jekyll
         og_properties = page.meta_tags['property']
         image_url = get_og_property(og_properties, 'og:image')
         title = get_og_property(og_properties, 'og:title')
+        type = get_og_property(og_properties, 'og:type')
         url = get_og_property(og_properties, 'og:url')
         image = convert_to_absolute_url(image_url, page.root_url)
         description = get_og_property(og_properties, 'og:description')
         domain = page.host
-        OpenGraphProperties.new(title, url, image, description, domain)
+        OpenGraphProperties.new(title, type, url, image, description, domain)
       end
 
       def from_hash(hash)
         OpenGraphProperties.new(
-          hash['title'], hash['url'], hash['image'], hash['description'], hash['domain'])
+          hash['title'], hash['type'], hash['url'], hash['image'], hash['description'], hash['domain'])
       end
 
       private
@@ -116,8 +120,7 @@ module Jekyll
 
     class NonOpenGraphPropertiesFactory
       def from_page(page)
-        NonOpenGraphProperties.new(
-          page.title, page.url, get_description(page), page.host)
+        NonOpenGraphProperties.new(page.best_title, page.url, get_description(page), page.host)
       end
 
       def from_hash(hash)
@@ -189,7 +192,9 @@ module Jekyll
 
       private
       def create_properties_from_page(page)
-        if page.meta_tags['property'].empty? then
+        if !%w[og:title og:type og:url og:image].all? { |required_tag|
+          page.meta_tags['property'].include?(required_tag)
+        }
           factory = NonOpenGraphPropertiesFactory.new
         else
           factory = OpenGraphPropertiesFactory.new
@@ -239,16 +244,15 @@ module Jekyll
         image_html = ""
         if image then
           image_html = <<-EOS
-<div class="jekyll-linkpreview-image">
-  <a href="#{url}" target="_blank">
-    <img src="#{image}" />
-  </a>
-</div>
+      <div class="jekyll-linkpreview-image">
+        <a href="#{url}" target="_blank">
+          <img src="#{image}" />
+        </a>
+      </div>
 EOS
         end
         html = <<-EOS
 <div class="jekyll-linkpreview-wrapper">
-  <p><a href="#{url}" target="_blank">#{url}</a></p>
   <div class="jekyll-linkpreview-wrapper-inner">
     <div class="jekyll-linkpreview-content">
 #{image_html}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-linkpreview
 version: !ruby/object:Gem::Version
-  version: 0.6.0.rc1
+  version: 0.6.0
 platform: ruby
 authors:
 - Yusuke Nishioka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-09 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -48,16 +48,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
@@ -166,9 +172,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.26
 signing_key: