remi 0.2.25 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46d71d9a012df7bc2c06ad438a1e1ad93d148090
-  data.tar.gz: a2f7d72215d30dcd1be49ea892f4f77e6839d642
+  metadata.gz: 783520781cb755c4f317a95122e3395296ac15da
+  data.tar.gz: 7bbbfd2df7aaa94f3604fec9d77d93f41e3f7740
 SHA512:
-  metadata.gz: d1c43fc32999b96398b4300b06b94ef9d00d87223ea460ec8f8b4b356bb8cc25a8f44861e6dc817db7bc290513687a5fc1ec75b2685d1a13dbc038af7a059cd5
-  data.tar.gz: 2f6691422a63b487921066a8e29835864d0f542caf9cb170ce5158e56714620aa9f85dd16cc8e9bf22bca832c461a8ff6d00584312d53dac788ada1d4ce629a8
+  metadata.gz: f06fda56e67c2dcc7884c13d1fa19a11f5c8d23438a331801b1d312c095ae9d13fae0a723a803b5fae62975832c075e702121d5c9f3621124f628bfca48969b9
+  data.tar.gz: 58d6e66fd1cbe3b79a9938b8e26efb5d2a86ab43e8b3832e4addce69e4f4c215fcd8b4a623c7f5e82fdcf22c884bae5f162a566e419ee75a960930cde090e3da

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    remi (0.2.25)
+    remi (0.2.26)
       activesupport (~> 4.2)
       bond (~> 0.5)
       cucumber (~> 2.1)

data/features/step_definitions/remi_step.rb

@@ -97,6 +97,10 @@ Given /^the (source|target) file uses ([\w ]+) line endings$/ do |st, line_endin
   expect(@brt.send(st.to_sym).csv_options[:row_sep]).to eq Remi::BusinessRules.csv_opt_map[line_endings]
 end
 
+Given /^the (source|target) file uses "([^"]+)" as a record separator$/ do |st, line_endings|
+  expect(@brt.send(st.to_sym).csv_options[:row_sep]).to eq line_endings.gsub(/\\n/, "\n").gsub(/\\r/, "\r")
+end
+
 Given /^the (source|target) file (contains|does not contain) a header row$/ do |st, header|
   expect(@brt.send(st.to_sym).csv_options[:headers]).to eq (header == 'contains')
 end

data/features/support/env.rb

@@ -5,8 +5,6 @@ require 'bundler/setup'
 require 'remi'
 require 'remi/cucumber'
 
-require_relative 'env_app.rb'
-
 Remi::Settings.log_level = Logger::ERROR
 
 Before do
@@ -35,3 +33,20 @@ Before '@fails' do
     end
   end
 end
+
+
+# Fix current time to the first time it is called in a test
+module TimeTesting
+  def current
+    @current_time ||= super
+  end
+end
+
+class Time
+  class << Time
+    prepend TimeTesting
+  end
+end
+
+# Include user-defined environment
+require_relative 'env_app.rb'

data/lib/remi/cucumber/business_rules.rb

@@ -29,9 +29,10 @@ module Remi::BusinessRules
 
     def formulas
       @formulas ||= RegexSieve.new({
-        /(today|yesterday|tomorrow)(|:[^*]+)\*/i => [:date_reference, :match_single_day],
-        /(this|last|previous|next) (day|month|year|week)(|:[^*]+)\*/i => [:date_reference, :match_single_unit],
-        /(\d+)\s(day|days|month|months|year|years|week|weeks) (ago|from now)(|:[^*]+)\*/i => [:date_reference, :match_multiple]
+        /\*now(|:[^*]+)\*/i => [:time_reference, :match_now],
+        /\*(today|yesterday|tomorrow)(|:[^*]+)\*/i => [:date_reference, :match_single_day],
+        /\*(this|last|previous|next) (day|month|year|week)(|:[^*]+)\*/i => [:date_reference, :match_single_unit],
+        /\*(\d+)\s(day|days|month|months|year|years|week|weeks) (ago|from now)(|:[^*]+)\*/i => [:date_reference, :match_multiple]
       })
     end
 
@@ -44,6 +45,8 @@ module Remi::BusinessRules
       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])
+      elsif form_opt[:value][0] == :time_reference
+        time_reference(form_opt[:value][1], form_opt[:match])
       else
         to_replace
       end
@@ -51,6 +54,10 @@ module Remi::BusinessRules
       form.gsub(to_replace, replace_with)
     end
 
+    def time_reference(formula, captured)
+      parsed = self.send("time_reference_#{formula}", *captured)
+      Time.current.send("#{parsed[:unit]}_#{parsed[:direction]}", parsed[:quantity]).strftime(parsed[:format])
+    end
 
     def date_reference(formula, captured)
       parsed = self.send("date_reference_#{formula}", *captured)
@@ -61,6 +68,19 @@ module Remi::BusinessRules
       str.blank? ? '%Y-%m-%d' : str.slice(1..-1).strip
     end
 
+    def parse_colon_time_format(str)
+      str.blank? ? '%Y-%m-%d %H:%M:%S' : str.slice(1..-1).strip
+    end
+
+    def time_reference_match_now(form, format=nil)
+      {
+        quantity: 0,
+        unit: 'days',
+        direction: 'ago',
+        format: parse_colon_time_format(format)
+      }
+    end
+
     def date_reference_match_single_day(form, direction, format=nil)
       {
         quantity: direction.downcase == 'today' ? 0 : 1,

data/lib/remi/version.rb

@@ -1,3 +1,3 @@
 module Remi
-  VERSION = '0.2.25'
+  VERSION = '0.2.26'
 end

metadata

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