workarea-core 3.4.20 → 3.4.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41997295c247cabcab6954794cc4fa0392b3f9553268588f4dde27bacd59565b
-  data.tar.gz: fa08d0c4013f2d5a5d509f2263bbf04c9d7bcd00a82c76ba4545437f2ffea5da
+  metadata.gz: 43fdd50f2d9a692430643d0df84315a29540ffccb3d4f3bdf822555280a154be
+  data.tar.gz: 4fe3d5c333e3400b5855c63eeb83c92ca2d861a6b5dddd9ce9a5e13046ab8f34
 SHA512:
-  metadata.gz: 6f0f192f913014b96436319712029c99c085b01252ecfdb756bf1e597769010543bac1be0f9ece10a1072bef45a113f337a11b23e649657635ed94d013058588
-  data.tar.gz: 85660931331ec7eb09ffbaae8a6a342ee2fcc5f6d352d3beea02f3406e5ecd5dd69dc1a8441111842e22567c9c4a9dcc67ee5be296c3ff040a9f49f0c3b0dd73
+  metadata.gz: 8e86f64b2bdc446737cb257a6414bbdfc7788b66f354e6220c4a27edb26b279c7aa095117ea187ef121626f64d91f38e8c2a20f5dcb29bab8881a8c35de2e2f0
+  data.tar.gz: dbb29d99e58f970a2a6e85da982379d6675079c39bc61db6185b5aa9cad94272bc36b85494006bb04b7ec491ea019c2f4e5dc955b9cd0ea02f267d13718f623e

data/app/models/workarea/data_file/csv_fields.rb

@@ -66,8 +66,37 @@ module Workarea
         serialize_hash(result, name, flatten_hash(value.as_json))
       end
 
+      def deserialize_time(hash, name, model)
+        return unless parsable_timestamp?(hash[name])
+        Time.parse(hash[name])
+      end
+
+      def deserialize_datetime(hash, name, model)
+        return unless parsable_timestamp?(hash[name])
+        DateTime.parse(hash[name])
+      end
+
+      def deserialize_date(hash, name, model)
+        return unless parsable_timestamp?(hash[name])
+        Date.parse(hash[name])
+      end
+
       private
 
+      # Mongoid uses ActiveSupport::TimeWithZone to mongoize strings into
+      # times and dates. TimeWithZone uses Date.parse, just as this method does,
+      # which can cause unpadded years to be returned. When parsing a CSV we
+      # can make sure the year is above a sensible threshold of 1970 to ensure
+      # marshalling data from mongoid models to elasticsearch does not cause
+      # errors.
+      #
+      def parsable_timestamp?(value)
+        return unless value.present?
+        Date.parse(value, false).year >= 1970
+      rescue ArgumentError
+        false
+      end
+
       def flatten_hash(hash, key = nil)
         return { key => hash } unless hash.is_a?(Hash)
 

data/app/models/workarea/metrics/search_by_day.rb

@@ -17,6 +17,8 @@ module Workarea
       field :revenue, type: Float, default: 0.0
 
       index(reporting_on: 1, total_results: 1)
+      index(query_id: 1)
+
       scope :by_query_id, ->(id) { where(query_id: id) }
 
       def self.save_search(query_string, total_results, at: Time.current)

data/lib/tasks/services.rake

@@ -15,7 +15,7 @@ See https://docs.docker.com/compose/install/ for how to install.
     end
 
     def compose_file_path
-      File.join(`bundle show workarea`, 'docker-compose.yml').gsub("\n", '')
+      File.join(Gem::Specification.find_by_name('workarea').gem_dir, 'docker-compose.yml')
     end
 
     def compose_env

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 4
-    PATCH = 20
+    PATCH = 21
     PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/test/models/workarea/data_file/csv_fields_test.rb

@@ -0,0 +1,96 @@
+require 'test_helper'
+
+module Workarea
+  module DataFile
+    class CsvFieldsTest < TestCase
+      class FooModel
+        include Mongoid::Document
+
+        field :test_time, type: Time
+        field :test_datetime, type: DateTime
+        field :test_date, type: Date
+      end
+
+      def test_deserialize_time
+        field = FooModel.fields['test_time']
+        model = FooModel.new
+
+        date = '10/10/2020 15:30:00'
+        assert(
+          Time.parse(date),
+          CsvFields.deserialize_from({ 'test_time' => date }, field: field, model: model)
+        )
+
+        date = '2020/10/30 15:30:00'
+        assert(
+          Time.parse(date),
+          CsvFields.deserialize_from({ 'test_time' => date }, field: field, model: model)
+        )
+
+        date = '10/30/2020 15:30:00'
+        assert_nil(
+          CsvFields.deserialize_from({ 'test_time' => date }, field: field, model: model)
+        )
+
+        date = '10/10/20 15:30:00'
+        assert_nil(
+          CsvFields.deserialize_from({ 'test_time' => date }, field: field, model: model)
+        )
+      end
+
+      def test_deserialize_datetime
+        field = FooModel.fields['test_datetime']
+        model = FooModel.new
+
+        date = '10/10/2020 15:30:00'
+        assert(
+          Time.parse(date),
+          CsvFields.deserialize_from({ 'test_datetime' => date }, field: field, model: model)
+        )
+
+        date = '2020/10/30 15:30:00'
+        assert(
+          Time.parse(date),
+          CsvFields.deserialize_from({ 'test_datetime' => date }, field: field, model: model)
+        )
+
+        date = '10/30/2020 15:30:00'
+        assert_nil(
+          CsvFields.deserialize_from({ 'test_datetime' => date }, field: field, model: model)
+        )
+
+        date = '10/10/20 15:30:00'
+        assert_nil(
+          CsvFields.deserialize_from({ 'test_datetime' => date }, field: field, model: model)
+        )
+      end
+
+      def test_deserialize_date
+        field = FooModel.fields['test_date']
+        model = FooModel.new
+
+        date = '10/10/2020 15:30:00'
+        assert(
+          Time.parse(date),
+          CsvFields.deserialize_from({ 'test_date' => date }, field: field, model: model)
+        )
+
+        date = '2020/10/30 15:30:00'
+        assert(
+          Time.parse(date),
+          CsvFields.deserialize_from({ 'test_date' => date }, field: field, model: model)
+        )
+
+        date = '10/30/2020 15:30:00'
+        assert_nil(
+          CsvFields.deserialize_from({ 'test_date' => date }, field: field, model: model)
+        )
+
+        date = '10/10/20 15:30:00'
+        assert_nil(
+          CsvFields.deserialize_from({ 'test_date' => date }, field: field, model: model)
+        )
+      end
+    end
+  end
+end

data/workarea-core.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'bundler', '>= 1.8.0' # 1.8.0 added env variable for secrets
   s.add_dependency 'rails', '~> 5.2.0'
   s.add_dependency 'mongoid', '~> 6.4.0'
-  s.add_dependency 'bson', '~> 4.3.0'
   s.add_dependency 'bcrypt', '~> 3.1.10'
   s.add_dependency 'money-rails', '~> 1.12.0'
   s.add_dependency 'mongoid-audit_log', '>= 0.5.0'
@@ -35,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sidekiq-throttled', '~> 0.8.2'
   s.add_dependency 'geocoder', '~> 1.4.4'
   s.add_dependency 'redis-rails', '~> 5.0.0'
-  s.add_dependency 'redis-rack-cache', '~> 2.0.2'
+  s.add_dependency 'redis-rack-cache', '~> 2.2.0'
   s.add_dependency 'easymon', '~> 1.4.0'
   s.add_dependency 'image_optim', '~> 0.26.0'
   s.add_dependency 'image_optim_pack', '0.5.0.20171101'
@@ -91,7 +90,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'referer-parser', '~> 0.3.0'
   s.add_dependency 'serviceworker-rails', '~> 0.5.5'
   s.add_dependency 'logstasher', '~> 1.2.2'
-  s.add_dependency 'chartkick', '~> 3.2.0'
+  s.add_dependency 'chartkick', '~> 3.3.0'
   s.add_dependency 'puma', '~> 4.0'
 
   # HACK for vendoring active_shipping

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.4.20
+  version: 3.4.21
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.4.0
-- !ruby/object:Gem::Dependency
-  name: bson
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -310,14 +296,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: easymon
   requirement: !ruby/object:Gem::Requirement
@@ -1100,14 +1086,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -2068,6 +2054,7 @@ files:
 - test/models/workarea/content/fields/products_test.rb
 - test/models/workarea/content/page_test.rb
 - test/models/workarea/content_test.rb
+- test/models/workarea/data_file/csv_fields_test.rb
 - test/models/workarea/data_file/csv_test.rb
 - test/models/workarea/data_file/export_test.rb
 - test/models/workarea/data_file/format_test.rb