solidus_reviews 1.2.0 → 1.3.0

data/lib/generators/solidus_reviews/install/install_generator.rb

@@ -11,7 +11,7 @@ module SolidusReviews
       end
 
       def add_stylesheets
-        inject_into_file "vendor/assets/stylesheets/spree/frontend/all.css", " *= require spree/frontend/solidus_reviews\n", before: /\*\//, verbose: true
+        inject_into_file "vendor/assets/stylesheets/spree/frontend/all.css", " *= require spree/frontend/solidus_reviews\n", before: %r{\*/}, verbose: true
       end
 
       def add_migrations

data/lib/solidus_reviews.rb

@@ -2,7 +2,9 @@
 
 require 'solidus'
 require 'solidus_support'
-require 'sass/rails'
+require 'sassc/rails'
 require 'deface'
-require 'spree_reviews/engine'
 require 'coffee_script'
+
+require 'solidus_reviews/engine'
+require 'solidus_reviews/version'

data/lib/{spree_reviews → solidus_reviews}/engine.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-module SpreeReviews
+module SolidusReviews
   class Engine < Rails::Engine
     require 'spree/core'
-    isolate_namespace Spree
+    isolate_namespace ::Spree
     engine_name 'solidus_reviews'
 
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
-      Spree::Ability.register_ability(Spree::ReviewsAbility)
+      ::Spree::Ability.register_ability(::Spree::ReviewsAbility)
     end
 
     if SolidusSupport.api_available?

data/lib/solidus_reviews/version.rb

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

data/solidus_reviews.gemspec

@@ -1,37 +1,28 @@
 # frozen_string_literal: true
 
+$:.push File.expand_path('lib', __dir__)
+require 'solidus_reviews/version'
+
 Gem::Specification.new do |s|
-  s.platform    = Gem::Platform::RUBY
-  s.name        = 'solidus_reviews'
-  s.version     = '1.2.0'
-  s.summary     = 'Basic review and ratings facility for Solidus'
+  s.platform = Gem::Platform::RUBY
+  s.name = 'solidus_reviews'
+  s.version = SolidusReviews::VERSION
+  s.summary = 'Review and rating functionality for your Solidus store.'
   s.authors = ['Solidus Contrib']
   s.description = s.summary
   s.required_ruby_version = '>= 1.9.3'
 
-  s.homepage     = 'https://github.com/solidusio-contrib/solidus_reviews/'
-  s.license      = 'BSD-3'
+  s.homepage = 'https://github.com/solidusio-contrib/solidus_reviews'
+  s.license = 'BSD-3'
 
-  s.files        = `git ls-files`.split("\n")
-  s.test_files   = `git ls-files -- spec/*`.split("\n")
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- spec/*`.split("\n")
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'deface', '~> 1'
+  s.add_dependency 'deface', '~> 1.0'
   s.add_dependency 'solidus', ['>= 1.4', '< 3']
-  s.add_dependency 'solidus_support', '~> 0.1'
+  s.add_dependency 'solidus_support'
 
-  s.add_development_dependency 'capybara'
-  s.add_development_dependency 'capybara-screenshot'
-  s.add_development_dependency 'coffee-rails'
-  s.add_development_dependency 'database_cleaner'
-  s.add_development_dependency 'ffaker'
-  s.add_development_dependency 'poltergeist'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'rspec-rails', '~> 4.0.0.beta2'
-  s.add_development_dependency 'rubocop', '~> 0.53.0'
-  s.add_development_dependency 'sass-rails'
-  s.add_development_dependency 'selenium-webdriver'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'solidus_extension_dev_tools'
 end

data/spec/controllers/spree/admin/feedback_reviews_controller_spec.rb

@@ -10,7 +10,7 @@ describe Spree::Admin::FeedbackReviewsController do
     allow(controller).to receive(:spree_current_user).and_return(user)
   end
 
-  context '#index' do
+  describe '#index' do
     let!(:review) { create(:review) }
     let!(:other_review) { create(:review) }
 

data/spec/controllers/spree/admin/review_settings_controller_spec.rb

@@ -10,7 +10,7 @@ describe Spree::Admin::ReviewSettingsController do
     allow(controller).to receive(:spree_current_user).and_return(user)
   end
 
-  context '#update' do
+  describe '#update' do
     it 'redirects to edit-review-settings page' do
       put :update, params: { preferences: { preview_size: 4 } }
       expect(response).to redirect_to spree.edit_admin_review_settings_path
@@ -22,7 +22,6 @@ describe Spree::Admin::ReviewSettingsController do
             feedback_rating: false,
             require_login: true,
             track_locale: true' do
-
       it 'sets preferred_preview_size to 4' do
         put :update, params: { preferences: { preview_size: 4 } }
         expect(Spree::Reviews::Config.preferred_preview_size).to eq 4
@@ -50,8 +49,8 @@ describe Spree::Admin::ReviewSettingsController do
     end
   end
 
-  context '#edit' do
-    it 'should render the edit template' do
+  describe '#edit' do
+    it 'renders the edit template' do
       get :edit
       expect(response).to render_template(:edit)
     end

data/spec/controllers/spree/admin/reviews_controller_spec.rb

@@ -13,7 +13,7 @@ describe Spree::Admin::ReviewsController do
     allow(controller).to receive(:spree_current_user).and_return(user)
   end
 
-  context '#index' do
+  describe '#index' do
     it 'list reviews' do
       reviews = [
         create(:review, product: product),
@@ -24,7 +24,7 @@ describe Spree::Admin::ReviewsController do
     end
   end
 
-  context '#approve' do
+  describe '#approve' do
     it 'show notice message when approved' do
       review.update_attribute(:approved, true)
       get :approve, params: { id: review.id }
@@ -39,7 +39,7 @@ describe Spree::Admin::ReviewsController do
     end
   end
 
-  context '#edit' do
+  describe '#edit' do
     specify do
       get :edit, params: { id: review.id }
       expect(response.status).to eq(200)

data/spec/controllers/spree/api/reviews_controller_spec.rb

@@ -24,7 +24,7 @@ describe Spree::Api::ReviewsController, type: :controller do
       end
 
       context 'there are no reviews for a product' do
-        it 'should return an empty array' do
+        it 'returns an empty array' do
           expect(Spree::Review.count).to be >= 0
           expect(subject["reviews"]).to be_empty
         end
@@ -53,7 +53,7 @@ describe Spree::Api::ReviewsController, type: :controller do
       end
 
       context 'there are no reviews for the user' do
-        it 'should return an empty array' do
+        it 'returns an empty array' do
           expect(Spree::Review.count).to be >= 0
           expect(subject["reviews"]).to be_empty
         end
@@ -81,7 +81,7 @@ describe Spree::Api::ReviewsController, type: :controller do
     context 'when it is the users review' do
       before { review.update(user_id: user.id) }
 
-      it 'should return the review' do
+      it 'returns the review' do
         expect(subject).not_to be_empty
         expect(subject["product_id"]).to eq(product.id)
         expect(subject["name"]).to eq(review[:name])
@@ -94,7 +94,7 @@ describe Spree::Api::ReviewsController, type: :controller do
     end
 
     context 'when it is not the users review' do
-      it 'should return with not authorized' do
+      it 'returns with not authorized' do
         expect(subject["error"]).not_to be_empty
         expect(subject["error"]).to match(/not authorized/i)
       end
@@ -102,7 +102,7 @@ describe Spree::Api::ReviewsController, type: :controller do
       context 'and it the review is approved' do
         before { review.update(approved: true) }
 
-        it 'should return the review' do
+        it 'returns the review' do
           expect(subject).not_to be_empty
           expect(subject["product_id"]).to eq(product.id)
           expect(subject["name"]).to eq(review[:name])
@@ -116,6 +116,12 @@ describe Spree::Api::ReviewsController, type: :controller do
   end
 
   describe '#create' do
+    subject do
+      params = { product_id: product.id, token: user.spree_api_key, format: 'json' }.merge(review_params)
+      post :create, params: params
+      JSON.parse(response.body)
+    end
+
     let(:review_params) do
       {
         "user_id": user.id,
@@ -126,25 +132,19 @@ describe Spree::Api::ReviewsController, type: :controller do
       }
     end
 
-    subject do
-      params = { product_id: product.id, token: user.spree_api_key, format: 'json' }.merge(review_params)
-      post :create, params: params
-      JSON.parse(response.body)
-    end
-
     context 'when user has already reviewed this product' do
       before do
         review.update(user_id: user.id)
       end
 
-      it 'should return with a fail' do
+      it 'returns with a fail' do
         expect(subject["error"]).not_to be_empty
         expect(subject["error"]).to match(/invalid resource/i)
       end
     end
 
     context 'when it is a users first review for the product' do
-      it 'should return success with review' do
+      it 'returns success with review' do
         expect(subject).not_to be_empty
         expect(subject["product_id"]).to eq(product.id)
         expect(subject["name"]).to eq(review_params[:name])
@@ -157,7 +157,13 @@ describe Spree::Api::ReviewsController, type: :controller do
   end
 
   describe '#update' do
+    subject do
+      put :update, params: params
+      JSON.parse(response.body)
+    end
+
     before { review.update(approved: true, user_id: user.id) }
+
     let(:params) { { product_id: product.id, id: review.id, token: user.spree_api_key, format: 'json' }.merge(review_params) }
 
     let(:review_params) do
@@ -169,13 +175,8 @@ describe Spree::Api::ReviewsController, type: :controller do
       }
     end
 
-    subject do
-      put :update, params: params
-      JSON.parse(response.body)
-    end
-
     context 'when a user updates their own review' do
-      it 'should successfully update the review and set approved back to false' do
+      it 'successfullies update the review and set approved back to false' do
         original = review
         expect(original.approved?).to be true
         expect(subject["id"]).to eq(original.id)
@@ -195,7 +196,7 @@ describe Spree::Api::ReviewsController, type: :controller do
         other_user.generate_spree_api_key!
       end
 
-      it 'should return an error' do
+      it 'returns an error' do
         expect(subject["error"]).not_to be_empty
         expect(subject["error"]).to match(/not authorized/i)
       end
@@ -203,16 +204,17 @@ describe Spree::Api::ReviewsController, type: :controller do
   end
 
   describe '#destroy' do
-    before { review.update(approved: true, user_id: user.id) }
-    let(:params) { { product_id: product.id, id: review.id, token: user.spree_api_key, format: 'json' } }
-
     subject do
       delete :destroy, params: params
       JSON.parse(response.body)
     end
 
+    before { review.update(approved: true, user_id: user.id) }
+
+    let(:params) { { product_id: product.id, id: review.id, token: user.spree_api_key, format: 'json' } }
+
     context "when a user destroys their own review" do
-      it 'should return the deleted review' do
+      it 'returns the deleted review' do
         expect(subject["id"]).to eq(review.id)
         expect(subject["product_id"]).to eq(product.id)
         expect(Spree::Review.find_by(id: review.id)).to be_falsey
@@ -227,7 +229,7 @@ describe Spree::Api::ReviewsController, type: :controller do
         other_user.generate_spree_api_key!
       end
 
-      it 'should return an error' do
+      it 'returns an error' do
         expect(subject["error"]).not_to be_empty
         expect(subject["error"]).to match(/not authorized/i)
       end

data/spec/controllers/spree/feedback_reviews_controller_spec.rb

@@ -27,11 +27,11 @@ describe Spree::FeedbackReviewsController do
       comment = ['Thanks for your review!', 'Cheers'].join("\n")
       expect {
         post :create, params: { review_id: review.id,
-                        feedback_review: {
-                          comment: comment,
-                          rating: rating
-},
-                        format: :js }
+                                feedback_review: {
+                                  comment: comment,
+                                  rating: rating
+                                },
+                                format: :js }
         expect(response.status).to eq(200)
         expect(response).to render_template(:create)
       }.to change(Spree::Review, :count).by(1)
@@ -48,7 +48,7 @@ describe Spree::FeedbackReviewsController do
     end
 
     it 'sets locale on feedback-review if required by config' do
-      Spree::Reviews::Config.preferred_track_locale = true
+      stub_spree_preferences(Spree::Reviews::Config, track_locale: true)
       post :create, params: valid_attributes
       expect(assigns[:review].locale).to eq I18n.locale.to_s
     end
@@ -68,7 +68,7 @@ describe Spree::FeedbackReviewsController do
 
     it 'do not create feedback-review if review doesnt exist' do
       expect {
-        post :create, params: valid_attributes.merge!({ review_id: nil })
+        post :create, params: valid_attributes.merge!(review_id: nil)
       }.to raise_error ActionController::UrlGenerationError
     end
   end

data/spec/controllers/spree/products_controller_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe Spree::ProductsController do
   [:avg_rating, :reviews_count].each do |attrib|
-    it "should add #{attrib} to the set of allowed attributes" do
+    it "adds #{attrib} to the set of allowed attributes" do
       expect(controller.permitted_product_attributes).to include(attrib)
     end
   end

data/spec/controllers/spree/reviews_controller_spec.rb

@@ -13,8 +13,7 @@ describe Spree::ReviewsController, type: :controller do
                 review: 'Some big review text..',
                 images: [
                   fixture_file_upload(File.new(Spree::Core::Engine.root + 'spec/fixtures/thinking-cat.jpg'))
-                ] }
-    }
+                ] } }
   end
 
   before do
@@ -22,7 +21,7 @@ describe Spree::ReviewsController, type: :controller do
     allow(controller).to receive(:spree_user_signed_in?).and_return(true)
   end
 
-  context '#index' do
+  describe '#index' do
     context 'for a product that does not exist' do
       it 'responds with a 404' do
         expect {
@@ -43,7 +42,7 @@ describe Spree::ReviewsController, type: :controller do
     end
   end
 
-  context '#new' do
+  describe '#new' do
     context 'for a product that does not exist' do
       it 'responds with a 404' do
         expect {
@@ -68,7 +67,7 @@ describe Spree::ReviewsController, type: :controller do
     end
   end
 
-  context '#create' do
+  describe '#create' do
     before { allow(controller).to receive(:spree_current_user).and_return(user) }
 
     context 'for a product that does not exist' do
@@ -146,7 +145,7 @@ describe Spree::ReviewsController, type: :controller do
 
       it 'does not create a review' do
         expect(Spree::Review.count).to eq 0
-        post :create, params: review_params.merge({ review: { rating: 'not_a_number' } })
+        post :create, params: review_params.merge(review: { rating: 'not_a_number' })
         expect(Spree::Review.count).to eq 0
       end
     end
@@ -154,7 +153,7 @@ describe Spree::ReviewsController, type: :controller do
     # It always sets the locale so preference pointless
     context 'when config requires locale tracking:' do
       it 'sets the locale' do
-        Spree::Reviews::Config.preferred_track_locale = true
+        stub_spree_preferences(Spree::Reviews::Config, track_locale: true)
         post :create, params: review_params
         expect(assigns[:review].locale).to eq I18n.locale.to_s
       end

data/spec/features/admin_spec.rb

@@ -2,21 +2,21 @@
 
 require 'spec_helper'
 
-RSpec.feature 'Review Admin' do
+RSpec.describe 'Review Admin' do
   stub_authorization!
 
-  given!(:review) { create(:review) }
+  let!(:review) { create(:review) }
 
   context 'index' do
-    background do
+    before do
       visit spree.admin_reviews_path
     end
 
-    scenario 'list reviews' do
+    it 'list reviews' do
       expect(page).to have_text review.product.name
     end
 
-    scenario 'approve reviews' do
+    it 'approve reviews' do
       expect(review.approved).to be false
       within("tr#review_#{review.id}") do
         find('.approve').click
@@ -24,7 +24,7 @@ RSpec.feature 'Review Admin' do
       expect(review.reload.approved).to be true
     end
 
-    scenario 'edit reviews' do
+    it 'edit reviews' do
       expect(page).to have_text review.product.name
       within("tr#review_#{review.id}") do
         find('.edit').click