remi 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c802335b8494b30ff89e4c31b1ce4df34b2fc8a
-  data.tar.gz: b405fbefb668bf07db5bcbb4a0cf6d8550658f13
+  metadata.gz: 0bb16e0f2dccad23e3473e60a9a83445f6eb0128
+  data.tar.gz: f362f1d884d7c904cefadccf8d56899bfd334e1d
 SHA512:
-  metadata.gz: e2380bbb4cc87d67cfdb554763f8614cfcc791ceb3b70f711ed2fb975dcaf142438f2937453734479a43d3735ea61c8bcb4e093e3f380b5ae107e2dba5fe9522
-  data.tar.gz: 56f42c6b3608157959713478fbeee5cea4898238a6af176ab0b632cc0bb75ec5c60c66fe0ad60b45f6483aee09bb2943ddfabe586a88ef223ceaf9349eeded07
+  metadata.gz: 4f57654405b399951ddf657c20779bab7801d3d59bef03c4452f0e3a74acfe5eb22b0a5aea699b2f00761529126df903fda07640c6a73e6dff93720d9d0db7ff
+  data.tar.gz: 10f4f6675c25fa25898c0637eea43eb67323d5215a5eb95cf43a4adcdb6a01f3cd953c2f2f1712600ec4a21fc94655637346ece3d7823639f1d2f3a64f6db7b4

data/lib/remi/cucumber/business_rules.rb

@@ -27,7 +27,7 @@ module Remi::BusinessRules
     end
 
     def base_regex
-      @base_regex ||= /\A\*(.*)\*\Z/
+      @base_regex ||= /\*(.*)\*/
     end
 
     def formulas
@@ -44,9 +44,14 @@ module Remi::BusinessRules
       form_opt = formulas[form, :match]
       raise "Unknown formula #{form}" unless form_opt
 
-      if form_opt[:value][0] == :date_reference
+      to_replace = form.match(base_regex)[0]
+      replace_with = if form_opt[:value][0] == :date_reference
         date_reference(form_opt[:value][1], form_opt[:match])
+      else
+        to_replace
       end
+
+      form.gsub(to_replace, replace_with)
     end
 
 
@@ -245,6 +250,34 @@ module Remi::BusinessRules
     end
 
 
+    # Would like to have this return a new DataSubject and not a dataframe.
+    # Need more robust duping to make that feasible.
+    # Don't use results for anything more than size.
+    def where(field_name, operation)
+      @data_obj.df.where(@data_obj.df[field_name.symbolize(@data_obj.field_symbolizer)].recode { |v| operation.call(v) })
+    end
+
+    def where_is(field_name, value)
+      where(field_name, ->(v) { v == value })
+    end
+
+    def where_lt(field_name, value)
+      where(field_name, ->(v) { v.to_f < value.to_f })
+    end
+
+    def where_gt(field_name, value)
+      where(field_name, ->(v) { v.to_f > value.to_f })
+    end
+
+    def where_between(field_name, low_value, high_value)
+      where(field_name, ->(v) { v.to_f.between?(low_value.to_f, high_value.to_f) })
+    end
+
+    def where_in(field_name, list)
+      list_array = list.split(',').map { |v| v.strip }
+      where(field_name, ->(v) { list_array.include?(v) })
+    end
+
 
     def stub_data
       @data_obj.stub_df if @data_obj.respond_to? :stub_df

data/lib/remi/cucumber/data_source.rb

@@ -59,5 +59,9 @@ module Remi
     class Salesforce
       include DataStub
     end
+
+    class DataFrame
+      include DataStub
+    end
   end
 end

data/lib/remi/data_source/data_frame.rb

@@ -3,8 +3,14 @@ module Remi
     class DataFrame
       include DataSubject
 
-      def initialize(**args)
+      def initialize(fields: {}, **args)
+        @fields = fields
       end
+
+      def df
+        @dataframe ||= Daru::DataFrame.new([], order: @fields.keys)
+      end
+
     end
   end
 end

data/lib/remi/project/features/examples.feature

@@ -22,3 +22,28 @@ Feature: This tests the creation of example records.
       | *Yesterday* | *3 days from now* |
     Then the target field 'Yesterday' is the date 1 day ago
     And the target field 'ThreeDaysFromNow' is the date 3 days from now
+
+  Scenario: Counting the number of records.
+    Given the following example record for 'Source Data':
+      | Id | Name  |
+      | 1  | Alpha |
+      | 2  | Beta  |
+      | 3  | Gamma |
+    Then the target has 3 records
+    Then the target 'Target Data' has 3 records
+
+  Scenario: Counting the number of recors that satisfy some condition.
+    Given the following example record for 'Source Data':
+      | Id | Name    | Category | Quantity |
+      | 1  | Alpha   | Small    | 0.5      |
+      | 2  | Beta    | Small    | 0.7      |
+      | 3  | Gamma   | Big      | 30       |
+      | 4  | Delta   | Big      | 38       |
+      | 5  | Epsilon | Normal   | 1        |
+    Then the target has 2 records where 'Category' is "Small"
+    And the target has 3 records where 'Category' is in "Small, Normal"
+    And the target has 1 record where 'Quantity' is 0.7
+    And the target has 2 records where 'Quantity' is less than 1
+    And the target has 3 records where 'Quantity' is greater than 0.9
+    And the target has 3 records where 'Quantity' is between 0 and 1
+    And the target has 2 records where 'Quantity' is between 0.6 and 2

data/lib/remi/project/features/formulas.feature

@@ -1,4 +1,5 @@
 Feature: This tests the creation of example records.
+  The job that runs does nothing but copy source data to target.
 
   Background:
     Given the job is 'Copy Source'
@@ -55,14 +56,20 @@ Feature: This tests the creation of example records.
     And the target field 'SevenWeeksAgo' is the date 7 weeks ago
     And the target field 'ThreeWeeksFromNow' is the date 3 weeks from now
 
-  Scenario: Handling date formulas when set explicitly in the source.
+  Scenario: Handling date formulas when set outside of a data example.
 
-    Given the following example record for 'Source Data':
-      | SomeDate   |
-      | 2015-10-22 |
-    And the source field 'SomeDate' is set to the value "*Yesterday*"
-    Then the target field 'SomeDate' is the date 1 day ago
+    Given the source field 'Some Date' is set to the value "*Yesterday*"
+    Then the target field 'Some Date' is the date 1 day ago
+
+    When the source field 'Some Date' is set to the value "*2 months from now*"
+    Then the target field 'Some Date' is the date 2 months from now
+    Then the target field 'Some Date' is populated with "*2 months from now*"
 
-    When the source field 'SomeDate' is set to the value "*2 months from now*"
-    Then the target field 'SomeDate' is the date 2 months from now
-    Then the target field 'SomeDate' is populated with "*2 months from now*"
+  Scenario: Handling a date formula that is embedded in a larger string.
+    Given the following example record for 'Source Data':
+      | Some Date | Some String | Combination       |
+      | *Today*   | Something   | *Today*-Something |
+    And the source field 'Some Date'
+    And the source field 'Some String'
+    And the target field 'Combination'
+    Then the target field is a concatenation of 'Some Date' and 'Some String', delimited by "-"

data/lib/remi/project/features/step_definitions/remi_step.rb

@@ -15,7 +15,7 @@ Given /^the job target '([[:alnum:]\s\-_]+)'$/ do |arg|
   @brt.add_job_target arg
 end
 
-Given /^the following example record called '([[:alnum:]\s\-_]+)':$/ do |arg, example_table|
+Given /^the following example(?: record| records|) called '([[:alnum:]\s\-_]+)':$/ do |arg, example_table|
   @brt.add_example arg, example_table
 end
 
@@ -25,7 +25,7 @@ end
 
 ### Setting up example data
 
-Given /^the following example record for '([[:alnum:]\s\-_]+)':$/ do |source_name, example_table|
+Given /^the following example(?: record| records|) for '([[:alnum:]\s\-_]+)':$/ do |source_name, example_table|
   example_name = source_name
   @brt.add_example example_name, example_table
   @brt.job_sources[source_name].stub_data_with(@brt.examples[example_name])
@@ -197,6 +197,15 @@ Then /^the target field '(.+)' is (?:set to the value|populated with) "([^"]*)"$
   expect(@brt.targets.fields[target_field].values.uniq).to eq [Remi::BusinessRules::ParseFormula.parse(value)]
 end
 
+Then /^the target field '(.+)' is in the list "([^"]*)"$/ do |target_field, list|
+  step "the target field '#{target_field}'"
+
+  list_array = list.split(',').map(&:strip)
+  @brt.run_transforms
+  expect(@brt.targets.fields[target_field].values.uniq & list_array).to include(*@brt.targets.fields[target_field].values.uniq)
+end
+
+
 Then /^the target field '(.+)' is the date (.+)$/ do |target_field, date_reference|
   step "the target field '#{target_field}' is set to the value \"*#{date_reference}*\""
 end
@@ -229,6 +238,12 @@ Then /^the target field is a concatenation of the source fields, delimited by "(
   expect(@brt.targets.fields.values.uniq).to eq concatenated_source
 end
 
+Then /^the target field is a concatenation of '(.+)' and '(.+)', delimited by "([^"]*)"$/ do |source_field_1, source_field_2, delimiter|
+  expected_value = [@brt.sources.fields[source_field_1].value, @brt.sources.fields[source_field_2].value].join(delimiter)
+  @brt.run_transforms
+  expect(@brt.targets.fields.values.uniq).to eq [[expected_value]]
+end
+
 Then /^the target field is a concatenation of "([^"]*)" and '(.+)', delimited by "([^"]*)"$/ do |constant, source_field, delimiter|
   expected_value = [constant, @brt.sources.fields[source_field].value].join(delimiter)
   @brt.run_transforms
@@ -295,8 +310,8 @@ end
 
 ### Record-level expectations
 
-Then /^the record should be (?i)(Retained|Rejected)(?-i)(?: without error|)$/ do |action|
-  source_size  = @brt.source.size
+Then /^the record from source '(.+)' should be (?i)(Retained|Rejected)(?-i)(?: without error|)$/ do |source_name, action|
+  source_size  = @brt.sources[source_name].size
   @brt.run_transforms
   targets_size = @brt.targets.total_size
 
@@ -310,7 +325,12 @@ Then /^the record should be (?i)(Retained|Rejected)(?-i)(?: without error|)$/ do
   end
 end
 
-Then /^the record should (not be|be) present on the target$/ do |action|
+Then /^the record(?:s|) should be (?i)(Retained|Rejected)(?-i)(?: without error|)$/ do |action|
+  source_name = @brt.sources.keys.first
+  step "the record from source '#{source_name}' should be #{action}"
+end
+
+Then /^the record(?:s|) should (not be|be) present on the target$/ do |action|
   map_action = { 'not be' => 'rejected', 'be' => 'retained' }
   step "the record should be #{map_action[action]}"
 end
@@ -324,3 +344,68 @@ Then /^a target record is not created$/ do
   @brt.run_transforms
   expect(@brt.targets.total_size).to be 0
 end
+
+
+### Record counting
+
+Then /^the target has (\d+) record(?:s|)$/ do |nrecords|
+  target_name = @brt.targets.keys.first
+  step "the target '#{target_name}' has #{nrecords} records"
+end
+
+Then /^the target '([[:alnum:]\s\-_]+)' has (\d+) record(?:s|)$/ do |target_name, nrecords|
+  @brt.run_transforms
+  expect(@brt.targets[target_name].size).to be nrecords.to_i
+end
+
+Then /^the target has (\d+) record(?:s|) where '([[:alnum:]\s\-_]+)' is "([^"]*)"$/ do |nrecords, field_name, value|
+  target_name = @brt.targets.keys.first
+  step "the target '#{target_name}' has #{nrecords} records where '#{field_name}' is \"#{value}\""
+end
+
+Then /^the target '([[:alnum:]\s\-_]+)' has (\d+) record(?:s|) where '([[:alnum:]\s\-_]+)' is "([^"]*)"$/ do |target_name, nrecords, field_name, value|
+  @brt.run_transforms
+  expect(@brt.targets[target_name].where_is(field_name, value).size).to eq nrecords.to_i
+end
+
+Then /^the target has (\d+) record(?:s|) where '([[:alnum:]\s\-_]+)' is in "([^"]*)"$/ do |nrecords, field_name, value|
+  target_name = @brt.targets.keys.first
+  step "the target '#{target_name}' has #{nrecords} records where '#{field_name}' is in \"#{value}\""
+end
+
+Then /^the target '([[:alnum:]\s\-_]+)' has (\d+) record(?:s|) where '([[:alnum:]\s\-_]+)' is in "([^"]*)"$/ do |target_name, nrecords, field_name, value|
+  @brt.run_transforms
+  expect(@brt.targets[target_name].where_in(field_name, value).size).to eq nrecords.to_i
+end
+
+Then /^the target has (\d+) record(?:s|) where '([[:alnum:]\s\-_]+)' is (\d*\.?\d+)$/ do |nrecords, field_name, value|
+  target_name = @brt.targets.keys.first
+  step "the target '#{target_name}' has #{nrecords} records where '#{field_name}' is #{value}"
+end
+
+Then /^the target '([[:alnum:]\s\-_]+)' has (\d+) record(?:s|) where '([[:alnum:]\s\-_]+)' is (\d*\.?\d+)$/ do |target_name, nrecords, field_name, value|
+  @brt.run_transforms
+  expect(@brt.targets[target_name].where_is(field_name, value).size).to eq nrecords.to_i
+end
+
+Then /^the target has (\d+) record(?:s|) where '([[:alnum:]\s\-_]+)' is (less|greater) than (\d*\.?\d+)$/ do |nrecords, field_name, direction, value|
+  target_name = @brt.targets.keys.first
+  step "the target '#{target_name}' has #{nrecords} records where '#{field_name}' is #{direction} than #{value}"
+end
+
+Then /^the target '([[:alnum:]\s\-_]+)' has (\d+) record(?:s|) where '([[:alnum:]\s\-_]+)' is (less|greater) than (\d*\.?\d+)$/ do |target_name, nrecords, field_name, direction, value|
+  @brt.run_transforms
+  query_method = { 'less' => :where_lt, 'greater' => :where_gt }[direction]
+
+  expect(@brt.targets[target_name].send(query_method, field_name, value).size).to eq nrecords.to_i
+end
+
+Then /^the target has (\d+) record(?:s|) where '([[:alnum:]\s\-_]+)' is between (\d*\.?\d+) and (\d*\.?\d+)$/ do |nrecords, field_name, low_value, high_value|
+  target_name = @brt.targets.keys.first
+  step "the target '#{target_name}' has #{nrecords} records where '#{field_name}' is between #{low_value} and #{high_value}"
+end
+
+Then /^the target '([[:alnum:]\s\-_]+)' has (\d+) record(?:s|) where '([[:alnum:]\s\-_]+)' is between (\d*\.?\d+) and (\d*\.?\d+)$/ do |target_name, nrecords, field_name, low_value, high_value|
+  @brt.run_transforms
+  expect(@brt.targets[target_name].where_between(field_name, low_value, high_value).size).to eq nrecords.to_i
+end

data/lib/remi/project/features/transforms/date_diff.feature

@@ -7,9 +7,6 @@ Feature: Tests the date_diff transform
 
     And the source 'Source Data'
     And the target 'Target Data'
-    And the following example record for 'Source Data':
-      | Date1      | Date2      |
-      | 2015-12-31 | 2016-01-02 |
 
   Scenario Outline: Calculating date difference in days2.
     Given the job parameter 'measure' is "days"

data/lib/remi/project/features/transforms/parse_date.feature

@@ -7,9 +7,6 @@ Feature: Tests the parse_date transform
 
     And the source 'Source Data'
     And the target 'Target Data'
-    And the following example record for 'Source Data':
-      | Date String |
-      | 2015-12-31  |
 
   Scenario Outline: Parsing date strings.
     Given the source field 'Date String' has the value "<Date String>"

data/lib/remi/project/features/transforms/prefix.feature

@@ -5,11 +5,8 @@ Feature: Test the prefix transformer.
     And the job source 'Source Data'
     And the job target 'Target Data'
 
-
   Scenario: Prefixing a field.
     Given the source 'Source Data'
     And the target 'Target Data'
-    Given the following example record for 'Source Data':
-      | Field     |
-      | something |
-    Then the target field 'Field' is set to the value "prefixsomething"
+    And the source field 'My Field' is set to the value "something"
+    Then the target field 'Prefixed Field' is set to the value "prefixsomething"

data/lib/remi/project/jobs/copy_source_job.rb

@@ -4,7 +4,11 @@ class CopySourceJob
   include AllJobsShared
   using Remi::Refinements::Daru
 
-  define_source :source_data, Remi::DataSource::DataFrame
+  define_source :source_data, Remi::DataSource::DataFrame,
+    fields: {
+      :some_field => {},
+      :some_date => { type: :date, format: '%Y-%m-%d' }
+    }
   define_source :target_data, Remi::DataSource::DataFrame
 
   define_transform :main, sources: :source_data, targets: :target_data do

data/lib/remi/project/jobs/transforms/date_diff_job.rb

@@ -4,7 +4,11 @@ class DateDiffJob
   include AllJobsShared
 
   define_param :measure, :days
-  define_source :source_data, Remi::DataSource::DataFrame
+  define_source :source_data, Remi::DataSource::DataFrame,
+    fields: {
+      :date1 => { type: :date, format: '%Y-%m-%d' },
+      :date2 => { type: :date, format: '%Y-%m-%d' }
+    }
   define_target :target_data, Remi::DataTarget::DataFrame
 
   define_transform :main, sources: :source_data, targets: :target_data do

data/lib/remi/project/jobs/transforms/parse_date_job.rb

@@ -5,7 +5,10 @@ class ParseDateJob
 
   define_param :format, '%Y-%m-%d'
   define_param :if_blank, nil
-  define_source :source_data, Remi::DataSource::DataFrame
+  define_source :source_data, Remi::DataSource::DataFrame,
+    fields: {
+      :date_string => {}
+    }
   define_target :target_data, Remi::DataTarget::DataFrame
 
   define_transform :main, sources: :source_data, targets: :target_data do

data/lib/remi/project/jobs/transforms/prefix_job.rb

@@ -4,12 +4,15 @@ class PrefixJob
   include AllJobsShared
 
   define_param :prefix, 'prefix'
-  define_source :source_data, Remi::DataSource::DataFrame
+  define_source :source_data, Remi::DataSource::DataFrame,
+    fields: {
+      :my_field => {}
+    }
   define_target :target_data, Remi::DataTarget::DataFrame
 
   define_transform :main, sources: :source_data, targets: :target_data do
     Remi::SourceToTargetMap.apply(source_data.df, target_data.df) do
-      map source(:field) .target(:field)
+      map source(:my_field) .target(:prefixed_field)
         .transform(Remi::Transform[:prefix].(params[:prefix]))
     end
   end

data/lib/remi/version.rb

@@ -1,3 +1,3 @@
 module Remi
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remi
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Sterling Paramore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daru