workarea-core 3.5.0.beta.1 → 3.5.0

data/test/models/workarea/pricing/calculators/tax_calculator_test.rb

@@ -128,7 +128,7 @@ module Workarea
           order = Order.new(
             items: [
               {
-                requires_shipping: false,
+                fulfillment: 'download',
                 price_adjustments: [
                   {
                     price: 'item',

data/test/models/workarea/search/admin/releasable_test.rb

@@ -9,23 +9,21 @@ module Workarea
         end
 
         def test_facets
-          releasable = create_page(name: 'Foo')
+          releasable = create_page(name: 'Foo', active_segment_ids: %w(foo bar))
+          content = Workarea::Content.for(releasable)
+          content.blocks.create!(type: 'html', active_segment_ids: %w(bar baz))
 
           release_one = create_release
           release_two = create_release
           release_three = create_release
 
           release_one.as_current { releasable.update_attributes!(name: 'Bar') }
-
-          release_two.as_current do
-            content = Workarea::Content.for(releasable)
-            content.update_attributes!(browser_title: 'Foo')
-          end
-
+          release_two.as_current { content.update_attributes!(browser_title: 'Foo') }
           release_three.as_current { releasable.update_attributes!(name: 'Bar') }
           release_three.update_attributes!(published_at: Time.current)
 
           search_model = Foo.new(releasable)
+          assert_equal(search_model.facets[:active_by_segment], %w(foo bar baz))
           assert_includes(search_model.facets[:upcoming_changes], release_one.id)
           assert_includes(search_model.facets[:upcoming_changes], release_two.id)
           refute_includes(search_model.facets[:upcoming_changes], release_three.id)

data/test/models/workarea/segment/life_cycle_test.rb

@@ -8,6 +8,11 @@ module Workarea
         self.default_rules = [Rules::Orders.new(maximum: 0)]
       end
 
+      def test_name_given
+        life_cycle = FooSegment.instance # create it
+        assert_equal('Foo Segment', life_cycle.name)
+      end
+
       def test_cannot_destroy
         life_cycle = FooSegment.instance # create it
 

data/test/models/workarea/segment/rules/last_order_test.rb

@@ -16,15 +16,27 @@ module Workarea
 
           metrics.update_attributes!(last_order_at: 8.days.ago)
           visit = create_visit(email: 'bcrouse@workarea.com')
-          refute(LastOrder.new(days: 7).qualifies?(visit))
+          refute(LastOrder.new(days: 7, within: true).qualifies?(visit))
+
+          metrics.update_attributes!(last_order_at: 7.days.ago)
+          visit = create_visit(email: 'bcrouse@workarea.com')
+          assert(LastOrder.new(days: 7, within: true).qualifies?(visit))
+
+          metrics.update_attributes!(last_order_at: 6.days.ago)
+          visit = create_visit(email: 'bcrouse@workarea.com')
+          assert(LastOrder.new(days: 7, within: true).qualifies?(visit))
+
+          metrics.update_attributes!(last_order_at: 8.days.ago)
+          visit = create_visit(email: 'bcrouse@workarea.com')
+          assert(LastOrder.new(days: 7, within: false).qualifies?(visit))
 
           metrics.update_attributes!(last_order_at: 7.days.ago)
           visit = create_visit(email: 'bcrouse@workarea.com')
-          assert(LastOrder.new(days: 7).qualifies?(visit))
+          refute(LastOrder.new(days: 7, within: false).qualifies?(visit))
 
           metrics.update_attributes!(last_order_at: 6.days.ago)
           visit = create_visit(email: 'bcrouse@workarea.com')
-          assert(LastOrder.new(days: 7).qualifies?(visit))
+          refute(LastOrder.new(days: 7, within: false).qualifies?(visit))
         end
       end
     end

data/test/models/workarea/segment/rules/traffic_referrer_test.rb

@@ -12,18 +12,20 @@ module Workarea
           refute(TrafficReferrer.new.qualifies?(visit))
 
           visit = create_visit('HTTP_REFERER' => 'https://www.google.com/')
-          assert(TrafficReferrer.new(source: 'google').qualifies?(visit))
-          assert(TrafficReferrer.new(source: ' Google').qualifies?(visit))
+          assert(TrafficReferrer.new(source: %w(Google)).qualifies?(visit))
+          refute(TrafficReferrer.new(source: %w(Yahoo!)).qualifies?(visit))
           assert(TrafficReferrer.new(medium: 'Search').qualifies?(visit))
-          refute(TrafficReferrer.new(source: 'Facebook ').qualifies?(visit))
-          refute(TrafficReferrer.new(source: 'social').qualifies?(visit))
+          refute(TrafficReferrer.new(medium: 'Social').qualifies?(visit))
+          assert(TrafficReferrer.new(url: 'google').qualifies?(visit))
+          refute(TrafficReferrer.new(url: 'twitter').qualifies?(visit))
 
           visit = create_visit('HTTP_REFERER' => 'https://www.facebook.com/')
-          refute(TrafficReferrer.new(source: ' Google').qualifies?(visit))
-          refute(TrafficReferrer.new(medium: 'search').qualifies?(visit))
-          assert(TrafficReferrer.new(source: 'facebook ').qualifies?(visit))
+          assert(TrafficReferrer.new(source: %w(Facebook)).qualifies?(visit))
+          refute(TrafficReferrer.new(source: %w(Google)).qualifies?(visit))
           assert(TrafficReferrer.new(medium: 'Social').qualifies?(visit))
-          assert(TrafficReferrer.new(medium: 'Social', source: 'facebook|twitter').qualifies?(visit))
+          refute(TrafficReferrer.new(medium: 'Search').qualifies?(visit))
+          assert(TrafficReferrer.new(url: 'www').qualifies?(visit))
+          refute(TrafficReferrer.new(url: 'facebook$').qualifies?(visit))
         end
       end
     end

data/test/models/workarea/segmentable_test.rb

@@ -6,6 +6,13 @@ module Workarea
       include Mongoid::Document
       include Releasable
       include Segmentable
+      embeds_many :bars
+    end
+
+    class Bar
+      include Mongoid::Document
+      include Releasable
+      include Segmentable
     end
 
     def test_active_by_segment
@@ -70,5 +77,16 @@ module Workarea
       Segment.with_current(segment_one) { assert(model.reload.active?) }
       Segment.with_current(segment_two) { refute(model.reload.active?) }
     end
+
+    def test_active_segment_ids_with_children
+      model = Foo.new
+      assert_equal([], model.active_segment_ids_with_children)
+
+      model.active_segment_ids = %w(foo)
+      assert_equal(%w(foo), model.active_segment_ids_with_children)
+
+      model.bars = [{ active_segment_ids: %w(bar) }, { active_segment_ids: %w(baz) }]
+      assert_equal(%w(foo bar baz), model.active_segment_ids_with_children)
+    end
   end
 end

data/test/queries/workarea/alerts_test.rb

@@ -127,5 +127,16 @@ module Workarea
 
       assert_equal([empty], Alerts.new.empty_upcoming_releases)
     end
+
+    def test_missing_segments
+      segment = create_segment
+      product = create_product(active: true, active_segment_ids: [segment.id])
+      IndexAdminSearch.perform(product)
+
+      assert_equal([], Alerts.new.missing_segments)
+
+      segment.destroy!
+      assert_equal([segment.id.to_s], Alerts.new.missing_segments)
+    end
   end
 end

data/test/queries/workarea/order_item_details_test.rb

@@ -12,20 +12,12 @@ module Workarea
       assert_nil(OrderItemDetails.find('SKU1'))
     end
 
-    def test_requires_shipping?
+    def test_fulfillment
       product = create_product(variants: [{ sku: 'SKU', regular: 5.00 }])
+      assert_equal('shipping', OrderItemDetails.find('SKU').to_h[:fulfillment])
 
-      assert(OrderItemDetails.find('SKU').requires_shipping?)
-
-      product.update(digital: true)
-      refute(OrderItemDetails.find('SKU').requires_shipping?)
-
-      product.update(digital: false)
-      sku = create_fulfillment_sku(id: 'SKU', policy: :ignore)
-      refute(OrderItemDetails.find('SKU').requires_shipping?)
-
-      sku.update(policy: :download, file: product_image_file)
-      refute(OrderItemDetails.find('SKU').requires_shipping?)
+      sku = create_fulfillment_sku(id: 'SKU', policy: 'download', file: product_image_file)
+      assert_equal('download', OrderItemDetails.find('SKU').to_h[:fulfillment])
     end
 
     def test_to_h

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/vcr_cassettes/get_latest_version.yml

@@ -0,0 +1,90 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://rubygems.org/api/v1/gems/workarea.json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Content-Type-Options:
+      - nosniff
+      X-Download-Options:
+      - noopen
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - GET
+      Access-Control-Max-Age:
+      - '1728000'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      X-Request-Id:
+      - d6394d50-39fa-47e9-8bf2-95934b5a81f2
+      X-Runtime:
+      - '0.016960'
+      Strict-Transport-Security:
+      - max-age=120
+      X-Backend:
+      - F_Rails 54.186.104.15:443
+      Accept-Ranges:
+      - bytes
+      - bytes
+      Age:
+      - '0'
+      - '0'
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Wed, 20 Nov 2019 17:06:57 GMT
+      Via:
+      - 1.1 varnish
+      Connection:
+      - keep-alive
+      X-Served-By:
+      - cache-mia17625-MIA
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1574269618.874178,VS0,VE106
+      Vary:
+      - Accept-Encoding,Fastly-SSL
+      Etag:
+      - '"867cab3200a545c2c4f8be4b5ae4398a"'
+      Server:
+      - RubyGems.org
+    body:
+      encoding: ASCII-8BIT
+      string: '{"name":"workarea","downloads":6177,"version":"3.4.21","version_downloads":240,"platform":"ruby","authors":"Ben
+        Crouse","info":"Workarea is an enterprise-grade Ruby on Rails commerce platform.","licenses":["Business
+        Software License"],"metadata":{},"yanked":false,"sha":"ec79083b5dde751f4bca7a384ef132afbded16660344d4343144b0b3f4d3b57d","project_uri":"https://rubygems.org/gems/workarea","gem_uri":"https://rubygems.org/gems/workarea-3.4.21.gem","homepage_uri":"http://www.workarea.com","wiki_uri":null,"documentation_uri":"http://www.rubydoc.info/gems/workarea/3.4.21","mailing_list_uri":null,"source_code_uri":null,"bug_tracker_uri":null,"changelog_uri":null,"dependencies":{"development":[],"runtime":[{"name":"workarea-admin","requirements":"=
+        3.4.21"},{"name":"workarea-core","requirements":"= 3.4.21"},{"name":"workarea-storefront","requirements":"=
+        3.4.21"},{"name":"workarea-testing","requirements":"= 3.4.21"}]}}'
+    http_version: 
+  recorded_at: Wed, 20 Nov 2019 17:06:57 GMT
+recorded_with: VCR 2.9.3

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

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-unique-jobs', '~> 6.0.6'
   s.add_dependency 'sidekiq-throttled', '~> 0.8.2'
   s.add_dependency 'geocoder', '~> 1.4.4'
-  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'
@@ -92,7 +91,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'
   s.add_dependency 'browser', '~> 2.6.1'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.0.beta.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2019-11-26 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
@@ -1114,14 +1100,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
@@ -1222,7 +1208,6 @@ files:
 - app/controllers/workarea/application_controller.rb
 - app/controllers/workarea/authentication.rb
 - app/controllers/workarea/authorization.rb
-- app/controllers/workarea/current_referrer.rb
 - app/controllers/workarea/current_release.rb
 - app/controllers/workarea/current_segments.rb
 - app/controllers/workarea/current_tracking.rb
@@ -1329,8 +1314,7 @@ files:
 - app/models/workarea/fulfillment/package.rb
 - app/models/workarea/fulfillment/policies/base.rb
 - app/models/workarea/fulfillment/policies/download.rb
-- app/models/workarea/fulfillment/policies/ignore.rb
-- app/models/workarea/fulfillment/policies/ship.rb
+- app/models/workarea/fulfillment/policies/shipping.rb
 - app/models/workarea/fulfillment/sku.rb
 - app/models/workarea/fulfillment/status.rb
 - app/models/workarea/fulfillment/token.rb
@@ -1516,6 +1500,7 @@ files:
 - app/models/workarea/release/preview.rb
 - app/models/workarea/release/status.rb
 - app/models/workarea/release_session.rb
+- app/models/workarea/reports/custom_event.rb
 - app/models/workarea/reports/export.rb
 - app/models/workarea/search/admin.rb
 - app/models/workarea/search/admin/catalog_category.rb
@@ -1939,12 +1924,14 @@ files:
 - lib/workarea/ext/freedom_patches/mongoid_simple_tags.rb
 - lib/workarea/ext/freedom_patches/net_http_ssl_connection.rb
 - lib/workarea/ext/freedom_patches/premailer.rb
+- lib/workarea/ext/freedom_patches/referer_parser.rb
 - lib/workarea/ext/freedom_patches/routes_reloader.rb
 - lib/workarea/ext/freedom_patches/string.rb
 - lib/workarea/ext/freedom_patches/uri.rb
 - lib/workarea/ext/jbuilder/jbuilder_append_partials.rb
 - lib/workarea/ext/mongoid/audit_log_entry.decorator
 - lib/workarea/ext/mongoid/each_by.rb
+- lib/workarea/ext/mongoid/embedded_children.rb
 - lib/workarea/ext/mongoid/error.rb
 - lib/workarea/ext/mongoid/except.rb
 - lib/workarea/ext/mongoid/find_ordered.rb
@@ -1957,6 +1944,7 @@ files:
 - lib/workarea/geolocation.rb
 - lib/workarea/i18n.rb
 - lib/workarea/image_optim_processor.rb
+- lib/workarea/latest_version.rb
 - lib/workarea/lint.rb
 - lib/workarea/lint/inconsistent_details.rb
 - lib/workarea/lint/products_missing_images.rb
@@ -2095,11 +2083,13 @@ files:
 - test/lib/workarea/ext/freedom_patches/mongoid_simple_tags_test.rb
 - test/lib/workarea/ext/mongoid/audit_log_entry_test.rb
 - test/lib/workarea/ext/mongoid/each_by_test.rb
+- test/lib/workarea/ext/mongoid/embedded_children_test.rb
 - test/lib/workarea/ext/mongoid/except_test.rb
 - test/lib/workarea/ext/mongoid/find_ordered_test.rb
 - test/lib/workarea/ext/mongoid/list_field_test.rb
 - test/lib/workarea/ext/mongoid/lookup_hash_test.rb
 - test/lib/workarea/geolocation_test.rb
+- test/lib/workarea/latest_version_test.rb
 - test/lib/workarea/lint/inconsistent_details_test.rb
 - test/lib/workarea/lint/products_missing_images_test.rb
 - test/lib/workarea/lint/products_missing_variants_test.rb
@@ -2443,6 +2433,7 @@ files:
 - test/teaspoon_env.rb
 - test/test_helper.rb
 - test/vcr_cassettes/csv_image_upload.yml
+- test/vcr_cassettes/get_latest_version.yml
 - test/view_models/workarea/shipping_carrier_view_model_test.rb
 - test/workarea_test.rb
 - test/workers/sidekiq/callbacks_test.rb
@@ -2722,9 +2713,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: