workarea-core 3.4.21 → 3.4.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43fdd50f2d9a692430643d0df84315a29540ffccb3d4f3bdf822555280a154be
-  data.tar.gz: 4fe3d5c333e3400b5855c63eeb83c92ca2d861a6b5dddd9ce9a5e13046ab8f34
+  metadata.gz: e0ac39dbd2237a5eee6f5e178777a066ffd0a147ea8a44acf39bd9fbfae3a552
+  data.tar.gz: 33761ee41ab2947ceac2ba27e698691d620ff97b1312a70a0288c1838fc47e1e
 SHA512:
-  metadata.gz: 8e86f64b2bdc446737cb257a6414bbdfc7788b66f354e6220c4a27edb26b279c7aa095117ea187ef121626f64d91f38e8c2a20f5dcb29bab8881a8c35de2e2f0
-  data.tar.gz: dbb29d99e58f970a2a6e85da982379d6675079c39bc61db6185b5aa9cad94272bc36b85494006bb04b7ec491ea019c2f4e5dc955b9cd0ea02f267d13718f623e
+  metadata.gz: 4e7764b6fd43aa82afdb84c211ea9d52b21a1cc96d5bc4aba13ceb0f86811406fc0ae5921b86b3975fa162c03c7d4b1d5073563fe9e7f2af33be662f85af2014
+  data.tar.gz: 0aefa8eb85b5ae78cbd9fb503e94d80306ead3268fbf06b44e03982f686cc362cf35c1a455a42c7de05d1cc0eef1d02c5f9080edd85fe1cf3bec81ed48d1838f

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

@@ -37,6 +37,10 @@ module Workarea
           Workarea.config.data_file_formats.first
       end
 
+      def mime_type
+        "#{MIME::Types.type_for(file_type).first.to_s}; charset=utf-8"
+      end
+
       def process!
         raise NotImplementedError
       end

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

@@ -92,6 +92,7 @@ module Workarea
         class_name: 'Workarea::Pricing::Discount::Redemption'
 
       index(active: 1)
+      index(updated_at: 1)
 
       validates :name, presence: true
 
@@ -242,7 +243,7 @@ module Workarea
       # @return [Time]
       #
       def auto_deactivates_at
-        start = last_redemption.try(:created_at) || created_at
+        start = last_redemption.try(:created_at) || updated_at
         start + Workarea.config.discount_staleness_ttl
       end
 

data/app/services/workarea/direct_upload.rb

@@ -7,6 +7,9 @@ module Workarea
       url = "#{uri.scheme}://#{uri.host}"
       url += ":#{uri.port}" unless uri.port.in? [80, 443]
 
+      redis_key = "cors_#{url.optionize}"
+      return if Workarea.redis.get(redis_key) == 'true'
+
       Workarea.s3.put_bucket_cors(
         Configuration::S3.bucket,
         'CORSConfiguration' => [
@@ -18,6 +21,8 @@ module Workarea
           }
         ]
       )
+
+      Workarea.redis.set(redis_key, 'true')
     end
 
     attr_reader :type, :filename

data/app/workers/workarea/deactivate_stale_discounts.rb

@@ -29,7 +29,7 @@ module Workarea
 
     def all_active_discount_ids
       Pricing::Discount
-        .where(:created_at.lt => Workarea.config.discount_staleness_ttl.ago)
+        .where(:updated_at.lt => Workarea.config.discount_staleness_ttl.ago)
         .active
         .pluck(:id)
         .map(&:to_s)

data/config/locales/en.yml

@@ -50,6 +50,28 @@ en:
         unit: instance
       csv:
         unit: row
+    duration:
+      years:
+        one: '%{count} year'
+        other: '%{count} years'
+      months:
+        one: '%{count} month'
+        other: '%{count} months'
+      weeks:
+        one: '%{count} week'
+        other: '%{count} weeks'
+      days:
+        one: '%{count} day'
+        other: '%{count} days'
+      hours:
+        one: '%{count} hour'
+        other: '%{count} hours'
+      minutes:
+        one: '%{count} minute'
+        other: '%{count} minutes'
+      seconds:
+        one: '%{count} second'
+        other: '%{count} seconds'
     errors:
       messages:
         contains_type: cannot contain 'type'

data/lib/workarea/configuration.rb

@@ -1267,7 +1267,7 @@ module Workarea
       # setting to configure the `:encoding` options for `CSV.foreach`
       # if your CSV files are failing to import with a UTF-8 encoding
       # error.
-      config.csv_import_options = {}
+      config.csv_import_options = { encoding: 'bom|utf-8' }
     end
   end
 end

data/lib/workarea/version.rb

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

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

@@ -403,6 +403,21 @@ module Workarea
           assert_equal("Bowl Light\u0099", product.name)
         end
       end
+
+      def test_bom_characters_in_unicode
+        csv = %(\xEF\xBB\xBF_id,name,slug,details_keywords\n653911,Bowl Light,Bowl_Light,"testing")
+        import = create_import(
+          model_type: Catalog::Product.name,
+          file: create_tempfile(csv, extension: 'csv'),
+          file_type: 'csv'
+        )
+
+        Csv.new(import).import!
+
+        product = Catalog::Product.find_by(slug: 'bowl_light')
+
+        assert_equal('653911', product.id)
+      end
     end
   end
 end

data/test/services/workarea/direct_upload_test.rb

@@ -83,8 +83,11 @@ module Workarea
 
 
       assert(DirectUpload.ensure_cors!('http://test.host/admin/content_assets'))
+      assert_equal('true', Workarea.redis.get('cors_http_test_host'))
       assert(DirectUpload.ensure_cors!('http://localhost:3000/admin/content_assets'))
+      assert_equal('true', Workarea.redis.get('cors_http_localhost_3000'))
       assert(DirectUpload.ensure_cors!('https://example.com/admin/direct_uploads'))
+      assert_equal('true', Workarea.redis.get('cors_https_example_com'))
     end
 
     private

data/test/workers/workarea/deactivate_stale_discounts_test.rb

@@ -4,7 +4,7 @@ module Workarea
   class DeactivateStaleDiscountsTest < TestCase
     def create_category_discount(attributes = {})
       before_ttl = (Workarea.config.discount_staleness_ttl + 1.day).ago
-      super(attributes.reverse_merge(created_at: before_ttl))
+      super(attributes.reverse_merge(updated_at: before_ttl))
     end
 
     def test_perform
@@ -71,7 +71,7 @@ module Workarea
     end
 
     def test_all_active_discount_ids
-      too_new = create_category_discount(active: true, created_at: Time.current)
+      too_new = create_category_discount(active: true, updated_at: Time.current)
       active = create_category_discount(active: true)
 
       worker = DeactivateStaleDiscounts.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.4.21
+  version: 3.4.22
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler