jekyll-emd-generator 0.1.9 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f4c19b0d69b9ff6d282f75c7513c52b0d52202ed19a61d4a53d24de0452e67c
-  data.tar.gz: 6ca099acaf342c6c0e273ad852a2568f5fece0992538190dc6dc1e46a0de89eb
+  metadata.gz: b4e8395cec3ac75f1857faf73749e3b8a0ee82b02be4217f875d83e267cde916
+  data.tar.gz: 7abf2d22d938cd968259d88b77f68b2872f4d49584833af6261b79f04818385c
 SHA512:
-  metadata.gz: cb945029f0e8bdf38a52075d57acaecd4202a3c43f5847870d4ce1f229370e177ef5150bbb7da33663952e30267a7e0ca9b09adb6e5c4820b147835a0b4dc6d6
-  data.tar.gz: 1da246158d16cd85db77e6aa2f542886bef794b9dbe6be7cbd0f68d733715e6de3e122826d8603418a5ccfa50dc5f090a44b9ca8b5a8f7c2e1300ed2da884773
+  metadata.gz: e7cadac7ac3d116ce161c1c10e87bd0db7714c6f222d1cd3609f11b3bab9472196d5389749f99c3f37c4412708826f42d732925c609de6ee5cd3ed258430e5f2
+  data.tar.gz: 5be80691d0b4d640d09ff8b7fbc7084d01284a83d6be0007c5199a4e119543a778855208b8c18b185780012e09edccc9177f28fba0b2509cce94da302a1267d5

data/lib/jekyll-emd-generator.rb

@@ -7,27 +7,24 @@ module EnhanceMetaData
     
     def generate(site)
 
-      @site = site
-      
       site.pages.each do |page|
         if File.fnmatch( "index.{html,md}", page.path, File::FNM_EXTGLOB )
           ["elements"].each do |method|
-            Generator.method(method).call page
+            Generator.method(method).call(page,site)
           end
         end
         if File.fnmatch( "**/index.{html,md}", page.path, File::FNM_EXTGLOB )
           ["product", "elements"].each do |method|
-            Generator.method(method).call page
+            Generator.method(method).call(page,site)
           end
         end
       end
     end
 
-    def self.product(doc)
+    def self.product(doc,site)
 
       dir = File.dirname(doc.path)
-      file = @site.in_source_dir(dir,"product.json")
-      Jekyll.logger.info "", file
+      file = site.in_source_dir(dir,"product.json")
       if File.exist?(file)
 
         doc.data['product'] = SafeYAML.load_file(file)
@@ -50,11 +47,11 @@ module EnhanceMetaData
         # Product.image wird zu @image falls nicht im
         # Frontmatter überschrieben
         if doc.data['image'].nil?
-          image = "#{dir}/#{doc.data['product']['image']}"
+          image = site.in_source_dir(dir,doc.data['product']['image'])
           if File.exist?(image)
             dimensions = FastImage.size(image)
             doc.data['image'] = {}
-            doc.data['image']['path'] = '/' + image
+            doc.data['image']['path'] = '/' + dir + '/' + doc.data['product']['image']
             doc.data['image']['width'] = dimensions[0]
             doc.data['image']['height'] = dimensions[1]
           else
@@ -64,11 +61,10 @@ module EnhanceMetaData
       end
     end
 
-    def self.elements(doc)
+    def self.elements(doc,site)
 
       dir = File.dirname(doc.path)
-      file = @site.in_source_dir(dir,"elements.json")
-      Jekyll.logger.info "", file
+      file = site.in_source_dir(dir,"elements.json")
       if File.exist?(file)
         #
         Jekyll.logger.info "", file

data/lib/jekyll-emd-generator/version.rb

@@ -2,6 +2,6 @@ module Jekyll; class Generator; end; end
 
 module EnhanceMetaData
   class Generator < Jekyll::Generator
-    VERSION = "0.1.9"
+    VERSION = "0.1.14"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-emd-generator
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.14
 platform: ruby
 authors:
 - Michael Gerzabek