remi 0.2.32 → 0.2.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 465e12569ac09f43f5e9f20fcf40ac4ee9f2e14c
-  data.tar.gz: 2c81e6feda132e5c3bc3aea5259f907a56bf0f6f
+  metadata.gz: a91453040868eaabb19fb50db4aafa0f0da4a643
+  data.tar.gz: 8530db1145f89b1abcb8450fe8bcb4eb5325409d
 SHA512:
-  metadata.gz: 8632e44d75be366bc3323567f597c73b5efb5e88a8fd07f94e1fa69e09a9a9c5b0f021f9f4ac13d7ae94030957f559136dfd09ad6f2626eb92743108f25cf307
-  data.tar.gz: 8657740cdb339d3bd311ec87d3aab8bbb63e005bd8bf07e5cac565bb7276417940e5885014dc95b8c5e3b6d69412b467cdeb0acff69ab981590cf884faa8948f
+  metadata.gz: 866bd205d40ea549fc8b11fd06d599a54a12bae6cdc3ddbb746c377c5bd17617ddf4eb48b0e88e2869df529eeafe26043b8fba7bbea8641ecc81eb2455b8480f
+  data.tar.gz: fc7906b2ffd875e42519a065a21212237cf48c0ece1a0ad393f58b83a02ea6f40811290e4fc21068a0322d9aa2828d8e0e5ea5bec61cb835ed9602eba0c87a6f

data/Gemfile.lock

@@ -19,7 +19,7 @@ GIT
 PATH
   remote: .
   specs:
-    remi (0.2.32)
+    remi (0.2.33)
       activesupport (~> 4.2)
       bond (~> 0.5)
       cucumber (~> 2.1)

data/features/transforms/data_frame_sieve.feature

@@ -18,7 +18,7 @@ Feature: Tests the DataFrameSieve transform
       | Undergrad   | NURS    | \\nil   | intensive |
       | Undergrad   | \\nil   | true    | intensive |
       | Undergrad   | \\nil   | false   | base      |
-      | Grad        | ENG     | true    | intensive |
+      | Grad        | /ENG/   | true    | intensive | # regex
       | \\nil       | \\nil   | \\nil   | base      |
 
     And the following example for 'Source Data':
@@ -28,6 +28,7 @@ Feature: Tests the DataFrameSieve transform
       | 3  | Grad        | CHEM    | true    |
       | 4  | Undergrad   | NURS    | false   |
       | 5  | Unknown     | CHEM    | true    |
+      | 6  | Grad        | ENGL    | true    |
 
     Then the target should match the example:
       | id | level       | program | contact | group     |
@@ -36,3 +37,4 @@ Feature: Tests the DataFrameSieve transform
       | 3  | Grad        | CHEM    | true    | base      |
       | 4  | Undergrad   | NURS    | false   | intensive |
       | 5  | Unknown     | CHEM    | true    | base      |
+      | 6  | Grad        | ENGL    | true    | intensive |

data/jobs/transforms/data_frame_sieve_job.rb

@@ -22,6 +22,10 @@ class DataFrameSieveJob
   define_target :target_data, Remi::DataTarget::DataFrame
 
   define_transform :main, sources: :source_data, targets: :target_data do
+
+    # Hack to convert example to regex
+    sieve.df[:program].recode! { |v| (v || '').match(/\A\/.*\/\Z/) ? /#{v[1...-1]}/ : v }
+
     Remi::SourceToTargetMap.apply(source_data.df, target_data.df) do
       map source(:level, :program, :contact) .target(:group)
         .transform(Remi::Transform::DataFrameSieve.new(sieve.df))

data/lib/remi/transform.rb

@@ -622,7 +622,13 @@ module Remi
         @sieve_df.each.find do |sieve_row|
           match_row = true
           sieve_keys.each_with_index do |key,idx|
-            match_row &&= sieve_row[key].nil? || sieve_row[key] == values[idx]
+            match_value = if sieve_row[key].is_a?(Regexp)
+              !!sieve_row[key].match(values[idx])
+            else
+              sieve_row[key] == values[idx]
+            end
+
+            match_row &&= sieve_row[key].nil? || match_value
           end
           match_row
         end[sieve_result_key]

data/lib/remi/version.rb

@@ -1,3 +1,3 @@
 module Remi
-  VERSION = '0.2.32'
+  VERSION = '0.2.33'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remi
 version: !ruby/object:Gem::Version
-  version: 0.2.32
+  version: 0.2.33
 platform: ruby
 authors:
 - Sterling Paramore