solidus_reviews 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9cabc6589687760227a9ba4c781a2d8b61fad18d6bdc08bff138cdeb257180d
-  data.tar.gz: 4970f27446bff1c1c52749b068fc40abd7dd2ed5cc080727b442b3d3f11ae3f8
+  metadata.gz: 6fc709261f34b4979904d11cceeb17b22a57be36089f37f77dea475262506c24
+  data.tar.gz: 9a3b6b6f70b0867534f634426da005d312db19e21d5633bb9e5ca2e8ab6ba3ec
 SHA512:
-  metadata.gz: abf9e6d511a7165baad650338a369500f9bdd94e9c2c283ab1c7104b58e5571e91c5ad4d221b4692a263197df05ce5794e9b6813782721fac9cbdab982c0d806
-  data.tar.gz: ecb8b8beed8ef58d25e104aabde8a01b4f28fb235997edefb22752f538c02a79f297ff36d68ff627f86e31923c170f9465ac762ff9c50143dcb98ed48c27f1b7
+  metadata.gz: 8c4eaa7f6e301a830b196bd194c897a670a8c193607fe98542890625ed6a3d19b54c7ce8b8df9678ba45bc3db114b0a358c58d053a93be0e438b4fa6354939fe
+  data.tar.gz: e2d8efba5a9ba5602318c40e1bcccb16291f49a68c577e76acf2db42b37e879bb9adfcbc56367b47dbfa84092964bdfe199e7aacb47b85c071c94d134c7906e4

data/.circleci/config.yml

@@ -0,0 +1,35 @@
+version: 2.1
+
+orbs:
+  # Always take the latest version of the orb, this allows us to
+  # run specs against Solidus supported versions only without the need
+  # to change this configuration every time a Solidus version is released
+  # or goes EOL.
+  solidusio_extensions: solidusio/extensions@volatile
+
+jobs:
+  run-specs-with-postgres:
+    executor: solidusio_extensions/postgres
+    steps:
+      - solidusio_extensions/run-tests
+  run-specs-with-mysql:
+    executor: solidusio_extensions/mysql
+    steps:
+      - solidusio_extensions/run-tests
+
+workflows:
+  "Run specs on supported Solidus versions":
+    jobs:
+      - run-specs-with-postgres
+      - run-specs-with-mysql
+  "Weekly run specs against master":
+    triggers:
+      - schedule:
+          cron: "0 0 * * 4" # every Thursday
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      - run-specs-with-postgres
+      - run-specs-with-mysql

data/.gitignore

@@ -10,3 +10,4 @@ coverage
 .rvmrc
 .ruby-version
 .ruby-gemset
+spec/examples.txt

data/Gemfile

@@ -5,25 +5,27 @@ source 'https://rubygems.org'
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem 'solidus', git: 'https://github.com/solidusio/solidus.git', branch: branch
 gem 'solidus_auth_devise'
+
+# 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
+
 gem 'puma'
 gem 'rails-controller-testing', group: :test
 
-if ENV['DB'] == 'mysql'
+case ENV['DB']
+when 'mysql'
   gem 'mysql2', '~> 0.4.10'
-else
+when 'postgres'
   gem 'pg', '~> 0.21'
 end
 
 group :development, :test do
-  if branch < 'v2.5'
-    gem 'factory_bot', '4.10.0'
-  else
-    gem 'factory_bot', '> 4.10.0'
-  end
-
-  gem 'pry-rails'
-  gem 'selenium-webdriver'
-  gem 'webdrivers'
+  gem 'factory_bot', '> 4.10.0'
 end
 
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # Reviews
 
-[![Build Status](https://travis-ci.org/solidusio-contrib/solidus_reviews.svg?branch=master)](https://travis-ci.org/solidusio-contrib/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

data/app/decorators/controllers/solidus_reviews/spree/admin/products_controller_decorator.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module SolidusReviews
+  module Spree
+    module ProductsControllerDecorator
+      def self.prepended(base)
+        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
+    end
+  end
+end

data/app/decorators/helpers/solidus_reviews/spree/api/api_helpers_decorator.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module SolidusReviews
+  module Spree
+    module Api
+      module ApiHelpersDecorator
+        def self.prepended(base)
+          base.module_eval do
+            @@review_attributes = [
+              :id, :product_id, :name, :location, :rating, :title, :review, :approved,
+              :created_at, :updated_at, :user_id, :ip_address, :locale, :show_identifier,
+              :verified_purchaser
+            ]
+
+            @@feedback_review_attributes = [
+              :id, :user_id, :review_id, :rating, :comment, :created_at, :updated_at, :locale
+            ]
+
+            def review_attributes
+              @@review_attributes
+            end
+
+            def feedback_review_attributes
+              @@feedback_review_attributes
+            end
+          end
+        end
+
+        ::Spree::Api::ApiHelpers.prepend self
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+module SolidusReviews
+  module Spree
+    module ProductDecorator
+      def self.prepended(base)
+        base.class_eval do
+          has_many :reviews
+        end
+      end
+
+      def stars
+        avg_rating.try(:round) || 0
+      end
+
+      def recalculate_rating
+        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
+        save
+      end
+
+      ::Spree::Product.prepend self
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module SolidusReviews
+  module Spree
+    module UserDecorator
+      def self.prepended(base)
+        base.class_eval do
+          has_many :reviews, class_name: 'Spree::Review'
+        end
+      end
+
+      ::Spree.user_class.prepend self
+    end
+  end
+end

data/app/models/spree/feedback_review.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Spree::FeedbackReview < ActiveRecord::Base
-  belongs_to :user, class_name: Spree.user_class.to_s
+  belongs_to :user, class_name: Spree.user_class.to_s, optional: true
 
   belongs_to :review, dependent: :destroy
   validates :review, presence: true

data/app/models/spree/review.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Spree::Review < ActiveRecord::Base
-  belongs_to :product, touch: true
-  belongs_to :user, class_name: Spree.user_class.to_s
+  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   :images, -> { order(:position) }, as: :viewable,
     dependent: :destroy, class_name: "Spree::Image"

data/lib/solidus_reviews.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'solidus'
+require 'solidus_support'
 require 'sass/rails'
 require 'deface'
-require 'solidus_auth_devise'
 require 'spree_reviews/engine'
 require 'coffee_script'

data/lib/spree_reviews/engine.rb

@@ -6,8 +6,6 @@ module SpreeReviews
     isolate_namespace Spree
     engine_name 'solidus_reviews'
 
-    config.autoload_paths += %W(#{config.root}/lib)
-
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)

data/solidus_reviews.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'solidus_reviews'
-  s.version     = '1.1.1'
+  s.version     = '1.2.0'
   s.summary     = 'Basic review and ratings facility for Solidus'
   s.authors = ['Solidus Contrib']
   s.description = s.summary
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'deface', '~> 1'
   s.add_dependency 'solidus', ['>= 1.4', '< 3']
-  s.add_dependency 'solidus_auth_devise', ['>= 1.0', '< 3']
   s.add_dependency 'solidus_support', '~> 0.1'
 
   s.add_development_dependency 'capybara'
@@ -29,9 +28,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'poltergeist'
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'rspec-rails'
+  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', '~> 1.3.6'
+  s.add_development_dependency 'sqlite3'
 end

data/spec/spec_helper.rb

@@ -1,41 +1,26 @@
 # frozen_string_literal: true
 
-require 'simplecov'
-SimpleCov.start 'rails'
+require "simplecov"
+SimpleCov.start "rails"
 
-ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ENV"] ||= "test"
 
 require File.expand_path('dummy/config/environment.rb', __dir__)
 
-# Requires factories and other useful helpers defined in spree_core.
 require "solidus_support/extension/feature_helper"
 require 'spree/testing_support/controller_requests'
-require 'selenium/webdriver'
+require 'spree/testing_support/capybara_ext'
 
 Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }
 
 require 'solidus_reviews/factories'
 
 RSpec.configure do |config|
-  config.include Spree::TestingSupport::ControllerRequests, type: :controller
-
   config.infer_spec_type_from_file_location!
-  config.use_transactional_fixtures = false
-
-  Capybara.register_driver :selenium_chrome_headless do |app|
-    browser_options = ::Selenium::WebDriver::Chrome::Options.new
-    browser_options.args << '--headless'
-    browser_options.args << '--disable-gpu'
-    browser_options.args << '--window-size=1440,1080'
-    Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
-  end
-
-  Capybara.javascript_driver = (ENV['CAPYBARA_DRIVER'] || :selenium_chrome_headless).to_sym
-
-  if Gem.loaded_specs['solidus'].version < Gem::Version.new('2.4')
-    config.include VersionCake::TestHelpers, type: :controller
-    config.before(:each, type: :controller) do
-      set_request_version('', 1)
-    end
-  end
+  config.raise_errors_for_deprecations!
+
+  config.example_status_persistence_file_path = "./spec/examples.txt"
+
+  config.include Spree::TestingSupport::UrlHelpers
+  config.include Spree::TestingSupport::ControllerRequests, type: :controller
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_reviews
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Solidus Contrib
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -44,26 +44,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: solidus_auth_devise
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
@@ -180,16 +160,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +198,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  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'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -236,26 +230,26 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 description: Basic review and ratings facility for Solidus
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
@@ -271,16 +265,16 @@ files:
 - app/controllers/spree/admin/review_settings_controller.rb
 - app/controllers/spree/admin/reviews_controller.rb
 - app/controllers/spree/feedback_reviews_controller.rb
-- app/controllers/spree/products_controller_decorator.rb
 - app/controllers/spree/reviews_controller.rb
-- app/helpers/spree/api/api_helpers_decorator.rb
+- app/decorators/controllers/solidus_reviews/spree/admin/products_controller_decorator.rb
+- app/decorators/helpers/solidus_reviews/spree/api/api_helpers_decorator.rb
+- app/decorators/models/solidus_reviews/spree/product_decorator.rb
+- app/decorators/models/solidus_reviews/spree/user_decorator.rb
 - app/helpers/spree/reviews_helper.rb
 - app/models/spree/feedback_review.rb
-- app/models/spree/product_decorator.rb
 - app/models/spree/review.rb
 - app/models/spree/reviews_ability.rb
 - app/models/spree/reviews_configuration.rb
-- app/models/spree/user_decorator.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
@@ -347,13 +341,13 @@ files:
 - lib/solidus_reviews/factories/review_factory.rb
 - lib/spree_reviews/engine.rb
 - solidus_reviews.gemspec
-- spec/controllers/admin/feedback_reviews_controller_spec.rb
-- spec/controllers/admin/review_settings_controller_spec.rb
-- spec/controllers/admin/reviews_controller_spec.rb
-- spec/controllers/feedback_reviews_controller_spec.rb
-- spec/controllers/products_controller_spec.rb
-- spec/controllers/reviews_controller_spec.rb
+- spec/controllers/spree/admin/feedback_reviews_controller_spec.rb
+- spec/controllers/spree/admin/review_settings_controller_spec.rb
+- spec/controllers/spree/admin/reviews_controller_spec.rb
 - spec/controllers/spree/api/reviews_controller_spec.rb
+- spec/controllers/spree/feedback_reviews_controller_spec.rb
+- spec/controllers/spree/products_controller_spec.rb
+- spec/controllers/spree/reviews_controller_spec.rb
 - spec/features/admin_spec.rb
 - spec/features/reviews_spec.rb
 - spec/helpers/review_helper_spec.rb
@@ -389,13 +383,13 @@ signing_key:
 specification_version: 4
 summary: Basic review and ratings facility for Solidus
 test_files:
-- spec/controllers/admin/feedback_reviews_controller_spec.rb
-- spec/controllers/admin/review_settings_controller_spec.rb
-- spec/controllers/admin/reviews_controller_spec.rb
-- spec/controllers/feedback_reviews_controller_spec.rb
-- spec/controllers/products_controller_spec.rb
-- spec/controllers/reviews_controller_spec.rb
+- spec/controllers/spree/admin/feedback_reviews_controller_spec.rb
+- spec/controllers/spree/admin/review_settings_controller_spec.rb
+- spec/controllers/spree/admin/reviews_controller_spec.rb
 - spec/controllers/spree/api/reviews_controller_spec.rb
+- spec/controllers/spree/feedback_reviews_controller_spec.rb
+- spec/controllers/spree/products_controller_spec.rb
+- spec/controllers/spree/reviews_controller_spec.rb
 - spec/features/admin_spec.rb
 - spec/features/reviews_spec.rb
 - spec/helpers/review_helper_spec.rb

data/.travis.yml

@@ -1,31 +0,0 @@
-cache: bundler
-dist: trusty
-language: ruby
-rvm:
-  - 2.4.3
-addons:
-  chrome: stable
-  apt:
-    packages:
-      - chromium-chromedriver
-before_install:
-  - ln -s /usr/lib/chromium-browser/chromedriver ~/bin/chromedriver
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - sleep 3 # give xvfb some time to start
-
-env:
-  matrix:
-    - SOLIDUS_BRANCH=v2.5 DB=postgres
-    - SOLIDUS_BRANCH=v2.6 DB=postgres
-    - SOLIDUS_BRANCH=v2.7 DB=postgres
-    - SOLIDUS_BRANCH=v2.8 DB=postgres
-    - SOLIDUS_BRANCH=v2.9 DB=postgres
-    - SOLIDUS_BRANCH=master DB=postgres
-    - SOLIDUS_BRANCH=v2.5 DB=mysql
-    - SOLIDUS_BRANCH=v2.6 DB=mysql
-    - SOLIDUS_BRANCH=v2.7 DB=mysql
-    - SOLIDUS_BRANCH=v2.8 DB=mysql
-    - SOLIDUS_BRANCH=v2.9 DB=mysql
-    - SOLIDUS_BRANCH=master DB=mysql

data/app/controllers/spree/products_controller_decorator.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-Spree::ProductsController.class_eval do
-  helper Spree::ReviewsHelper
-
-  [:avg_rating, :reviews_count].each { |attrib| Spree::PermittedAttributes.product_attributes << attrib }
-end

data/app/helpers/spree/api/api_helpers_decorator.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-Spree::Api::ApiHelpers.module_eval do
-  @@review_attributes = [
-    :id, :product_id, :name, :location, :rating, :title, :review, :approved,
-    :created_at, :updated_at, :user_id, :ip_address, :locale, :show_identifier,
-    :verified_purchaser
-  ]
-
-  @@feedback_review_attributes = [
-    :id, :user_id, :review_id, :rating, :comment, :created_at, :updated_at, :locale
-  ]
-
-  def review_attributes
-    @@review_attributes
-  end
-
-  def feedback_review_attributes
-    @@feedback_review_attributes
-  end
-end

data/app/models/spree/product_decorator.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-# Add access to reviews/ratings to the product model
-Spree::Product.class_eval do
-  has_many :reviews
-
-  def stars
-    avg_rating.try(:round) || 0
-  end
-
-  def recalculate_rating
-    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
-    save
-  end
-end

data/app/models/spree/user_decorator.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-Spree.user_class.has_many :reviews, class_name: 'Spree::Review'