remi 0.2.36 → 0.2.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b43c0f454a9c3df185534347b76d5d7ac0a37c4
-  data.tar.gz: 024381d3a8b2da98b1de66fddd14c0929a304d3d
+  metadata.gz: 4053acf8d3794062479455dd42afc7d3820832b5
+  data.tar.gz: 363985988b27cda161515842f3469d8b34487904
 SHA512:
-  metadata.gz: bc680e8048b300f645c013a3f261506b6c4e1efdef0f240f37eebb0d393f2cc948de06d53d1d3912122011ba8d2755ac8e851c6399af79c13d68b467389a1118
-  data.tar.gz: cb5f72b9db98cdf7b79fcaee6a1597e9259b805779b93655ba0738b5e8a14240a0e57cc6078b92cdc2c414f21eb3af034eb78a185e974f3c28707667ea80f792
+  metadata.gz: 5882b3ea3e2ee615e7c280108138a5e3cb8f7d30321655191c2973a083e722f974a4250ed40f1aa5f52ee610529b0078051355c160b914feb821e7f652117dff
+  data.tar.gz: 6cfff4363a00d7b030a700340da60e1b590432f67ff74e6adc96783b6e14be3078c244f890f8f4a77fddfabc1567d18cb64657375b0a882f51cc8c59a25b574c

data/Gemfile.lock

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

data/features/json.feature

@@ -0,0 +1,31 @@
+Feature: This tests using json data in tests.
+
+  Background:
+    Given the job is 'Json'
+    And the job source 'Source Data'
+    And the job target 'Target Data'
+    And the source 'Source Data'
+    And the target 'Target Data'
+
+
+  Scenario: Using JSON data in an example record.
+
+    Given the following example record for 'Source Data':
+      | json_array       | json_hash            |
+      | [ "one", "two" ] | { "name": "Darwin" } |
+
+    Then the target field 'second_element' is populated with "two"
+    And the target field 'name_field' is populated with "Darwin"
+
+
+  Scenario: Using JSON data in long form
+
+    Given the source field 'json_hash' has the multiline value
+      """
+        {
+          "id": 97,
+          "name": "Darwin",
+          "birthday": "1809-02-12"
+        }
+      """
+    And the target field 'name_field' is populated with "Darwin"

data/features/step_definitions/remi_step.rb

@@ -139,16 +139,16 @@ Given /^the source field (?:has|is set to) the value "([^"]*)"$/ do |value|
   end
 end
 
-Given /^the source field '([^']+)' (?:has|is set to) the json value$/ do |source_field, value|
+Given /^the source field '([^']+)' (?:has|is set to) the multiline value$/ do |source_field, value|
   step "the source field '#{source_field}'"
 
   source_name, source_field_name = @brt.sources.parse_full_field(source_field)
-  @brt.sources[source_name].fields[source_field_name].value = JSON.parse(value)
+  @brt.sources[source_name].fields[source_field_name].value = Remi::BusinessRules::ParseFormula.parse(value)
 end
 
-Given /^the source field (?:has|is set to) the json value$/ do |value|
+Given /^the source field (?:has|is set to) the multiline value$/ do |value|
   @brt.sources.fields.each do |field|
-    step "the source field '#{field.full_name}' is set to the json value \"#{value}\""
+    step "the source field '#{field.full_name}' has the multiline value #{value}"
   end
 end
 
@@ -254,6 +254,8 @@ Then /^the target field is copied from the source field$/ do
 end
 
 Then /^the target field '([^']+)' is (?:set to the value|populated with) "([^"]*)"$/ do |target_field, value|
+  value = value.gsub(/(\\n|\\t)/, '\n' => "\n", '\t' => "\t" )
+
   expect_cucumber {
     target_names, target_field_name = @brt.targets.parse_full_field(target_field, multi: true)
 
@@ -336,7 +338,7 @@ end
 ### Transforms
 
 Then /^the target field '([^']+)' is a concatenation of the source fields '(.+)', delimited by "([^"]*)"$/ do |target_field, source_field_list, delimiter|
-  delimiter = delimiter.gsub(/(\\n|\\t)/, '\n' => "\n", '\t' => "t" )
+  delimiter = delimiter.gsub(/(\\n|\\t)/, '\n' => "\n", '\t' => "\t" )
   source_fields = "'#{source_field_list}'".gsub(' and ', ', ').split(',').map do |field_with_quotes|
     full_field_name = field_with_quotes.match(/'(.+)'/)[1]
 

data/jobs/json_job.rb

@@ -0,0 +1,30 @@
+require_relative 'all_jobs_shared'
+
+class JsonJob
+  include AllJobsShared
+
+  define_source :source_data, Remi::DataSource::DataFrame,
+    fields: {
+      :json_array => { type: :json },
+      :json_hash  => { type: :json }
+    }
+
+  define_target :target_data, Remi::DataTarget::DataFrame,
+    fields: {
+      :second_element => {},
+      :name_field     => {}
+    }
+
+  define_transform :main do
+    Remi::SourceToTargetMap.apply(source_data.df, target_data.df, source_metadata: source_data.fields) do
+      map source(:json_array) .target(:second_element)
+        .transform(->(*values) { values[1] })
+      # This is NOT the way I would like it to work, but we need to do some work on STTM first
+      map source(:json_hash) .target(:name_field)
+        .transform(->(*json_hash) { json_hash.to_h['name'] })
+      # preferred
+#      map source(:json_hash) .target(:name_field)
+#        .transform(->(json_hash) { json_hash['name'] })
+    end
+  end
+end

data/lib/remi/cucumber/business_rules.rb

@@ -293,12 +293,6 @@ module Remi::BusinessRules
       end
     end
 
-    # For debugging only
-    def _df
-      @data_subject.df
-    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.
@@ -333,7 +327,13 @@ module Remi::BusinessRules
     end
 
     def example_to_df(example)
-      example.to_df(@data_subject.df.row[0].to_h, field_symbolizer: @data_subject.field_symbolizer)
+      df = example.to_df(@data_subject.df.row[0].to_h, field_symbolizer: @data_subject.field_symbolizer)
+      data_subject.fields.each do |vector, metadata|
+        if metadata[:type] == :json
+          df[vector].recode! { |v| JSON.parse(v) rescue v }
+        end
+      end
+      df
     end
 
     def stub_data_with(example)
@@ -486,7 +486,13 @@ module Remi::BusinessRules
     end
 
     def value=(arg)
-      vector.recode! { |v| arg }
+      typed_arg = if metadata[:type] == :json
+        JSON.parse(arg)
+      else
+        arg
+      end
+
+      vector.recode! { |_v| typed_arg }
     end
   end
 

data/lib/remi/version.rb

@@ -1,3 +1,3 @@
 module Remi
-  VERSION = '0.2.36'
+  VERSION = '0.2.37'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remi
 version: !ruby/object:Gem::Version
-  version: 0.2.36
+  version: 0.2.37
 platform: ruby
 authors:
 - Sterling Paramore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bond
@@ -186,6 +186,7 @@ files:
 - features/csv_file_target_job.feature
 - features/examples.feature
 - features/formulas.feature
+- features/json.feature
 - features/metadata.feature
 - features/parameters.feature
 - features/sample_job.feature
@@ -205,6 +206,7 @@ files:
 - jobs/all_jobs_shared.rb
 - jobs/copy_source_job.rb
 - jobs/csv_file_target_job.rb
+- jobs/json_job.rb
 - jobs/metadata_job.rb
 - jobs/parameters_job.rb
 - jobs/sample_job.rb
@@ -289,6 +291,7 @@ test_files:
 - features/csv_file_target_job.feature
 - features/examples.feature
 - features/formulas.feature
+- features/json.feature
 - features/metadata.feature
 - features/parameters.feature
 - features/sample_job.feature