workarea-core 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 350a33b73048c0e24062f5bbd378518bfae1133b2e8d49b58907d4327191ffe9
-  data.tar.gz: 74ddf766b88286672ca1ac81924a09b753aa6e20efae0d9fa6eeb1ecbcf8bfa8
+  metadata.gz: 8235a2cc74baebc1277b7654671af10c36f634f31e1cf42f66b13acc71bc2422
+  data.tar.gz: 98bad1e8beb51469a28a823f935361517201b9306e7c1191357bd0ab03b8fa9d
 SHA512:
-  metadata.gz: 349c362c45e578680ef743051bc3554c5995013be7a1e348bcac2780fa6a9425b137fbfec9f6d7be3af354996a5fcc895be5af91241e1bf7b7ad1a878cf428d1
-  data.tar.gz: 260730f0b9e935712e47230aa9b3a103b971ec190afbadb7b0a15a2b78efd562928f48f990ed0db0a4ecf515084bd65f385145683b33ac2a66fab971cdbeda47
+  metadata.gz: ae272f2e725c5ea055fee8d5650896f39ecafffb429cb08287a8b698425fdd91252ad9efcf3cb11b2ba8ff9ef2c46d49bf2aa6bebea5672685ffacca2d4baecd
+  data.tar.gz: a1ce00f795b52f99024aac425f38f0ecf81b0945559a272bd31a974c797b9d3ac2312d9bd2226bdf5e07e3da6b09574d30c6d67fafe11776bb463abedbaeb131

data/app/models/workarea/content/block_draft.rb

@@ -2,13 +2,16 @@ module Workarea
   class Content
     class BlockDraft
       include ApplicationDocument
-      include Releasable
 
       field :content_id, type: String
       Block.fields.except('_id').each do |name, field_instance|
         field name, field_instance.options.except(:klass)
       end
 
+      # Added as a field to ensure copying this value to any blocks created
+      # from a draft.
+      field :activate_with, type: String
+
       index(
         { created_at: 1 },
         { expire_after_seconds: 1.hour.seconds.to_i }

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

@@ -48,6 +48,8 @@ module Workarea
 
       def assign_attributes(model, attrs)
         model.fields.each do |name, metadata|
+          next if name == 'updated_at'
+
           value = CsvFields.deserialize_from(attrs, field: metadata, model: model)
           model.send("#{name}=", value) if value.present?
         end
@@ -86,17 +88,17 @@ module Workarea
           ]
 
           if unnamespaced_attrs.values.any?(&:present?)
+            klass = attrs["#{name}_type"].constantize if attrs["#{name}_type"].present?
+            klass ||= root.relations[name].class_name.constantize
+
             if metadata.many?
               id = attrs["#{name}_id"]
-              instance = if id.present?
-                root.send(name).find_or_initialize_by(id: id)
-              else
-                root.send(name).build
-              end
+              instance = root.send(name).find_by(id: id) rescue nil
+              instance ||= root.send(name).build({}, klass)
 
               assign_attributes(instance, unnamespaced_attrs)
             else
-              instance = root.send(name) || root.send("build_#{name}")
+              instance = root.send(name) || root.send("build_#{name}", {}, klass)
               assign_attributes(instance, unnamespaced_attrs)
             end
           end

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

@@ -45,12 +45,31 @@ module Workarea
 
         if id.present?
           result = model_class.find_or_initialize_by(id: id)
-          result.attributes = attributes
+          result.attributes = attributes_without_updated_at(attributes)
           result
         else
           model_class.new(attributes)
         end
       end
+
+      def attributes_without_updated_at(attrs)
+        return attrs unless attrs.respond_to?(:each_with_object)
+
+        attrs.each_with_object({}) do |(key, value), attributes|
+          next if key.to_s == 'updated_at'
+
+          attributes[key] = case value
+                            when Hash
+                              attributes_without_updated_at(value)
+                            when Array
+                              value.map do |item|
+                                attributes_without_updated_at(item)
+                              end
+                            else
+                              value
+                            end
+        end
+      end
     end
   end
 end

data/app/models/workarea/insights/customer_acquisition.rb

@@ -37,8 +37,8 @@ module Workarea
           {
             '$match' => {
               'first_order_at' => {
-                '$gte' => beginning_of_last_month,
-                '$lte' => end_of_last_month
+                '$gte' => beginning_of_last_month.utc,
+                '$lte' => end_of_last_month.utc
               }
             }
           }
@@ -48,14 +48,18 @@ module Workarea
           {
             '$group' => {
               '_id' => {
-                'year' => { '$year' => '$first_order_at' },
-                'month' => { '$month' => '$first_order_at' },
-                'day' => { '$dayOfMonth' => '$first_order_at' }
+                'year' => { '$year' => first_order_at_in_time_zone },
+                'month' => { '$month' => first_order_at_in_time_zone },
+                'day' => { '$dayOfMonth' => first_order_at_in_time_zone }
               },
               'new_customers' => { '$sum' => 1 }
             }
           }
         end
+
+        def first_order_at_in_time_zone
+          { 'date' => '$first_order_at', 'timezone' => Time.zone.tzinfo.name }
+        end
       end
     end
   end

data/app/models/workarea/insights/trending_products.rb

@@ -22,8 +22,8 @@ module Workarea
           {
             '$match' => {
               'reporting_on' => {
-                '$gte' => beginning_of_last_month,
-                '$lte' => end_of_last_month
+                '$gte' => beginning_of_last_month.utc,
+                '$lte' => end_of_last_month.utc
               }
             }
           }

data/app/models/workarea/insights/trending_searches.rb

@@ -28,8 +28,8 @@ module Workarea
           {
             '$match' => {
               'reporting_on' => {
-                '$gte' => beginning_of_last_month,
-                '$lte' => end_of_last_month
+                '$gte' => beginning_of_last_month.utc,
+                '$lte' => end_of_last_month.utc
               }
             }
           }

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

@@ -35,8 +35,8 @@ module Workarea
           {
             '$match' => {
               'reporting_on' => {
-                '$gte' => Time.current.last_week,
-                '$lte' => Time.current.last_week.end_of_week
+                '$gte' => Time.current.last_week.utc,
+                '$lte' => Time.current.last_week.end_of_week.utc
               }
             }
           }
@@ -72,8 +72,8 @@ module Workarea
                     '$expr' => {
                       '$and' => [
                         { '$eq' => ['$product_id', '$$product_id'] },
-                        { '$gte' => ['$reporting_on', Time.current.last_week - 1.week] },
-                        { '$lte' => ['$reporting_on', Time.current.last_week.end_of_week - 1.week] }
+                        { '$gte' => ['$reporting_on', (Time.current.last_week - 1.week).utc] },
+                        { '$lte' => ['$reporting_on', (Time.current.last_week.end_of_week - 1.week).utc] }
                       ]
                     }
                   }
@@ -146,7 +146,13 @@ module Workarea
             '$addFields' => {
               '_id' => {
                 '$concat' => [
-                  { '$dateToString' => { 'format' => '%Y%m%d', 'date' => '$reporting_on' } },
+                  {
+                    '$dateToString' => {
+                      'format' => '%Y%m%d',
+                      'date' => '$reporting_on',
+                      'timezone' => Time.zone.tzinfo.name
+                    }
+                  },
                   '-',
                   '$product_id'
                 ]

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

@@ -36,8 +36,8 @@ module Workarea
           {
             '$match' => {
               'reporting_on' => {
-                '$gte' => Time.current.last_week,
-                '$lte' => Time.current.last_week.end_of_week
+                '$gte' => Time.current.last_week.utc,
+                '$lte' => Time.current.last_week.end_of_week.utc
               }
             }
           }
@@ -77,8 +77,8 @@ module Workarea
                     '$expr' => {
                       '$and' => [
                         { '$eq' => ['$query_id', '$$query_id'] },
-                        { '$gte' => ['$reporting_on', Time.current.last_week - 1.week] },
-                        { '$lte' => ['$reporting_on', Time.current.last_week.end_of_week - 1.week] }
+                        { '$gte' => ['$reporting_on', (Time.current.last_week - 1.week).utc] },
+                        { '$lte' => ['$reporting_on', (Time.current.last_week.end_of_week - 1.week).utc] }
                       ]
                     }
                   }
@@ -151,7 +151,13 @@ module Workarea
             '$addFields' => {
               '_id' => {
                 '$concat' => [
-                  { '$dateToString' => { 'format' => '%Y%m%d', 'date' => '$reporting_on' } },
+                  {
+                    '$dateToString' => {
+                      'format' => '%Y%m%d',
+                      'date' => '$reporting_on',
+                      'timezone' => Time.zone.tzinfo.name
+                    }
+                  },
                   '-',
                   '$query_id'
                 ]

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

@@ -19,7 +19,7 @@ module Workarea
                   {
                     '$divide' => [
                       '$orders',
-                      { '$subtract' => [Time.current, '$first_order_at'] }
+                      { '$subtract' => [Time.current.utc, '$first_order_at'] }
                     ]
                   }
                 ]

data/app/models/workarea/pricing/discount/redemption.rb

@@ -20,6 +20,7 @@ module Workarea
 
         scope :recent, -> { desc(:created_at) }
         index({ discount_id: 1, email: 1 })
+        index({ discount_id: 1, created_at: -1 }, { background: true })
 
         before_validation :downcase_email
 

data/app/queries/workarea/reports/average_order_value.rb

@@ -14,7 +14,7 @@ module Workarea
       def filter_date_range_and_zeroes
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
+            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
             'orders' => { '$gt' => 0 },
             'revenue' => { '$gt' => 0 }
           }

data/app/queries/workarea/reports/first_time_vs_returning_sales.rb

@@ -14,7 +14,7 @@ module Workarea
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
+            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
             'orders' => { '$gt' => 0 }
           }
         }

data/app/queries/workarea/reports/group_by_time.rb

@@ -25,46 +25,50 @@ module Workarea
 
       private
 
+      def reporting_on_in_time_zone
+        { 'date' => '$reporting_on', 'timezone' => Time.zone.tzinfo.name }
+      end
+
       def day_id
         {
-          'year' => { '$year' => '$reporting_on' },
-          'month' => { '$month' => '$reporting_on' },
-          'day' => { '$dayOfMonth' => '$reporting_on' }
+          'year' => { '$year' => reporting_on_in_time_zone },
+          'month' => { '$month' => reporting_on_in_time_zone },
+          'day' => { '$dayOfMonth' => reporting_on_in_time_zone }
         }
       end
 
       def week_id
         {
-          'year' => { '$year' => '$reporting_on' },
-          'week' => { '$isoWeek' => '$reporting_on' }
+          'year' => { '$year' => reporting_on_in_time_zone },
+          'week' => { '$isoWeek' => reporting_on_in_time_zone }
         }
       end
 
       def day_of_week_id
-        { 'day_of_week' => { '$dayOfWeek' => '$reporting_on' } }
+        { 'day_of_week' => { '$dayOfWeek' => reporting_on_in_time_zone } }
       end
 
       def month_id
         {
-          'year' => { '$year' => '$reporting_on' },
-          'month' => { '$month' => '$reporting_on' }
+          'year' => { '$year' => reporting_on_in_time_zone },
+          'month' => { '$month' => reporting_on_in_time_zone }
         }
       end
 
       def quarter_id
         {
-          'year' => { '$year' => '$reporting_on' },
+          'year' => { '$year' => reporting_on_in_time_zone },
           'quarter' => {
             '$cond' => [
-              { '$lte' => [{ '$month' => '$reporting_on' }, 3] },
+              { '$lte' => [{ '$month' => reporting_on_in_time_zone }, 3] },
               1,
               {
                 '$cond' => [
-                  { '$lte' => [{ '$month' => '$reporting_on' }, 6] },
+                  { '$lte' => [{ '$month' => reporting_on_in_time_zone }, 6] },
                   2,
                   {
                     '$cond' => [
-                      { '$lte' => [{ '$month' => '$reporting_on' }, 9] },
+                      { '$lte' => [{ '$month' => reporting_on_in_time_zone }, 9] },
                       3,
                       4
                     ]
@@ -77,7 +81,7 @@ module Workarea
       end
 
       def year_id
-        { 'year' => { '$year' => '$reporting_on' } }
+        { 'year' => { '$year' => reporting_on_in_time_zone } }
       end
     end
   end

data/app/queries/workarea/reports/sales_by_category.rb

@@ -13,7 +13,7 @@ module Workarea
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
+            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
             'orders' => { '$gt' => 0 }
           }
         }

data/app/queries/workarea/reports/sales_by_country.rb

@@ -13,7 +13,7 @@ module Workarea
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
+            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
             '$or' => [
               { 'orders' => { '$gt' => 0 } },
               { 'units_sold' => { '$gt' => 0 } },

data/app/queries/workarea/reports/sales_by_discount.rb

@@ -13,7 +13,7 @@ module Workarea
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
+            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
             'orders' => { '$gt' => 0 }
           }
         }

data/app/queries/workarea/reports/sales_by_menu.rb

@@ -13,7 +13,7 @@ module Workarea
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
+            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
             'orders' => { '$gt' => 0 }
           }
         }

data/app/queries/workarea/reports/sales_by_product.rb

@@ -13,7 +13,7 @@ module Workarea
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
+            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
             '$or' => [
               { 'orders' => { '$gt' => 0 } },
               { 'units_sold' => { '$gt' => 0 } },

data/app/queries/workarea/reports/sales_by_sku.rb

@@ -17,7 +17,7 @@ module Workarea
       def filter
         result = {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
+            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
             '$or' => [
               { 'orders' => { '$gt' => 0 } },
               { 'units_sold' => { '$gt' => 0 } },

data/app/queries/workarea/reports/sales_by_traffic_referrer.rb

@@ -23,7 +23,7 @@ module Workarea
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
+            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
             'orders' => { '$gt' => 0 }
           }
         }

data/app/queries/workarea/reports/sales_over_time.rb

@@ -14,7 +14,7 @@ module Workarea
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
+            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
             '$or' => [
               { 'orders' => { '$gt' => 0 } },
               { 'cancellations' => { '$gt' => 0 } }

data/app/queries/workarea/reports/searches.rb

@@ -13,7 +13,7 @@ module Workarea
       def filter_date_range
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
+            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
             'total_results' => total_results_query
           }
         }

data/app/queries/workarea/reports/searches_over_time.rb

@@ -14,7 +14,7 @@ module Workarea
       def filter_date_range
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at }
+            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc }
           }
         }
       end

data/app/queries/workarea/reports/searches_without_results_over_time.rb

@@ -14,7 +14,7 @@ module Workarea
       def filter
         {
           '$match' => {
-            'reporting_on' => { '$gte' => starts_at, '$lte' => ends_at },
+            'reporting_on' => { '$gte' => starts_at.utc, '$lte' => ends_at.utc },
             'total_results' => 0
           }
         }

data/app/queries/workarea/search/product_search.rb

@@ -58,7 +58,7 @@ module Workarea
         return @customization if defined?(@customization)
 
         result = Customization.find_by_query(params[:q])
-        @customization = result.active? ? result : nil
+        @customization = result.active? ? result : Customization.new
       end
 
       def boosts

data/config/initializers/00_configuration.rb

@@ -5,11 +5,6 @@ Workarea::Configuration.define_fields do
       default: 6,
       description: 'How many failed login attempts before marking the user locked out'
 
-    field 'Password Reset Timeout',
-      type: :duration,
-      default: 2.hours,
-      description: 'How long a password reset URL stays valid'
-
     field 'Password Strength',
       type: :symbol,
       default: :weak,

data/lib/workarea/configuration.rb

@@ -1273,6 +1273,9 @@ module Workarea
       # Max number of non-unique affinity items that will be stored, older items
       # will be evicted first.
       config.max_affinity_items = 50
+
+      # How long a password reset URL stays valid
+      config.password_reset_timeout = 2.hours
     end
   end
 end

data/lib/workarea/configuration/redis.rb

@@ -34,41 +34,37 @@ module Workarea
         def find_config(name)
           config_slug = name.to_s.underscore.downcase
           from_config = Workarea.config[config_slug].presence ||
-                          Rails.application.secrets[config_slug]
-
-          return from_config if from_config.present?
+                          Rails.application.secrets[config_slug] ||
+                          {}
 
           env_slug = name.to_s.underscore.upcase
-          scheme = ENV["WORKAREA_#{env_slug}_SCHEME"].presence || DEFAULT[:scheme]
-
-          {
-            scheme: scheme,
-            host: ENV["WORKAREA_#{env_slug}_HOST"].presence || DEFAULT[:host],
-            port: ENV["WORKAREA_#{env_slug}_PORT"].presence || DEFAULT[:port],
-            db: ENV["WORKAREA_#{env_slug}_DB"].presence || DEFAULT[:db],
-            password: ENV["WORKAREA_#{env_slug}_PASSWORD"].presence,
-            ssl: scheme == 'rediss' ? true : false
-          }
+          from_config.symbolize_keys.reverse_merge(
+            scheme: ENV["WORKAREA_#{env_slug}_SCHEME"],
+            host: ENV["WORKAREA_#{env_slug}_HOST"],
+            port: ENV["WORKAREA_#{env_slug}_PORT"],
+            db: ENV["WORKAREA_#{env_slug}_DB"],
+            password: ENV["WORKAREA_#{env_slug}_PASSWORD"]
+          )
         end
       end
 
       attr_reader :config
-      alias_method :to_h, :config
 
       def initialize(config)
         @config = config.to_h.deep_symbolize_keys
       end
 
       def scheme
-        @config[:scheme]
+        @config[:scheme].presence || DEFAULT[:scheme]
       end
 
-      def ssl
-        @config[:ssl]
+      def ssl?
+        scheme == 'rediss'
       end
+      alias_method :ssl, :ssl?
 
       def host
-        @config[:host]
+        @config[:host].presence || DEFAULT[:host]
       end
 
       def password
@@ -76,19 +72,30 @@ module Workarea
       end
 
       def port
-        @config[:port]
+        @config[:port].presence || DEFAULT[:port]
       end
 
       def db
-        @config[:db]
+        @config[:db].presence || DEFAULT[:db]
+      end
+
+      def to_h
+        {
+          scheme: scheme,
+          host: host,
+          port: port,
+          db: db,
+          password: password,
+          ssl: ssl?
+        }
       end
 
       def to_url
         base = "#{scheme}://"
         base << "admin:#{password}@" if password.present?
         base << "#{host}"
-        base << ":#{port}" if port.present?
-        base << "/#{db}" if db.present?
+        base << ":#{port}"
+        base << "/#{db}"
         base
       end
     end

data/lib/workarea/core.rb

@@ -106,7 +106,6 @@ require 'referer-parser'
 require 'dragonfly/s3_data_store'
 require 'serviceworker-rails'
 require 'chartkick'
-require 'logstasher' if ENV['WORKAREA_LOGSTASH'] =~ /true/i
 require 'mongoid/encrypted'
 require 'browser'
 
@@ -176,7 +175,6 @@ require 'workarea/configuration/asset_host'
 require 'workarea/configuration/s3'
 require 'workarea/configuration/cache_store'
 require 'workarea/configuration/action_mailer'
-require 'workarea/configuration/logstasher'
 require 'workarea/configuration/error_handling'
 require 'workarea/configuration/i18n'
 require 'workarea/configuration/session'
@@ -223,11 +221,14 @@ require 'workarea/warnings'
 require 'workarea/latest_version'
 
 #
-# Core
+# Engines
 #
 #
 require 'workarea/version'
 require 'workarea/core/engine'
+require 'workarea/admin/engine'
+require 'workarea/storefront/engine'
+require 'workarea/testing/engine' if Rails.env.test?
 
 #
 # Testing

data/lib/workarea/core/engine.rb

@@ -29,7 +29,6 @@ module Workarea
         Configuration::CacheStore.load
         Configuration::AssetHost.load
         Configuration::ActionMailer.load
-        Configuration::Logstasher.load
         Configuration::ErrorHandling.load
         Configuration::I18n.load
       end

data/lib/workarea/version.rb

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

data/test/lib/workarea/configuration/redis_test.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+module Workarea
+  module Configuration
+    class RedisTest < TestCase
+      def test_find_config
+        ENV['WORKAREA_FOO_REDIS_PORT'] = '1234'
+        Workarea.config.foo_redis = { scheme: 'rediss' }
+
+        result = Redis.find_config(:foo_redis)
+        assert_equal('rediss', result[:scheme])
+        assert_equal('1234', result[:port])
+
+      ensure
+        ENV.delete('WORKAREA_FOO_REDIS_PORT')
+      end
+
+      def test_defaults
+        instance = Redis.new(host: 'foo')
+        assert_equal('redis', instance.scheme)
+        assert_equal('foo', instance.host)
+        assert_equal(6379, instance.port)
+        assert_equal(0, instance.db)
+        refute(instance.ssl?)
+        assert_match(URI::regexp, instance.to_url)
+
+        instance = Redis.new(scheme: 'rediss')
+        assert_equal('rediss', instance.scheme)
+        assert_equal('localhost', instance.host)
+        assert_equal(6379, instance.port)
+        assert_equal(0, instance.db)
+        assert(instance.ssl?)
+        assert_match(URI::regexp, instance.to_url)
+      end
+
+      def test_to_h
+        result = Redis.new(scheme: 'rediss', port: 1234).to_h
+        assert_equal('rediss', result[:scheme])
+        assert_equal('localhost', result[:host])
+        assert_equal(1234, result[:port])
+        assert_equal(0, result[:db])
+        assert_nil(result[:password])
+        assert(result[:ssl])
+      end
+    end
+  end
+end

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

@@ -47,6 +47,10 @@ module Workarea
         embedded_in :foo
       end
 
+      class Qoo < Bar
+        field :qoo, type: String
+      end
+
       def test_merging_rows_for_embedded
         model = Foo.create!(
           bars: [{ name: '1' }, { name: '2' }],
@@ -416,6 +420,50 @@ module Workarea
 
         assert_equal('653911', product.id)
       end
+
+      def test_embedded_subclasses
+        model = Foo.create!(bars: [{ name: '1' }, { _type: Qoo.name, qoo: '2' }])
+        csv = Csv.new.serialize(model)
+        results = CSV.parse(csv, headers: :first_row).map(&:to_h)
+
+        assert_equal(2, results.size)
+        results.each { |r| assert_equal(model.id.to_s, r['_id']) }
+        assert_equal('1', results.first['bars_name'])
+        assert_equal(Qoo.name, results.second['bars_type'])
+        assert_equal('2', results.second['bars_qoo'])
+
+        import = create_import(
+          model_type: Foo.name,
+          file: create_tempfile(csv, extension: 'csv'),
+          file_type: 'csv'
+        )
+
+        model.destroy
+        Csv.new(import).import!
+
+        model = Foo.first
+        assert_equal(2, model.bars.size)
+        assert_equal(Bar, model.bars.first.class)
+        assert_equal('1', model.bars.first.name)
+        assert_equal(Qoo, model.bars.second.class)
+        assert_equal('2', model.bars.second.qoo)
+      end
+
+      def test_exclude_updated_at
+        original_date = 2.days.ago
+        model = Foo.create!(name: '1', updated_at: original_date)
+        model.name = '2'
+        csv = Csv.new.serialize(model)
+        import = create_import(
+          model_type: Foo.name,
+          file: create_tempfile(csv, extension: 'csv'),
+          file_type: 'csv'
+        )
+
+        assert_changes -> { model.reload.updated_at.to_date } do
+          Csv.new(import).import!
+        end
+      end
     end
   end
 end

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

@@ -7,6 +7,16 @@ module Workarea
         include ApplicationDocument
         field :name, type: String
         field :ignore, type: Integer
+
+        embeds_many :bars, class_name: Foo.name
+      end
+
+      class Bar
+        include ApplicationDocument
+
+        field :name, type: String
+
+        embedded_in :foo, class_name: Foo.name
       end
 
       def test_ignored_fields
@@ -73,6 +83,36 @@ module Workarea
 
         assert_equal 'Bar', user.reload.first_name
       end
+
+      def test_exclude_updated_at
+        model = Foo.create!(name: '1', updated_at: 2.days.ago)
+        json = [model.as_json.merge(name: '2')].to_json
+        import = create_import(
+          model_type: Foo.name,
+          file: create_tempfile(json, extension: 'json'),
+          file_type: 'json'
+        )
+
+        assert_changes -> { model.reload.updated_at.to_date } do
+          Json.new(import).import!
+        end
+      end
+
+      def test_exclude_updated_at_when_embedded
+        original_date = 2.days.ago
+        parent = Foo.create!(updated_at: original_date)
+        model = parent.bars.create!(name: '1', updated_at: original_date)
+        json = [model.as_json.merge(name: '2')].to_json
+        import = create_import(
+          model_type: Foo.name,
+          file: create_tempfile(json, extension: 'json'),
+          file_type: 'json'
+        )
+
+        assert_changes -> { model.reload.updated_at.to_date } do
+          Json.new(import).import!
+        end
+      end
     end
   end
 end

data/test/queries/workarea/search/product_search_test.rb

@@ -277,11 +277,13 @@ module Workarea
       end
 
       def test_only_finds_active_customizations
-        Search::Customization.find_by_query('*').tap do |c|
-          c.active = false
-          c.save
-        end
-        search = ProductSearch.new(q: '*')
+        customization = Search::Customization.find_by_query('foo')
+        search = ProductSearch.new(q: 'foo')
+        assert_equal(customization, search.customization)
+
+        customization.update!(active: false)
+        search = ProductSearch.new(q: 'foo')
+        refute_equal(customization, search.customization)
         refute(search.customization.persisted?)
       end
 

data/workarea-core.gemspec

@@ -90,10 +90,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'loofah', '~> 2.3.1'
   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.3.0'
-  s.add_dependency 'puma', '~> 4.0'
   s.add_dependency 'browser', '~> 2.6.1'
+  s.add_dependency 'puma', '>= 4.3.1'
 
   # HACK for vendoring active_shipping
   s.add_dependency 'active_utils', '~> 3.3.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1080,20 +1080,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.5
-- !ruby/object:Gem::Dependency
-  name: logstasher
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: chartkick
   requirement: !ruby/object:Gem::Requirement
@@ -1109,33 +1095,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.3.0
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: browser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 2.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
-  name: browser
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 4.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: active_utils
   requirement: !ruby/object:Gem::Requirement
@@ -1893,7 +1879,6 @@ files:
 - lib/workarea/configuration/error_handling.rb
 - lib/workarea/configuration/i18n.rb
 - lib/workarea/configuration/localized_active_fields.rb
-- lib/workarea/configuration/logstasher.rb
 - lib/workarea/configuration/mongoid.rb
 - lib/workarea/configuration/mongoid_client.rb
 - lib/workarea/configuration/redis.rb
@@ -2073,6 +2058,7 @@ files:
 - test/lib/workarea/configuration/administrable/field_test.rb
 - test/lib/workarea/configuration/administrable/fieldset_test.rb
 - test/lib/workarea/configuration/configuration_test.rb
+- test/lib/workarea/configuration/redis_test.rb
 - test/lib/workarea/constants_test.rb
 - test/lib/workarea/elasticsearch/document_test.rb
 - test/lib/workarea/elasticsearch/query_cache_test.rb

data/lib/workarea/configuration/logstasher.rb

@@ -1,16 +0,0 @@
-module Workarea
-  module Configuration
-    module Logstasher
-      extend self
-
-      def load
-        if ENV['WORKAREA_LOGSTASH'] =~ /true/i
-          Rails.application.config.logstasher.enabled = true
-          Rails.application.config.logstasher.controller_enabled = true
-          Rails.application.config.logstasher.suppress_app_log = true
-          Rails.application.config.logstasher.source = `hostname`.strip!.to_s
-        end
-      end
-    end
-  end
-end