alchemy-solidus 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6e92c70519b42d1b2ddd77907a413ee2ac8657b8bf180987d28c9beb12b93d9
-  data.tar.gz: 8dc7e00168b554f7efb2fbe01e884f269a7112d6feeaa7a63aa62c614271cf1d
+  metadata.gz: 78297e4bf371b6cfc4d26faa46417dbcbf165650a64d484f60dac52feae1ebde
+  data.tar.gz: 9d985945b0d70a693cef42837edf97791ac4c7b3b38b5df5e5e5c79e21382642
 SHA512:
-  metadata.gz: 45edca46563a2713b35b39ddd58e743909b0a72219532087264b6d4eb66aebe1199bd466d5d0833b80a04265106ebfcdc866510ecedc25f272f5a54c25701740
-  data.tar.gz: 78f94fce34c3689cd843da7a451bbe34e83100bd31c1f85b1f3ea0c761dba578b6b292cd340622917a08d39a8c8e74fed755a9a51ce278f7d1976c30a831dc70
+  metadata.gz: 0c1f70ee1697b9dc3aa3fdca9ab58e532a5adbf81c0ed5ddc7f3c1e07033c77717b43815920ca47f9d1a0731792fe69e7185402289a9cb5a4aa99bb4a6ae5d53
+  data.tar.gz: 7e5923735790b534b8e780f71a51b3cb4e07c34692a7977bf0accf9abb949406eee23cd4166c839b6d40df62c374832367e2dedef16f11ac4163e84041ec6c50

data/README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/AlchemyCMS/alchemy-solidus.svg?branch=master)](https://travis-ci.org/AlchemyCMS/alchemy-solidus)
+[![Gem Version](https://badge.fury.io/rb/alchemy-solidus.svg)](https://badge.fury.io/rb/alchemy-solidus)
 
 # Alchemy-Solidus
 

data/Rakefile

@@ -26,3 +26,11 @@ task :test_setup do
     exit($?.exitstatus) unless $?.success?
   end
 end
+
+require 'github_changelog_generator/task'
+require 'alchemy/solidus/version'
+GitHubChangelogGenerator::RakeTask.new(:changelog) do |config|
+  config.user = 'AlchemyCMS'
+  config.project = 'alchemy-solidus'
+  config.future_release = "v#{Alchemy::Solidus::VERSION}"
+end

data/app/assets/javascripts/alchemy/solidus/admin.js

@@ -0,0 +1,3 @@
+//= require alchemy/solidus/admin/product_select
+//= require alchemy/solidus/admin/variant_select
+//= require alchemy/solidus/admin/taxon_select

data/app/assets/javascripts/alchemy/solidus/admin/product_select.js

@@ -0,0 +1,32 @@
+//= require alchemy/solidus/admin/select2_config
+
+$.fn.alchemyProductSelect = function(options) {
+  var config = Alchemy.Solidus.getSelect2Config(options)
+
+  this.select2($.extend(true, config, {
+    ajax: {
+      data: function(term, page) {
+        return {
+          q: $.extend({
+            name_cont: term
+          }, options.query_params),
+          page: page
+        }
+      },
+      results: function(data, page) {
+        return {
+          results: data.products.map(function(product) {
+            return {
+              id: product.id,
+              text: product.name
+            }
+          }),
+          more: page * data.per_page < data.total_count
+        }
+      }
+    },
+    formatSelection: function(product) {
+      return product.text || product.name
+    }
+  }))
+}

data/app/assets/javascripts/alchemy/solidus/admin/select2_config.js

@@ -0,0 +1,24 @@
+Alchemy = window.Alchemy || {}
+Alchemy.Solidus = Alchemy.Solidus || {}
+
+Alchemy.Solidus.getSelect2Config = function(options) {
+  var headers = {
+    'X-Spree-Token': options.apiToken
+  }
+
+  return {
+    placeholder: options.placeholder,
+    minimumInputLength: 3,
+    initSelection: function(_$el, callback) {
+      if (options.initialSelection) {
+        callback(options.initialSelection)
+      }
+    },
+    ajax: {
+      url: options.baseUrl,
+      datatype: 'json',
+      quietMillis: 300,
+      params: { headers: headers }
+    }
+  }
+}

data/app/assets/javascripts/alchemy/solidus/admin/taxon_select.js

@@ -0,0 +1,32 @@
+//= require alchemy/solidus/admin/select2_config
+
+$.fn.alchemyTaxonSelect = function(options) {
+  var config = Alchemy.Solidus.getSelect2Config(options)
+
+  this.select2($.extend(true, config, {
+    ajax: {
+      data: function(term, page) {
+        return {
+          q: $.extend({
+            name_cont: term
+          }, options.query_params),
+          page: page
+        }
+      },
+      results: function(data, page) {
+        return {
+          results: data.taxons.map(function(taxon) {
+            return {
+              id: taxon.id,
+              text: taxon.name
+            }
+          }),
+          more: page * data.per_page < data.total_count
+        }
+      }
+    },
+    formatSelection: function(taxon) {
+      return taxon.text || taxon.name
+    }
+  }))
+}

data/app/assets/javascripts/alchemy/solidus/admin/variant_select.js

@@ -0,0 +1,32 @@
+//= require alchemy/solidus/admin/select2_config
+
+$.fn.alchemyVariantSelect = function(options) {
+  var config = Alchemy.Solidus.getSelect2Config(options)
+
+  this.select2($.extend(true, config, {
+    ajax: {
+      data: function(term, page) {
+        return {
+          q: $.extend({
+            product_name_or_sku_cont: term
+          }, options.query_params),
+          page: page
+        }
+      },
+      results: function(data, page) {
+        return {
+          results: data.variants.map(function(variant) {
+            return {
+              id: variant.id,
+              text: variant.frontend_display
+            }
+          }),
+          more: page * data.per_page < data.total_count
+        }
+      }
+    },
+    formatSelection: function(variant) {
+      return variant.text || variant.frontend_display
+    }
+  }))
+}

data/app/models/alchemy/essence_spree_product.rb

@@ -1,14 +1,28 @@
+# frozen_string_literal: true
+
 module Alchemy
   class EssenceSpreeProduct < ActiveRecord::Base
-    belongs_to :product, class_name: "Spree::Product", foreign_key: 'spree_product_id'
+    PRODUCT_ID = /\A\d+\z/
+
+    belongs_to :product, class_name: 'Spree::Product',
+      optional: true, foreign_key: 'spree_product_id'
 
-    acts_as_essence(
-      ingredient_column: 'spree_product_id',
-      preview_text_method: 'name'
-    )
+    acts_as_essence(ingredient_column: :product)
+
+    def ingredient=(product_or_id)
+      case product_or_id
+      when PRODUCT_ID
+        self.spree_product_id = product_or_id
+      when Spree::Product
+        self.product = product_or_id
+      else
+        super
+      end
+    end
 
-    def ingredient
-      product
+    def preview_text(_maxlength)
+      return unless product
+      product.name
     end
   end
 end

data/app/models/alchemy/essence_spree_taxon.rb

@@ -1,14 +1,28 @@
+# frozen_string_literal: true
+
 module Alchemy
   class EssenceSpreeTaxon < ActiveRecord::Base
-    belongs_to :taxon, class_name: "Spree::Taxon", foreign_key: 'taxon_id'
+    TAXON_ID = /\A\d+\z/
+
+    belongs_to :taxon, class_name: 'Spree::Taxon',
+      optional: true, foreign_key: 'taxon_id'
 
-    acts_as_essence(
-      ingredient_column: 'taxon_id',
-      preview_text_method: 'name'
-    )
+    acts_as_essence(ingredient_column: :taxon)
+
+    def ingredient=(taxon_or_id)
+      case taxon_or_id
+      when TAXON_ID
+        self.taxon_id = taxon_or_id
+      when Spree::Taxon
+        self.taxon = taxon_or_id
+      else
+        super
+      end
+    end
 
-    def ingredient
-      taxon
+    def preview_text(_maxlength)
+      return unless taxon
+      taxon.name
     end
   end
 end

data/app/models/alchemy/essence_spree_variant.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class EssenceSpreeVariant < ActiveRecord::Base
+    VARIANT_ID = /\A\d+\z/
+
+    belongs_to :variant, class_name: 'Spree::Variant', optional: true
+
+    acts_as_essence(ingredient_column: :variant)
+
+    def ingredient=(variant_or_id)
+      case variant_or_id
+      when VARIANT_ID
+        self.variant_id = variant_or_id
+      when Spree::Variant
+        self.variant = variant_or_id
+      else
+        super
+      end
+    end
+
+    def preview_text(_maxlength)
+      return unless variant
+      variant.descriptive_name
+    end
+  end
+end

data/app/views/alchemy/essences/_essence_spree_product_editor.html.erb

@@ -1,9 +1,24 @@
-<div class="content_editor essence_spree_product">
-  <label><%= render_content_name(content) %></label>
-  <%= select_tag(
+<div class="content_editor essence_spree_product" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
+  <%= content_label(content) %>
+  <%= text_field_tag(
     content.form_field_name,
-    options_from_collection_for_select(Spree::Product.not_deleted, :id, :name, content.essence.spree_product_id),
-    class: ['alchemy_selectbox very_long', html_options[:class]].join(' '),
-    style: html_options[:style]
+    content.essence.spree_product_id,
+    id: content.form_field_id,
+    class: 'alchemy_selectbox full_width'
   ) %>
 </div>
+
+<script>
+  $('#<%= content.form_field_id %>').alchemyProductSelect({
+    placeholder: "<%= Alchemy.t(:search_product, scope: 'solidus') %>",
+    apiToken: "<%= current_alchemy_user.spree_api_key %>",
+    baseUrl: "<%= spree.api_products_path %>",
+    query_params: <%== content.settings[:query_params].to_json %>,
+    <% if content.essence.product %>
+    initialSelection: {
+      id: <%= content.essence.spree_product_id %>,
+      text: "<%= content.essence.product.name %>"
+    }
+    <% end %>
+  })
+</script>

data/app/views/alchemy/essences/_essence_spree_taxon_editor.html.erb

@@ -1,15 +1,24 @@
-<div class="content_editor essence_spree_taxon essence_select">
+<div class="content_editor essence_spree_taxon" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
   <%= content_label(content) %>
-  <%= select_tag(
+  <%= text_field_tag(
     content.form_field_name,
-    options_from_collection_for_select(
-      local_assigns.fetch(:options, {})[:taxons] || Spree::Taxon.all,
-      :id,
-      :pretty_name,
-      content.essence.taxon_id
-    ),
-    include_blank: t(".none"),
-    class: ["alchemy_selectbox", "essence_editor_select", html_options[:class]].join(' '),
-    style: html_options[:style]
+    content.essence.taxon_id,
+    id: content.form_field_id,
+    class: 'alchemy_selectbox full_width'
   ) %>
 </div>
+
+<script>
+  $('#<%= content.form_field_id %>').alchemyTaxonSelect({
+    placeholder: "<%= Alchemy.t(:search_taxon, scope: 'solidus') %>",
+    apiToken: "<%= current_alchemy_user.spree_api_key %>",
+    baseUrl: "<%= spree.api_taxons_path %>",
+    query_params: <%== content.settings[:query_params].to_json %>,
+    <% if content.essence.taxon %>
+    initialSelection: {
+      id: <%= content.essence.taxon_id %>,
+      text: "<%= content.essence.taxon.name %>"
+    }
+    <% end %>
+  })
+</script>

data/app/views/alchemy/essences/_essence_spree_variant_editor.html.erb

@@ -0,0 +1,24 @@
+<div class="content_editor essence_spree_variant" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
+  <%= content_label(content) %>
+  <%= text_field_tag(
+    content.form_field_name,
+    content.essence.variant_id,
+    id: content.form_field_id,
+    class: 'alchemy_selectbox full_width'
+  ) %>
+</div>
+
+<script>
+  $('#<%= content.form_field_id %>').alchemyVariantSelect({
+    placeholder: "<%= Alchemy.t(:search_variant, scope: 'solidus') %>",
+    apiToken: "<%= current_alchemy_user.spree_api_key %>",
+    baseUrl: "<%= spree.api_variants_path %>",
+    query_params: <%== content.settings[:query_params].to_json %>,
+    <% if content.essence.variant %>
+    initialSelection: {
+      id: <%= content.essence.variant_id %>,
+      text: "<%= content.essence.variant.name %>"
+    }
+    <% end %>
+  })
+</script>

data/config/locales/alchemy_solidus_en.yml

@@ -1,4 +1,9 @@
 en:
+  alchemy:
+    solidus:
+      search_variant: Search a variant by name or sku
+      search_product: Search a product by name
+      search_taxon: Search a taxon by name
   spree:
     admin:
       tab:

data/db/migrate/20191107135822_create_alchemy_essence_spree_variants.rb

@@ -0,0 +1,9 @@
+class CreateAlchemyEssenceSpreeVariants < ActiveRecord::Migration[5.2]
+  def change
+    create_table :alchemy_essence_spree_variants do |t|
+      t.references :variant, null: true, foreign_key: { to_table: Spree::Variant.table_name }
+
+      t.timestamps
+    end
+  end
+end

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "2.4.0"
+    VERSION = "2.5.0"
   end
 end

data/lib/generators/alchemy/solidus/install/install_generator.rb

@@ -131,6 +131,11 @@ module Alchemy
           end
         end
       end
+
+      def append_assets
+        append_file "vendor/assets/javascripts/alchemy/admin/all.js",
+          "//= require alchemy/solidus/admin.js"
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -112,6 +112,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +182,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A AlchemyCMS and Solidus integration
 email:
 - thomas@vondeyen.com
@@ -178,12 +206,20 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/javascripts/alchemy/solidus/admin.js
+- app/assets/javascripts/alchemy/solidus/admin/product_select.js
+- app/assets/javascripts/alchemy/solidus/admin/select2_config.js
+- app/assets/javascripts/alchemy/solidus/admin/taxon_select.js
+- app/assets/javascripts/alchemy/solidus/admin/variant_select.js
 - app/models/alchemy/essence_spree_product.rb
 - app/models/alchemy/essence_spree_taxon.rb
+- app/models/alchemy/essence_spree_variant.rb
 - app/views/alchemy/essences/_essence_spree_product_editor.html.erb
 - app/views/alchemy/essences/_essence_spree_product_view.html.erb
 - app/views/alchemy/essences/_essence_spree_taxon_editor.html.erb
 - app/views/alchemy/essences/_essence_spree_taxon_view.html.erb
+- app/views/alchemy/essences/_essence_spree_variant_editor.html.erb
+- app/views/alchemy/essences/_essence_spree_variant_view.html.erb
 - app/views/spree/admin/shared/_alchemy_sub_menu.html.erb
 - config/initializers/alchemy.rb
 - config/initializers/solidus.rb
@@ -192,6 +228,7 @@ files:
 - config/locales/en.yml
 - db/migrate/20120229160509_create_alchemy_essence_spree_products.rb
 - db/migrate/20131030140218_create_alchemy_essence_spree_taxons.rb
+- db/migrate/20191107135822_create_alchemy_essence_spree_variants.rb
 - lib/alchemy-solidus.rb
 - lib/alchemy/solidus/alchemy_in_solidus.rb
 - lib/alchemy/solidus/alchemy_user_extension.rb