jekyll-thumbor 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba5bd159fb7f87db7c8fb1862fca556aa0e2d959
-  data.tar.gz: 6011292dc7b4a3ad917fc3116ce17a4890aabd41
+  metadata.gz: be9f0b0b803f98bdf2607bfecc3d8d5ab5eb3a61
+  data.tar.gz: 6fa972bb4255d2db2fd296b4391b8766b22a1508
 SHA512:
-  metadata.gz: ae912eb68157fcb7bd34eb5e995144a0e3880866ffcbdcb07922502bee0842ed1a550413a016421d9faa8bffaa621e33939fe3fbef22d6464c1b4d7699f1fb68
-  data.tar.gz: f491abbf96f8271fc93dc49215dab35510fc4740814469fe3ac7c6b9ecf3f5e0f723803266a56c169ae854903af94c6e74326981c19aa2e27fbb02eb607ba80a
+  metadata.gz: 00348543f5a26cf1987ac281daed932e05ece37e8997d905990814a6402663320a814b41d4393a9dbfa5a7daaf54f6f71be9e768ba81feb91597b49690607c7a
+  data.tar.gz: a816b9c9519a2a7e998628a27253a87d2ad63d3c629f848f6009dcf0522cb06d7460169e6ae416e84fee04bfdd9c0e39c43ebd6081861f94735c2e7c01b60f3e

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.1
+current_version = 0.4.2
 commit = True
 tag = False
 message = :bookmark: {current_version} → {new_version}

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-thumbor (0.4.1)
+    jekyll-thumbor (0.4.2)
       ruby-thumbor
 
 GEM

data/appveyor.yml

@@ -1,4 +1,4 @@
-version: v0.4.1-{branch}-{build}
+version: v0.4.2-{branch}-{build}
 
 environment:
   matrix:

data/lib/jekyll/thumbor_tag.rb

@@ -19,14 +19,9 @@ module Jekyll
         end
       end
 
-<<<<<<< HEAD
-      def render(context)
-        @config = context.registers[:site].config['thumbor']
-=======
     def render(context)
       @url = Liquid::Template.parse(@url).render context
       @config = context.registers[:site].config['thumbor']
->>>>>>> ad314eb... added functionality to interpret jekyll variables
 
         image = Thumbor::Cascade.new(@config['key'], @url)
         image_url = image.width(@parameters['width']).height(@parameters['height']).generate
@@ -37,8 +32,4 @@ module Jekyll
   end
 end
 
-<<<<<<< HEAD
 Liquid::Template.register_tag('thumbor', Jekyll::ThumborTag::ThumborTag)
-=======
-Liquid::Template.register_tag('thumbor_tag', Jekyll::ThumborTag)
->>>>>>> ad314eb... added functionality to interpret jekyll variables

data/lib/jekyll/thumbor_tag/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module ThumborTag
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-thumbor
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Myles Braithwaite