jekyll-tweetsert 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 620896be0df8f5c877e4e8c52ecf5e879d29e4e3
-  data.tar.gz: c1c12cd48eef6759c32aa46c744323a6396fa7c2
+  metadata.gz: d46fa427ad2b24f048b448acbe2238b905147666
+  data.tar.gz: b7f1b6dd5b7a9de8de34aa7963860160c608c222
 SHA512:
-  metadata.gz: 5df648c341876335f5e80622faa8a262bbe6b1fca1f7684f570217c547c68e09c15c729121e3982a8ad22f398a25438eb93da990a72e5eb11a6fb032ec0062d5
-  data.tar.gz: e72c0eae8d162b2c0e67c50fa7ec09635a267a7079fbc05f4430559578e7c13aa543533bf6bc91ea5b61bd23ef52409f84bc3e5e9208d03b7c3615da122d58f1
+  metadata.gz: a26a811b1d2ce1a77f4bde517cca85c3dc30a1a65c1f012cbe963c8ceb6592305b40b369d23cd947b288829fe956b86e5218eef86eb8004d932c705a3f99a7ca
+  data.tar.gz: e282608ee9c2e10b5c49362e3016f3c056c06dc985c6c5849d865406b2835f9bca1fe0413eb6223c480037ccf08357e01ad7e204c3fbbd0ee5f80534834d5c17

data/README.md

@@ -1,18 +1,22 @@
 # Jekyll::Tweetsert
 
-*Version 1.0.0*
+[![Gem Version](https://badge.fury.io/rb/jekyll-tweetsert.svg)](https://badge.fury.io/rb/jekyll-tweetsert)
 
 *Tweetsert* is a plugin for Jekyll that pulls recent tweets from one or more Twitter handles, then inserts them (dated appropriately) as regular posts on your site. You can specify which tweets to include or exclude based on patterns or words, import retweets and replies, and tweak the theme and link colors of the embedded tweet.
 
 To organize your tweet-posts, Tweetsert can automatically assign a category and/or tag. You may also choose to automatically import Twitter hashtags.
 
-### Why do this?
+## Why do this?
 
 1. You want your blog readers to also see your recent tweets when they visit;
 1. You may want to pull in tweets from friends, family, co-workers, etc. into your blog;
 1. You want to create a blog composed only of tweets from a group of people;
 1. Just for fun!
 
+## What's new?
+
+*v1.1.0* Added `prefix` and `suffix` options to `embed`
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -138,6 +142,11 @@ tweetsert:
     # Set to true if you manually include it in e.g. the header
     #omit_script: true
 
+    # Some markup to include right before and after the embedded tweet
+    # {{anything}} will be expanded to the corresponding frontmatter/properties
+    #prefix: '<i>This was tweeted on {{date}}</i>'
+    #suffix: '<i>This is after. Click <a href="{{url}}">here</a> to view this tweet separately.</i>'
+
   category:
     default: "tweets"                  # Automatically set to this category
     dir: ""                            # Folder that contains your categories
@@ -223,6 +232,8 @@ tweetsert:
     theme: "dark"
     link_color: "#80FF80"
     omit_script: false
+    prefix: '<i>I tweeted this on {{date}}</i>'
+    suffix: '<p>Click <a href="{{url}}">here</a> to comment.</p>'
 
   category:
     default: "tweets"
@@ -262,7 +273,19 @@ tweetsert:
 
 ## Further configuration
 
-The embedded tweet is wrapped inside a `<div class="jekyll-tweetsert">`. You may adjust its appearance via CSS:
+You may want to edit your `home`/index layout to make the imported tweets look different from the regular ones, for instance,
+
+```html
+{% for post in site.posts %}
+  {% if post.tags contains "tweet" %}
+	<br/>
+  {% else %}
+    <!-- normal post header -->
+  {% endif %}
+{% endfor %}
+```
+
+The embedded tweet is wrapped inside a `<div class="jekyll-tweetsert">`, with `embed.prefix` inserted before, and `embed.suffix` after. You may adjust its appearance via CSS:
 
 ```css
 .jekyll-tweetsert {
@@ -278,23 +301,24 @@ If you'd rather access the embedded tweet directly, use a property:
 
 ```yaml
   properties:
-    tweet_html: $
+    tweet: $
 ```
 
-and include it as `{{ post.tweet_html }}` or `{{ page.tweet_html }}`
+and include it in your layout as `{{ page.tweet }}` or `{{ post.tweet }}`. You may want to do this since `{{ content }}` includes the contents of `embed.prefix` and `embed.suffix` and you'd rather exclude them to further tweak the appearance via a custom layout.
 
-You may also want to edit your `home` layout to make the imported tweets look different from the regular ones, for instance,
+This has the nice side-effect of being able to do things like:
 
 ```html
-{% for post in site.posts %}
-  {% if post.tags contains "tweet" %}
-	<br/>
-  {% else %}
-    <!-- normal post header -->
-  {% endif %}
-{% endfor %}
+{% if page.tweet %}
+<p>The following is a tweet:</p>
+<div class="my-tweet-class">{{ page.tweet }}</div>
+{% else %}
+  {{ content }}
+{% endif %}
 ```
 
+## Demo
+
 See the [author's blog](https://ibrado.org) for a demo.
 
 ## Contributing
@@ -319,3 +343,7 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 Everyone interacting in the Jekyll::Tweetsert project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/jekyll-tweetsert/blob/master/CODE_OF_CONDUCT.md).
+
+## Also by the author
+
+[Jekyll Stickyposts Plugin](https://github.com/ibrado/jekyll-stickyposts) - Move/pin posts tagged `sticky: true` before all others. Sorting on custom fields supported, collection and paginator friendly.

data/jekyll-tweetsert.gemspec

@@ -6,6 +6,8 @@ require "jekyll/tweetsert/version"
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-tweetsert"
   spec.version       = Jekyll::Tweetsert::VERSION
+  spec.platform      = Gem::Platform::RUBY
+  spec.required_ruby_version = '>= 2.0.0'
   spec.authors       = ["Alex Ibrado"]
   spec.email         = ["alex@ibrado.org"]
 
@@ -23,6 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.16"
 
+  spec.add_runtime_dependency "jekyll", "~> 3.0"
   spec.add_runtime_dependency "api_cache", "~> 0.3"
   spec.add_runtime_dependency "moneta", "~> 1.0"
 end

data/lib/jekyll/tweetsert.rb

@@ -370,17 +370,10 @@ module Jekyll
               tweetpost = Jekyll::Document.new(File.join(site.source, o[:category], name),
                 { :site => site, :collection => site.posts })
 
-              tweetpost.content = '<div class="jekyll-tweetsert">' + oembed["html"] + '</div>'
-
               tweetpost.data["title"] = prefix + title_base + suffix
-
               tweetpost.data["date"] = tweet['timestamp'].to_time
               tweetpost.data["layout"] = o[:layout]
 
-              if o[:embed]["excerpts"].nil? || o[:embed]["excerpts"]
-                tweetpost.data["excerpt"] = Jekyll::Excerpt.new(tweetpost)
-              end
-
               tweet_tags = [o[:default_tag]].compact
 
               plain_text = tweet["full_text"].downcase.gsub(/&\S[^;]+;/, '');
@@ -410,6 +403,15 @@ module Jekyll
                 end
               end
 
+              pre = Liquid::Template.parse(o[:embed]["prefix"] || '').render(tweetpost.to_liquid)
+              post = Liquid::Template.parse(o[:embed]["suffix"] || '').render(tweetpost.to_liquid)
+
+              tweetpost.content = '<div class="jekyll-tweetsert">' + pre + oembed["html"] + post + '</div>'
+
+              if o[:embed]["excerpts"].nil? || o[:embed]["excerpts"]
+                tweetpost.data["excerpt"] = Jekyll::Excerpt.new(tweetpost)
+              end
+
               site.posts.docs << tweetpost
 
               # Create the tag index file

data/lib/jekyll/tweetsert/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Tweetsert
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-tweetsert
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alex Ibrado
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: jekyll
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: api_cache
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="