middleman-disqus 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d552d193d5f180f06a48f7e49e4ce16deb72e467
-  data.tar.gz: 50615410d5a80e524dad1f174f0b1a55b0b7df29
+  metadata.gz: fe6f06e5afcebd8e68d944d67b78304472af8b67
+  data.tar.gz: 332c3de284937f11eada22d8ff30eede9642ea0f
 SHA512:
-  metadata.gz: 86258d1c47c86f6def9738621cfcb8cc3a68e6ce3923783496a228d0786f75565d807d1285e61706327dc2db92d340fe80b898230b25c0c4b8bde2bf3e3c2cf8
-  data.tar.gz: 063392125c3309b40cdbe86df182eb0bc7f540e6c95eb878d5d7fbbf8e1edcc0bae7dce3b2c3c5eb8777e8869f805dd8daca0da6ff004974d358e7b9a9fc477d
+  metadata.gz: feeda2b05a136d69426154080b572d76ec5e005b92fcbabfc62bf9fb342268c01e23b2b96da26a12999824627cf1e171c099d75c05ea1c2a582d9e942b48bc7b
+  data.tar.gz: 868a4e42c27f7cba8ee6620aa4de094084148beb16460a2214e71aac5483955fe595be498b25a428e36d4dc66c3d28550e2c3cbc914a21a752dfc9bf0503a86d

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in middleman-google-analytics.gemspec
+# Specify your gem's dependencies in middleman-disqus.gemspec
 gemspec
 
 group :development do

data/features/disqus.feature

@@ -68,3 +68,31 @@ Feature: Disqus Integration
     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/lib/middleman-disqus/extension.rb

@@ -19,8 +19,8 @@ module Middleman
     end
 
     helpers do
-      def disqus
-        page_options = current_resource.metadata[:page]
+      def disqus(call_options = {})
+        page_options = current_resource.metadata[:page].merge(call_options)
         @options = Middleman::DisqusExtension.options(page_options)
         return '' unless @options[:shortname]
 

data/lib/middleman-disqus/version.rb

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

data/middleman-disqus.gemspec

@@ -19,5 +19,5 @@ EOL
   s.test_files    = `git ls-files -- {features,fixtures}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency("middleman-core", ["~> 3.1"])
+  s.add_runtime_dependency("middleman-core", ["~> 3.3"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-disqus
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Simon Rice
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-06 00:00:00.000000000 Z
+date: 2015-06-21 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.1'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
 description: |
   A Middleman extension to integrate Disqus into your site,
   supporting Disqus configuration variables and comment counts.
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Quickly integrate Disqus comments into your Middleman site