workarea-storefront 3.4.45 → 3.5.0.beta.1

data/test/view_models/workarea/storefront/display_content_test.rb

@@ -94,6 +94,10 @@ module Workarea
         og_asset = view_model.open_graph_asset
         assert(og_asset.open_graph_placeholder?)
 
+        default_asset = create_asset(tag_list: 'og-default')
+        view_model = ContentViewModel.wrap(content)
+        assert_equal(default_asset, view_model.open_graph_asset)
+
         content.update_attributes(open_graph_asset_id: create_asset.id)
         view_model = ContentViewModel.wrap(content)
         og_asset = view_model.open_graph_asset

data/test/view_models/workarea/storefront/product_view_model/option_set_test.rb

@@ -315,14 +315,13 @@ module Workarea
             ]
           )
 
-          Workarea.with_config do |config|
-            config.option_selections_sort = ->(p, o) { o.sort_by(&:name) }
-            set = OptionSet.new(product)
-            assert_equal(
-              %w(color material size),
-              set.options_for_selection.map(&:slug)
-            )
-          end
+          Workarea.config.option_selections_sort = ->(p, o) { o.sort_by(&:name) }
+
+          set = OptionSet.new(product)
+          assert_equal(
+            %w(color material size),
+            set.options_for_selection.map(&:slug)
+          )
         end
 
         def test_not_losing_formatting_with_titleize

data/test/view_models/workarea/storefront/product_view_model_test.rb

@@ -15,18 +15,10 @@ module Workarea
         view_model = ProductViewModel.wrap(@product, one: '1')
         assert_instance_of(ProductTemplates::OptionSelectsViewModel, view_model)
         assert_equal('1', view_model.options[:one])
-
-        Workarea.with_config do |config|
-          config.product_templates << :no_view_model
-          @product.template = 'no_view_model'
-          view_model = ProductViewModel.wrap(@product, one: '1')
-
-          assert_kind_of(ProductViewModel, view_model)
-        end
       end
 
       def test_cache_key
-        cached_product = Catalog::Product.new(@product.as_document)
+        cached_product = Catalog::Product.instantiate(@product.as_document)
 
         view_model = ProductViewModel.new(cached_product)
         assert_match(/#{@product.id}/, view_model.cache_key)
@@ -45,7 +37,7 @@ module Workarea
 
       def test_cache_key_with_options
         variant = @product.variants.build(sku: 'SKU', details: { 'Color' => 'blue' })
-        cached_product = Catalog::Product.new(@product.as_document)
+        cached_product = Catalog::Product.instantiate(@product.as_document)
         options = { action: 'show', sku: variant.sku }.merge(variant.details)
         view_model = ProductViewModel.new(cached_product, options)
 
@@ -238,6 +230,21 @@ module Workarea
         refute(view_model.inventory_purchasable?)
         refute(view_model.purchasable?)
       end
+
+      def test_requires_shipping?
+        product = create_product(variants: [{ sku: 'SKU1' }, { sku: 'SKU2' }])
+        sku_1 = create_fulfillment_sku(id: 'SKU1', policy: 'ignore')
+        sku_2 = create_fulfillment_sku(id: 'SKU2', policy: 'ship')
+
+        view_model = ProductViewModel.wrap(product)
+        assert(view_model.requires_shipping?)
+
+        view_model = ProductViewModel.wrap(product, sku: 'SKU1')
+        refute(view_model.requires_shipping?)
+
+        view_model = ProductViewModel.wrap(product, sku: 'SKU2')
+        assert(view_model.requires_shipping?)
+      end
     end
   end
 end

data/test/view_models/workarea/storefront/search_view_model_test.rb

@@ -51,12 +51,6 @@ module Workarea
 
         view_model = SearchViewModel.new(response)
         assert_equal(%w(one two), view_model.query_suggestions)
-
-        Recommendation::Searches.expects(:find).returns(%w(one))
-        response.query.expects(:query_suggestions).returns(%w(one))
-
-        view_model = SearchViewModel.new(response)
-        assert_equal(%w(one), view_model.query_suggestions)
       end
     end
   end

data/test/view_models/workarea/storefront/user_activity_view_model_test.rb

@@ -3,7 +3,6 @@ require 'test_helper'
 module Workarea
   module Storefront
     class UserActivityViewModelTest < TestCase
-
       setup :set_display_count
       teardown :reset_display_count
 
@@ -19,47 +18,46 @@ module Workarea
       def test_products
         product_one = create_product
         product_two = create_product
-        product_three = create_product
+        product_three = create_product(
+          details:  { 'Material' => 'Wool', 'Style' => '12345' },
+          filters:  { 'Material' => 'Wool', 'Style' => '12345' }
+        )
+        [product_three, product_two, product_one, product_one].each do |product|
+          Metrics::User.save_affinity(id: 'foo', action: 'viewed', product_ids: product.id)
+        end
 
-        product_ids = [product_one.id, product_one.id, product_two.id, product_three.id]
-        user_activity = Recommendation::UserActivity.new(product_ids: product_ids)
-        view_model = UserActivityViewModel.new(user_activity)
+        metrics = Metrics::User.find('foo')
+        view_model = UserActivityViewModel.new(metrics)
 
         assert_equal(2, view_model.products.length)
         assert_equal(product_one, view_model.products.first.model)
         assert_equal(product_two, view_model.products.second.model)
 
         product_two.update_attributes!(active: false)
-
-        product_ids = [product_one.id, product_two.id]
-        user_activity = Recommendation::UserActivity.new(product_ids: product_ids)
-        view_model = UserActivityViewModel.new(user_activity)
+        view_model = UserActivityViewModel.new(metrics)
 
         assert_equal(1, view_model.products.length)
         assert_equal(product_one, view_model.products.first.model)
+
+        view_model = UserActivityViewModel.new(metrics, 'Material' => 'Wool')
+        assert_equal 'Wool', view_model.products.first.options['Material']
       end
 
       def test_categories
         one = create_category
         two = create_category
         three = create_category
-        user_activity =
-          Recommendation::UserActivity.new(category_ids: [one.id, one.id, two.id, three.id])
+        [three, two, one, one].each do |category|
+          Metrics::User.save_affinity(id: 'foo', action: 'viewed', category_ids: category.id)
+        end
 
-        view_model = UserActivityViewModel.new(user_activity)
+        metrics = Metrics::User.find('foo')
+        view_model = UserActivityViewModel.new(metrics)
 
         assert_equal(2, view_model.categories.length)
         assert_equal(one.id, view_model.categories.first.id)
         assert_equal(two.id, view_model.categories.second.id)
       end
-
-      def test_searches
-        searches = %w(one one two three)
-        user_activity = Recommendation::UserActivity.new(searches: searches)
-        view_model = UserActivityViewModel.new(user_activity)
-
-        assert_equal(%w(one two), view_model.searches)
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-storefront
 version: !ruby/object:Gem::Version
-  version: 3.4.45
+  version: 3.5.0.beta.1
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.45
+        version: 3.5.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.45
+        version: 3.5.0.beta.1
 description: Provides user-facing ecommerce storefront functionality for the Workarea
   Commerce Platform.
 email:
@@ -33,6 +33,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - app/assets/fonts/.keep
@@ -66,7 +67,7 @@ files:
 - app/assets/javascripts/workarea/storefront/modules/address_region_fields.js
 - app/assets/javascripts/workarea/storefront/modules/admin_toolbar.js
 - app/assets/javascripts/workarea/storefront/modules/alternate_image_buttons.js
-- app/assets/javascripts/workarea/storefront/modules/analytics.js
+- app/assets/javascripts/workarea/storefront/modules/analytics.js.erb
 - app/assets/javascripts/workarea/storefront/modules/authenticity_token.js
 - app/assets/javascripts/workarea/storefront/modules/back_to_top_button.js
 - app/assets/javascripts/workarea/storefront/modules/break_points.js
@@ -91,10 +92,8 @@ files:
 - app/assets/javascripts/workarea/storefront/modules/popup_buttons.js
 - app/assets/javascripts/workarea/storefront/modules/primary_nav_content.js
 - app/assets/javascripts/workarea/storefront/modules/product_details_sku_selects.js
-- app/assets/javascripts/workarea/storefront/modules/recent_views.js
 - app/assets/javascripts/workarea/storefront/modules/recommendations_placeholders.js
 - app/assets/javascripts/workarea/storefront/modules/scroll_to_buttons.js
-- app/assets/javascripts/workarea/storefront/modules/search_fields.js
 - app/assets/javascripts/workarea/storefront/modules/single_submit_forms.js
 - app/assets/javascripts/workarea/storefront/modules/traffic_referrer.js
 - app/assets/javascripts/workarea/storefront/modules/workarea_analytics.js
@@ -114,12 +113,8 @@ files:
 - app/assets/javascripts/workarea/storefront/templates/pagination_button.jst.ejs
 - app/assets/javascripts/workarea/storefront/templates/same_as_shipping_button_property.jst.ejs
 - app/assets/javascripts/workarea/storefront/templates/saved_addresses_property.jst.ejs
-- app/assets/javascripts/workarea/storefront/templates/ui_menu_heading.jst.ejs
-- app/assets/javascripts/workarea/storefront/templates/ui_menu_item.jst.ejs
-- app/assets/stylesheets/jquery_ui/storefront/_ui_autocomplete.scss
 - app/assets/stylesheets/jquery_ui/storefront/_ui_dialog.scss
 - app/assets/stylesheets/jquery_ui/storefront/_ui_helper_hidden_accessible.scss
-- app/assets/stylesheets/jquery_ui/storefront/_ui_menu.scss
 - app/assets/stylesheets/jquery_ui/storefront/_ui_state_focus.scss
 - app/assets/stylesheets/jquery_ui/storefront/_ui_widget_overlay.scss
 - app/assets/stylesheets/workarea/storefront/application.scss.erb
@@ -202,7 +197,7 @@ files:
 - app/assets/stylesheets/workarea/storefront/email/_base.scss
 - app/assets/stylesheets/workarea/storefront/email/_components.scss
 - app/assets/stylesheets/workarea/storefront/email/_helpers.scss
-- app/assets/stylesheets/workarea/storefront/email/_settings.scss
+- app/assets/stylesheets/workarea/storefront/email/_settings.scss.erb
 - app/assets/stylesheets/workarea/storefront/generic/_box_sizing.scss
 - app/assets/stylesheets/workarea/storefront/generic/_fonts.scss
 - app/assets/stylesheets/workarea/storefront/generic/_reset.scss
@@ -250,9 +245,9 @@ files:
 - app/controllers/workarea/storefront/content_areas_controller.rb
 - app/controllers/workarea/storefront/content_blocks_controller.rb
 - app/controllers/workarea/storefront/current_checkout.rb
+- app/controllers/workarea/storefront/downloads_controller.rb
 - app/controllers/workarea/storefront/email_signups_controller.rb
 - app/controllers/workarea/storefront/errors_controller.rb
-- app/controllers/workarea/storefront/http_caching.rb
 - app/controllers/workarea/storefront/menus_controller.rb
 - app/controllers/workarea/storefront/order_lookup.rb
 - app/controllers/workarea/storefront/orders_controller.rb
@@ -263,7 +258,6 @@ files:
 - app/controllers/workarea/storefront/searches_controller.rb
 - app/controllers/workarea/storefront/sitemaps_controller.rb
 - app/controllers/workarea/storefront/style_guides_controller.rb
-- app/controllers/workarea/storefront/user_activity.rb
 - app/controllers/workarea/storefront/users/accounts_controller.rb
 - app/controllers/workarea/storefront/users/addresses_controller.rb
 - app/controllers/workarea/storefront/users/credit_cards_controller.rb
@@ -281,6 +275,7 @@ files:
 - app/helpers/workarea/storefront/pagination_helper.rb
 - app/helpers/workarea/storefront/products_helper.rb
 - app/helpers/workarea/storefront/recent_views_helper.rb
+- app/helpers/workarea/storefront/schema_org_helper.rb
 - app/helpers/workarea/storefront/users_helper.rb
 - app/mailers/workarea/storefront/account_mailer.rb
 - app/mailers/workarea/storefront/application_mailer.rb
@@ -340,7 +335,6 @@ files:
 - app/view_models/workarea/storefront/search_content.rb
 - app/view_models/workarea/storefront/search_customization_content.rb
 - app/view_models/workarea/storefront/search_customization_view_model.rb
-- app/view_models/workarea/storefront/search_suggestion_view_model.rb
 - app/view_models/workarea/storefront/search_view_model.rb
 - app/view_models/workarea/storefront/shipping_view_model.rb
 - app/view_models/workarea/storefront/taxon_lookup.rb
@@ -430,7 +424,6 @@ files:
 - app/views/workarea/storefront/recent_views/narrow.html.haml
 - app/views/workarea/storefront/recent_views/show.html.haml
 - app/views/workarea/storefront/recommendations/show.html.haml
-- app/views/workarea/storefront/searches/index.json.jbuilder
 - app/views/workarea/storefront/searches/no_results.html.haml
 - app/views/workarea/storefront/searches/show.html.haml
 - app/views/workarea/storefront/shared/_address_fields.html.haml
@@ -476,7 +469,6 @@ files:
 - app/views/workarea/storefront/style_guides/components/_text_box.html.haml
 - app/views/workarea/storefront/style_guides/components/_text_button.html.haml
 - app/views/workarea/storefront/style_guides/components/_text_content_block.html.haml
-- app/views/workarea/storefront/style_guides/components/_ui_autocomplete.html.haml
 - app/views/workarea/storefront/style_guides/components/_ui_dialog.html.haml
 - app/views/workarea/storefront/style_guides/components/_ui_dialog_image.html.haml
 - app/views/workarea/storefront/style_guides/components/_ui_helper_hidden_accessible.html.haml
@@ -575,13 +567,13 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/tmp/screenshots/.keep
 - test/helpers/workarea/storefront/application_helper_test.rb
 - test/helpers/workarea/storefront/content_helper_test.rb
 - test/helpers/workarea/storefront/credit_cards_helper_test.rb
 - test/helpers/workarea/storefront/navigation_helper_test.rb
 - test/helpers/workarea/storefront/pagination_helper_test.rb
 - test/helpers/workarea/storefront/products_helper_test.rb
+- test/helpers/workarea/storefront/schema_org_helper_test.rb
 - test/integration/workarea/storefront/accounts_integration_test.rb
 - test/integration/workarea/storefront/analytics_integration_test.rb
 - test/integration/workarea/storefront/browse_images_integration_test.rb
@@ -595,6 +587,7 @@ files:
 - test/integration/workarea/storefront/content_blocks_integration_test.rb
 - test/integration/workarea/storefront/current_checkout_integration_test.rb
 - test/integration/workarea/storefront/current_user_integration_test.rb
+- test/integration/workarea/storefront/downloads_integration_test.rb
 - test/integration/workarea/storefront/email_signups_integration_test.rb
 - test/integration/workarea/storefront/errors_integration_test.rb
 - test/integration/workarea/storefront/favicons_integration_test.rb
@@ -611,7 +604,11 @@ files:
 - test/integration/workarea/storefront/place_order_integration_test.rb
 - test/integration/workarea/storefront/placing_order_integration_test.rb
 - test/integration/workarea/storefront/products_integration_test.rb
+- test/integration/workarea/storefront/recent_views_integration_test.rb
+- test/integration/workarea/storefront/releases_integration_test.rb
 - test/integration/workarea/storefront/search_integration_test.rb
+- test/integration/workarea/storefront/segment_overrides_integration_test.rb
+- test/integration/workarea/storefront/segments_integration_test.rb
 - test/integration/workarea/storefront/store_credit_integration_test.rb
 - test/integration/workarea/storefront/users/addresses_integration_test.rb
 - test/integration/workarea/storefront/users/credit_cards_integration_test.rb
@@ -663,6 +660,7 @@ files:
 - test/system/workarea/storefront/digital_products_system_test.rb
 - test/system/workarea/storefront/discounting_multiple_system_test.rb
 - test/system/workarea/storefront/discounting_system_test.rb
+- test/system/workarea/storefront/download_system_test.rb
 - test/system/workarea/storefront/email_signup_system_test.rb
 - test/system/workarea/storefront/fulfillment_system_test.rb
 - test/system/workarea/storefront/guest_checkout_system_test.rb
@@ -679,6 +677,7 @@ files:
 - test/system/workarea/storefront/recommendations_system_test.rb
 - test/system/workarea/storefront/release_browsing_system_test.rb
 - test/system/workarea/storefront/search_system_test.rb
+- test/system/workarea/storefront/segment_overrides_system_test.rb
 - test/system/workarea/storefront/sitemap_system_test.rb
 - test/system/workarea/storefront/store_credit_system_test.rb
 - test/system/workarea/storefront/style_guides_system_test.rb
@@ -711,7 +710,6 @@ files:
 - test/view_models/workarea/storefront/product_view_model_test.rb
 - test/view_models/workarea/storefront/recommendations_view_model_test.rb
 - test/view_models/workarea/storefront/refund_view_model_test.rb
-- test/view_models/workarea/storefront/search_suggestion_view_model_test.rb
 - test/view_models/workarea/storefront/search_view_model_test.rb
 - test/view_models/workarea/storefront/shipping_view_model_test.rb
 - test/view_models/workarea/storefront/user_activity_view_model_test.rb
@@ -732,11 +730,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Storefront for the Workarea Commerce Platform

data/app/assets/javascripts/workarea/storefront/modules/recent_views.js

@@ -1,25 +0,0 @@
-/**
- * @namespace WORKAREA.recentViews
- */
-WORKAREA.registerModule('recentViews', (function () {
-    'use strict';
-
-    var updateRecentViews = function (index, element) {
-            var data = JSON.parse($(element).attr('content'));
-
-            $.post(WORKAREA.routes.storefront.recentViewsPath(), data);
-        },
-
-        /**
-         * @method
-         * @name init
-         * @memberof WORKAREA.recentViews
-         */
-        init = function ($scope) {
-            $('meta[property="recent-view"]', $scope).each(updateRecentViews);
-        };
-
-    return {
-        init: init
-    };
-}()));

data/app/assets/javascripts/workarea/storefront/modules/search_fields.js

@@ -1,59 +0,0 @@
-/**
- * @namespace WORKAREA.searchFields
- */
-WORKAREA.registerModule('searchFields', (function () {
-    'use strict';
-
-    var getSource = function (request, response) {
-            var endpoint = WORKAREA.routes.storefront.searchesPath();
-
-            $.getJSON(endpoint, { q: request.term }, function (data) {
-                response(data.results);
-            });
-        },
-
-        openSelected = function (event, ui) {
-            if (ui.item.type === "Products") {
-                WORKAREA.analytics.fireCallback(
-                    'productClick',
-                    ui.item.analytics
-                );
-            }
-
-            if (WORKAREA.analytics.domEventsDisabled()) { return; }
-            window.location = ui.item.url;
-        },
-
-        /**
-         * iOS touch devices treat touch events as mouseenter unless there is no
-         * change in the UI, like a menu-selected state. By unbinding the
-         * mouseenter event we force those devices to treat the touch event as a
-         * click. This prevents the user having to tap twice to open a search
-         * autocomplete result.
-         */
-        openOnTouchDevices = function () {
-            $('.ui-autocomplete').off('mouseenter');
-        },
-
-        getConfig = function () {
-            return _.assign({}, WORKAREA.config.searchFieldsAutocomplete, {
-                source: getSource,
-                select: openSelected,
-                open: openOnTouchDevices
-            });
-        },
-
-        /**
-         * @method
-         * @name init
-         * @memberof WORKAREA.searchFields
-         */
-        init = function ($scope) {
-            $('[data-search-field]', $scope)
-            .categorizedAutocomplete(getConfig());
-        };
-
-    return {
-        init: init
-    };
-}()));