jekyll-auto-image 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cec08a8d995e0f3265c5d360c691511e7419b519
-  data.tar.gz: 8e8215eb24e8d68009eecf9cd61ea75048be27b6
+  metadata.gz: 8e06d01730c1b039c6a772f4fac7d18ddfc15fe1
+  data.tar.gz: b28ccd64cdffe03c513158af14f462f66f046903
 SHA512:
-  metadata.gz: f318489b1f8066a61ebe1d920a034e5b31acefe48d7db75df41be8c1584208ae16096c3c9ef24e1c09221acbb4ca2d04afee2360c9e535728f3ad46282afc02d
-  data.tar.gz: 3d6f34afb694bfe99241c63e7a5c482bd66f2580c08a6c527372ff6e8e75f4a7ca686bc5319804f6551fb39752630726ab512efabc02e6536972f1e3968e5065
+  metadata.gz: 1eeb44f69a12c42a831a5451ab61fa702649392c0b99fc73eca0e77ce4c39d8f0a2ff6f6eb286eefb831335a88d9ccae98c2320c2bc5ab07cf6ac6196183ae24
+  data.tar.gz: c68a33a10d853faa6967e5430ecfed4a74eaa81af3ffb3d49f6187e7b4b29e8af809c8ab33b942dcdd79a445f6fbd101badb51ef3c96862e448dcc421481672f

data/lib/jekyll-auto-image.rb

@@ -10,7 +10,7 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
 #
@@ -27,23 +27,23 @@ require "jekyll-auto-image/version"
 require "jekyll"
 
 module Jekyll
- 
+
   #
   # Auto Image Generator
-  # 
+  #
   # Sets {{page.image}} variable in liquid with the following fallback:
-  #  
+  #
   #  1) image value in front matter
   #  2) first image in the post/pàge
   #  3) _config.yaml image default
   #  4) nothing (not set)
   #
-  #  
+  #
   class AutoImageGenerator < Generator
- 
+
     def generate(site)
       @site = site
-      
+
       site.pages.each do |page|
         img = get_image(page)
         page.data['image'] = img if img
@@ -55,21 +55,23 @@ module Jekyll
         #puts post.class
         #puts post.inspect
         #puts post.data.inspect
-        #puts "-----"      
+        #puts "-----"
         #puts post.output
         #puts "----"
         img = get_image(post)
         post.data['image'] = img if img
       end
     end # generate
-    
+
+    #
+    # page: is either a Jekyll::Page or a Jekyll::Post in 2.x. In Jekyll 3.0 is Jekyll::Document and
+    # in Jekyll 3.3 is either Jekyll::Page or Jekyll::Document (fascinating!)
     #
-    # page: is either a Jekyll::Page or a Jekyll::post
     # returns the path of the first image found in the contents
-    # of the page/post 
+    # of the page/post
     #
     def get_image(page)
-      
+
       # debug lines
       #puts page.title
       #puts page.name
@@ -78,20 +80,25 @@ module Jekyll
       if page.data['image']
         return page.data['image']
       end
+
+      # fix for jekyll 3.3.0,
+      @site.config['kramdown'] = @site.config['kramdown'].dup
+
       # convert the contents to html, and extract the first <img src="" apearance
       # I know, it's not efficient, but rather easy to implement :)
-      
-      if page.class == Jekyll::Document # for jekyll 3.0 posts & collections
+
+      # Convertible for jekyll 3.0 and 3.3 posts & collections 
+      if page.class < Jekyll::Convertible || page.class == Jekyll::Document
         htmled = Jekyll::Renderer.new(@site, page, @site.site_payload).convert(page.content)
-      else 
+      else
         htmled = page.transform # for jekyll 2.x pages
       end
-      
+
       img_url = htmled.match(/<img.*\ssrc=[\"\']([\S.]+)[\"\']/i)
-      return img_url[1] if img_url != nil 
+      return img_url[1] if img_url != nil
       return @site.config['image'] if @site.config['image'] != nil
       return nil
     end
-    
+
   end # class
 end # module

data/lib/jekyll-auto-image/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AutoImage
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end

data/test/test_jekyll_auto_image.rb

@@ -1,100 +1,100 @@
 require 'helper'
 
 class Jekyll::AutoImageTest < Minitest::Test
-  def set_page_image (page, image_path) 
+  def set_page_image (page, image_path)
     page.instance_variable_set(:@content, '<img attribute="blabla" src="' + image_path + '">')
   end
-  
+
   context 'AutoImage' do
-    
+
     setup do
-      
+
       @default_image_path = '/assets/default_image.png'
-         
-      Jekyll.logger.log_level = :error 
-      
+
+      Jekyll.logger.log_level = :error
+
       #
-      # Sites   
+      # Sites
       #
-      @config = Jekyll::Configuration::DEFAULTS.clone
+      @config = Jekyll::Configuration::DEFAULTS.dup
       @config['destination'] = File.expand_path('../tmp/', __FILE__)
       @site = Jekyll::Site.new(@config)
-      
+
       # config with default image
-      @config_with_image = @config.clone
+      @config_with_image = @config.dup
       @config_with_image['image'] = @default_image_path
       @site_with_default_image = Jekyll::Site.new(@config_with_image)
-      
+
       # posts are in test/fixtures/_posts/
-      @config_with_posts = @config.clone
+      @config_with_posts = @config.dup
       @config_with_posts['source'] = File.expand_path('../fixtures/', __FILE__)
       @site_with_posts = Jekyll::Site.new(@config_with_posts)
       # now add the collection
       @posts_collection = Jekyll::Collection.new(@site_with_posts, 'posts')
-      
+
       # Pages
       @no_image_page = Jekyll::Page.new(@site, File.expand_path('../fixtures/', __FILE__), '', 'no-image.md')
       @front_matter_image_page = Jekyll::Page.new(@site, File.expand_path('../fixtures/', __FILE__), '', 'front-matter-image.md')
       @contents_image_page = Jekyll::Page.new(@site, File.expand_path('../fixtures/', __FILE__), '', 'contents-image.md')
       @contents_html_page = Jekyll::Page.new(@site, File.expand_path('../fixtures/', __FILE__), '', 'contents-html.html')
-      
+
       # Posts as collections
       #@contents_html_page = Jekyll::Document.new(File.expand_path('../fixtures/_posts/contents-image.md', __FILE__), {:site =>@site,:collection =>'post'})
-      
-      
+
+
       @auto_image = Jekyll::AutoImageGenerator.new
       @auto_image.generate(@site)
       @auto_image_with_default_image = Jekyll::AutoImageGenerator.new
       @auto_image_with_default_image.generate(@site_with_default_image)
-      
-      
+
+
       #@page.instance_variable_set(:@content, '<div>ivan.tse1@gmail.com</div>')
       #@site.pages << @page
       #@email_link = '<div><a href="mailto:ivan.tse1@gmail.com">ivan.tse1@gmail.com</a></div>'
     end
-    
-        
+
+
     #
     # FALLBACK LOGIC TESTS
     #
-    
+
     # Tests without {{site.image}}
-    
+
     should 'not be defined site image by default' do
-      assert_nil @site.config['image'] 
+      assert_nil @site.config['image']
     end
-        
+
     should 'not return image when not set in config and not included in page' do
       assert_nil @auto_image.get_image(@no_image_page)
     end
-    
+
      should 'use front matter image whenever defined' do
       assert_equal @front_matter_image_page.data['image'], @auto_image.get_image(@front_matter_image_page)
     end
-    
+
     should 'detect contents image on markdown' do
       assert_equal '/assets/contents-image.png', @auto_image.get_image(@contents_image_page)
     end
-      
+
     should 'detect contents image in html' do
       assert_equal '/assets/contents-html.png',  @auto_image.get_image(@contents_html_page)
     end
-  
+
     # Tests with {{site.image}} defined
-    
+
     should 'be defined site_image in config' do
-      assert_equal @default_image_path, @site_with_default_image.config['image'] 
-    end  
-    
+      assert_equal @default_image_path, @site_with_default_image.config['image']
+    end
+
     should 'return default image when page does not have image' do
       assert_equal @site_with_default_image.config['image'], @auto_image_with_default_image.get_image(@no_image_page)
-    end  
-    
+    end
+
     should 'return front matter image even if default image is defined' do
       assert_equal  @front_matter_image_page.data['image'], @auto_image_with_default_image.get_image(@front_matter_image_page)
-    end  
-    
-    
+    end
+
+
     #
     # Tests to check if the regexp works in some use cases
     #
@@ -103,7 +103,7 @@ class Jekyll::AutoImageTest < Minitest::Test
       set_page_image(@no_image_page,image)
       assert image, @auto_image.get_image(@no_image_page)
     end
-    
+
     #
     # Tests to check if the regexp works in some use cases
     #
@@ -112,7 +112,7 @@ class Jekyll::AutoImageTest < Minitest::Test
       set_page_image(@no_image_page,image)
       assert image, @auto_image.get_image(@no_image_page)
     end
-    
+
     #
     # Tests to check if the regexp works in some use cases
     #
@@ -121,7 +121,7 @@ class Jekyll::AutoImageTest < Minitest::Test
       set_page_image(@no_image_page,image)
       assert_nil @auto_image.get_image(@no_image_page)
     end
-    
+
     #
     # Generate site with data
     #
@@ -133,18 +133,18 @@ class Jekyll::AutoImageTest < Minitest::Test
       @auto_image.get_image(@contents_html_page)
       assert_equal '/assets/contents-html.png',  @auto_image.get_image(@contents_html_page)
     end
-    
+
     should 'generate a site with post as part of collection' do
-      #puts @posts_collection.directory      
+      #puts @posts_collection.directory
       assert_equal 1, @posts_collection.entries.length
       assert_equal 1, @posts_collection.filtered_entries.length
-      @site_with_posts.process      
+      @site_with_posts.process
       @auto_image.generate(@site_with_posts)
       assert_equal 1, @site_with_posts.posts.docs.length
       #puts @site_with_posts.collections.inspect
       assert_equal '/assets/contents-image.png',  @auto_image.get_image(@site_with_posts.posts.docs[0])
     end
-    
-    
+
+
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-auto-image
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - merlos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: jekyll plugin that makes available the first image of a post in the template
@@ -135,4 +135,3 @@ test_files:
 - test/fixtures/no-image.md
 - test/helper.rb
 - test/test_jekyll_auto_image.rb
-has_rdoc: