jekyll-responsive_image 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1a977d6f85c94a62c44f642c1c5db654858934c
-  data.tar.gz: ef3148da73fb5d20263355e5e11fe1b8b1b2c1de
+  metadata.gz: 8222a5289fe9566ef0395c25a7491215e9fd3f55
+  data.tar.gz: 2648869efed1723fb8b6b209e62b878dec1bb406
 SHA512:
-  metadata.gz: 65376dfb2c03ddd25ca527dba6a222821fd4b2ec4b19877fa6b9c4cb3cb74e605c0bdeb951fbe6fd26dcea006d84992e6ab04a1b6e7456667bcc45751836735a
-  data.tar.gz: c47166b22a9acc36d355f700c49cf42ba115284470ce3365cf914ce188cdcff8522a621fa6f91e9adeeb647d13fc865b59b46a17bd38fcd890330c8460aa321f
+  metadata.gz: 04aab057ea359cd2c98365acb89dbae99042d1a74c95cf0e992b201f426ecee00f33d33adb0d1bc4736aff81a716520de28a390b22182c201f525e7292768817
+  data.tar.gz: 36a5d066c75ef897cdb4ccbea51932211e37ef6dc379a612ac16584bdb2da08422b6eff7136ad2a5435a9e0ed58a09f95f003f9bcf1d211d35b4f6986d9c1cd9

data/features/fixtures/_includes/base-url.html

@@ -0,0 +1 @@
+<img src="{{ site.baseurl }}/{{ path }}">

data/features/responsive-image-block.feature

@@ -19,6 +19,22 @@ Feature: Jekyll responsive_image_block tag
     When I run Jekyll
     Then I should see "<img alt=\"Lorem ipsum\" src=\"/assets/test.png\" title=\"Magic rainbow adventure!\"" in "_site/index.html"
 
+  Scenario: Global variables available in templates
+    Given I have a file "index.html" with:
+      """
+      {% responsive_image_block %}
+          path: assets/test.png
+      {% endresponsive_image_block %}
+      """
+    And I have a configuration with:
+      """
+        baseurl: https://wildlyinaccurate.com
+        responsive_image:
+          template: _includes/base-url.html
+      """
+    When I run Jekyll
+    Then I should see "<img src=\"https://wildlyinaccurate.com/assets/test.png\">" in "_site/index.html"
+
   Scenario: More complex logic in the block tag
     Given I have a responsive_image configuration with "template" set to "_includes/responsive-image.html"
     And I have a file "index.html" with:

data/features/responsive-image-tag.feature

@@ -9,6 +9,17 @@ Feature: Jekyll responsive_image tag
     When I run Jekyll
     Then I should see "<img alt=\"Foobar\" src=\"/assets/test.png\"" in "_site/index.html"
 
+  Scenario: Global variables available in templates
+    Given I have a file "index.html" with "{% responsive_image path: assets/test.png %}"
+    And I have a configuration with:
+      """
+        baseurl: https://wildlyinaccurate.com
+        responsive_image:
+          template: _includes/base-url.html
+      """
+    When I run Jekyll
+    Then I should see "<img src=\"https://wildlyinaccurate.com/assets/test.png\">" in "_site/index.html"
+
   Scenario: Adding custom attributes
     Given I have a responsive_image configuration with "template" set to "_includes/responsive-image.html"
     And I have a file "index.html" with:

data/features/step_definitions/jekyll_steps.rb

@@ -8,6 +8,10 @@ Then /^Jekyll should throw a "(.+)"$/ do |error_class|
   assert_raise(Object.const_get(error_class)) { run_jekyll }
 end
 
+Given /^I have a configuration with:$/ do |config|
+  write_file('_config.yml', config)
+end
+
 Given /^I have a responsive_image configuration with:$/ do |config|
   write_file('_config.yml', "responsive_image:\n#{config}")
 end

data/lib/jekyll/responsive_image/block.rb

@@ -4,7 +4,8 @@ module Jekyll
       include Jekyll::ResponsiveImage::Common
 
       def render(context)
-        config = make_config(context.registers[:site])
+        site = context.registers[:site]
+        config = make_config(site)
 
         attributes = YAML.load(super)
         image_template = attributes['template'] || config['template']
@@ -16,7 +17,7 @@ module Jekyll
         partial = File.read(image_template)
         template = Liquid::Template.parse(partial)
 
-        template.render!(attributes)
+        template.render!(attributes.merge(site.site_payload))
       end
     end
   end

data/lib/jekyll/responsive_image/tag.rb

@@ -15,7 +15,8 @@ module Jekyll
       end
 
       def render(context)
-        config = make_config(context.registers[:site])
+        site = context.registers[:site]
+        config = make_config(site)
 
         image = ImageProcessor.process(@attributes['path'], config)
         @attributes['original'] = image[:original]
@@ -26,7 +27,7 @@ module Jekyll
         partial = File.read(image_template)
         template = Liquid::Template.parse(partial)
 
-        template.render!(@attributes)
+        template.render!(@attributes.merge(site.site_payload))
       end
     end
   end

data/lib/jekyll/responsive_image/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   class ResponsiveImage
-    VERSION = '0.12.0'.freeze
+    VERSION = '0.13.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-responsive_image
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Joseph Wynn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -60,6 +60,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- features/fixtures/_includes/base-url.html
 - features/fixtures/_includes/custom-template.html
 - features/fixtures/_includes/responsive-image.html
 - features/fixtures/assets/test.png
@@ -103,6 +104,7 @@ signing_key:
 specification_version: 4
 summary: Responsive images for Jekyll via srcset
 test_files:
+- features/fixtures/_includes/base-url.html
 - features/fixtures/_includes/custom-template.html
 - features/fixtures/_includes/responsive-image.html
 - features/fixtures/assets/test.png