octopress-social 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc69b51e6a1d4ccc410094fede2aee2d4d6af2a7
-  data.tar.gz: 909c4cb057c933360f3e35781217685f8e976b66
+  metadata.gz: 897b85017a8b777f4c2e525da305201fed073713
+  data.tar.gz: 125b92d5eee580aaf1aa6c901ae68c5c814a4bfe
 SHA512:
-  metadata.gz: 6715d8246cc3b68020c5b9697625515a112317d71d0ff74826996596884778286b7c4b0d61f8e2c6593ff86caf876584841370333793ae4b09153d6d68886a06
-  data.tar.gz: 59df88675057d14007087997e82dcfeccd22530a94559a26c58f6a65b5a2bab41a070812ade795c91d357ad5d9a16c0df3f3d4f99f266afd69da68c1694d3f8a
+  metadata.gz: 23ef92ea65bdfd4c49e1663ffc36c0c5c4326dc6917a9d225f249163a1981b6b29efc424efb9d83f0b0c2c0580d712d9473033ec11f896b4fc5a8c9e63b7440a
+  data.tar.gz: c36bd80d6775eb098d9f155d09d501217b3f034f3d0395beb47f70495ad17a57f1ab2474d5d6bb4d7e8bb4dbccca39ec3fd1dd1f8ec21943c66c78c4eb891999

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 1.3.0 (2015-03-21)
+- New: Embeddable tweets with {% tweet %} tag.
+- Fixed: Default tweet message (without configured username) removes 'by' credit.
+- Fixed: Tweets in post loops shared current page instead of post.
+
 ### 1.2.0 (2015-03-18)
 - New: Added Disqus comments link tag.
 - New: Facebook comments link tag.

data/README.md

@@ -47,6 +47,7 @@ twitter:
   size:                normal    # Or large
   tweet_link_text:     Twitter   # Configure the link text
   tweet_message:       ":title by :username :hashtags - :url" # With Tweet button Twitter add the URL last
+  embedded_link_color:           # Set link color for embedded tweets
 
   follow_count:        false     # Show number of followers
   profile_link_text:   "Follow :username"
@@ -101,6 +102,23 @@ Follow tags:
 {% twitter_profile_link %}
 ```
 
+Embed a tweet:
+
+```
+{% tweet status_url %}Tweet Text{% endtweet %}
+```
+
+This will generate a blockquote, much like this one:
+
+```
+<blockquote class="twitter-tweet" data-link-color="" lang="">
+<p>[Tweet Text]</p>
+<a href="[tweet_url]"> — @[user]</a>
+</blockquote>
+```
+
+If you include the twitter widget.js in your site, this will automatically be replaced with one of Twitter's fancy embedded tweets.
+
 ## Facebook
 
 Configure this plugin in your site's `_config.yml`.

data/lib/octopress-social/twitter.rb

@@ -31,7 +31,8 @@ module Octopress
           <a href="https://twitter.com/share" class="twitter-share-button" 
           #{'data-size="large"' if config['size'] == 'large'}
           #{'data-count="none"' if !config['tweet_count']}
-          #{button_message(site, item).sub(/\s?#{url}/, '')}
+          data-url="#{url}"
+          #{button_message(site, item)}
           data-dnt="true">#{config['tweet_link_text']}</a>
         }
       end
@@ -51,16 +52,17 @@ module Octopress
       end
 
       def message(site, item)
+        username_var = (username(item).empty? ? 'by :username' : ':username')
         (item['tweet_message'] || config['tweet_message'])
           .sub(':title', item['title'] || '')
-          .sub(':username', username(item))
+          .sub(username_var, username(item))
           .sub(':url', url)
           .sub(':hashtags', hashtags(item))
           .strip
       end
 
       def button_message(site, item)
-        %Q{data-text="#{message(site, item)}"}
+        %Q{data-text="#{message(site, item).sub(/\s?#{url}/, '')}"}
       end
 
       def profile_link_text
@@ -82,6 +84,32 @@ module Octopress
         "<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>"
       end
 
+      def tweet(site, item, url, content)
+        user = "@#{url.match(/.com\/(.+)?\/status/)[1]}"
+        %Q{<blockquote class="twitter-tweet"
+          data-link-color="#{config['embedded_link_color']}"
+          lang="#{item['lang'] || site['lang']}">
+          <p>#{content}</p>
+          <a href="#{url}"> — #{user}</a>
+          </blockquote>
+        }
+      end
+
+      class Tweet < Liquid::Block
+        def initialize(tag, input, tokens)
+          super
+          @tag = tag.strip
+          @input = input.strip
+        end
+
+        def render(context)
+          content = super(context)
+          site = context['site']
+          item = context['page']
+          Octopress::Social::Twitter.tweet(site, item, @input, content).gsub(/(\s{2,}|\n)/, ' ').strip
+        end
+      end
+
       class Tag < Liquid::Tag
         def initialize(tag, input, tokens)
           @tag = tag.strip
@@ -89,8 +117,8 @@ module Octopress
         end
 
         def render(context)
-          item = Octopress::Social.item(context, @input)
           site = context['site']
+          item = Octopress::Social.item(context, @input)
 
           Octopress::Social::Twitter.set_config(site)
           Octopress::Social::Twitter.set_url(site, item)

data/lib/octopress-social/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Social
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/lib/octopress-social.rb

@@ -33,6 +33,7 @@ module Octopress
   end
 end
 
+Liquid::Template.register_tag('tweet', Octopress::Social::Twitter::Tweet)
 Liquid::Template.register_tag('tweet_button', Octopress::Social::Twitter::Tag)
 Liquid::Template.register_tag('tweet_link', Octopress::Social::Twitter::Tag)
 Liquid::Template.register_tag('twitter_script_tag', Octopress::Social::Twitter::Tag)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-social
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll