workarea-core 3.5.0.beta.1 → 3.5.0

data/app/queries/workarea/order_item_details.rb

@@ -45,24 +45,24 @@ module Workarea
       @fulfillment ||= Fulfillment::Sku.find_or_initialize_by(id: sku)
     end
 
-    # This is a stop-gap for transitioning away from a digital flag for
-    # determining checkout behavior for items not requiring
-    # physical fulfillment.
-    #
-    # TODO: remove #digital? usage in v3.6
-    #
-    def requires_shipping?
-      !product.digital? && fulfillment.requires_shipping?
+    def to_h
+      Rails.cache.fetch(cache_key, expires_in: cache_expiration) do
+        {
+          product_id: product.id,
+          product_attributes: product.as_document,
+          category_ids: category_ids,
+          discountable: pricing.discountable?,
+          fulfillment: fulfillment.policy
+        }
+      end
     end
 
-    def to_h
-      {
-        product_id: product.id,
-        product_attributes: product.as_document,
-        category_ids: category_ids,
-        discountable: pricing.discountable?,
-        requires_shipping: requires_shipping?
-      }
+    def cache_key
+      "order_item_details/#{product.cache_key}/#{sku}"
+    end
+
+    def cache_expiration
+      Workarea.config.cache_expirations.order_item_details
     end
   end
 end

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

@@ -119,7 +119,8 @@ module Workarea
           TermsFacet.new(self, 'type'),
           TermsFacet.new(self, 'status'),
           TermsFacet.new(self, 'tags'),
-          TermsFacet.new(self, 'upcoming_changes')
+          TermsFacet.new(self, 'upcoming_changes'),
+          TermsFacet.new(self, 'active_by_segment')
         ]
       end
     end

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

@@ -25,8 +25,6 @@ module Workarea
         }
       end
 
-      private
-
       def inventory_display_clause(allow_displayable_when_out_of_stock: true)
         result = { bool: { should: [{ range: { 'numeric.inventory': { gt: 0 } } }] } }
 

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/services/workarea/packaging.rb

@@ -89,7 +89,7 @@ module Workarea
     end
 
     def shippable_items
-      @order.items.select(&:requires_shipping?)
+      @order.items.select(&:shipping?)
     end
 
     def stacked_dimensions

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)
         .select(&:active?)
         .map(&:id)
         .map(&:to_s)

data/app/workers/workarea/synchronize_user_metrics.rb

@@ -8,6 +8,15 @@ module Workarea
       queue: 'low'
     )
 
+    # It's essential for the {Metrics::User#admin} field always be in sync, so
+    # we always want this worker enabled.
+    #
+    # @return [Boolean]
+    #
+    def self.enabled?
+      true
+    end
+
     def perform(id)
       user = User.find(id)
       metrics = Metrics::User.find_or_create_by(id: user.email)

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/tasks/migrate.rake

@@ -35,18 +35,6 @@ namespace :workarea do
 
       puts "✅ #{count} tax categories updated."
 
-      Workarea::Catalog::Product.each_by(500) do |product|
-        next unless product.digital?
-
-        product.skus.each do |sku|
-          fulfillment = Workarea::Fulfillment::Sku.find_or_initialize_by(id: sku)
-          fulfillment.policy = 'ignore'
-          fulfillment.save!
-        end
-      end
-
-      puts "✅ #{count} fulfillment skus for digital product have been created."
-
       count = 0
       failed_ids = []
       backup = Mongo::Collection.new(Mongoid::Clients.default.database, 'workarea_legacy_segments')
@@ -100,6 +88,15 @@ namespace :workarea do
         puts "The segments that failed are #{failed_ids.to_sentence}."
       end
 
+      Workarea::Segment::LifeCycle.create!
+      puts "✅ Life cycle segments have been created."
+
+      admin_ids = Workarea::User.admins.pluck(:id)
+      admin_ids.each do |id|
+        Workarea::SynchronizeUserMetrics.new.perform(id)
+      end
+      puts "✅ #{admin_ids.count} admins have had their metrics synchronized." if admin_ids.count > 0
+
       puts "\nMigration complete!"
     end
   end

data/lib/workarea/configuration.rb

@@ -821,8 +821,7 @@ module Workarea
       # recommended as the default policy.
       config.fulfillment_policies = SwappableList.new(
         %w(
-          Workarea::Fulfillment::Policies::Ship
-          Workarea::Fulfillment::Policies::Ignore
+          Workarea::Fulfillment::Policies::Shipping
           Workarea::Fulfillment::Policies::Download
         )
       )
@@ -877,6 +876,7 @@ module Workarea
       config.cache_expirations.sitemap_fragment_cache = 1.day
       config.cache_expirations.free_gift_attributes = 1.hour
       config.cache_expirations.reports = 1.hour
+      config.cache_expirations.order_item_details = 15.minutes
 
       # Send transactional emails. Allows default transaction emails to be
       # disabled when using third-party email services.
@@ -1257,14 +1257,14 @@ 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' }
 
       # Determines what payment action happens when "place order" is submitted.
       # These correspond to methods on the {Checkout}'s instance of {Payment}
       config.checkout_payment_action = {
-        shipped: 'authorize!',
-        not_shipped: 'purchase!',
-        mixed: 'purchase!'
+        shipping: 'authorize!',
+        partial_shipping: 'purchase!',
+        no_shipping: 'purchase!'
       }
 
       # Class used to determine if an order is fraudlent

data/lib/workarea/configuration/redis.rb

@@ -1,7 +1,7 @@
 module Workarea
   module Configuration
     class Redis
-      DEFAULT = { host: 'localhost', port: 6379, db: 0 }.freeze
+      DEFAULT = { host: 'localhost', port: 6379, db: 0, scheme: 'redis' }.freeze
 
       class << self
         # Used for Sidekiq and Predictor
@@ -39,11 +39,15 @@ module Workarea
           return from_config if from_config.present?
 
           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]
+            db: ENV["WORKAREA_#{env_slug}_DB"].presence || DEFAULT[:db],
+            password: ENV["WORKAREA_#{env_slug}_PASSWORD"].presence,
+            ssl: scheme == 'rediss' ? true : false
           }
         end
       end
@@ -55,10 +59,22 @@ module Workarea
         @config = config.to_h.deep_symbolize_keys
       end
 
+      def scheme
+        @config[:scheme]
+      end
+
+      def ssl
+        @config[:ssl]
+      end
+
       def host
         @config[:host]
       end
 
+      def password
+        @config[:password]
+      end
+
       def port
         @config[:port]
       end
@@ -68,7 +84,9 @@ module Workarea
       end
 
       def to_url
-        base = "redis://#{host}"
+        base = "#{scheme}://"
+        base << "admin:#{password}@" if password.present?
+        base << "#{host}"
         base << ":#{port}" if port.present?
         base << "/#{db}" if db.present?
         base

data/lib/workarea/core.rb

@@ -131,6 +131,7 @@ require 'workarea/ext/freedom_patches/dragonfly_job_fetch_url'
 require 'workarea/ext/freedom_patches/dragonfly_callable_url_host'
 require 'workarea/ext/freedom_patches/active_support_duration'
 require 'workarea/ext/freedom_patches/premailer'
+require 'workarea/ext/freedom_patches/referer_parser'
 require 'workarea/ext/mongoid/list_field'
 require 'workarea/ext/mongoid/each_by'
 require 'workarea/ext/mongoid/except'
@@ -141,6 +142,7 @@ require 'workarea/ext/mongoid/lookup_hash'
 require 'workarea/ext/active_shipping/workarea'
 require 'workarea/ext/mongoid/audit_log_entry.decorator'
 require 'workarea/ext/mongoid/find_ordered'
+require 'workarea/ext/mongoid/embedded_children'
 require 'workarea/ext/sprockets/ruby_processor'
 require 'workarea/ext/jbuilder/jbuilder_append_partials'
 
@@ -218,6 +220,7 @@ require 'workarea/string_id'
 require 'workarea/mail_interceptor'
 require 'workarea/visit'
 require 'workarea/warnings'
+require 'workarea/latest_version'
 
 #
 # Core

data/lib/workarea/ext/freedom_patches/referer_parser.rb

@@ -0,0 +1,7 @@
+module RefererParser
+  class Parser
+    def sources
+      @name_hash.values.map { |v| v[:source] }
+    end
+  end
+end

data/lib/workarea/ext/mongoid/embedded_children.rb

@@ -0,0 +1,20 @@
+module Mongoid
+  module Document
+    # Returns all the embedded children in this document by recursion.
+    #
+    # @return [Array<Mongoid::Document>]
+    #
+    def embedded_children
+      result = []
+
+      embedded_relations.each do |name, metadata|
+        Array.wrap(send(name)).each do |child|
+          result << child
+          result += child.embedded_children
+        end
+      end
+
+      result
+    end
+  end
+end

data/lib/workarea/latest_version.rb

@@ -0,0 +1,24 @@
+module Workarea
+  module LatestVersion
+    def self.get
+      Rails.cache.fetch('workarea/version/latest', expires_in: 3.days) do
+        request = Net::HTTP::Get.new('/api/v1/gems/workarea.json')
+        request.content_type = 'application/json'
+
+        uri = URI('https://rubygems.org')
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        response = http.start { |h| h.request(request) }
+
+        JSON.parse(response.body)['version']
+      end
+    rescue Exception => e
+      Rails.logger.error '-------------------------------------'
+      Rails.logger.error "There was an error contacting rubygems.org!"
+      Rails.logger.error e.class
+      Rails.logger.error e.message
+      Rails.logger.error '-------------------------------------'
+    end
+  end
+end

data/lib/workarea/ping_home_base.rb

@@ -6,7 +6,6 @@ module Workarea
     class << self
       def ping
         begin
-          ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
           request = Net::HTTP::Post.new('/ping')
           request['X-WeblincClientName'] = Workarea.config.site_name
           request['X-WeblincAuthToken'] = auth_token

data/lib/workarea/version.rb

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

data/lib/workarea/visit.rb

@@ -64,8 +64,11 @@ module Workarea
     end
 
     def referrer
-      return @referrer if defined?(@referrer)
-      @referrer = Workarea.referrer_parser.parse(request.referrer) rescue {}
+      @referrer ||= begin
+        value = cookies['workarea_referrer'].presence || request.referrer
+        attributes = Workarea.referrer_parser.parse(value) rescue {}
+        TrafficReferrer.new(attributes)
+      end
     end
 
     def browser

data/lib/workarea/warnings.rb

@@ -75,16 +75,16 @@ of items in the order.
 You should set Workarea.config.checkout_payment_action instead. You can set it
 for each type of order, here are the defaults:
   {
-    shipped: 'authorize!',
-    not_shipped: 'purchase!',
-    mixed: 'authorize!'
+    shipping: 'authorize!',
+    partial_shipping: 'authorize!',
+    no_shipping: 'purchase!'
   }
 
 To achieve the same functionality as Workarea.config.auto_capture, you'd set:
   {
-    shipped: 'purchase!',
-    not_shipped: 'purchase!',
-    mixed: 'purchase!'
+    shipping: 'purchase!',
+    partial_shipping: 'purchase!',
+    no_shipping: 'purchase!'
   }
 
 **************************************************

data/test/lib/workarea/ext/mongoid/embedded_children_test.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+module Mongoid
+  class EmbeddedChildrenTest < Workarea::TestCase
+    class Parent
+      include Mongoid::Document
+      embeds_one :child, class_name: 'Mongoid::EmbeddedChildrenTest::Child'
+      embeds_many :children, class_name: 'Mongoid::EmbeddedChildrenTest::Child'
+    end
+
+    class Child
+      include Mongoid::Document
+      field :name, type: String
+      embeds_one :grandchild, class_name: 'Mongoid::EmbeddedChildrenTest::Grandchild'
+      embeds_many :grandchildren, class_name: 'Mongoid::EmbeddedChildrenTest::Grandchild'
+    end
+
+    class Grandchild
+      include Mongoid::Document
+      field :name, type: String
+    end
+
+    def test_embedded_children
+      model = Parent.create!(
+        child: { name: '1', grandchild: { name: '2' } },
+        children: [{ name: '3' }, { name: '4', grandchildren: [{ name: '5' }] }]
+      )
+
+      assert_equal(%w(1 2 3 4 5), model.embedded_children.map(&:name))
+    end
+  end
+end