middleman-disqus 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe6f06e5afcebd8e68d944d67b78304472af8b67
-  data.tar.gz: 332c3de284937f11eada22d8ff30eede9642ea0f
+  metadata.gz: b6956acd8c1e514de5e8dd1ba0d8cde50596b865
+  data.tar.gz: 90f84459b92b5dc87e60572098fa9e12819569d7
 SHA512:
-  metadata.gz: feeda2b05a136d69426154080b572d76ec5e005b92fcbabfc62bf9fb342268c01e23b2b96da26a12999824627cf1e171c099d75c05ea1c2a582d9e942b48bc7b
-  data.tar.gz: 868a4e42c27f7cba8ee6620aa4de094084148beb16460a2214e71aac5483955fe595be498b25a428e36d4dc66c3d28550e2c3cbc914a21a752dfc9bf0503a86d
+  metadata.gz: 0fea0356be5376ffbc02e2960f48bafea793f2b1eb199f8d66269fc8908c40f3849dbeb03d37a9901aa23806a5158966aa0c85d23a5527e8df604a2758975d78
+  data.tar.gz: aa3c7d43d7dfac550296f0b919609427a25dea693653f53d3ff4899678b4ca9ecaa8957f28dcc88c155a3c65a049d8062d2076c91c6423971ef9067bb2eb0d40

data/.gitignore

@@ -3,3 +3,4 @@ Gemfile.lock
 pkg
 *.gem
 tmp/
+.ruby-version

data/.travis.yml

@@ -1,18 +1,12 @@
 language: ruby
 rvm:
   - ruby-head
-  - 2.1.2
-  - 2.1.1
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
-  - rbx-2
-  - rbx-19mode
+  - 2.2.4
+  - 2.1
+  - 2.0
   - jruby-head
-  - jruby-19mode
 
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: rbx-2

data/Gemfile

@@ -4,15 +4,12 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem "rake",     "~> 0.9.2"
-  gem "rdoc",     "~> 3.9"
-  gem "yard",     "~> 0.8.0"
+  gem 'rake',     '~> 0.9.2'
+  gem 'rdoc',     '~> 3.9'
+  gem 'yard',     '~> 0.8.0'
 end
 
 group :test do
-  gem "cucumber", "~> 1.3.4"
-  gem "fivemat",  "~> 1.2.1"
-  gem "aruba",    "~> 0.5.3"
+  gem 'rspec', '~> 3.4'
+  gem 'capybara', '~> 2.5'
 end
-
-gem "ruby18_source_location", :platforms => :mri_18

data/HISTORY.md

@@ -1,3 +1,8 @@
+## 1.2.0 (2016-01-06)
+
+* Add support for Middleman v4 (please continue to use middleman-disqus 1.1 if you need v3 support).
+* Moved all tests from Cucumber to Capybara / RSpec.
+
 ## 1.0.0 (2014-08-06)
 
 * Add support for Disqus JavaScript configuration variables using per page

data/README.md

@@ -1,9 +1,9 @@
 # Middleman Disqus
 
-[![Build Status](https://travis-ci.org/simonrice/middleman-disqus.png)](https://travis-ci.org/simonrice/middleman-disqus)
-[![Gem Version](https://badge.fury.io/rb/middleman-disqus.png)](http://badge.fury.io/rb/middleman-disqus)
-[![Dependency Status](https://gemnasium.com/simonrice/middleman-disqus.png)](https://gemnasium.com/simonrice/middleman-disqus)
-[![Code Climate](https://codeclimate.com/github/simonrice/middleman-disqus.png)](https://codeclimate.com/github/simonrice/middleman-disqus)
+[![Build Status](https://travis-ci.org/simonrice/middleman-disqus.svg)](https://travis-ci.org/simonrice/middleman-disqus)
+[![Gem Version](https://badge.fury.io/rb/middleman-disqus.svg)](http://badge.fury.io/rb/middleman-disqus)
+[![Dependency Status](https://gemnasium.com/simonrice/middleman-disqus.svg)](https://gemnasium.com/simonrice/middleman-disqus)
+[![Code Climate](https://codeclimate.com/github/simonrice/middleman-disqus.svg)](https://codeclimate.com/github/simonrice/middleman-disqus)
 
 Middleman-Disqus is a [Middleman](https://github.com/middleman/middleman)
 extension that generates the Disqus embed code, and keeps your config

data/Rakefile

@@ -1,14 +1,5 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'rspec/core/rake_task'
 
-require 'cucumber/rake/task'
+RSpec::Core::RakeTask.new(:spec)
 
-Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
-end
-
-require 'rake/clean'
-
-task :test => ["cucumber"]
-
-task :default => :test
+task :default => :spec

data/fixtures/disqus-app/source/options1.html.erb

@@ -0,0 +1,8 @@
+---
+disqus_identifier: /2012/the-best-day-of-my-life.html
+disqus_title: The best day of my life
+disqus_url: http://example.com/2012/the-best-day-of-my-life.html
+disqus_category_id: 4
+disqus_disable_mobile: true
+---
+<%= disqus %>

data/fixtures/disqus-app/source/options2.html.erb

@@ -0,0 +1,5 @@
+---
+disqus_category_id: 4
+disqus_disable_mobile: false
+---
+<%= disqus %>

data/fixtures/disqus-app/source/per_call_options1.html.erb

@@ -0,0 +1 @@
+<%= disqus disqus_url: 'http://example.com/2012/the-best-day-of-my-life.html' %>

data/fixtures/disqus-app/source/per_call_options2.html.erb

@@ -0,0 +1,5 @@
+---
+disqus_identifier: /2012/the-best-day-of-my-life.html
+disqus_url: http://example.com/2015/better-day-of-my-life.html
+---
+<%= disqus disqus_url: 'http://example.com/2012/the-best-day-of-my-life.html' %>

data/lib/middleman-disqus/embed.erb

@@ -1,5 +1,5 @@
-<div id="disqus_thread"></div>
-<script type="text/javascript">
+<div id='disqus_thread'></div>
+<script type='text/javascript'>
 //<![CDATA[
     <% @options.each do |key, value| %>
       <% if value.is_a?(String) %>
@@ -16,5 +16,5 @@
     })();
 //]]>
 </script>
-<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+<noscript>Please enable JavaScript to view the <a href='http://disqus.com/?ref_noscript'>comments powered by Disqus.</a></noscript>
+<a href='http://disqus.com' class='dsq-brlink'>comments powered by <span class='logo-disqus'>Disqus</span></a>

data/lib/middleman-disqus/extension.rb

@@ -1,8 +1,8 @@
-require "middleman-core"
+require 'middleman-core'
 
 module Middleman
   class DisqusExtension < Extension
-    option :shortname, nil, "Your short name for Disqus"
+    option :shortname, nil, 'Your short name for Disqus'
 
     def initialize(app, options_hash={}, &block)
       super
@@ -36,6 +36,5 @@ module Middleman
         ERB.new(File.read(file), 0, '>').result(binding)
       end
     end
-
   end
 end

data/lib/middleman-disqus/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Disqus
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/middleman-disqus.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "middleman-disqus/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'middleman-disqus/version'
 
 Gem::Specification.new do |s|
-  s.name        = "middleman-disqus"
+  s.name        = 'middleman-disqus'
   s.version     = Middleman::Disqus::VERSION
-  s.authors     = ["Simon Rice", "Luke Antins"]
-  s.email       = ["im@simonrice.com"]
-  s.homepage    = "http://github.com/simonrice/middleman-disqus"
-  s.license     = "MIT"
+  s.authors     = ['Simon Rice', 'Luke Antins']
+  s.email       = ['im@simonrice.com']
+  s.homepage    = 'http://github.com/simonrice/middleman-disqus'
+  s.license     = 'MIT'
   s.summary     = %q{Quickly integrate Disqus comments into your Middleman site}
   s.description = <<-EOL
 A Middleman extension to integrate Disqus into your site,
@@ -17,7 +17,7 @@ EOL
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {features,fixtures}/*`.split("\n")
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.add_runtime_dependency("middleman-core", ["~> 3.3"])
+  s.add_runtime_dependency('middleman-core', ['~> 4.0'])
 end

data/spec/features/basic_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe 'basic', :type => :feature do
+  before do
+    visit '/basic.html'
+  end
+
+  it 'has the disqus thread element' do
+    expect(page).to have_selector '#disqus_thread'
+  end
+
+  it 'has the disqus JS element set up' do
+    expect(page.html).to include 'disqus.com/embed.js'
+    expect(page.html).to include "var disqus_shortname = 'test-name'"
+    expect(page.html).to_not include 'var disqus_identifier'
+    expect(page.html).to_not include 'var disqus_title'
+    expect(page.html).to_not include 'var disqus_url'
+    expect(page.html).to_not include 'var disqus_category_id'
+    expect(page.html).to_not include 'var disqus_disable_mobile'
+  end
+end

data/spec/features/count_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe 'count', :type => :feature do
+  before do
+    visit '/count.html'
+  end
+
+  it 'has the disqus JS element set up' do
+    expect(page.html).to include "var disqus_shortname = 'test-name'"
+    expect(page.html).to include 'disqus.com/count.js'
+    expect(page.html).to_not include 'var disqus_identifier'
+    expect(page.html).to_not include 'var disqus_title'
+    expect(page.html).to_not include 'var disqus_url'
+    expect(page.html).to_not include 'var disqus_category_id'
+    expect(page.html).to_not include 'var disqus_disable_mobile'
+  end
+end

data/spec/features/options1_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe 'options1', :type => :feature do
+  before do
+    visit '/options1.html'
+  end
+
+  it 'has the disqus thread element' do
+    expect(page).to have_selector '#disqus_thread'
+  end
+
+  it 'has the disqus JS element set up' do
+    expect(page.html).to include 'disqus.com/embed.js'
+    expect(page.html).to include "var disqus_shortname = 'test-name'"
+    expect(page.html).to include 'var disqus_category_id = 4'
+    expect(page.html).to include 'var disqus_disable_mobile = true'
+    expect(page.html).to include "var disqus_identifier = '/2012/the-best-day-of-my-life.html'"
+    expect(page.html).to include "var disqus_url = 'http://example.com/2012/the-best-day-of-my-life.html'"
+    expect(page.html).to include "var disqus_title = 'The best day of my life'"
+  end
+end

data/spec/features/options2_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe 'options2', :type => :feature do
+  before do
+    visit '/options2.html'
+  end
+
+  it 'has the disqus thread element' do
+    expect(page).to have_selector '#disqus_thread'
+  end
+
+  it 'has the disqus JS element set up' do
+    expect(page.html).to include 'disqus.com/embed.js'
+    expect(page.html).to include "var disqus_shortname = 'test-name'"
+    expect(page.html).to include 'var disqus_category_id = 4'
+    expect(page.html).to include 'var disqus_disable_mobile = false'
+    expect(page.html).to_not include 'var disqus_identifier'
+    expect(page.html).to_not include 'var disqus_title'
+    expect(page.html).to_not include 'var disqus_url'
+  end
+end

data/spec/features/per_call_options1_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe 'per_call_options1', :type => :feature do
+  before do
+    visit '/per_call_options1.html'
+  end
+
+  it 'has the disqus thread element' do
+    expect(page).to have_selector '#disqus_thread'
+  end
+
+  it 'has the disqus JS element set up' do
+    expect(page.html).to include 'disqus.com/embed.js'
+    expect(page.html).to include "var disqus_shortname = 'test-name'"
+    expect(page.html).to include "var disqus_url = 'http://example.com/2012/the-best-day-of-my-life.html'"
+    expect(page.html).to_not include 'var disqus_identifier'
+    expect(page.html).to_not include 'var disqus_title'
+    expect(page.html).to_not include 'var disqus_category_id'
+    expect(page.html).to_not include 'var disqus_disable_mobile'
+  end
+end

data/spec/features/per_call_options2_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe 'per_call_options2', :type => :feature do
+  before do
+    visit '/per_call_options2.html'
+  end
+
+  it 'has the disqus thread element' do
+    expect(page).to have_selector '#disqus_thread'
+  end
+
+  it 'has the disqus JS element set up' do
+    expect(page.html).to include 'disqus.com/embed.js'
+    expect(page.html).to include "var disqus_shortname = 'test-name'"
+    expect(page.html).to include "var disqus_identifier = '/2012/the-best-day-of-my-life.html'"
+    expect(page.html).to include "var disqus_url = 'http://example.com/2012/the-best-day-of-my-life.html'"
+    expect(page.html).to_not include "var disqus_url = 'http://example.com/2015/the-best-day-of-my-life.html'"
+    expect(page.html).to_not include 'var disqus_title'
+    expect(page.html).to_not include 'var disqus_category_id'
+    expect(page.html).to_not include 'var disqus_disable_mobile'
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,19 @@
+require 'rspec'
+require 'capybara/rspec'
+
+require 'middleman-core'
+require 'middleman-core/rack'
+
+PROJECT_ROOT_PATH = File.dirname(File.dirname(__FILE__))
+require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-disqus')
+
+FIXTURE_ROOT_PATH = File.join(PROJECT_ROOT_PATH, 'fixtures', 'disqus-app')
+ENV['MM_ROOT'] = FIXTURE_ROOT_PATH
+
+middleman_app = ::Middleman::Application.new
+
+Capybara.app = ::Middleman::Rack.new(middleman_app).to_app do
+  set :root, FIXTURE_ROOT_PATH
+  set :environment, :development
+  set :show_exceptions, false
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-disqus
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Simon Rice
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.0'
 description: |
   A Middleman extension to integrate Disqus into your site,
   supporting Disqus configuration variables and comment counts.
@@ -41,17 +41,26 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- features/disqus.feature
-- features/support/env.rb
 - fixtures/disqus-app/config.rb
+- fixtures/disqus-app/source/basic.html.erb
 - fixtures/disqus-app/source/count.html.erb
-- fixtures/disqus-app/source/index.html.erb
+- fixtures/disqus-app/source/options1.html.erb
+- fixtures/disqus-app/source/options2.html.erb
+- fixtures/disqus-app/source/per_call_options1.html.erb
+- fixtures/disqus-app/source/per_call_options2.html.erb
 - lib/middleman-disqus.rb
 - lib/middleman-disqus/count.erb
 - lib/middleman-disqus/embed.erb
 - lib/middleman-disqus/extension.rb
 - lib/middleman-disqus/version.rb
 - middleman-disqus.gemspec
+- spec/features/basic_spec.rb
+- spec/features/count_spec.rb
+- spec/features/options1_spec.rb
+- spec/features/options2_spec.rb
+- spec/features/per_call_options1_spec.rb
+- spec/features/per_call_options2_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/simonrice/middleman-disqus
 licenses:
 - MIT
@@ -72,13 +81,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Quickly integrate Disqus comments into your Middleman site
 test_files:
-- features/disqus.feature
-- features/support/env.rb
 - fixtures/disqus-app/config.rb
+- fixtures/disqus-app/source/basic.html.erb
 - fixtures/disqus-app/source/count.html.erb
-- fixtures/disqus-app/source/index.html.erb
+- fixtures/disqus-app/source/options1.html.erb
+- fixtures/disqus-app/source/options2.html.erb
+- fixtures/disqus-app/source/per_call_options1.html.erb
+- fixtures/disqus-app/source/per_call_options2.html.erb
+has_rdoc: 

data/features/disqus.feature

@@ -1,98 +0,0 @@
-Feature: Disqus Integration
-
-  Scenario: Disqus config var `shotname` is not set
-    Given a fixture app "disqus-app"
-    And a file named "config.rb" with:
-      """
-      activate :disqus do |d|
-        d.shortname = nil
-      end
-      """
-    And the Server is running
-    When I go to "/"
-    Then I should see "0" lines
-    When I go to "/count.html"
-    Then I should see "0" lines
-
-  Scenario: Basic usage, Disqus javascript is included when `shotname` is set
-    Given a successfully built app at "disqus-app"
-    When I cd to "build"
-    Then the following files should exist:
-      | index.html |
-      | count.html |
-    And the file "index.html" should contain 'div id="disqus_thread"'
-    And the file "index.html" should contain "var disqus_shortname = 'test-name';"
-    And the file "index.html" should contain 'disqus.com/embed.js'
-    And the file "count.html" should contain "var disqus_shortname = 'test-name';"
-    And the file "count.html" should contain 'disqus.com/count.js'
-
-  Scenario: Per page Disqus variables
-    Given a fixture app "disqus-app"
-    And a file named "source/options.html.erb" with:
-      """
-      ---
-      disqus_identifier: /2012/the-best-day-of-my-life.html
-      disqus_title: The best day of my life
-      disqus_url: http://example.com/2012/the-best-day-of-my-life.html
-      disqus_category_id: 4
-      disqus_disable_mobile: true
-      ---
-      <%= disqus %>
-      """
-    And a successfully built app at "disqus-app"
-    When I cd to "build"
-    Then the following files should exist:
-      | options.html |
-    And the file "options.html" should contain "var disqus_identifier = '/2012/the-best-day-of-my-life.html';"
-    And the file "options.html" should contain "var disqus_title = 'The best day of my life';"
-    And the file "options.html" should contain "var disqus_url = 'http://example.com/2012/the-best-day-of-my-life.html';"
-    And the file "options.html" should contain "var disqus_category_id = 4;"
-    And the file "options.html" should contain "var disqus_disable_mobile = true;"
-
-  Scenario: Only set a couple of per page Disqus variables
-    Given a fixture app "disqus-app"
-    And a file named "source/options.html.erb" with:
-      """
-      ---
-      disqus_category_id: 4
-      disqus_disable_mobile: false
-      ---
-      <%= disqus %>
-      """
-    And a successfully built app at "disqus-app"
-    When I cd to "build"
-    Then the following files should exist:
-      | options.html |
-    And the file "options.html" should not contain "var disqus_identifier"
-    And the file "options.html" should not contain "var disqus_title"
-    And the file "options.html" should not contain "var disqus_url"
-    And the file "options.html" should contain "var disqus_category_id = 4;"
-    And the file "options.html" should contain "var disqus_disable_mobile = false;"
-
-  Scenario: Per call Disqus variables
-    Given a fixture app "disqus-app"
-    And a file named "source/per-call-options.html.erb" with:
-      """
-      <%= disqus disqus_url: "http://example.com/2012/the-best-day-of-my-life.html" %>
-      """
-    And a successfully built app at "disqus-app"
-    When I cd to "build"
-    Then the following files should exist:
-      | per-call-options.html |
-    And the file "per-call-options.html" should contain "var disqus_url = 'http://example.com/2012/the-best-day-of-my-life.html';"
-
-  Scenario: Per call Disqus variables overriding page variables
-    Given a fixture app "disqus-app"
-    And a file named "source/per-call-options.html.erb" with:
-      """
-      ---
-      disqus_identifier: /2012/the-best-day-of-my-life.html
-      disqus_url: http://example.com/2012/better-day-of-my-life.html
-      ---
-      <%= disqus disqus_url: "http://example.com/2012/the-best-day-of-my-life.html" %>
-      """
-    And a successfully built app at "disqus-app"
-    When I cd to "build"
-    Then the following files should exist:
-      | per-call-options.html |
-    And the file "per-call-options.html" should contain "var disqus_url = 'http://example.com/2012/the-best-day-of-my-life.html';"

data/features/support/env.rb

@@ -1,5 +0,0 @@
-PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
-ENV['TEST'] = 'true'
-require "middleman-core"
-require "middleman-core/step_definitions"
-require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-disqus')