dcm 0.0.18 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aaa1587b03304465c420597c49eb4e1f2da31b398179619a369a661e132f403
-  data.tar.gz: 7f50432f400c44d7df6811be4824074e5e3b4ddd6ba093bf56228d2844365719
+  metadata.gz: ff41f6d733e28eebf919406315f8a48dad52e1ca0e0125596198f03cbc18ce49
+  data.tar.gz: 4975ccbbe1e3b4dbaff474e8001cefe68ebe064c6b6ed38e3c232cc8f2c96d2a
 SHA512:
-  metadata.gz: 4c30e958e78c5a792876bd5cd82efa5203e1aa68c743f7ea3c6cb5adda5df6de955d2b4005c4ebcf02fa5759c1383260118e64db93f38c6653cc046257e557bc
-  data.tar.gz: 8e6c1b9898ddfa1aeaee8ac0d714ef1a25667441f9b46870c41da349dbd58826c6afc28415cecbb16ebcf9b9b50d341e2b9c2c472d0c6904a1b1117583ab8062
+  metadata.gz: f69c854cdb29bb6961c4c66b33a05e94a449a094618b9299e5dcc8116de1526185c248c2490797e83c5410bd9f3842593de5f91e0c7f9068ef93dedfc6346072
+  data.tar.gz: 6fd9a37661dbfbeaaf56dcca87f4eb4ea7abeb56c3ffd0e2864e07aa3f34f5ea732740e1cb5f7fa22638f85a08bb4519cc2b8c9981fe24cbe3fede11590c7a88

data/lib/cli.rb

@@ -19,6 +19,17 @@ module Dcm
 
   class CLI < Thor
 
+    check_unknown_options!
+
+    def help
+      super
+      puts <<~EOS
+        Options:
+          FILTER may be any of the following keys: #{VariantFilter::ALLOWED_FILTERKEYS.join(", ")}
+          and should have the format key:value
+      EOS
+    end
+
     desc "show FILE", "Show all labels in FILE"
     option :oneline, type: :boolean, aliases: ["-l"]
     def show(file=nil)
@@ -26,7 +37,7 @@ module Dcm
     end
 
     desc "new [SPEC]", "Create a new dcm from scratch"
-    option :indented,   aliases: ["-i"], type: :boolean, default: false
+    option :indented, aliases: ["-i"], type: :boolean, default: false
     def new(*spec)
       list = parse_spec(spec)
       puts list.to_dcm(option[:indented])
@@ -43,18 +54,30 @@ module Dcm
 
     desc "creta2begu FILTER CODING FILE", "Convert a hierarchical DCM to a flat DCM"
     def creta2begu(expr, codingpath, file)
+      filter = VariantFilter.new(expr)
       list = parse_file(file)
 
-      puts Codinginfo.new(codingpath, VariantFilter.new(expr))
+      puts Codinginfo.new(codingpath, filter)
         .flatten_list(list)
         .to_dcm
     end
 
+    desc "creta2filt FILTER CODING FILE", "Filter a hierarchical DCM"
+    def creta2filt(expr, codingpath, file)
+      filter = VariantFilter.new(expr)
+      list = parse_file(file)
+
+      puts Codinginfo.new(codingpath, filter)
+        .filter_list(list)
+        .to_dcm
+    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, VariantFilter.new(expr))
+      puts Codinginfo.new(codingpath, filter)
         .unflatten_list(list)
         .to_dcm
     end

data/lib/codinginfo.rb

@@ -18,7 +18,7 @@ class Codinginfo
       @assignments = []
     end
 
-    def match?(assignments, label)
+    def match?(label)
       # assignments
       #   .values
       #   .select { _1.name == name }
@@ -59,6 +59,10 @@ class Codinginfo
         .map { Cvar.new(name: _1, value: _2.to_i) }
     end
 
+    def has_matching_cvar?(label)
+      cvars.any? { _1.match?(label) }
+    end
+
     def description = @properties[:swfk_id]
   end
 
@@ -132,11 +136,17 @@ class Codinginfo
 
   def flatten_list(list)
     list
-      .select { !cvar_coded?(_1) || has_matching_cvar?(_1) }
+      .select { !cvar_coded?(_1) || variant.has_matching_cvar?(_1) }
       .map_int { _1.with(name: remove_cvar_prefix(_1.name)) }
       .with(headers: variants_description)
   end
 
+  def filter_list(list)
+    list
+      .select { |label| !cvar_coded?(label) || @variants.any? { _1.has_matching_cvar?(label) } }
+      .with(headers: variants_description)
+  end
+
   def cvar_coded?(label)
     label.name.match?(CVAR_PREFIX_REGEXP)
   end
@@ -145,10 +155,6 @@ class Codinginfo
     @assignments.key?(label.name)
   end
 
-  def has_matching_cvar?(label)
-    variant.cvars.any? { _1.match?(@assignments, label) }
-  end
-
   def add_cvar_prefix(name, variant)
     variant
       .cvars

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Dcm
-  VERSION = "0.0.18"
+  VERSION = "0.0.20"
 end

metadata

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