workarea-core 3.5.0.beta.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6ddffdd6e59cf8d313af5d6e66ce27d527aba9a8d9f226697b8291b16263c00
-  data.tar.gz: 64a0dcf6ab8aee0fedd8a8f3e55c3ecfbcf552fc9b8e3418daa1cb5759c6dded
+  metadata.gz: 350a33b73048c0e24062f5bbd378518bfae1133b2e8d49b58907d4327191ffe9
+  data.tar.gz: 74ddf766b88286672ca1ac81924a09b753aa6e20efae0d9fa6eeb1ecbcf8bfa8
 SHA512:
-  metadata.gz: 546e65d948e142a5ed31a3d57583690af677416a1ebb0368c6d0b7e36caaeb599ef80390fe9fa9c103ed0ac1747c97e5f05b0b07c05001c2da0655a396d178a2
-  data.tar.gz: c5aea33c89c5a53ab66133d6a9b9181bf4dda114ee1dcc55fcb4a934e58548b0e6b70993a027f2c9659846b0b866dbe12bb7d60c0263f687aa908ffc427542bb
+  metadata.gz: 349c362c45e578680ef743051bc3554c5995013be7a1e348bcac2780fa6a9425b137fbfec9f6d7be3af354996a5fcc895be5af91241e1bf7b7ad1a878cf428d1
+  data.tar.gz: 260730f0b9e935712e47230aa9b3a103b971ec190afbadb7b0a15a2b78efd562928f48f990ed0db0a4ecf515084bd65f385145683b33ac2a66fab971cdbeda47

data/app/controllers/workarea/current_tracking.rb

@@ -19,6 +19,10 @@ module Workarea
       current_visit.metrics
     end
 
+    def current_referrer
+      current_visit.referrer
+    end
+
     def update_tracking!(email: current_user&.email)
       if email.blank?
         cookies.delete(:email)

data/app/models/workarea/checkout/collect_payment.rb

@@ -36,12 +36,12 @@ module Workarea
         # TODO deprecated, remove in v3.6
         return 'purchase!' if Workarea.config.auto_capture
 
-        if @order.items.all?(&:requires_shipping?)
-          Workarea.config.checkout_payment_action[:shipped]
-        elsif @order.items.any?(&:requires_shipping?)
-          Workarea.config.checkout_payment_action[:mixed]
+        if @order.items.all?(&:shipping?)
+          Workarea.config.checkout_payment_action[:shipping]
+        elsif @order.items.any?(&:shipping?)
+          Workarea.config.checkout_payment_action[:partial_shipping]
         else
-          Workarea.config.checkout_payment_action[:not_shipped]
+          Workarea.config.checkout_payment_action[:no_shipping]
         end
       end
     end

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/fulfillment/policies/base.rb

@@ -8,10 +8,6 @@ module Workarea
           @sku = sku
         end
 
-        def requires_shipping?
-          false
-        end
-
         def process(order_item:, fulfillment: nil)
           raise(NotImplementedError)
         end

data/app/models/workarea/fulfillment/policies/{ignore.rb → shipping.rb}

@@ -1,8 +1,8 @@
 module Workarea
   class Fulfillment
     module Policies
-      class Ignore < Base
-        def process(*args)
+      class Shipping < Base
+        def process(*)
           # no op
         end
       end

data/app/models/workarea/fulfillment/sku.rb

@@ -15,8 +15,6 @@ module Workarea
       dragonfly_accessor :file, app: :workarea
       validates :file, presence: true, if: -> { download? }
 
-      delegate :requires_shipping?, to: :policy_object
-
       def self.policies
         Workarea.config.fulfillment_policies.map(&:demodulize).map(&:underscore)
       end

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

@@ -7,7 +7,13 @@ module Workarea
         end
 
         def generate_monthly!
-          results = generate_results.map { |r| r.merge(query_id: r['_id']) }
+          results = generate_results.map do |result|
+            result.merge(
+              query_id: result['_id'],
+              query_string: result['query_string'].presence || result['_id']
+            )
+          end
+
           create!(results: results) if results.present?
         end
 
@@ -33,6 +39,7 @@ module Workarea
           {
             '$group' => {
               '_id' => '$query_id',
+              'query_string' => { '$first' => '$query_string' },
               'improving_weeks' => { '$sum' => 1 },
               'revenue_changes' => { '$push' => '$revenue_change' },
               'orders' => { '$sum' => '$orders' }

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/app/models/workarea/order.rb

@@ -183,12 +183,22 @@ module Workarea
       save!
     end
 
-    # Whether this order needs to be shipped
+    # Check to see if this order delivers with any of the fulfillment policies
+    # passed in.
+    #
+    # @param [String,Symbol]
+    # @return [Boolean]
+    #
+    def fulfilled_by?(*types)
+      items.any? { |i| i.fulfilled_by?(*types) }
+    end
+
+    # Whether any of the order's items require physical shipping.
     #
     # @return [Boolean]
     #
     def requires_shipping?
-      items.present? && items.any?(&:requires_shipping?)
+      fulfilled_by?(:shipping)
     end
 
     # Whether this order can be purchased, which is defined here as the order

data/app/models/workarea/order/item.rb

@@ -13,7 +13,7 @@ module Workarea
     field :total_value, type: Money, default: 0
     field :total_price, type: Money, default: 0
     field :via, type: String
-    field :requires_shipping, type: Boolean, default: true
+    field :fulfillment, type: String, default: -> { Workarea.config.fulfillment_policies.first.demodulize.underscore }
 
     scope :by_newest, -> { desc(:created_at) }
 
@@ -30,6 +30,32 @@ module Workarea
         only_integer: true
       }
 
+    # To allow for custom policies defining their own methods here
+    Workarea.config.fulfillment_policies.each do |class_name|
+      define_method "#{class_name.demodulize.underscore}?" do
+        fulfillment == class_name.demodulize.underscore
+      end
+    end
+
+    # These methods exist for findability
+    def shipping?
+      fulfillment == 'shipping'
+    end
+
+    def download?
+      fulfillment == 'download'
+    end
+
+    # Whether this order has any items that need to be fulfilled by a particular
+    # fulfillment policy.
+    #
+    # @param [Array<String,Symbol>]
+    # @return [Boolean]
+    #
+    def fulfilled_by?(*types)
+      types.any? { |t| send("#{t}?") }
+    end
+
     # Whether this item is a digital (not-shipped) type of item.
     #
     # @return [Boolean]
@@ -39,7 +65,7 @@ module Workarea
     end
     Workarea.deprecation.deprecate_methods(
       Order::Item,
-      digital?: 'use `!item.requires_shipping?` to determine if this item is shipped.'
+      digital?: :fulfilled_by?
     )
 
     # Adds a price adjustment to the item. Does not persist.

data/app/models/workarea/pricing/calculators/tax_calculator.rb

@@ -29,13 +29,13 @@ module Workarea
 
         def shipped_items_price_adjustments
           PriceAdjustmentSet.new(
-            order.items.select(&:requires_shipping?).flat_map(&:price_adjustments)
+            order.items.select(&:shipping?).flat_map(&:price_adjustments)
           )
         end
 
         def not_shipped_items_price_adjustments
           PriceAdjustmentSet.new(
-            order.items.reject(&:requires_shipping?).flat_map(&:price_adjustments)
+            order.items.reject(&:shipping?).flat_map(&:price_adjustments)
           )
         end
 

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

@@ -91,7 +91,8 @@ module Workarea
       has_many :redemptions,
         class_name: 'Workarea::Pricing::Discount::Redemption'
 
-      index(created_at: 1) # for DeactivateStaleDiscounts
+      index(active: 1)
+      index(updated_at: 1) # for DeactivateStaleDiscounts
 
       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/models/workarea/releasable.rb

@@ -32,11 +32,9 @@ module Workarea
         { releasable_type: self.class.name, releasable_id: id }
       )
 
-      embedded_relations.each do |name, metadata|
-        Array.wrap(send(name)).each do |child|
-          if child.respond_to?(:changesets_with_children)
-            criteria.merge!(child.changesets_with_children)
-          end
+      embedded_children.each do |child|
+        if child.respond_to?(:changesets_with_children)
+          criteria.merge!(child.changesets_with_children)
         end
       end
 

data/app/models/workarea/reports/custom_event.rb

@@ -0,0 +1,22 @@
+module Workarea
+  module Reports
+    class CustomEvent
+      include ApplicationDocument
+
+      field :name, type: String
+      field :occurred_at, type: Time
+
+      index({ occurred_at: 1 });
+
+      validates :name, presence: true
+      validates :occurred_at, presence: true
+
+      scope :occurred_between, ->(starts_at: nil, ends_at: nil) do
+        where(
+          :occurred_at.gte => starts_at,
+          :occurred_at.lte => ends_at
+        )
+      end
+    end
+  end
+end

data/app/models/workarea/search/admin/releasable.rb

@@ -3,7 +3,10 @@ module Workarea
     class Admin
       module Releasable
         def facets
-          super.merge(upcoming_changes: upcoming_release_ids_with_changesets)
+          super.merge(
+            upcoming_changes: upcoming_release_ids_with_changesets,
+            active_by_segment: active_segment_ids
+          )
         end
 
         def status
@@ -25,16 +28,25 @@ module Workarea
         end
 
         def content_changesets
-          return [] unless model.is_a?(Contentable)
-
-          Workarea::Content.for(model)
-            .changesets
-            .any_in(release_id: upcoming_release_ids)
+          return [] unless content.present?
+          content.changesets.any_in(release_id: upcoming_release_ids)
         end
 
         def upcoming_release_ids
           @upcoming_release_ids ||= Workarea::Release.upcoming.map(&:id)
         end
+
+        def content
+          return unless model.is_a?(Contentable)
+          @content ||= Workarea::Content.for(model)
+        end
+
+        def active_segment_ids
+          result = model.active_segment_ids_with_children +
+            (content&.active_segment_ids_with_children || [])
+
+          result.uniq
+        end
       end
     end
   end

data/app/models/workarea/segment/life_cycle.rb

@@ -14,12 +14,16 @@ module Workarea
         end
 
         def instance
-          first || create!(rules: default_rules)
+          first || create!(name: instance_name, rules: default_rules)
         end
 
         def instance_id
           name.demodulize.underscore.to_sym
         end
+
+        def instance_name
+          name.demodulize.underscore.titleize
+        end
       end
 
       def self.create!
@@ -32,10 +36,6 @@ module Workarea
         ].each(&:instance)
       end
 
-      def name
-        self.class.name.demodulize.underscore.titleize
-      end
-
       def destroy
         false
       end

data/app/models/workarea/segment/rules/last_order.rb

@@ -2,11 +2,18 @@ module Workarea
   class Segment
     module Rules
       class LastOrder < Base
+        field :within, type: Boolean, default: true
         field :days, type: Integer
 
         def qualifies?(visit)
-          return false if visit.metrics.last_order_at.blank? || days.blank?
-          visit.metrics.last_order_at >= days.days.ago
+          return false if days.blank?
+          return !within if visit.metrics.last_order_at.blank?
+
+          if within?
+            visit.metrics.last_order_at >= days.days.ago
+          else
+            visit.metrics.last_order_at < days.days.ago
+          end
         end
       end
     end

data/app/models/workarea/segment/rules/traffic_referrer.rb

@@ -3,14 +3,25 @@ module Workarea
     module Rules
       class TrafficReferrer < Base
         field :medium, type: String
-        field :source, type: String
+        field :source, type: Array, default: []
+        field :url, type: String
 
         def qualifies?(visit)
-          return false if medium.blank? && source.blank?
-          return false unless visit.referrer[:known]
+          medium_match?(visit.referrer) ||
+            source_match?(visit.referrer) ||
+            url_match?(visit.referrer)
+        end
+
+        def medium_match?(referrer)
+          medium.to_s.strip.casecmp?(referrer.medium)
+        end
+
+        def source_match?(referrer)
+          source.any? { |s| s.strip.casecmp?(referrer.source) }
+        end
 
-          (medium.blank? || medium.strip.casecmp?(visit.referrer[:medium])) &&
-            (source.blank? || visit.referrer[:source].to_s =~ /#{source.strip}/i)
+        def url_match?(referrer)
+          url.present? && referrer.uri.to_s =~ /#{url.strip}/i
         end
       end
     end

data/app/models/workarea/segmentable.rb

@@ -50,10 +50,23 @@ module Workarea
       end
     end
 
+    def segmented?
+      active_segment_ids.present?
+    end
+
     def segments
       @segments ||= active_segment_ids.blank? ? [] : Segment.in(id: active_segment_ids)
     end
 
+    def active_segment_ids_with_children
+      children = embedded_children.reduce([]) do |memo, child|
+        memo += child.active_segment_ids if child.respond_to?(:active_segment_ids)
+        memo
+      end
+
+      (active_segment_ids + children).uniq
+    end
+
     private
 
     def mark_segmented_content

data/app/models/workarea/traffic_referrer.rb

@@ -2,8 +2,11 @@ module Workarea
   class TrafficReferrer
     include ApplicationDocument
 
+    field :known, type: Boolean, default: false
     field :source, type: String
     field :medium, type: String
     field :uri, type: String
+    field :domain, type: String
+    field :term, type: String
   end
 end

data/app/queries/workarea/alerts.rb

@@ -78,5 +78,26 @@ module Workarea
                                     .asc(:publish_at)
                                     .reject(&:has_changes?)
     end
+
+    def latest_workarea_version
+      return if Rails.env.test?
+      return if Rails.env.development? && ENV.fetch('SKIP_VERSION_CHECK', 'true') =~ /true/i
+
+      Workarea::LatestVersion.get
+    end
+
+    def missing_segments
+      @missing_segments ||= begin
+        search = Search::AdminSearch.new
+        active_by_segment_facet =
+          search.facets.detect { |f| f.name == 'active_by_segment' }
+
+        if active_by_segment_facet.present?
+          active_by_segment_facet.results.keys - Segment.pluck(:id).map(&:to_s)
+        else
+          []
+        end
+      end
+    end
   end
 end