dcm 0.1.33 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a924998e12ed2b4cf2792defdeb7fff452b2752c1788ca4b78f48cedb7729bea
-  data.tar.gz: 47f31c96e0519b2d830b88766e3835f8934804868f47c8ef2267726bf323c8f8
+  metadata.gz: fa54183039b54a526760fa32fe22759f2f868930bb26fcf66f20b7d160d8a808
+  data.tar.gz: 397b66f1946176da83b407d05253f4d4a6bde08af07e455e0a21589bf2e42c45
 SHA512:
-  metadata.gz: df4b83301ab46a86a4e59c21ef0c098fb218f225a151e1173fd8be3d54264ab1c7cfd0e0b67289a957ddcb96849ac5b345c9cd8a8877b6b7943040a7a3ec1924
-  data.tar.gz: 0dd6fe7336e9c0bafbdc4031d179352913e3d4b570e7608e102dbdee3bd60701e2e08340ad462d4d0b72d823cc1cf0b170ca593c93c69b705ed8882386b25fb1
+  metadata.gz: e1f5128b226d63f2ce8f20160cc7e7bedeb02d36226b9f29f7877986f29e156c7ecb1114339aa4b75189689a32f2642804634db03ccaf77cf6e86371b779fa88
+  data.tar.gz: 6b7c96a428049abdfdd05fc8bbdd0d8d22a74b26a3b3f984b1796fafff6503972a2cd65d54a7c7d49f9197b179fc8a1971eb03db89dcf3e8ce628508728cb728

data/lib/cli.rb

@@ -79,7 +79,7 @@ module Dcm
       filter = VariantFilter.new(expr)
       list = parse_file(file)
 
-      puts Codinginfo.new(codingpath, filter)
+      puts Codinginfo.new(codingpath, filter, nocache: options[:nocache])
         .flatten_list(list)
         .to_dcm
     end
@@ -89,17 +89,27 @@ module Dcm
       filter = VariantFilter.new(expr)
       list = parse_file(file)
 
-      puts Codinginfo.new(codingpath, filter)
+      puts Codinginfo.new(codingpath, filter, nocache: options[:nocache])
         .filter_list(list)
         .to_dcm
     end
 
+    desc "cretaattrs FILTER CODING", "Output attributes for a given variant"
+    def cretaattrs(expr, codingpath)
+      filter = VariantFilter.new(expr)
+
+      puts Codinginfo.new(codingpath, filter, nocache: options[:nocache])
+        .variant
+        .attributes
+        .to_json
+    end
+
     desc "begu2creta FILTER CODING FILE", "Convert a flat DCM to a hierarchical DCM"
     def begu2creta(expr, codingpath, file)
       filter = VariantFilter.new(expr)
       list = parse_file(file)
 
-      puts Codinginfo.new(codingpath, filter)
+      puts Codinginfo.new(codingpath, filter, nocache: options[:nocache])
         .unflatten_list(list)
         .to_dcm
     end

data/lib/codinginfo.rb

@@ -1,4 +1,5 @@
 require "simple_xlsx_reader"
+require_relative "file_cache"
 
 class Codinginfo
   CVAR_PREFIX_REGEXP = /^CVAR_[A-Za-z0-9_]+_\d+\./
@@ -59,6 +60,13 @@ class Codinginfo
         .map { Cvar.new(name: _1, value: _2.to_i) }
     end
 
+    def attributes
+      @attrs ||= @properties
+        .reject { |key, _| key.start_with?("CSIG_") }
+        .reject { |key, _| key.start_with?("CVAR_") }
+        .select { |_, val| val == 0 || val == 1 || val == "-" }
+    end
+
     def has_matching_cvar?(label)
       cvars.any? { _1.match?(label) }
     end
@@ -66,43 +74,20 @@ class Codinginfo
     def description = @properties[:swfk_id]
   end
 
-  def initialize(filepath, filter)
-    @doc         = SimpleXlsxReader.open(filepath)
+  def initialize(filepath, filter, nocache: false)
     @filter      = filter
-    @headers     = []
     @variants    = []
-    @assignments = {}
-
-    overview_sheet
-      .rows
-      .each do |row|
-        next unless headers_parsed?(row)
-        next unless filter.match?(@headers, row)
 
-        @variants << Variant.new(@headers, row)
-      end
-
-    param_assignment_sheet
-      .rows
-      .each(headers: PARAM_ASSIGNMENT_HEADERS) do |row|
-        next if row[:cvar].nil?
+    parsed = nocache ? parse_xlsx(filepath) : FileCache.get(filepath) { parse_xlsx(filepath) }
 
-        @assignments[row[:name]] = Cvar.new(name: row[:cvar], package: row[:package])
-      end
-  end
+    @headers     = parsed[:headers]
+    @assignments = parsed[:assignments]
 
-  def overview_sheet
-    @doc
-      .sheets
-      .find { _1.name == "Gesamtübersicht" }
-      .tap { fail "Cannot find sheet Gesamtübersicht" if _1.nil? }
-  end
+    parsed[:rows].each do |row|
+      next unless filter.match?(@headers, row)
 
-  def param_assignment_sheet
-    @doc
-      .sheets
-      .find { _1.name == "Parameterdefinition" }
-      .tap { fail "Cannot find sheet Parameterdefinition" if _1.nil? }
+      @variants << Variant.new(@headers, row)
+    end
   end
 
   def variant
@@ -167,21 +152,55 @@ class Codinginfo
     name.sub(CVAR_PREFIX_REGEXP, "")
   end
 
-  def headers_parsed?(row)
-    return true if @headers.any?
+  private
+
+  def parse_xlsx(filepath)
+    doc = SimpleXlsxReader.open(filepath)
+    headers = []
+    rows = []
+    assignments = {}
+
+    doc.sheets
+      .find { _1.name == "Gesamtübersicht" }
+      .tap { fail "Cannot find sheet Gesamtübersicht" if _1.nil? }
+      .rows
+      .each do |row|
+        unless headers.any?
+          next unless parse_headers!(headers, row)
+          next
+        end
+        rows << row
+      end
+
+    doc.sheets
+      .find { _1.name == "Parameterdefinition" }
+      .tap { fail "Cannot find sheet Parameterdefinition" if _1.nil? }
+      .rows
+      .each(headers: PARAM_ASSIGNMENT_HEADERS) do |row|
+        next if row[:cvar].nil?
+
+        assignments[row[:name]] = Cvar.new(name: row[:cvar], package: row[:package])
+      end
+
+    { headers: headers, rows: rows, assignments: assignments }
+  end
 
+  def parse_headers!(headers, row)
     return false unless row[1]&.match?(/SWFK-ID/)
     return false unless row[1]&.match?(/CVAR_BeguData/)
     return false unless row[2]&.match?(/Kommentar/)
 
-    @headers = row
-      .map(&:chomp)
-      .map(&:lstrip)
-      .map(&:strip)
-      .map { _1.sub(/\n.*/, "") }
-      .tap { _1[0] = :typestr }
-      .tap { _1[1] = :swfk_id }
-      .tap { _1[4] = :typekey }
-      .tap { _1[6] = :devkey }
+    headers.replace(
+      row
+        .map(&:chomp)
+        .map(&:lstrip)
+        .map(&:strip)
+        .map { _1.sub(/\n.*/, "") }
+        .tap { _1[0] = :typestr }
+        .tap { _1[1] = :swfk_id }
+        .tap { _1[4] = :typekey }
+        .tap { _1[6] = :devkey }
+    )
+    true
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Dcm
-  VERSION = "0.1.33"
+  VERSION = "0.1.34"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dcm
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.34
 platform: ruby
 authors:
 - Jonas Mueller