jekyll-auto-image 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f17eb0c04f0edea10bdc1501e63e1640c248340f
-  data.tar.gz: f92a678b7163ef0283c98e2fe52e013e14c5c152
+  metadata.gz: f15dab8cf06765361ee12b89df02e0fb88870448
+  data.tar.gz: 7385a9d597ec8ed3d1c6e80bf6d66ff831cc2b24
 SHA512:
-  metadata.gz: 0d3eeb9c6ad6d1a82b75def4638baa139f1c237eefdd4affc63f9f63cb18ee102d4949c56fb80ddcc9f462ee7f4bd3794d604e58142ff8c086a86f693a6bf54d
-  data.tar.gz: 0056012c2c0893b2100c67292ff5af1faa2f1bec80453367a2614af2161ce7d75719630efe76939e81166daad4f96ff791228ea91949ae004d03b0845c8d1220
+  metadata.gz: 0dcd31f53aff84cf38b26d8507a81a0c07909cdf04b386a6786857f3b3006264c9c61bca53e43f8ee1f285c57d7e6f80eae9e9bfb84fe437dd9ea5fe817016f7
+  data.tar.gz: b97d07184afb2d7b225b21786646b40ae92f7dc87d702f8685058168212158678485df62d0f3eab70da1b6568d16747b19ee63872c317e3b51dbf1e6910bc514

data/lib/jekyll-auto-image.rb

@@ -43,12 +43,21 @@ module Jekyll
  
     def generate(site)
       @site = site
+      
       site.pages.each do |page|
         img = get_image(page)
         page.data['image'] = img if img
       end
       # Now do the same with posts
-      site.posts.docs do |post|
+      site.posts.docs.each do |post|
+        #puts "hola"
+        #puts Jekyll::VERSION
+        #puts post.class
+        #puts post.inspect
+        #puts post.data.inspect
+        #puts "-----"      
+        #puts post.output
+        #puts "----"
         img = get_image(post)
         post.data['image'] = img if img
       end
@@ -65,13 +74,19 @@ module Jekyll
       #puts page.title
       #puts page.name
       #puts page.ext
-      #puts site.converters.select { |c| c.matches(page.ext) }.sort
+      #puts @site.converters.select { |c| c.matches(page.ext) }.sort
       if page.data['image']
         return page.data['image']
       end
       # convert the contents to html, and extract the first <img src="" apearance
       # I know, it's not efficient, but rather easy to implement :)
-      htmled = page.transform
+      
+      if page.class == Jekyll::Document # for jekyll 3.0 posts & collections
+        htmled = Jekyll::Renderer.new(@site, page, @site.site_payload).run
+      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 @site.config['image'] if @site.config['image'] != nil

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

@@ -1,5 +1,5 @@
 module Jekyll
   module AutoImage
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/test/test_jekyll_auto_image.rb

@@ -10,13 +10,27 @@ class Jekyll::AutoImageTest < Minitest::Test
     setup do
       
       @default_image_path = '/assets/default_image.png'
-          
-      # Sites   
-      @site = Jekyll::Site.new(Jekyll::Configuration::DEFAULTS)
+         
+      Jekyll.logger.log_level = :error 
       
+      #
+      # Sites   
+      #
       @config = Jekyll::Configuration::DEFAULTS.clone
-      @config['image'] = @default_image_path
-      @site_with_default_image = Jekyll::Site.new(@config)
+      @config['destination'] = File.expand_path('../tmp/', __FILE__)
+      @site = Jekyll::Site.new(@config)
+      
+      # config with default image
+      @config_with_image = @config.clone
+      @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['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')
@@ -24,11 +38,16 @@ class Jekyll::AutoImageTest < Minitest::Test
       @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>'
@@ -44,7 +63,7 @@ class Jekyll::AutoImageTest < Minitest::Test
     should 'not be defined site image by default' do
       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
@@ -103,6 +122,29 @@ class Jekyll::AutoImageTest < Minitest::Test
       assert_nil @auto_image.get_image(@no_image_page)
     end
     
+    #
+    # Generate site with data
+    #
+    should 'generate a site with a page' do
+      #add page to site
+      @site.pages << @contents_image_page
+      @site.generate()
+      @auto_image.generate(@site)
+      @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      
+      assert_equal 1, @posts_collection.entries.length
+      assert_equal 1, @posts_collection.filtered_entries.length
+      @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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-auto-image
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - merlos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-05 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -96,7 +96,7 @@ files:
 - jekyll-auto-image.gemspec
 - lib/jekyll-auto-image.rb
 - lib/jekyll-auto-image/version.rb
-- test/fixtures/_posts/contents-image.md
+- test/fixtures/_posts/2015-01-01-post-with-contents-image.md
 - test/fixtures/contents-html.html
 - test/fixtures/contents-image.md
 - test/fixtures/front-matter-image.md
@@ -128,7 +128,7 @@ signing_key:
 specification_version: 4
 summary: jekyll plugin that makes available the first image of a post in the template
 test_files:
-- test/fixtures/_posts/contents-image.md
+- test/fixtures/_posts/2015-01-01-post-with-contents-image.md
 - test/fixtures/contents-html.html
 - test/fixtures/contents-image.md
 - test/fixtures/front-matter-image.md