jekyll-archimate 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 450c76bef35c5a96c2dd7b52a7e8598ef0b3910a
-  data.tar.gz: 9506cf3a7a0a23f70ac2f4083be19f9ae25023b2
+  metadata.gz: 286ae636a15d00a41da942349afb0fe96030d76d
+  data.tar.gz: 1d3f7e8e92b72b9df7b6fabc01b74154b21b898f
 SHA512:
-  metadata.gz: ad3da00341c4db0c5329e8e23a50cdf1eac79c9f0fcbf36db9f85a6cfd8acc4171716a98539c77f69183cc27053f2d28b2965a0ab3c43c0cd4674dc8bdc2bd21
-  data.tar.gz: 79ac5eae532d4709e7fe08de80acea38649c8f3c95ae8d5029a565648ef1b5a442681b888c91ae00069e15bed420d7258e0a29c5ded297e54b82a9730b691bc5
+  metadata.gz: 89d6bb51fd7a584436eb6c7cd34acb4a465ef29c8cc1b17b7265e6699ea263de5c15005557d74cb4050d5a07acc7683f6f54cfdb9afb8c4e4957222747a64bc3
+  data.tar.gz: e67b30a145482b2a3e5ce3ae2f43c7854a731cea0db1d8ba10e6c2e9f610e66e7e845ce9839b5dc812339aa417cd9c627e2e59ed5e41352118aabc6681bc7c8e

data/lib/jekyll-archimate.rb

@@ -13,7 +13,9 @@ module Jekyll
 end
 
 require "jekyll/archimate/version"
+require "jekyll/archimate/markup_converter"
 require "jekyll/archimate/archimate_cache"
+require "jekyll/archimate/tag_attribute_parser"
 require "jekyll/archimate/archimate_diagram_tag"
 require "jekyll/archimate/catalog_tag"
 require "jekyll/archimate/application_interaction_matrix_tag"

data/lib/jekyll/archimate/catalog_tag.rb

@@ -7,6 +7,8 @@ module Jekyll
     #   {% element_catalog type:"Principle" | caption:"Principles Catalog"  %}
     #
     class CatalogTag < Liquid::Tag
+      include MarkupConverter
+
       attr_reader :context
       attr_reader :caption
       attr_reader :element_types
@@ -96,12 +98,6 @@ module Jekyll
         @element_types = element_type.split(",").map(&:strip)
       end
 
-      def converter(context)
-        # Gather settings
-        site = context.registers[:site]
-        site.find_converter_instance(::Jekyll::Converters::Markdown)
-      end
-
       def site
         @site ||= context.registers[:site]
       end

data/lib/jekyll/archimate/conditional_file.rb

@@ -32,6 +32,7 @@ module Jekyll
       def write(content)
         return unless needs_write?(content)
         Jekyll.logger.info "Rendering #{relative_path}"
+        write_file(content)
       end
 
       private

data/lib/jekyll/archimate/markup_converter.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Archimate
+    module MarkupConverter
+      def converter(context)
+        # Gather settings
+        site = context.registers[:site]
+        site.find_converter_instance(::Jekyll::Converters::Markdown)
+      end
+    end
+  end
+end

data/lib/jekyll/archimate/matrix_tag.rb

@@ -78,8 +78,6 @@ module Jekyll
       end
 
       def scan_attributes(context)
-        @converter = converter(context)
-
         # Render any liquid variables
         markup = Liquid::Template.parse(@markup).render(context)
 
@@ -94,12 +92,6 @@ module Jekyll
         @element_types = element_type.split(",").map(&:strip)
       end
 
-      def converter(context)
-        # Gather settings
-        site = context.registers[:site]
-        site.find_converter_instance(::Jekyll::Converters::Markdown)
-      end
-
       def site
         @site ||= context.registers[:site]
       end

data/lib/jekyll/archimate/tag_attribute_parser.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Archimate
+    # For the element catalog, the "type" argument syntax is:
+    #
+    #     element_spec[,element_spec]*
+    #
+    # Where:
+    #
+    #     element_spec: element_type_name | element_type_name_stereotype | element_ref_relationship
+    #     element_type_name: "BusinessActor", "DataObject", etc.
+    #     element_type_name_stereotype: element_type_name<<stereotype>>
+    #     element_ref_relationship: element_ref rel_direction element_spec
+    #
+    # Examples:
+    #
+    # * `BusinessActor`
+    # * `BusinessActor<<Organization>>`
+    # * `BusinessActor<<Organization>>,BusinessActor` - Note, this should be a unique set - the organization stereotyped Business Actor shouldn't be duplicated in the BusinessActor list.
+    # * `BusinessActor,Location` - Note, this should be a list of Business Actors, followed by a list of Locations
+    #
+    # Class requirements
+    # @converter
+    # @markup
+    module TagAttributeParser
+      def scan_attributes(context)
+        @converter = converter(context)
+
+        # Render any liquid variables
+        markup = Liquid::Template.parse(@markup).render(context)
+
+        # Extract tag attributes
+        attributes = {}
+        markup.scan(Liquid::TagAttributes) do |key, value|
+          attributes[key] = value
+        end
+
+        caption = attributes['caption']&.gsub!(/\A"|"\Z/, '')
+        # @caption = @converter.convert(caption).gsub(/<\/?p[^>]*>/, '').chomp if @caption
+        @caption = @converter.convert(caption).gsub(%r{</?p[^>]*>}, '').chomp if @caption
+        element_type = attributes['type']
+        element_type = element_type.gsub!(/\A"|"\Z/, '') if element_type
+        @element_types = element_type.split(",").map(&:strip)
+      end
+    end
+  end
+end

data/lib/jekyll/archimate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-archimate
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Mark Morga
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -111,10 +111,12 @@ files:
 - lib/jekyll/archimate/entity_base.rb
 - lib/jekyll/archimate/folder.rb
 - lib/jekyll/archimate/json_file.rb
+- lib/jekyll/archimate/markup_converter.rb
 - lib/jekyll/archimate/matrix_tag.rb
 - lib/jekyll/archimate/model_entity.rb
 - lib/jekyll/archimate/relationship_entity.rb
 - lib/jekyll/archimate/svg_file.rb
+- lib/jekyll/archimate/tag_attribute_parser.rb
 - lib/jekyll/archimate/unified_model.rb
 - lib/jekyll/archimate/version.rb
 homepage: https://github.com/mmorga/jekyll-archimate