jekyll-archimate 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1390d11ccf52bae0ba50f6f22bd1dec103f2465e
-  data.tar.gz: 792d680dea4b6dbb6a95f91276d14d7df09ee373
+  metadata.gz: 28f21df623d8b7517b7cb96f6afa8d2447a70d20
+  data.tar.gz: 723393f13b2337fbc0ff24e4e743fd132735c7b3
 SHA512:
-  metadata.gz: aa6f9b4030f007efb4ca456029abb00721af40180c67ea6ca96ebc81814ec10115c7c8261e8cd4cef66601ae2ae509d9aa46f608c175ed34f2f5378774171df4
-  data.tar.gz: 0730d88c6bd3b3067b1d797cb913a19dc8cecab7307ba9695a06b79ed66b02ad05f76ef423084e314a1826c7822fa3f62cf6f7f11d14867651dca99ecf453960
+  metadata.gz: 3d4dfa4d1e4ab5ac8dad5bb6290369053af032950183cf53cbf5a1727180ebe413b1572777da64ac65b21f7d87afa8edaf9c09016ee9e0e36e1efc4f17f8d088
+  data.tar.gz: 256ae8198b5cd36510c13351f3fb30be571f0cd06be3513e24f59f784dc388e5b809ca71ba382f5d0de11bab22c5ff2f2064d17bf7b4dd3276976a1a2cbc4639

data/lib/jekyll-archimate.rb

@@ -4,5 +4,5 @@ require "jekyll/archimate/version"
 require "jekyll/archimate/archimate_cache"
 require "jekyll/archimate/archimate_diagram_tag"
 require "jekyll/archimate/catalog_tag"
-require "jekyll/archimate/matrix_tag"
+require "jekyll/archimate/application_interaction_matrix_tag"
 require "jekyll/archimate/archimate_hook"

data/lib/jekyll/archimate/application_interaction_matrix_tag.rb

@@ -0,0 +1,150 @@
+module Jekyll
+  module Archimate
+    # Insert a diagram from the ArchiMate model.
+    #
+    #   {% application_interaction_matrix plateau:"Today" | caption: "Today's Application Interaction" }
+    #
+    class ApplicationInteractionMatrixTag < Liquid::Tag
+      attr_reader :context
+      attr_reader :markup
+      attr_reader :caption
+      attr_reader :plateau
+
+
+      def initialize(tag_name, markup, tokens)
+        @markup = markup
+        @context = nil
+        @caption = nil
+        @plateau = nil
+        super
+      end
+
+      def render(context)
+        @context = context
+        scan_attributes(context)
+        application_interaction
+        render_table
+      end
+
+      # Here I want all of the Serving relationships between 2 app components
+      # included or derived.
+      #
+      # attrs:
+      # source_selector: Element selector for source elements
+      # target_selector: Element selector for target elements
+      # relationship_selector
+      def application_interaction
+        model = site.data["archimate_model"]
+        dr_engine = ::Archimate::DerivedRelations.new(model)
+
+        relationship_filter = lambda { |rel| rel.weight >= ::Archimate::DataModel::Serving::WEIGHT }
+
+        plateau_today = dr_engine.element_by_name(plateau)
+        today_rels = model.relationships.select do |rel|
+          rel.source.id == plateau_today.id &&
+            %w{CompositionRelationship AggregationRelationship}.include?(rel.type) &&
+            rel.target.type == "ApplicationComponent"
+        end
+        today_apps = today_rels.map { |rel| rel.target }
+        source_filter = lambda { |el|  }
+        target_filter = lambda { |el| today_apps.map(&:id).include?(el.id) }
+        stop_filter = lambda { |el| el.type == "ApplicationComponent" }
+
+        concrete_rels = model.relationships.select { |rel|
+          rel.type == "ServingRelationship" &&
+            today_apps.include?(rel.source.id) &&
+            today_apps.include?(rel.target.id)
+        }
+
+        derived_rels = dr_engine.derived_relations(
+          today_apps,
+          relationship_filter,
+          target_filter,
+          stop_filter
+        )
+
+        @all_rels = [concrete_rels, derived_rels].flatten
+
+        @callers = @all_rels.map(&:source).uniq.sort { |a, b| a.name.to_s <=> b.name.to_s }
+        @callees = @all_rels.map(&:target).uniq.sort { |a, b| a.name.to_s <=> b.name.to_s }
+      end
+
+      def matrix_data
+        model = site.data["archimate_model"]
+        dr_engine = ::Archimate::DerivedRelations.new(model)
+
+      end
+
+      def render_table
+        <<~END
+        <table class="table table-condensed table-hover table-striped">
+        <caption>#{caption}</caption>
+        <thead>
+        <tr>
+        <th>&nbsp;</th>
+        <th class="success" scope="col" colspan="#{@callers.size}">Callers</th>
+        </tr>
+        <tr>
+        <th class="info" scope="col">Callees</th>
+        #{@callers.map { |ac| "<th class=\"success\" scope=\"col\" style=\"text-transform: capitalize\">#{ac.name}</th>" }.join("\n")}
+        </tr>
+        </thead>
+        <tbody>
+        #{render_rows.strip}
+        </tbody>
+        </table>
+        END
+      end
+
+      def render_rows
+        return "<tr><td>No Items</td></tr>" if @callees.empty?
+        @callees.map do |callee|
+          <<~END
+          <tr>
+          <th class="info" scope="row">#{callee.name}</th>
+          #{@callers.map { |caller| cell_content(caller, callee) }.join("")}
+          </tr>
+          END
+        end.join("")
+      end
+
+      def cell_content(caller, callee)
+        rels = @all_rels.select { |rel| rel.source == caller && rel.target == callee }
+        if rels.empty?
+          "<td></td>"
+        else
+          derived = rels.all? { |rel| rel.derived }
+          span_class = derived ? "text-danger" : "text-primary"
+          tooltip = "#{caller.name} &rarr; #{}#{callee.name} #{"(derived)" if derived}"
+          cell = <<~END
+          <td>
+          <a href="#" data-toggle="tooltip" data-placement="top" title="#{tooltip}">
+          <span class="#{span_class}">&crarr; calls</span>
+          </a>
+          </td>
+          END
+        end
+      end
+
+      def scan_attributes(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/, '')
+        @plateau = attributes['plateau']&.gsub!(/\A"|"\Z/, '')
+      end
+
+      def site
+        @site ||= context.registers[:site]
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag("application_interaction_matrix", Jekyll::Archimate::ApplicationInteractionMatrixTag)
+

data/lib/jekyll/archimate/catalog_tag.rb

@@ -52,7 +52,7 @@ module Jekyll
           <<-END
           <tr>
             <td><span class="badge badge-primary">#{element["type"]}</span> #{element["name"]}</td>
-            <td>#{element["documentation"]}</td>
+            <td>#{@converter.convert(element["documentation"]).gsub(/<\/?p[^>]*>/, '').chomp if element["documentation"]}</td>
             <td>#{render_properties(element["properties"])}</td>
           </tr>
           END
@@ -76,7 +76,9 @@ module Jekyll
         markup.scan(Liquid::TagAttributes) do |key, value|
           attributes[key] = value
         end
-        @caption = attributes['caption']&.gsub!(/\A"|"\Z/, '')
+
+        caption = attributes['caption']&.gsub!(/\A"|"\Z/, '')
+        @caption = @converter.convert(caption).gsub(/<\/?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)

data/lib/jekyll/archimate/matrix_tag.rb

@@ -2,8 +2,7 @@ module Jekyll
   module Archimate
     # Insert a diagram from the ArchiMate model.
     #
-    #   {% matrix type:"Principle" | caption:"Principles Catalog"  %}
-    #   {% matrix source:"ApplicationComponent" | target:"ApplicationComponent" | }
+    #   {% matrix plateau:"Today" | caption: "Today's Application Interaction" }
     #
     class MatrixTag < Liquid::Tag
       attr_reader :context
@@ -16,7 +15,7 @@ module Jekyll
         @markup = markup
         @context = nil
         @caption = nil
-        @element_types = []
+        @plateau = []
         super
       end
 
@@ -36,19 +35,32 @@ module Jekyll
       # relationship_selector
       def application_interaction
         model = site.data["archimate_model"]
-        derived_relations_engine = ::Archimate::DerivedRelations.new(model)
+        dr_engine = ::Archimate::DerivedRelations.new(model)
+
+        relationship_filter = lambda { |rel| rel.weight >= ::Archimate::DataModel::Serving::WEIGHT }
+
+        plateau_today = dr_engine.element_by_name("Today")
+        today_rels = model.relationships.select do |rel|
+          rel.source.id == plateau_today.id &&
+            %w{CompositionRelationship AggregationRelationship}.include?(rel.type) &&
+            rel.target.type == "ApplicationComponent"
+        end
+        today_apps = today_rels.map { |rel| rel.target }
+        source_filter = lambda { |el|  }
+        target_filter = lambda { |el| today_apps.map(&:id).include?(el.id) }
+        stop_filter = lambda { |el| el.type == "ApplicationComponent" }
 
         concrete_rels = model.relationships.select { |rel|
           rel.type == "ServingRelationship" &&
-            rel.source.type == "ApplicationComponent" &&
-            rel.target.type == "ApplicationComponent"
+            today_apps.include?(rel.source.id) &&
+            today_apps.include?(rel.target.id)
         }
 
-        derived_rels = derived_relations_engine.derived_relations(
-          model.elements.select { |el| el.type == "ApplicationComponent" },
-          lambda { |rel| rel.weight >= ::Archimate::DataModel::Serving::WEIGHT },
-          lambda { |el| el.type == "ApplicationComponent" },
-          lambda { |el| el.type == "ApplicationComponent" }
+        derived_rels = dr_engine.derived_relations(
+          today_apps,
+          relationship_filter,
+          target_filter,
+          stop_filter
         )
 
         @all_rels = [concrete_rels, derived_rels].flatten
@@ -59,7 +71,7 @@ module Jekyll
 
       def matrix_data
         model = site.data["archimate_model"]
-        derived_relations_engine = ::Archimate::DerivedRelations.new(model)
+        dr_engine = ::Archimate::DerivedRelations.new(model)
 
       end
 

data/lib/jekyll/archimate/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Archimate
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-archimate
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mark Morga
@@ -98,6 +98,7 @@ files:
 - bin/setup
 - jekyll-archimate.gemspec
 - lib/jekyll-archimate.rb
+- lib/jekyll/archimate/application_interaction_matrix_tag.rb
 - lib/jekyll/archimate/archimate_cache.rb
 - lib/jekyll/archimate/archimate_diagram_tag.rb
 - lib/jekyll/archimate/archimate_hook.rb