spree_frontend 4.0.0.rc2 → 4.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3982d0d2bca6f4d00c1d018654379594c0d7d0ce54da2f3a3a8f01d0603fc4a
-  data.tar.gz: 89d67d5bdd953a2f5d1045207ff811d58d0cabce111631452948d3f7b6647c18
+  metadata.gz: 1a7266f41e2fa6d573a0f4794494010db8a3ca8c63a7aa1b1c2e630bf9cb69d4
+  data.tar.gz: 8a66adc0c24cf0e480b87263b5b2708d922fc2d6cc092792bde6757d6e585994
 SHA512:
-  metadata.gz: 47f8a3f74444868e849342e97da9882adc96c3bfc00d8fc6b559ffe4942898c658fc68eebe286cc90d009f10d791d428341cc37dfdd5f29d07d62f032ce53afb
-  data.tar.gz: 0a9535eae3f7973c0d23966d5f69acbe1ada940d7c91a80be3db29d707329aebca169b4a8600b4e12ccc8efa5edc594f9eae32136a1ebe028e9344fc41376104
+  metadata.gz: 279b4c93d0070a054c15815c95b1734f18dbcf2ede6067dd1058a2e759f2c86b9e91b6b231f7eb443c1820f6ad60de6e6c6df91993158a546fe8cca519b07aa3
+  data.tar.gz: c087a9e63763783145f05f7adc5d9dc67cda2d50b43da34659e2bb94f273ccec3416bf0ae27eca2f36df1118948981b5e9bdad029dd66a062f9c72c814e5aeec

data/app/assets/javascripts/spree/frontend/checkout/address.js

@@ -6,7 +6,7 @@ Spree.ready(function ($) {
         if (countryId != null) {
           if (Spree.Checkout[countryId] == null) {
             $.ajax({
-              async: false, method: 'GET', url: '/api/v2/storefront/countries/' + countryId + '?include=states', dataType: 'json'
+              async: false, method: 'GET', url: Spree.pathFor('/api/v2/storefront/countries/' + countryId + '?include=states'), dataType: 'json'
             }).done(function (data) {
               var json = data.included; var xStates = []
               for (var i = 0; i < json.length; i++) {
@@ -62,7 +62,7 @@ Spree.ready(function ($) {
           statesWithBlank = [{name: '', id: ''}].concat(states)
           $.each(statesWithBlank, function (idx, state) {
             var opt = $(document.createElement('option')).attr('value', state.id).html(state.name)
-            if (selected === state.id) {
+            if (selected.toString(10) === state.id.toString(10)) {
               opt.prop('selected', true)
             }
             stateSelect.append(opt)

data/app/controllers/spree/store_controller.rb

@@ -3,7 +3,7 @@ module Spree
     include Spree::Core::ControllerHelpers::Order
 
     skip_before_action :set_current_order, only: :cart_link
-    skip_before_action :verify_authenticity_token, only: :ensure_cart
+    skip_before_action :verify_authenticity_token, only: :ensure_cart, raise: false
 
     def forbidden
       render 'spree/shared/forbidden', layout: Spree::Config[:layout], status: 403

data/app/helpers/spree/structured_data_helper.rb

@@ -0,0 +1,44 @@
+module Spree
+  module StructuredDataHelper
+    def products_structured_data(products)
+      content_tag :script, type: 'application/ld+json' do
+        raw(
+          products.map do |product|
+            structured_product_hash(product)
+          end.to_json
+        )
+      end
+    end
+
+    private
+
+    def structured_product_hash(product)
+      {
+        '@context': 'https://schema.org/',
+        '@type': 'Product',
+        '@id': "#{spree.root_url}product_#{product.id}",
+        url: spree.product_url(product),
+        name: product.name,
+        image: structured_images(product),
+        description: product.description,
+        sku: product.sku,
+        offers: {
+          '@type': 'Offer',
+          price: product.price,
+          priceCurrency: current_currency,
+          availability: product.in_stock? ? 'InStock' : 'OutOfStock',
+          url: spree.product_url(product),
+          availabilityEnds: product.discontinue_on ? product.discontinue_on.strftime('%F') : ''
+        }
+      }
+    end
+
+    def structured_images(product)
+      images = product.has_variants? ? product.variant_images : product.images
+
+      return '' unless images.any?
+
+      main_app.rails_blob_url(images.first.attachment)
+    end
+  end
+end

data/app/views/spree/home/index.html.erb

@@ -11,3 +11,4 @@
   <% end %>
 </div>
 
+<%= products_structured_data(@products) %>

data/app/views/spree/products/_product.html.erb

@@ -1,19 +1,18 @@
 <% url = spree.product_path(product, taxon_id: taxon.try(:id)) %>
-<div id="product_<%= product.id %>" class="d-flex w-100 col-12 col-sm-6 col-lg-4 col-xl-3 product-list-item mb-4" data-hook="products_list_item" itemscope itemtype="https://schema.org/Product">
+<div id="product_<%= product.id %>" class="d-flex w-100 col-12 col-sm-6 col-lg-4 col-xl-3 product-list-item mb-4" data-hook="products_list_item">
   <div class="card w-100">
     <% cache(taxon.present? ? [I18n.locale, current_currency, taxon, product] : cache_key_for_product(product)) do %>
       <div class="card-body text-center product-body">
-        <%= link_to url, itemprop: "url", class: 'd-block text-center' do %>
-          <%= small_image(product, itemprop: "image", class: "d-block mx-auto") %>
-          <%= content_tag(:span, truncate(product.name, length: 50), class: 'info mt-3 d-block', itemprop: "name", title: product.name) %>
+        <%= link_to url, class: 'd-block text-center' do %>
+          <%= small_image(product, class: "d-block mx-auto") %>
+          <%= content_tag(:span, truncate(product.name, length: 50), class: 'info mt-3 d-block', title: product.name) %>
         <% end %>
       </div>
       <div class="card-footer text-center">
-        <span itemprop="offers" itemscope itemtype="https://schema.org/Offer">
-          <span class="price selling lead" itemprop="price" content="<%= (product.price_in(current_currency).amount.nil?)? 0 : product.price_in(current_currency).amount.to_d %>">
+        <span>
+          <span class="price selling lead">
             <%= display_price(product) %>
           </span>
-          <span itemprop="priceCurrency" content="<%= current_currency %>"></span>
         </span>
       </div>
     <% end %>

data/app/views/spree/products/index.html.erb

@@ -25,3 +25,5 @@
     <% end %>
   </div>
 <% end %>
+
+<%= products_structured_data(@products) %>

data/app/views/spree/products/show.html.erb

@@ -1,13 +1,13 @@
 <% @body_id = 'product-details' %>
 
 <% cache cache_key_for_product do %>
-  <div data-hook="product_show" class="row" itemscope itemtype="https://schema.org/Product">
+  <div data-hook="product_show" class="row">
     <div class="col-lg-4 col-md-5" data-hook="product_left_part">
       <div data-hook="product_left_part_wrap">
         <div id="product-images" data-hook="product_images">
           <div id="main-image" class="card  " data-hook>
             <div class="card-body text-center">
-              <%= product_image(@product, itemprop: "image") %>
+              <%= product_image(@product) %>
             </div>
           </div>
           <div id="thumbnails" data-hook>
@@ -28,9 +28,9 @@
     <div class="col-lg-8 col-md-7" data-hook="product_right_part">
       <div data-hook="product_right_part_wrap">
         <div id="product-description" data-hook="product_description">
-          <h1 class="product-title mt-2" itemprop="name"><%= @product.name %></h1>
+          <h1 class="product-title mt-2"><%= @product.name %></h1>
 
-          <div itemprop="description" data-hook="description">
+          <div data-hook="description">
             <%= sanitize product_description(@product) %>
           </div>
 
@@ -46,3 +46,5 @@
     </div>
   </div>
 <% end %>
+
+<%= products_structured_data([@product]) %>

data/app/views/spree/taxons/show.html.erb

@@ -18,3 +18,5 @@
     <% end %>
   </div>
 <% end %>
+
+<%= products_structured_data(@products) %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc2
+  version: 4.0.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,7 @@ files:
 - app/helpers/spree/addresses_helper.rb
 - app/helpers/spree/frontend_helper.rb
 - app/helpers/spree/orders_helper.rb
+- app/helpers/spree/structured_data_helper.rb
 - app/helpers/spree/taxons_helper.rb
 - app/models/spree/frontend_configuration.rb
 - app/views/kaminari/twitter-bootstrap-4/_first_page.html.erb