solidus_reviews 1.2.0 → 1.5.0

data/CHANGELOG.md

@@ -0,0 +1,155 @@
+# Changelog
+
+## [v1.5.0](https://github.com/solidusio-contrib/solidus_reviews/tree/v1.5.0) (2021-09-20)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_reviews/compare/v1.4.1...v1.5.0)
+
+**Closed issues:**
+
+- Dependabot can't resolve your Ruby dependency files [\#105](https://github.com/solidusio-contrib/solidus_reviews/issues/105)
+- Prepare Solidus Reviews for Solidus 3.0 [\#101](https://github.com/solidusio-contrib/solidus_reviews/issues/101)
+- Installing fresh solidus and solidus\_reviews, rails g solidus\_reviews:install fails [\#100](https://github.com/solidusio-contrib/solidus_reviews/issues/100)
+- Dependabot can't resolve your Ruby dependency files [\#97](https://github.com/solidusio-contrib/solidus_reviews/issues/97)
+- Dependabot can't resolve your Ruby dependency files [\#96](https://github.com/solidusio-contrib/solidus_reviews/issues/96)
+
+**Merged pull requests:**
+
+- bump to support ruby 3 and solidus 3 [\#103](https://github.com/solidusio-contrib/solidus_reviews/pull/103) ([peterberkenbosch](https://github.com/peterberkenbosch))
+- Fix specs to allow support for solidus 3 [\#102](https://github.com/solidusio-contrib/solidus_reviews/pull/102) ([seriousammy](https://github.com/seriousammy))
+- Update gem to latest solidus\_dev\_support [\#99](https://github.com/solidusio-contrib/solidus_reviews/pull/99) ([nirebu](https://github.com/nirebu))
+- Make reviews:config like the config in solidus-frontend [\#98](https://github.com/solidusio-contrib/solidus_reviews/pull/98) ([marcrohloff](https://github.com/marcrohloff))
+
+## [v1.4.1](https://github.com/solidusio-contrib/solidus_reviews/tree/v1.4.1) (2020-08-10)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_reviews/compare/v1.4.0...v1.4.1)
+
+## [v1.4.0](https://github.com/solidusio-contrib/solidus_reviews/tree/v1.4.0) (2020-08-06)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_reviews/compare/v1.3.0...v1.4.0)
+
+**Closed issues:**
+
+- Cannot select star rating when creating or editing a review [\#88](https://github.com/solidusio-contrib/solidus_reviews/issues/88)
+- uninitialized constant SolidusReviews::Spree::Admin \(NameError\) [\#77](https://github.com/solidusio-contrib/solidus_reviews/issues/77)
+- Dependabot can't resolve your Ruby dependency files [\#75](https://github.com/solidusio-contrib/solidus_reviews/issues/75)
+- Dependabot can't resolve your Ruby dependency files [\#74](https://github.com/solidusio-contrib/solidus_reviews/issues/74)
+- Dependabot can't resolve your Ruby dependency files [\#73](https://github.com/solidusio-contrib/solidus_reviews/issues/73)
+- Dependabot can't resolve your Ruby dependency files [\#71](https://github.com/solidusio-contrib/solidus_reviews/issues/71)
+- Dependabot can't resolve your Ruby dependency files [\#70](https://github.com/solidusio-contrib/solidus_reviews/issues/70)
+- Dependabot can't resolve your Ruby dependency files [\#69](https://github.com/solidusio-contrib/solidus_reviews/issues/69)
+- Users should be able to upload images as part of their review [\#67](https://github.com/solidusio-contrib/solidus_reviews/issues/67)
+
+**Merged pull requests:**
+
+- Replace deprected ` SolidusSupport::EngineExtensions::Decorators` with ` SolidusSupport::EngineExtensions` [\#93](https://github.com/solidusio-contrib/solidus_reviews/pull/93) ([marcrohloff](https://github.com/marcrohloff))
+- Allow solidus\_support 0.4 [\#92](https://github.com/solidusio-contrib/solidus_reviews/pull/92) ([mamhoff](https://github.com/mamhoff))
+- Fixes review title [\#91](https://github.com/solidusio-contrib/solidus_reviews/pull/91) ([memotoro](https://github.com/memotoro))
+- remove extraneous .css file [\#90](https://github.com/solidusio-contrib/solidus_reviews/pull/90) ([dhughesbc](https://github.com/dhughesbc))
+- Relax solidus\_support dependency [\#86](https://github.com/solidusio-contrib/solidus_reviews/pull/86) ([kennyadsl](https://github.com/kennyadsl))
+- Adds PermissionSets classes and checks for Reviews [\#85](https://github.com/solidusio-contrib/solidus_reviews/pull/85) ([memotoro](https://github.com/memotoro))
+- Adds controls for image uploads [\#83](https://github.com/solidusio-contrib/solidus_reviews/pull/83) ([memotoro](https://github.com/memotoro))
+- Add option to auto approve star only reviews [\#82](https://github.com/solidusio-contrib/solidus_reviews/pull/82) ([KaemonIsland](https://github.com/KaemonIsland))
+- Add touch to feedback review model [\#81](https://github.com/solidusio-contrib/solidus_reviews/pull/81) ([KaemonIsland](https://github.com/KaemonIsland))
+- Add feedback reviews to api [\#79](https://github.com/solidusio-contrib/solidus_reviews/pull/79) ([KaemonIsland](https://github.com/KaemonIsland))
+- Fix path for Spree::ProductsControllerDecorator [\#78](https://github.com/solidusio-contrib/solidus_reviews/pull/78) ([aldesantis](https://github.com/aldesantis))
+- Add edit and update methods to reviews controller [\#76](https://github.com/solidusio-contrib/solidus_reviews/pull/76) ([KaemonIsland](https://github.com/KaemonIsland))
+- Update to solidus\_dev\_support [\#72](https://github.com/solidusio-contrib/solidus_reviews/pull/72) ([aldesantis](https://github.com/aldesantis))
+
+## [v1.3.0](https://github.com/solidusio-contrib/solidus_reviews/tree/v1.3.0) (2019-11-27)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_reviews/compare/v1.2.0...v1.3.0)
+
+**Closed issues:**
+
+- sass/rails is deprecated. Please update to `require 'sassc/rails'` [\#48](https://github.com/solidusio-contrib/solidus_reviews/issues/48)
+- Class variable access from toplevel [\#47](https://github.com/solidusio-contrib/solidus_reviews/issues/47)
+
+**Merged pull requests:**
+
+- Prepare v1.3.0 [\#68](https://github.com/solidusio-contrib/solidus_reviews/pull/68) ([aldesantis](https://github.com/aldesantis))
+- Adopt solidus\_extension\_dev\_tools [\#66](https://github.com/solidusio-contrib/solidus_reviews/pull/66) ([aldesantis](https://github.com/aldesantis))
+- Switch to sassc/rails [\#65](https://github.com/solidusio-contrib/solidus_reviews/pull/65) ([pelargir](https://github.com/pelargir))
+- Fix flaky specs caused by bad preference stubbing [\#54](https://github.com/solidusio-contrib/solidus_reviews/pull/54) ([aldesantis](https://github.com/aldesantis))
+
+## [v1.2.0](https://github.com/solidusio-contrib/solidus_reviews/tree/v1.2.0) (2019-09-17)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_reviews/compare/v1.1.1...v1.2.0)
+
+**Merged pull requests:**
+
+- Remove solidus\_auth\_devise as dependency [\#53](https://github.com/solidusio-contrib/solidus_reviews/pull/53) ([kennyadsl](https://github.com/kennyadsl))
+- Adopt CircleCI instead of Travis [\#51](https://github.com/solidusio-contrib/solidus_reviews/pull/51) ([aldesantis](https://github.com/aldesantis))
+
+## [v1.1.1](https://github.com/solidusio-contrib/solidus_reviews/tree/v1.1.1) (2019-08-15)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_reviews/compare/v1.1.0...v1.1.1)
+
+**Closed issues:**
+
+- Rubygems release [\#22](https://github.com/solidusio-contrib/solidus_reviews/issues/22)
+
+**Merged pull requests:**
+
+- Adds missing API features to the index and show endpoints [\#46](https://github.com/solidusio-contrib/solidus_reviews/pull/46) ([ericsaupe](https://github.com/ericsaupe))
+
+## [v1.1.0](https://github.com/solidusio-contrib/solidus_reviews/tree/v1.1.0) (2019-08-14)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_reviews/compare/v1.0.0...v1.1.0)
+
+**Closed issues:**
+
+- Support rating only reviews [\#41](https://github.com/solidusio-contrib/solidus_reviews/issues/41)
+- Settings \> Reviews styling is broken [\#35](https://github.com/solidusio-contrib/solidus_reviews/issues/35)
+- Need add key to translate file ru.yml [\#23](https://github.com/solidusio-contrib/solidus_reviews/issues/23)
+- Error in solidus 2.1 due to add\_routes method [\#5](https://github.com/solidusio-contrib/solidus_reviews/issues/5)
+
+**Merged pull requests:**
+
+- General Typos [\#45](https://github.com/solidusio-contrib/solidus_reviews/pull/45) ([ericsaupe](https://github.com/ericsaupe))
+- Updated API to include new fields [\#44](https://github.com/solidusio-contrib/solidus_reviews/pull/44) ([ericsaupe](https://github.com/ericsaupe))
+- Fix specs [\#43](https://github.com/solidusio-contrib/solidus_reviews/pull/43) ([ericsaupe](https://github.com/ericsaupe))
+- Rating only reviews [\#42](https://github.com/solidusio-contrib/solidus_reviews/pull/42) ([ericsaupe](https://github.com/ericsaupe))
+- Adds verified purchaser [\#40](https://github.com/solidusio-contrib/solidus_reviews/pull/40) ([ericsaupe](https://github.com/ericsaupe))
+- Cleanup [\#39](https://github.com/solidusio-contrib/solidus_reviews/pull/39) ([ericsaupe](https://github.com/ericsaupe))
+- Added Images to Reviews [\#38](https://github.com/solidusio-contrib/solidus_reviews/pull/38) ([ericsaupe](https://github.com/ericsaupe))
+- Add missing admin translation [\#37](https://github.com/solidusio-contrib/solidus_reviews/pull/37) ([jtapia](https://github.com/jtapia))
+- Fix wrong locale id for require login in admin [\#36](https://github.com/solidusio-contrib/solidus_reviews/pull/36) ([kevinnio](https://github.com/kevinnio))
+- Gem maintenance [\#34](https://github.com/solidusio-contrib/solidus_reviews/pull/34) ([spaghetticode](https://github.com/spaghetticode))
+- Remove Solidus v2.3 from Travis config \(EOL\) [\#33](https://github.com/solidusio-contrib/solidus_reviews/pull/33) ([aitbw](https://github.com/aitbw))
+- Add Solidus v2.7 and v2.8 to Travis config [\#32](https://github.com/solidusio-contrib/solidus_reviews/pull/32) ([aitbw](https://github.com/aitbw))
+- Fix deprecation warnings [\#31](https://github.com/solidusio-contrib/solidus_reviews/pull/31) ([aitbw](https://github.com/aitbw))
+- Fix Travis build [\#30](https://github.com/solidusio-contrib/solidus_reviews/pull/30) ([aitbw](https://github.com/aitbw))
+- Fix validation i18n [\#29](https://github.com/solidusio-contrib/solidus_reviews/pull/29) ([mamhoff](https://github.com/mamhoff))
+- Avoid conflicts when same rating HTML is repeated on page [\#28](https://github.com/solidusio-contrib/solidus_reviews/pull/28) ([spaghetticode](https://github.com/spaghetticode))
+- Add missing TH tag [\#27](https://github.com/solidusio-contrib/solidus_reviews/pull/27) ([spaghetticode](https://github.com/spaghetticode))
+- Use default translation key structure for validation message [\#26](https://github.com/solidusio-contrib/solidus_reviews/pull/26) ([aldesantis](https://github.com/aldesantis))
+- Remove redundant rescue\_from from api controller [\#24](https://github.com/solidusio-contrib/solidus_reviews/pull/24) ([dgra](https://github.com/dgra))
+- Improve specs [\#21](https://github.com/solidusio-contrib/solidus_reviews/pull/21) ([kennyadsl](https://github.com/kennyadsl))
+- Refactor spec helper to let specs pass [\#20](https://github.com/solidusio-contrib/solidus_reviews/pull/20) ([kennyadsl](https://github.com/kennyadsl))
+- Fix Trevis CI badge to use master branch status [\#19](https://github.com/solidusio-contrib/solidus_reviews/pull/19) ([kennyadsl](https://github.com/kennyadsl))
+- Fix bundle install issue with solidus\_auth\_devise 2.0 [\#18](https://github.com/solidusio-contrib/solidus_reviews/pull/18) ([kennyadsl](https://github.com/kennyadsl))
+- Fix resetting preferences in specs [\#17](https://github.com/solidusio-contrib/solidus_reviews/pull/17) ([kennyadsl](https://github.com/kennyadsl))
+- Add italian translations [\#16](https://github.com/solidusio-contrib/solidus_reviews/pull/16) ([vassalloandrea](https://github.com/vassalloandrea))
+- Add user email to admin review editing page [\#15](https://github.com/solidusio-contrib/solidus_reviews/pull/15) ([pelargir](https://github.com/pelargir))
+- Api interface [\#14](https://github.com/solidusio-contrib/solidus_reviews/pull/14) ([dgra](https://github.com/dgra))
+- General Solidus 2.3 updates [\#13](https://github.com/solidusio-contrib/solidus_reviews/pull/13) ([dgra](https://github.com/dgra))
+- Prefix named route [\#11](https://github.com/solidusio-contrib/solidus_reviews/pull/11) ([pelargir](https://github.com/pelargir))
+- Add the has\_many association for reviews from a user [\#10](https://github.com/solidusio-contrib/solidus_reviews/pull/10) ([dgra](https://github.com/dgra))
+- Updates to Solidus admin UI [\#9](https://github.com/solidusio-contrib/solidus_reviews/pull/9) ([tvdeyen](https://github.com/tvdeyen))
+- Update for Solidus 2.1 [\#6](https://github.com/solidusio-contrib/solidus_reviews/pull/6) ([kennyadsl](https://github.com/kennyadsl))
+
+## [v1.0.0](https://github.com/solidusio-contrib/solidus_reviews/tree/v1.0.0) (2017-02-03)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_reviews/compare/8640958dc42f9472cb5cbb85cab981a44f4c45db...v1.0.0)
+
+**Merged pull requests:**
+
+- Allow solidus\_auth\_devise \< 1.5 [\#8](https://github.com/solidusio-contrib/solidus_reviews/pull/8) ([tvdeyen](https://github.com/tvdeyen))
+- Test against multiple Solidus 1.x versions [\#7](https://github.com/solidusio-contrib/solidus_reviews/pull/7) ([tvdeyen](https://github.com/tvdeyen))
+- Fix install generator [\#3](https://github.com/solidusio-contrib/solidus_reviews/pull/3) ([andrewjwu](https://github.com/andrewjwu))
+- Do not add CRUD product routes to frontend [\#2](https://github.com/solidusio-contrib/solidus_reviews/pull/2) ([mamhoff](https://github.com/mamhoff))
+- Move factories into `lib` [\#1](https://github.com/solidusio-contrib/solidus_reviews/pull/1) ([alexblackie](https://github.com/alexblackie))
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/Gemfile

@@ -1,31 +1,28 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem 'solidus', git: 'https://github.com/solidusio/solidus.git', branch: branch
-gem 'solidus_auth_devise'
+gem 'solidus', github: 'solidusio/solidus', branch: branch
 
-# Needed to help Bundler figure out how to resolve dependencies, otherwise it takes forever to
-# resolve them
-if branch == 'master' || Gem::Version.new(branch[1..-1]) >= Gem::Version.new('2.10.0')
-  gem 'rails', '~> 6.0'
-else
-  gem 'rails', '~> 5.0'
-end
+# Needed to help Bundler figure out how to resolve dependencies,
+# otherwise it takes forever to resolve them.
+# See https://github.com/bundler/bundler/issues/6677
+gem 'rails', '>0.a'
 
-gem 'puma'
-gem 'rails-controller-testing', group: :test
+# Provides basic authentication functionality for testing parts of your engine
+gem 'solidus_auth_devise'
 
 case ENV['DB']
 when 'mysql'
-  gem 'mysql2', '~> 0.4.10'
-when 'postgres'
-  gem 'pg', '~> 0.21'
+  gem 'mysql2'
+when 'postgresql'
+  gem 'pg'
+else
+  gem 'sqlite3'
 end
 
-group :development, :test do
-  gem 'factory_bot', '> 4.10.0'
-end
+gem 'rails-controller-testing', group: :test
 
 gemspec

data/{LICENSE.md → LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2019 Solidus and contributors.
+Copyright (c) 2020 Solidus and contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/README.md

@@ -1,12 +1,10 @@
-# Reviews
+# Solidus Reviews
 
 [![CircleCI](https://circleci.com/gh/solidusio-contrib/solidus_reviews.svg?style=svg)](https://circleci.com/gh/solidusio-contrib/solidus_reviews)
 
-Straightforward review/rating functionality, updated for
-[Solidus](https://solidus.io). While the Gem name has changed, the module
-namespace and commands are still `spree` for now.
+Straightforward review/rating functionality, updated for [Solidus](https://solidus.io).
 
----
+While the gem's name has changed, the module namespace and commands are still `spree` for now.
 
 ## Installation
 
@@ -15,77 +13,101 @@ Add the following to your `Gemfile` to install from git:
 ```ruby
 gem 'solidus_reviews', github: 'solidusio-contrib/solidus_reviews'
 ```
+
 Now bundle up with:
 
-    bundle
+```console
+$ bundle
+```
 
 Next, run the rake task that copies the necessary migrations and assets to your project:
 
-    rails g solidus_reviews:install
+```console
+$ rails g solidus_reviews:install
+```
 
 And finish with a migrate:
 
-    rake db:migrate
+```console
+$ rake db:migrate
+```
 
 Now you should be able to boot up your server with:
 
-    rails s
+```console
+$ rails s
+```
 
 That's all!
 
----
-
 ## Usage
 
-Action "submit" in "reviews" controller - goes to review entry form
+The `Spree::ReviewsController` controller provides all the CRUD functionality for product reviews.
 
-Users must be logged in to submit a review
+The `Spree::FeedbackReviewsController` allows user to express their feedback on a specific review.
+You can think of these as meta-reviews (e.g. the classic "Was this useful?" modal).
 
-Three partials:
- - `app/views/spree/products/_rating.html.erb` -- display number of stars
- - `app/views/spree/products/_shortrating.html.erb` -- shorter version of above
- - `app/views/spree/products/_review.html.erb` -- display a single review
-
-Administrator can edit and/or approve and/or delete reviews.
+You can approve, edit and delete reviews and feedback reviews from the backend.
 
 ## Factories
 
-If you want factories for our models available in your application, simply
-require our factories in your `spec_helper.rb`:
+If you want factories for our models available in your application, simply require our factories in
+your `spec_helper.rb`:
 
 ```ruby
-require "solidus_reviews/factories"
+require 'solidus_reviews/factories'
 ```
 
-## Implementation
-
-Reviews table is quite obvious - and note the "approved" flag which is for the
-administrator to update.
+### Testing the extension
 
-Ratings table holds current fractional value - avoids frequent recalc...
+First bundle your dependencies, then run `bin/rake`. `bin/rake` will default to building the dummy
 
----
+app if it does not exist, then it will run specs. The dummy app can be regenerated by using
+`bin/rake extension:test_app`.
 
-## Testing
+```shell
+bin/rake
+```
 
-Just run the following to automatically build a dummy app if necessary and
-run the tests:
+To run [Rubocop](https://github.com/bbatsov/rubocop) static code analysis run
 
 ```shell
-bundle exec rake
+bundle exec rubocop
 ```
 
----
+### Running the sandbox
 
-## Contributing
+To run this extension in a sandboxed Solidus application, you can run `bin/sandbox`. The path for
 
-See corresponding [contributing guidelines][1].
+the sandbox app is `./sandbox` and `bin/rails` will forward any Rails commands to
+`sandbox/bin/rails`.
+
+Here's an example:
+
+```
+$ bin/rails server
+=> Booting Puma
+=> Rails 6.0.2.1 application starting in development
+* Listening on tcp://127.0.0.1:3000
+Use Ctrl-C to stop
+```
+
+### Updating the changelog
+
+Before and after releases the changelog should be updated to reflect the up-to-date status of
+the project:
+```shell
+
+bin/rake changelog
+git add CHANGELOG.md
+git commit -m "Update the changelog"
+```
+
+## Contributing
 
----
+Bug reports and pull requests are welcome on GitHub at <https://github.com/solidusio-contrib/solidus_reviews>.
 
-Copyright (c) 2009-2019 [Solidus][2] and [contributors][3], released under the [New BSD License][4]
+## License
 
-[1]: ./CONTRIBUTING.md
-[2]: https://github.com/solidusio
-[3]: https://github.com/solidusio-contrib/solidus_reviews/graphs/contributors
-[4]: ./LICENSE.md
+Copyright (c) 2009-2020 [Solidus](https://github.com/solidusio) and [contributors](https://github.com/solidusio-contrib/solidus_reviews/graphs/contributors),
+released under the [New BSD License](https://github.com/solidusio-contrib/solidus_reviews/blob/master/LICENSE.md).

data/Rakefile

@@ -1,23 +1,6 @@
 # frozen_string_literal: true
 
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'solidus_dev_support/rake_tasks'
+SolidusDevSupport::RakeTasks.install
 
-require 'rspec/core/rake_task'
-require 'spree/testing_support/extension_rake'
-
-RSpec::Core::RakeTask.new
-
-task :default do
-  if Dir["spec/dummy"].empty?
-    Rake::Task[:test_app].invoke
-    Dir.chdir("../../")
-  end
-  Rake::Task[:spec].invoke
-end
-
-desc 'Generates a dummy app for testing'
-task :test_app do
-  ENV['LIB_NAME'] = 'solidus_reviews'
-  Rake::Task['extension:test_app'].invoke
-end
+task default: 'extension:specs'

data/app/assets/stylesheets/spree/frontend/solidus_reviews.css

@@ -0,0 +1,4 @@
+/*
+Placeholder manifest file.
+the installer will append this file to the app vendored assets here: 'vendor/assets/stylesheets/spree/frontend/all.css'
+*/

data/app/controllers/spree/feedback_reviews_controller.rb

@@ -16,13 +16,7 @@ class Spree::FeedbackReviewsController < Spree::StoreController
     end
 
     respond_to do |format|
-      format.html {
-        if SolidusSupport.solidus_gem_version < Gem::Version.new('2.0')
-          redirect_to(:back)
-        else
-          redirect_back(fallback_location: root_path)
-        end
-      }
+      format.html { redirect_back(fallback_location: root_path) }
       format.js { render action: :create }
     end
   end
@@ -30,7 +24,7 @@ class Spree::FeedbackReviewsController < Spree::StoreController
   protected
 
   def load_review
-    @review ||= Spree::Review.find_by_id!(params[:review_id])
+    @review ||= Spree::Review.find_by!(id: params[:review_id])
   end
 
   def permitted_feedback_review_attributes

data/app/controllers/spree/reviews_controller.rb

@@ -2,7 +2,7 @@
 
 class Spree::ReviewsController < Spree::StoreController
   helper Spree::BaseHelper
-  before_action :load_product, only: [:index, :new, :create]
+  before_action :load_product, only: [:index, :new, :create, :edit, :update]
 
   def index
     @approved_reviews = Spree::Review.approved.where(product: @product)
@@ -13,9 +13,17 @@ class Spree::ReviewsController < Spree::StoreController
     authorize! :create, @review
   end
 
+  def edit
+    @review = Spree::Review.find(params[:id])
+    if @review.product.nil?
+      flash[:error] = I18n.t('spree.error_no_product')
+    end
+    authorize! :update, @review
+  end
+
   # save if all ok
   def create
-    params[:review][:rating].sub!(/\s*[^0-9]*\z/, '') unless params[:review][:rating].blank?
+    review_params[:rating].sub!(/\s*[^0-9]*\z/, '') if review_params[:rating].present?
 
     @review = Spree::Review.new(review_params)
     @review.product = @product
@@ -36,6 +44,25 @@ class Spree::ReviewsController < Spree::StoreController
     end
   end
 
+  def update
+    review_params[:rating].sub!(/\s*[^0-9]*\z/, '') if params[:review][:rating].present?
+
+    @review = Spree::Review.find(params[:id])
+
+    # Handle images
+    params[:review][:images]&.each do |image|
+      @review.images.new(attachment: image)
+    end
+
+    authorize! :update, @review
+    if @review.update(review_params)
+      flash[:notice] = I18n.t('spree.review_successfully_submitted')
+      redirect_to spree.product_path(@product)
+    else
+      render :edit
+    end
+  end
+
   private
 
   def load_product

data/app/decorators/controllers/solidus_reviews/spree/{admin/products_controller_decorator.rb → products_controller_decorator.rb}

@@ -7,10 +7,6 @@ module SolidusReviews
         base.class_eval do
           helper ::Spree::ReviewsHelper
         end
-
-        [:avg_rating, :reviews_count].each do |attribute|
-          ::Spree::PermittedAttributes.product_attributes << attribute
-        end
       end
 
       ::Spree::ProductsController.prepend self

data/app/decorators/models/solidus_reviews/spree/product_decorator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module SolidusReviews
   module Spree
     module ProductDecorator
@@ -16,11 +17,11 @@ module SolidusReviews
         reviews_count = reviews.reload.default_approval_filter.count
 
         self.reviews_count = reviews_count
-        if reviews_count > 0
-          self.avg_rating = '%.1f' % (reviews.default_approval_filter.sum(:rating).to_f / reviews_count)
-        else
-          self.avg_rating = 0
-        end
+        self.avg_rating = if reviews_count > 0
+                            '%.1f' % (reviews.default_approval_filter.sum(:rating).to_f / reviews_count)
+                          else
+                            0
+                          end
         save
       end
 

data/app/helpers/spree/reviews_helper.rb

@@ -2,7 +2,7 @@
 
 module Spree::ReviewsHelper
   def star(the_class)
-    content_tag(:span, " ✮ ".html_safe, class: the_class)
+    tag.span(" ✮ ".html_safe, class: the_class)
   end
 
   def mk_stars(m)
@@ -18,10 +18,10 @@ module Spree::ReviewsHelper
   def display_verified_purchaser?(review)
     Spree::Reviews::Config[:show_verified_purchaser] && review.user &&
     Spree::LineItem.joins(:order, :variant)
-      .where.not(spree_orders: { completed_at: nil })
-      .find_by(
-        spree_variants: { product_id: review.product_id },
-        spree_orders: { user_id: review.user_id }
-      ).present?
+                   .where.not(spree_orders: { completed_at: nil })
+                   .find_by(
+                     spree_variants: { product_id: review.product_id },
+                     spree_orders: { user_id: review.user_id }
+                   ).present?
   end
 end

data/app/models/spree/feedback_review.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-class Spree::FeedbackReview < ActiveRecord::Base
+class Spree::FeedbackReview < ApplicationRecord
   belongs_to :user, class_name: Spree.user_class.to_s, optional: true
 
-  belongs_to :review, dependent: :destroy
+  belongs_to :review, touch: true
   validates :review, presence: true
 
   validates :rating, numericality: { only_integer: true,

data/app/models/spree/permission_sets/review_display.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Spree
+  module PermissionSets
+    class ReviewDisplay < PermissionSets::Base
+      def activate!
+        can [:display, :admin], Spree::Review
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/review_management.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Spree
+  module PermissionSets
+    class ReviewManagement < PermissionSets::Base
+      def activate!
+        can :manage, Spree::Review
+      end
+    end
+  end
+end

data/app/models/spree/review.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
-class Spree::Review < ActiveRecord::Base
+class Spree::Review < ApplicationRecord
   belongs_to :product, touch: true, optional: true
   belongs_to :user, class_name: Spree.user_class.to_s, optional: true
-  has_many   :feedback_reviews
+  has_many   :feedback_reviews, dependent: :destroy
   has_many   :images, -> { order(:position) }, as: :viewable,
-    dependent: :destroy, class_name: "Spree::Image"
+                                               dependent: :destroy, class_name: "Spree::Image"
 
-  before_create :verify_purchaser
+  before_save :verify_purchaser
+  before_save :approve_review, unless: :approved?
   after_save :recalculate_product_rating, if: :approved?
   after_destroy :recalculate_product_rating
 
@@ -28,6 +29,7 @@ class Spree::Review < ActiveRecord::Base
 
   def feedback_stars
     return 0 if feedback_reviews.size <= 0
+
     ((feedback_reviews.sum(:rating) / feedback_reviews.size) + 0.5).floor
   end
 
@@ -36,19 +38,32 @@ class Spree::Review < ActiveRecord::Base
   end
 
   def email
-    user.try!(:email)
+    user&.email
   end
 
   def verify_purchaser
     return unless user_id && product_id
 
     verified_purchase = Spree::LineItem.joins(:order, :variant)
-      .where.not(spree_orders: { completed_at: nil })
-      .find_by(
-        spree_variants: { product_id: product_id },
-        spree_orders: { user_id: user_id }
-      ).present?
+                                       .where.not(spree_orders: { completed_at: nil })
+                                       .find_by(
+                                         spree_variants: { product_id: product_id },
+                                         spree_orders: { user_id: user_id }
+                                       ).present?
 
     self.verified_purchaser = verified_purchase
   end
+
+  def star_only?
+    [title, review].all?(&:blank?) && rating.present?
+  end
+
+  def approve_review
+    # Checks if we should auto approve the review.
+    if Spree::Reviews::Config[:approve_star_only]
+      self.approved = true if star_only?
+    elsif Spree::Reviews::Config[:approve_star_only_for_verified_purchaser]
+      self.approved = true if star_only? && verified_purchaser?
+    end
+  end
 end