solidus_reviews 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f786e0b7b86049c102cea681a540eae39543d8afa2b428092de2470c7e8caf28
-  data.tar.gz: 7d06e09fbc10a29eae662fa260874a6c202bcde097a99fb22b7bf13bec68b193
+  metadata.gz: a4e942dd7285deb7b0cf758d8fbe4a953ce2b963633663548973d92d3de96011
+  data.tar.gz: 13c4dcf8795994edf582f417d48b584d1cebc8c393656c43d0688a75301aa500
 SHA512:
-  metadata.gz: 50e9f5c509e0ed7a6ca2c7ef783a4cd33bc06649873266690a1e2fe70ca4d582ca530203aa6f83d94dc202b38fe6a7f56628909c9712d40f68e39d4a56197b3e
-  data.tar.gz: 77e05282a759c6e0d8029f686263a24379408416718b5f88fd9ea2ad66274ef64f8c86fa973679410ec9095b43d7fa80fa17e183a8b4c414a2ce8ac76d7f19f0
+  metadata.gz: 32089cd4cb4ab16ef7da9cb8f6f865a01d0e98676f274736a2ec6978227390434b10bbe03ce64e5ee6df3ce9a69c15a306f57fab5164bd65be04ede4e67d090d
+  data.tar.gz: b6020cf9ef67a93fee51d2c9622a1b62d1423414396781159048f47965ec0e4b289069fb7576fea5d4aaae9eb02cfdc73abfce6231f6fedd4599734ba1f1cb2e

data/app/models/spree/review.rb

@@ -27,6 +27,23 @@ class Spree::Review < ApplicationRecord
   scope :not_approved, -> { where(approved: false) }
   scope :default_approval_filter, -> { Spree::Reviews::Config[:include_unapproved_reviews] ? all : approved }
 
+  def self.ransackable_attributes(*)
+    [
+      "approved",
+      "name",
+      "review",
+      "title"
+    ]
+  end
+
+  def self.ransackable_associations(*)
+    [
+      "feedback_reviews",
+      "product",
+      "user"
+    ]
+  end
+
   def feedback_stars
     return 0 if feedback_reviews.size <= 0
 

data/app/overrides/spree/products/show/add_reviews_after_product_properties.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_after "[data-hook='product_properties']" -->
+
+<%= render "spree/shared/reviews" %>

data/config/initializers/add_spree_reviews_to_menu.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+Rails.application.config.to_prepare do
+  Spree::Backend::Config.configure do |config|
+    config.menu_items = config.menu_items.map do |item|
+      if item.label.to_sym == :settings
+        # The API of the MenuItem class changes in Solidus 4.2.0
+        if item.respond_to?(:children)
+          item.children << Spree::BackendConfiguration::MenuItem.new(
+            label: :reviews,
+            condition: -> { can?(:admin, Spree::ReviewsConfiguration) },
+            url: -> { Spree::Core::Engine.routes.url_helpers.edit_admin_review_settings_path },
+            match_path: /review_settings/
+          )
+        else
+          item.sections << :reviews
+        end
+      elsif item.label.to_sym == :products
+        if item.respond_to?(:children)
+          item.children << Spree::BackendConfiguration::MenuItem.new(
+            label: :reviews,
+            condition: -> { can?(:admin, Spree::Review) },
+            url: -> { Spree::Core::Engine.routes.url_helpers.admin_reviews_path },
+            match_path: /reviews/
+          )
+        else
+          item.sections << :reviews
+        end
+      end
+      item
+    end
+  end
+end

data/lib/solidus_reviews/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusReviews
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 end

data/spec/models/review_spec.rb

@@ -123,6 +123,18 @@ describe Spree::Review do
     end
   end
 
+  describe '.ransackable_attributes' do
+    subject { described_class.ransackable_attributes }
+
+    it { is_expected.to contain_exactly("approved", "name", "review", "title") }
+  end
+
+  describe '.ransackable_associations' do
+    subject { described_class.ransackable_associations }
+
+    it { is_expected.to contain_exactly("feedback_reviews", "product", "user") }
+  end
+
   describe '#recalculate_product_rating' do
     let(:product) { create(:product) }
     let!(:review) { create(:review, product: product) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_reviews
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Solidus Contrib
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-20 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -115,9 +115,7 @@ files:
 - app/models/spree/review.rb
 - app/models/spree/reviews_ability.rb
 - app/models/spree/reviews_configuration.rb
-- app/overrides/add_reviews_after_product_properties.rb
-- app/overrides/add_reviews_tab_to_admin.rb
-- app/overrides/add_reviews_to_admin_configuration_sidebar.rb
+- app/overrides/spree/products/show/add_reviews_after_product_properties.html.erb.deface
 - app/views/spree/admin/feedback_reviews/index.html.erb
 - app/views/spree/admin/review_settings/edit.html.erb
 - app/views/spree/admin/reviews/_form.html.erb
@@ -147,6 +145,7 @@ files:
 - bin/rake
 - bin/sandbox
 - bin/setup
+- config/initializers/add_spree_reviews_to_menu.rb
 - config/initializers/constants.rb
 - config/initializers/load_preferences.rb
 - config/locales/de-CH.yml
@@ -233,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Review and rating functionality for your Solidus store.

data/app/overrides/add_reviews_after_product_properties.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-Deface::Override.new(virtual_path: "spree/products/show",
-  name: "converted_product_properties_767643482",
-  insert_after: "[data-hook='product_properties']",
-  partial: "spree/shared/reviews",
-  disabled: false)

data/app/overrides/add_reviews_tab_to_admin.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-Spree::Backend::Config.configure do |config|
-  config.menu_items.detect { |menu_item|
-    menu_item.label == :products
-  }.sections << :reviews
-end
-
-Deface::Override.new(
-  virtual_path: "spree/admin/shared/_product_sub_menu",
-  name: "reviews_admin_tab",
-  insert_bottom: "[data-hook='admin_product_sub_tabs']",
-  disabled: false
-) do
-  <<-HTML
-    <% if can? :admin, Spree::Review %>
-      <%= tab(:reviews, label: 'review_management') %>
-    <% end %>
-  HTML
-end

data/app/overrides/add_reviews_to_admin_configuration_sidebar.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-Spree::Backend::Config.configure do |config|
-  config.menu_items.detect { |menu_item|
-    menu_item.label == :settings
-  }.sections << :review_settings
-end
-
-Deface::Override.new(
-  virtual_path: "spree/admin/shared/_settings_sub_menu",
-  name: "converted_admin_configurations_menu",
-  insert_bottom: "[data-hook='admin_settings_sub_tabs']",
-  disabled: false
-) do
-  <<-HTML
-    <% if can? :admin, Spree::ReviewsConfiguration %>
-      <%= tab :reviews, url: spree.edit_admin_review_settings_path, match_path: /review_settings/ %>
-    <% end %>
-  HTML
-end