Skip to content

Fix tweet embed inside a list #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xfalcox wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix tweet embed inside a list #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions lib/jekyll-twitter-plugin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
# https://github.com/rob-murray/jekyll-twitter-plugin
#
module TwitterJekyll
VERSION = "2.0.0".freeze
REFER_TO_README = "Please see 'https://github.com/rob-murray/jekyll-twitter-plugin' for usage.".freeze
LIBRARY_VERSION = "jekyll-twitter-plugin-v#{VERSION}".freeze
VERSION = "2.0.0"
REFER_TO_README = "Please see 'https://github.com/rob-murray/jekyll-twitter-plugin' for usage."
LIBRARY_VERSION = "jekyll-twitter-plugin-v#{VERSION}"
REQUEST_HEADERS = { "User-Agent" => LIBRARY_VERSION }.freeze

# TODO: remove after deprecation cycle
CONTEXT_API_KEYS = %w(consumer_key consumer_secret access_token access_token_secret).freeze
ENV_API_KEYS = %w(TWITTER_CONSUMER_KEY TWITTER_CONSUMER_SECRET TWITTER_ACCESS_TOKEN TWITTER_ACCESS_TOKEN_SECRET).freeze
CONTEXT_API_KEYS = %w[consumer_key consumer_secret access_token access_token_secret].freeze
ENV_API_KEYS = %w[TWITTER_CONSUMER_KEY TWITTER_CONSUMER_SECRET TWITTER_ACCESS_TOKEN TWITTER_ACCESS_TOKEN_SECRET].freeze

# Cache class that writes to filesystem
# TODO: Do i really need to cache?
Expand Down Expand Up @@ -107,7 +107,7 @@ def to_h
# Holds the URI were going to request with any parameters
# @api private
ApiRequest = Struct.new(:entity_url, :params) do
TWITTER_API_URL = "https://publish.twitter.com/oembed".freeze
TWITTER_API_URL = "https://publish.twitter.com/oembed"

# Always;
def ssl?
Expand Down Expand Up @@ -140,10 +140,10 @@ def unique_request_key
# Class to respond to Jekyll tag; entry point to library
# @api public
class TwitterTag < Liquid::Tag
ERROR_BODY_TEXT = "<p>Tweet could not be processed</p>".freeze
OEMBED_ARG = "oembed".freeze
ERROR_BODY_TEXT = "<p>Tweet could not be processed</p>"
OEMBED_ARG = "oembed"

URL_OR_STRING_PARAM = /^("|')?(http|https):\/\//i
URL_OR_STRING_PARAM = %r{^("|')?(http|https)://}i

attr_writer :cache # for testing

Expand Down Expand Up @@ -198,7 +198,8 @@ def api_client
# Return Twitter response or error html
# @api private
def html_output_for(response)
body = (response.html if response) || ERROR_BODY_TEXT
body = response&.html || ERROR_BODY_TEXT
body = body.delete("\n")

"<div class='jekyll-twitter-plugin'>#{body}</div>"
end
Expand Down