octopress-social 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3213c10c4cdb75d78032f8147d4c77f7004d874
-  data.tar.gz: cee00964846941a3c8ee6bd97c5e82dbb7f441f2
+  metadata.gz: 7ad8a7ece7e30fbc6fce89ea3753d9eaf13355c8
+  data.tar.gz: b4f122dce2d3e6ea8648372350925946a809dcd2
 SHA512:
-  metadata.gz: 4f38f54ce707ce47542466af7721a39103b77f7acb64bff33eae1de977db49450446bdcd393acb58c04d2dc5a317912452657fefe1e53706d4e593bc838b26eb
-  data.tar.gz: 7b6d4b137b4da101fb8740c179dd51bf29dec2211eb6a633e4969ecb20c8fd0de60dc459a71d09fc75ced9877ea105416593538e03a3ed85712ee4425a47fbd6
+  metadata.gz: 984ee78928c0d0c68bda2eb965364fdc0e27c4b6ba38413ee6cfd3e047cd5dfb27755dac7d0145ddf57b0fc3327d242b4303dd084287c88b9304c0495f5a50ea
+  data.tar.gz: 9f7234ac4585cfbecffc5a8ce6ceb0b8b7125e6b08393a6c28e9a0215c9b3bba222cac7e8a4c2fabd9f83aa7d072a8c995c92849c894b630fbabdd7333214762

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# Changelog
+
+### 1.1.0 (2015-03-17)
+- New: Added support Disqus comments.
+- New: Disable Facebook comments on any page or post with `comments: false`.
+
+### 1.0.0 (2015-03-17)
+- Initial release

data/README.md

@@ -1,6 +1,10 @@
 # Octopress Social
 
-Easy social features from Twitter, Facebook, and Google+ with fancy buttons or plain-old links.
+Easy social integrations with Twitter, Facebook, and Google+ with fancy buttons or plain-old links.
+
+[![Build Status](http://img.shields.io/travis/octopress/social.svg)](https://travis-ci.org/octopress/social)
+[![Gem Version](http://img.shields.io/gem/v/octopress-social.svg)](https://rubygems.org/gems/octopress-social)
+[![License](http://img.shields.io/:license-mit-blue.svg)](http://octopress.mit-license.org)
 
 ## Installation
 
@@ -91,7 +95,7 @@ Follow tags:
 
 ## Facebook
 
-These configurations are all based on [Facebook's widget configuration spec](https://developers.facebook.com/docs/plugins/), visit that site for more info.
+Configure this plugin in your site's `_config.yml`.
 
 ```yaml
 facebook:
@@ -108,6 +112,8 @@ facebook:
   comment_count:       5             # Number of facebook comments to show by default
 ```
 
+These configurations are all based on [Facebook's widget configuration spec](https://developers.facebook.com/docs/plugins/), visit that site for more info.
+
 To get your `profile_id`, take a section from the url to your profile page `https://www.facebook.com/[profile_id]`.
 
 To get an `app_id` you'll need to [register](https://developers.facebook.com/apps) as a developer and go through the process to create an
@@ -144,10 +150,9 @@ Embed Facebook comments widget:
 {% facebook_comments %}
 ```
 
-
 ## Google+
 
-These configurations are based on Google's [web sharing widgets](https://developers.google.com/+/web/+1button/).
+Configure this plugin in your site's `_config.yml`.
 
 ```yaml
 gplus:
@@ -160,6 +165,8 @@ gplus:
   profile_link_text: "Follow on Google+"
 ```
 
+These configurations are based on Google's [web sharing widgets](https://developers.google.com/+/web/+1button/).
+
 ### Google+ Tags
 
 To use Google's fancy buttons, you'll need to add this tag to your site's layout before the closing body tag.
@@ -183,6 +190,49 @@ Follow tags:
 {% gplus_profile_link %}
 ```
 
+## Disqus Comments
+
+Configure this plugin in your site's `_config.yml` and optionally on each page or post.
+
+```yaml
+disqus_shortname:          # Your site's disqus identifier
+```
+
+In any page or post, you can add these configurations to the YAML front-matter.
+
+```
+disqus_identifier:     # Unique identifier for this page's comments (defaults to full url)
+disqus_title:          # Custom title for comments metadata (defaults to page/post title)
+comments: false        # Disable comments for this page or post
+```
+
+### Tags
+
+These tags will help you integrate Disqus comments into your site.
+
+```
+{% disqus_comments %}      # Embed comments on a page
+```
+
+If you want to link directly to the comments section of a post or page, create a link like this:
+
+```
+{% disqus_comments_link %}        # link to the comments section on the current page
+{% disqus_comments_link post %}   # link to the comments section on a post (in the posts loop)
+```
+
+This will generate a link to the page or post with the on page anchor `#disqus_thread` added, linking you directly to the comments
+section.
+
+If you want to show the number of comments in the link, add the following tag to your page layout, somewhere before `</body>`.
+
+```
+{% disqus_count_script %}  # Add script for adding counts to comment links
+```
+
+This tag will find all comments links on the current page and add the comment count. You can configure this link text from your the admin panel on Disqus's site.
+
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/octopress-social/fork )

data/lib/octopress-social.rb

@@ -5,9 +5,10 @@ module Octopress
   module Social
     extend self
 
-    autoload :Twitter,                'octopress-social/twitter'
-    autoload :Facebook,               'octopress-social/facebook'
-    autoload :GooglePlus,             'octopress-social/google-plus'
+    autoload :Twitter,        'octopress-social/twitter'
+    autoload :Facebook,       'octopress-social/facebook'
+    autoload :GooglePlus,     'octopress-social/google-plus'
+    autoload :Disqus,         'octopress-social/disqus'
     
     def full_url(site, item)
       unless root = site['url']
@@ -37,6 +38,9 @@ Liquid::Template.register_tag('facebook_follow_button', Octopress::Social::Faceb
 Liquid::Template.register_tag('facebook_profile_link', Octopress::Social::Facebook::Tag)
 Liquid::Template.register_tag('facebook_comments', Octopress::Social::Facebook::Tag)
 Liquid::Template.register_tag('facebook_script_tag', Octopress::Social::Facebook::Tag)
+Liquid::Template.register_tag('disqus_comments', Octopress::Social::Disqus::Tag)
+Liquid::Template.register_tag('disqus_count_script', Octopress::Social::Disqus::Tag)
+Liquid::Template.register_tag('disqus_comments_link', Octopress::Social::Disqus::Tag)
 
 if defined? Octopress::Docs
   Octopress::Docs.add({

data/lib/octopress-social/disqus.rb

@@ -0,0 +1,67 @@
+module Octopress
+  module Social
+    module Disqus
+      extend self
+
+      def config(site=nil)
+        @config ||= site['disqus_shortname']
+      end
+
+      def url(site, item)
+        Social.full_url(site, item)
+      end
+
+      def identifier(site, item)
+        item['disqus_identifier'] || url(site, item)
+      end
+
+      def disqus_comments(site, item)
+        %Q{<div id="disqus_thread"></div>
+          <script type="text/javascript">
+            var disqus_shortname = '#{config}';
+            var disqus_url = '#{url(site, item)}';
+            var disqus_identifier = '#{identifier(site, item)}';
+            var disqus_title = '#{item['title']}';
+            #{embed_script('embed')}
+          </script>
+          <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript>
+        }
+      end
+
+      def disqus_count_script(site, item)
+        %Q{<script type="text/javascript">
+        var disqus_shortname = '#{config}';
+        #{embed_script('count')}
+        </script>  
+        }
+      end
+
+      def embed_script(script)
+        %Q{(function () {
+            var s = document.createElement('script'); s.async = true;
+            s.type = 'text/javascript';
+            s.src = '//#{config}.disqus.com/#{script}.js';
+            (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+          }());
+        }
+      end
+
+      class Tag < Liquid::Tag
+        def initialize(tag, input, tokens)
+          @tag = tag.strip
+          @input = input.strip
+        end
+
+        def render(context)
+          item = context[@input] || context['page']
+          site = context['site']
+
+          config = Octopress::Social::Disqus.config(site)
+          if config && item['comments'] != false
+            Octopress::Social::Disqus.send(@tag, site, item).gsub(/(\s{2,}|\n)/, ' ').strip
+          end
+        end
+      end
+    end
+  end
+end

data/lib/octopress-social/facebook.rb

@@ -95,11 +95,15 @@ module Octopress
       end
 
       def facebook_comments(site, item)
-        %Q{<div class="fb-comments" 
-        data-href="#{Social.full_url(site, item)}" 
-        data-numposts="#{config['comment_count']}" 
-        data-colorscheme="#{config['colorscheme']}"
-        ></div>}
+        if item['comments'] != false
+          %Q{<div class="fb-comments" 
+          data-href="#{Social.full_url(site, item)}" 
+          data-numposts="#{config['comment_count']}" 
+          data-colorscheme="#{config['colorscheme']}"
+          ></div>}
+        else
+          ''
+        end
       end
 
       class Tag < Liquid::Tag

data/lib/octopress-social/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Social
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-social
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -87,8 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - README.md
 - lib/octopress-social.rb
+- lib/octopress-social/disqus.rb
 - lib/octopress-social/facebook.rb
 - lib/octopress-social/google-plus.rb
 - lib/octopress-social/twitter.rb