jekyll-archimate 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 286ae636a15d00a41da942349afb0fe96030d76d
-  data.tar.gz: 1d3f7e8e92b72b9df7b6fabc01b74154b21b898f
+  metadata.gz: ff80653eaa463970477dd3dbd4ecca16b3f3479a
+  data.tar.gz: c81145111de4852bb3899ca398a03b9d65f7976d
 SHA512:
-  metadata.gz: 89d6bb51fd7a584436eb6c7cd34acb4a465ef29c8cc1b17b7265e6699ea263de5c15005557d74cb4050d5a07acc7683f6f54cfdb9afb8c4e4957222747a64bc3
-  data.tar.gz: e67b30a145482b2a3e5ce3ae2f43c7854a731cea0db1d8ba10e6c2e9f610e66e7e845ce9839b5dc812339aa417cd9c627e2e59ed5e41352118aabc6681bc7c8e
+  metadata.gz: d44deb504efcd55b8c068fe0de590056306c0c2825a65357483874567212b9fcab1cfd22fb890f3e238094faf0c1c6f3c2536430e4457373a47d573ea110e5b6
+  data.tar.gz: 13924d4aaf7023978733669ce2d12c542782fbfacec46dc4cb46b9599bc5d420d94a85dbc4f9ccdf3279f5d79ca88433c9b6c9de44aba70ac89e9c3f28cf7f28

data/lib/jekyll/archimate/archimate_cache.rb

@@ -13,6 +13,7 @@ module Jekyll
       end
 
       def cache_valid?(archimate_file)
+        return false unless archimate_file
         path = archimate_file.path
         @cache.key?(path) &&
           @cache[path].archimate_file.modified_time.to_i == archimate_file.modified_time.to_i
@@ -30,7 +31,7 @@ module Jekyll
       end
 
       def default_archimate_file=(archimate_file)
-        unless @cache.key?(archimate_file.path)
+        unless !archimate_file || @cache.key?(archimate_file.path)
           raise(
             "Default ArchiMate file does not exist in cache: #{archimate_file.relative_path}"
           )

data/lib/jekyll/archimate/archimate_diagram_tag.rb

@@ -19,7 +19,10 @@ module Jekyll
       end
 
       def render(context)
-        baseurl = context.registers[:site].baseurl
+        page = context.registers[:page]
+        page_dir = File.dirname(page["path"])
+        rel_archimate_dir = File.join(page_dir, "archimate")
+        baseurl = Dir.exist?(rel_archimate_dir) ? File.dirname(page["url"]) : context.registers[:site].baseurl
         # TODO: make the archimate_dir configurable in _config.yml and as an
         #       optional argument in the tag.
         archimate_dir = [baseurl, "archimate", "svg"].join("/")

data/lib/jekyll/archimate/archimate_generator.rb

@@ -5,26 +5,16 @@ module Jekyll
     class ArchimateGenerator < Jekyll::Generator
       def generate(site)
         Jekyll.logger.info "ArchimateGenerator.generate"
-        archimate_files = site.static_files.select { |static_file| static_file.extname =~ /\.(archimate|xml)$/ }
-        archimate_file = preload_cache(archimate_files)
-        return unless needs_generation?
-        ArchimateSvgGenerator.new(site, archimate_file).generate
-        ArchimateIndexGenerator.new(site, archimate_file).generate
-      end
-
-      private
-
-      def needs_generation?
-        cache.cache_valid?(cache.default_archimate_file)
-      end
-
-      def preload_cache(archimate_files)
-        archimate_files.each { |file| cache.model(file) }
-        cache.default_archimate_file = archimate_files.first # TODO: select file in the `archimate` directory
-      end
-
-      def cache
-        @cache ||= ArchimateCache.instance
+        site
+          .collections
+          .values
+          .flat_map(&:files)
+          .concat(site.static_files)
+          .select { |static_file| static_file.extname =~ /\.(archimate|xml)$/ }
+          .each do |archimate_file|
+            ArchimateSvgGenerator.new(site, archimate_file).generate
+            ArchimateIndexGenerator.new(site, archimate_file).generate
+          end
       end
     end
   end

data/lib/jekyll/archimate/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Archimate
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-archimate
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Mark Morga
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll