sinatra-disqus 2.0.0 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: aff92a05e2278aae7766e0922c7bd66a7528caf1
+  data.tar.gz: 5d2a66a4f66c40893ee2d53c1e1a9f4697e06bad
+SHA512:
+  metadata.gz: abddbc3a2aee65a721099063f51c8758a843d89623bbc18756e8ad0aa3a288c3ee25f001dadec74de663b2878e25cb9e4bc9f7ea1bd2373a243e151762360513
+  data.tar.gz: 400f9a79bc6e6a73ee740c430c87aa95f1122573352d87e8bdf55db8f25a86bad49d144f3d30c91470e63c61c0fadbe8c4bf26e6a3338cd90406715204c64a26

data/.gitignore

@@ -16,4 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 bin/
-vendor/
+vendor/
+vendor.noindex/

data/CHANGES.md

@@ -1,5 +1,13 @@
 ## CH-CH-CH-CH-CHANGES! ##
 
+### Wednesday the 4th of November 2015, v2.1.0 ###
+
+* Added setting for host, as an alternative to the one in the request. Useful when running on localhost but still want the request to output a domain.
+* Chopped up the script into smaller pieces to make dealing with it easier (internal).
+
+----
+
+
 ### Friday the 28th of June 2013, v2.0.0 ###
 
 * Disqus has dropped support for developer mode. Updated to reflect this.

data/README.md

@@ -49,7 +49,7 @@ Note: It used to be that you were able to put Disqus into "development mode", [t
       %p
         Now for some comments:
     #comments
-      inject_disqus
+      = inject_disqus
 
 #### Modular style ####
 
@@ -94,7 +94,7 @@ Note: It used to be that you were able to put Disqus into "development mode", [t
       %p
         Now for some comments:
     #comments
-      inject_disqus # you'd probably do this at the bottom of a view instead.
+      = inject_disqus # you'd probably do this at the bottom of a view instead.
 
 ### Version numbering ###
 

data/lib/sinatra/disqus.rb

@@ -15,14 +15,19 @@ module Sinatra
   //<![CDATA[
 TOP
 
-    # The bottom bit of the sandwich we're making.
-    Disqus_output_bottom = <<BOTTOM
+    Disqus_output_function_top = <<FUNCTOP
     (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+FUNCTOP
+
+    Disqus_output_function_bot = <<FUNCBOT
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
     })();
   //]]>
+FUNCBOT
+
+    # The bottom bit of the sandwich we're making.
+    Disqus_output_bottom = <<BOTTOM
 </script>
 <noscript>
   Please enable JavaScript to view the <a href="//disqus.com/?ref_noscript">comments powered by Disqus.</a>
@@ -57,6 +62,7 @@ BOTTOM
     var disqus_url = '#{opts[:request_url]}';
 STR
       end
+
     end
 
 
@@ -65,7 +71,17 @@ STR
       
       # @return [String] Returns the bit of HTML/javascript to stick in the page.
       def inject_disqus
-        "#{Disqus_output_top}#{Private.build_vars(request_url: uri(request.path_info), disqus_shortname: settings.disqus_shortname, title: @title, disqus_identifier: Private.disqus_identifier(request.path))}#{Disqus_output_bottom}"
+        req_url = settings.disqus_host ?
+          File.join(settings.disqus_host,request.path_info) :
+          request.url
+
+          options = {
+            request_url: req_url,
+            disqus_shortname: settings.disqus_shortname,
+            title: @title,
+            disqus_identifier: Private.disqus_identifier(request.path)
+          }
+          "#{Disqus_output_top}#{Private.build_vars(options)}#{Disqus_output_function_top}        dsq.src = '//#{settings.disqus_shortname}.disqus.com/embed.js';\n#{Disqus_output_function_bot}#{Disqus_output_bottom}"
       end
 
     end
@@ -78,6 +94,11 @@ STR
       # @param [String] s The short name of the site (e.g. example.org )
       app.set :disqus_shortname, nil
 
+      # @param [String] s Alternative host to the one in the request. Useful when running on localhost but still want the request to output a domain.
+      # @example
+      #   set :disqus_host, "//example.org"
+      app.set :disqus_host, nil
+
     end # registered
   end
   register Disqus

data/lib/sinatra/disqus/version.rb

@@ -3,6 +3,6 @@
 module Sinatra
   module Disqus
     # This library's version.
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/spec/disqus_spec.rb

@@ -5,11 +5,12 @@ require "rspec_helper"
 require_relative "../lib/sinatra/Disqus.rb"
 
 describe "Disqus" do
-  before{ get '/' }
-  include_context "All pages"
-  it_should_behave_like "Any route"
-  context "Output" do
-    let(:expected) { <<STR
+  context "General" do
+    before{ get '/' }
+    include_context "All pages"
+    it_should_behave_like "Any route"
+    context "Output" do
+      let(:expected) { <<STR
 <div id='disqus_thread'></div>
 <script type='text/javascript'>
   //<![CDATA[
@@ -19,7 +20,7 @@ describe "Disqus" do
     var disqus_url = 'http://example.org/';
     (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+        dsq.src = '//example.org.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
     })();
   //]]>
@@ -29,8 +30,55 @@ describe "Disqus" do
 </noscript>
 <a href="//disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
 STR
-    }
-    subject{ last_response.body }
-    it { should == expected }
+      }
+      subject{ last_response.body }
+      it { should == expected }
+    end
+  end
+
+  context "settings.disqus_host" do
+    include Rack::Test::Methods
+    def app
+      app = Sinatra.new do
+        register Sinatra::Disqus
+  
+        configure do
+          set :disqus_shortname, "example.org"
+          set :disqus_host, "//localhost:4567"
+        end
+  
+        get "/" do
+          @title = "Home"
+          inject_disqus
+        end
+      end
+    end
+    before{ get '/' }
+    context "Output" do
+      let(:expected) { <<STR
+<div id='disqus_thread'></div>
+<script type='text/javascript'>
+  //<![CDATA[
+    var disqus_title = "Home";
+    var disqus_shortname = 'example.org';
+    var disqus_identifier = '6666cd76f96956469e7be39d750cc7d9';
+    var disqus_url = '//localhost:4567/';
+    (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//example.org.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+    })();
+  //]]>
+</script>
+<noscript>
+  Please enable JavaScript to view the <a href="//disqus.com/?ref_noscript">comments powered by Disqus.</a>
+</noscript>
+<a href="//disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+STR
+      }
+      subject{ last_response.body }
+      it { should == expected }
+    end
+    
   end
 end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-disqus
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - Iain Barnett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2016-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Drop in disqus to any Sinatra view via a handy helper.
@@ -49,27 +46,26 @@ files:
 - spec/support/shared/all_routes.rb
 homepage: https://bitbucket.org/yb66/sinatra-disqus
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easy disqus for Sinatra.
 test_files:
 - spec/disqus_spec.rb