sinatra-disqus 1.0.0 → 1.1.0

data/CHANGES.md

@@ -1,5 +1,10 @@
 ## CH-CH-CH-CH-CHANGES! ##
 
+### Saturday the 20th of April 2013, v1.1.0 ###
+
+* More updating of docs.
+* Removed reliance on Haml.
+
 ### Saturday the 20th of April 2013, v1.0.0 ###
 
 * Updated the docs a bit.

data/README.md

@@ -61,7 +61,7 @@ or via Bundler:
 
         # Disqus settings
         set :disqus_shortname, "example.org"
-         # Put disqus into developer mode unless in production.
+        # Put disqus into developer mode unless in production.
         set :disqus_developer, !production?
       end
       
@@ -87,6 +87,10 @@ or via Bundler:
     #comments
       inject_disqus # you'd probably do this at the bottom of a view instead.
 
+### Version numbering ###
+
+This project attempts to follow the [semver](http://semver.org/) standard of numbering.
+
 ### Licence ###
 
 Look in the LICENCE file.

data/lib/sinatra/disqus/version.rb

@@ -2,6 +2,6 @@
 
 module Sinatra
   module Disqus
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/sinatra/disqus.rb

@@ -1,26 +1,30 @@
 # encoding: UTF-8
 
 require 'sinatra/base'
-require 'haml'
 
 module Sinatra
   module Disqus
 
     Disqus_output_top = <<TOP
-#disqus_thread
-  :javascript
+<div id='disqus_thread'>
+  <script type='text/javascript'>
+    //<![CDATA[
 TOP
     Disqus_output_bottom = <<BOTTOM
-    (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-    })();
-    
-  %noscript
+      (function() {
+          var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+          dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
+          (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+      })();
+    //]]>
+  </script>
+  <noscript>
     Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
-  %p
+  </noscript>
+  <p>
     <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
+  </p>
+</div>
 BOTTOM
 
     # @private
@@ -43,11 +47,11 @@ BOTTOM
       # @return [String] The portion of the disqus javascript with the vars.
       def self.build_vars( opts )
 <<STR
-    var disqus_title = "#{opts[:title].gsub(/'/, "\\\\'")}";
-    var disqus_developer = #{opts[:disqus_developer]}; // developer mode
-    var disqus_shortname = '#{opts[:disqus_shortname]}';
-    var disqus_identifier = '#{opts[:disqus_identifier]}'; // is on if 1
-    var disqus_url = '#{opts[:request_url]}';
+      var disqus_title = "#{opts[:title].gsub(/'/, "\\\\'")}";
+      var disqus_developer = #{opts[:disqus_developer]}; // developer mode
+      var disqus_shortname = '#{opts[:disqus_shortname]}';
+      var disqus_identifier = '#{opts[:disqus_identifier]}'; // is on if 1
+      var disqus_url = '#{opts[:request_url]}';
 STR
       end
     end
@@ -57,7 +61,7 @@ STR
       
       # @return [String] Returns the bit of HTML/javascript to stick in the page.
       def inject_disqus
-        Haml::Engine.new( "#{Disqus_output_top}#{Private.build_vars(request_url: uri(request.path_info), disqus_shortname: settings.disqus_shortname, disqus_developer: settings.disqus_developer, title: @title, disqus_identifier: Private.disqus_identifier(request.path))}#{Disqus_output_bottom}" ).render
+        "#{Disqus_output_top}#{Private.build_vars(request_url: uri(request.path_info), disqus_shortname: settings.disqus_shortname, disqus_developer: settings.disqus_developer, title: @title, disqus_identifier: Private.disqus_identifier(request.path))}#{Disqus_output_bottom}"
       end
 
     end

data/sinatra-disqus.gemspec

@@ -15,5 +15,4 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Sinatra::Disqus::VERSION
   gem.add_dependency( "sinatra" )
-  gem.add_dependency( "haml" )
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-disqus
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  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.
 email:
 - iainspeed@gmail.com