Merge pull request #157 from spark-solutions/update-to-spree-3-3

update extension to work with rails 5

Author: damianlegawiec

Appraisals

@@ -4,8 +4,14 @@ appraise 'spree-3-1' do
 end
 
 appraise 'spree-3-2' do
-  gem 'spree', '~> 3.2.0.rc1'
-  gem 'spree_auth_devise', '~> 3.2.0.beta'
+  gem 'spree', '~> 3.2.0'
+  gem 'spree_auth_devise', '~> 3.2.0'
+  gem 'rails-controller-testing'
+end
+
+appraise 'spree-3-3' do
+  gem 'spree', '~> 3.3.0'
+  gem 'spree_auth_devise', '~> 3.3.0'
   gem 'rails-controller-testing'
 end
 

Gemfile

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 spree_version = 'master'
 gem 'spree', github: 'spree/spree', branch: spree_version
 gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: spree_version
+gem 'rails-controller-testing'
 
 gemspec

app/controllers/spree/feedback_reviews_controller.rb

@@ -14,7 +14,7 @@ def create
     end
 
     respond_to do |format|
-      format.html { redirect_to :back  }
+      format.html { redirect_back(fallback_location: root_path) }
       format.js   { render action: :create }
     end
   end
@@ -36,4 +36,12 @@ def feedback_review_params
   def sanitize_rating
     params[:feedback_review][:rating].to_s.sub!(/\s*[^0-9]*\z/, '') unless params[:feedback_review] && params[:feedback_review][:rating].blank?
   end
+
+  def redirect_back(fallback_location:)
+    if Rails.gem_version >= Gem::Version.new('5.x')
+      super
+    else
+      redirect_to :back
+    end
+  end
 end

db/migrate/20081020220724_create_reviews.rb

@@ -1,4 +1,4 @@
-class CreateReviews < ActiveRecord::Migration
+class CreateReviews < SpreeExtension::Migration[4.2]
   def self.up
     create_table :reviews do |t|
       t.integer :product_id

db/migrate/20101222083309_create_feedback_reviews.rb

@@ -1,4 +1,4 @@
-class CreateFeedbackReviews < ActiveRecord::Migration
+class CreateFeedbackReviews < SpreeExtension::Migration[4.2]
   def self.up
     create_table :feedback_reviews do |t|
       t.integer :user_id

db/migrate/20110406083603_add_rating_to_products.rb

@@ -1,4 +1,4 @@
-class AddRatingToProducts < ActiveRecord::Migration
+class AddRatingToProducts < SpreeExtension::Migration[4.2]
   def self.up
     if table_exists?('products')
       add_column :products, :avg_rating, :decimal, default: 0.0, null: false, precision: 7, scale: 5

db/migrate/20110606150524_add_user_to_reviews.rb

@@ -1,4 +1,4 @@
-class AddUserToReviews < ActiveRecord::Migration
+class AddUserToReviews < SpreeExtension::Migration[4.2]
   def self.up
     add_column :reviews, :user_id, :integer, null: true
   end

db/migrate/20110806093221_add_ip_address_to_reviews.rb

@@ -1,4 +1,4 @@
-class AddIpAddressToReviews < ActiveRecord::Migration
+class AddIpAddressToReviews < SpreeExtension::Migration[4.2]
   def self.up
     add_column :reviews, :ip_address, :string
   end

db/migrate/20120110172331_namespace_tables.rb

@@ -1,4 +1,4 @@
-class NamespaceTables < ActiveRecord::Migration
+class NamespaceTables < SpreeExtension::Migration[4.2]
   def change
     rename_table :reviews, :spree_reviews
     rename_table :feedback_reviews, :spree_feedback_reviews

db/migrate/20120123141326_recalculate_ratings.rb

@@ -1,4 +1,4 @@
-class RecalculateRatings < ActiveRecord::Migration
+class RecalculateRatings < SpreeExtension::Migration[4.2]
   def up
     Spree::Product.reset_column_information
     Spree::Product.update_all reviews_count: 0