Merge pull request #197 from bookmebus/update-spree-450

upgrade to support spree v4.5

.gitignore

@@ -8,7 +8,9 @@ pkg/*
 spec/dummy
 coverage
 .rvmrc
+.nvmrc
 .ruby-version
 .ruby-gemset
+.tool-versions
 tmp
 gemfiles/*.gemfile.lock

Gemfile

@@ -5,8 +5,10 @@ git_source(:github) do |repo_name|
  "https://github.com/#{repo_name}.git"
 end
 
-gem 'spree', github: 'spree/spree', branch: 'master'
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'master'
+spree_version = '>= 4.5'
+gem 'spree', spree_version
+gem 'spree_auth_devise', spree_version
 gem 'rails-controller-testing'
 
+
 gemspec

app/assets/config/spree_reviews_manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_tree ../javascripts
+//= link_directory ../stylesheets .css

app/controllers/spree/feedback_reviews_controller.rb

@@ -27,7 +27,7 @@ def load_review
  end
 
  def permitted_feedback_review_attributes
- [:rating, :comment]
+ permitted_attributes.feedback_review_attributes
  end
 
  def feedback_review_params

app/controllers/spree/reviews_controller.rb

@@ -39,7 +39,7 @@ def load_product
  end
 
  def permitted_review_attributes
- [:rating, :title, :review, :name, :show_identifier]
+ permitted_attributes.review_attributes
  end
 
  def review_params

config/initializers/asset.rb

@@ -0,0 +1 @@
+Rails.application.config.assets.precompile << 'spree_reviews_manifest.js'

config/initializers/spree_permitted_attributes.rb

@@ -0,0 +1,10 @@
+module Spree
+ module PermittedAttributes
+ ATTRIBUTES += %i[review_attributes feedback_review_attributes]
+ mattr_reader *ATTRIBUTES
+
+ @@product_attributes += %i[avg_rating reviews_count]
+ @@review_attributes = [:rating, :title, :review, :name, :show_identifier]
+ @@feedback_review_attributes = [:rating, :comment]
+ end
+end

lib/spree_reviews.rb

@@ -1,5 +1,6 @@
 require 'spree_core'
 require 'spree_extension'
+require 'spree_backend'
 require 'spree_reviews/engine'
 require 'spree_reviews/version'
 require 'deface'

lib/spree_reviews/engine.rb

@@ -4,12 +4,17 @@ class Engine < Rails::Engine
  isolate_namespace Spree
  engine_name 'spree_reviews'
 
+ config.autoload_paths += %W[#{config.root}/lib]
  # use rspec for tests
  config.generators do |g|
  g.test_framework :rspec
  end
 
  initializer 'spree_reviews.environment', before: :load_config_initializers do |_app|
+ Config = Configuration.new
+ end
+
+ config.after_initialize do
  Spree::Reviews::Config = Spree::ReviewSetting.new
  end
 

spec/controllers/products_controller_spec.rb

@@ -6,7 +6,7 @@
  end
 
  it "adds #{attrib} to the set of available attributes from Spree API" do
- expect(Spree::Api::ApiHelpers.product_attributes).to include(attrib)
+ expect(Spree::PermittedAttributes.product_attributes).to include(attrib)
  end
  end
 end

spree_reviews.gemspec

@@ -20,13 +20,15 @@ Gem::Specification.new do |s|
  s.require_path = 'lib'
  s.requirements << 'none'
 
- spree_version = '>= 3.2.0', '< 5.0'
+ spree_version = '>= 4.5'
  s.add_dependency 'deface', '~> 1.0'
  s.add_dependency 'spree_api', spree_version
  s.add_dependency 'spree_backend', spree_version
+ s.add_dependency 'spree_frontend', spree_version
  s.add_dependency 'spree_core', spree_version
  s.add_dependency 'spree_extension'
 
  s.add_development_dependency 'sass-rails'
  s.add_development_dependency 'spree_dev_tools'
+ s.add_development_dependency 'pg'
 end