Rubocop auto

Gemfile

@@ -49,5 +49,5 @@ end
 
 gem 'rspec_junit_formatter', require: false, group: :ci
 
-custom_gemfile = File.expand_path("../Gemfile-custom", __FILE__)
+custom_gemfile = File.expand_path('Gemfile-custom', __dir__)
 eval File.read(custom_gemfile) if File.exist?(custom_gemfile)

Rakefile

@@ -31,7 +31,7 @@ desc "Run backend JS specs"
 subproject_task("backend", "spec:js", title: "backend JS", task_name: "spec:backend:js")
 
 # Add backend JS specs to `rake spec` dependencies
-task :spec => 'spec:backend:js'
+task spec: 'spec:backend:js'
 
 task test: :spec
 task test_app: 'db:reset'
@@ -67,7 +67,7 @@ namespace :gem do
 
   desc "Build all solidus gems"
   task :build do
-    pkgdir = File.expand_path("../pkg", __FILE__)
+    pkgdir = File.expand_path('pkg', __dir__)
     FileUtils.mkdir_p pkgdir
 
     %w(core api backend frontend sample).each do |gem_name|

api/Rakefile

@@ -10,7 +10,7 @@ RSpec::Core::RakeTask.new
 task default: :spec
 
 DummyApp::RakeTasks.new(
-  gem_root: File.expand_path('../', __FILE__),
+  gem_root: File.expand_path(__dir__),
   lib_name: 'solidus_api'
 )
 

api/app/controllers/spree/api/payments_controller.rb

@@ -29,7 +29,7 @@ def create
 
       def update
         authorize! params[:action], @payment
-        if ! @payment.pending?
+        if !@payment.pending?
           render 'update_forbidden', status: 403
         elsif @payment.update_attributes(payment_params)
           respond_with(@payment, default_template: :show)

api/app/controllers/spree/api/states_controller.rb

@@ -26,9 +26,9 @@ def show
       def scope
         if params[:country_id]
           @country = Spree::Country.accessible_by(current_ability, :read).find(params[:country_id])
-          return @country.states.accessible_by(current_ability, :read)
+          @country.states.accessible_by(current_ability, :read)
         else
-          return Spree::State.accessible_by(current_ability, :read)
+          Spree::State.accessible_by(current_ability, :read)
         end
       end
     end

api/script/rails

@@ -3,8 +3,8 @@
 
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/spree/api/engine', __FILE__)
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/spree/api/engine', __dir__)
 
 require 'rails/all'
 require 'rails/engine/commands'

api/solidus_api.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 2.2.2'
   gem.required_rubygems_version = '>= 1.8.23'
 
-  gem.add_dependency 'solidus_core', gem.version
-  gem.add_dependency 'responders'
   gem.add_dependency 'jbuilder', '~> 2.6'
   gem.add_dependency 'kaminari-activerecord', '~> 1.1'
+  gem.add_dependency 'responders'
+  gem.add_dependency 'solidus_core', gem.version
 end

api/spec/controllers/spree/api/resource_controller_spec.rb

@@ -62,8 +62,8 @@ def permitted_widget_attributes
           get :index, params: { token: admin_user.spree_api_key }, as: :json
           expect(response).to be_successful
           expect(json_response['widgets']).to include(hash_including(
-            'name' => 'a widget',
-            'position' => 1
+                                                        'name' => 'a widget',
+                                                        'position' => 1
           ))
         end
 

api/spec/requests/spree/api/addresses_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::AddressesController, type: :request do
-
     before do
       stub_authentication!
       @address = create(:address)

api/spec/requests/spree/api/checkouts_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::CheckoutsController, type: :request do
-
     before(:each) do
       stub_authentication!
       Spree::Config[:track_inventory_levels] = false

api/spec/requests/spree/api/config_controller_spec.rb

@@ -4,7 +4,7 @@
 
 module Spree
   describe Api::ConfigController, type: :request do
-    let!(:default_country) { create :country, iso: "US"}
+    let!(:default_country) { create :country, iso: "US" }
 
     before do
       stub_authentication!

api/spec/requests/spree/api/countries_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::CountriesController, type: :request do
-
     before do
       stub_authentication!
       @state = create(:state)

api/spec/requests/spree/api/credit_cards_controller_spec.rb

@@ -5,7 +5,6 @@
 module Spree
   describe Api::CreditCardsController, type: :request do
     describe '#index' do
-
       let!(:admin_user) do
         create(:admin_user)
       end

api/spec/requests/spree/api/images_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Spree::Api::ImagesController, type: :request do
-
     let!(:product) { create(:product) }
     let!(:attributes) {
       [:id, :position, :attachment_content_type,

api/spec/requests/spree/api/line_items_controller_spec.rb

@@ -12,7 +12,6 @@ module Spree
   end
 
   describe Api::LineItemsController, type: :request do
-
     let!(:order) { create(:order_with_line_items, line_items_count: 1) }
 
     let(:product) { create(:product) }

api/spec/requests/spree/api/option_types_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::OptionTypesController, type: :request do
-
     let(:attributes) { [:id, :name, :position, :presentation] }
     let!(:option_value) { create(:option_value) }
     let!(:option_type) { option_value.option_type }

api/spec/requests/spree/api/option_values_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::OptionValuesController, type: :request do
-
     let(:attributes) { [:id, :name, :presentation, :option_type_name, :option_type_name] }
     let!(:option_value) { create(:option_value) }
     let!(:option_type) { option_value.option_type }
@@ -103,7 +102,7 @@ def check_option_values(option_values)
         end
 
         it "cannot create an option type with invalid attributes" do
-          post spree.api_option_type_option_values_path(option_type), params: { option_value: {name: ""} }
+          post spree.api_option_type_option_values_path(option_type), params: { option_value: { name: "" } }
           expect(response.status).to eq(422)
         end
 

api/spec/requests/spree/api/product_properties_controller_spec.rb

@@ -5,7 +5,6 @@
 
 module Spree
   describe Spree::Api::ProductPropertiesController, type: :request do
-
     let!(:product) { create(:product) }
     let!(:property_1) { product.product_properties.create(property_name: "My Property 1", value: "my value 1", position: 0) }
     let!(:property_2) { product.product_properties.create(property_name: "My Property 2", value: "my value 2", position: 1) }

api/spec/requests/spree/api/products_controller_spec.rb

@@ -5,7 +5,6 @@
 
 module Spree
   describe Spree::Api::ProductsController, type: :request do
-
     let!(:product) { create(:product) }
     let!(:inactive_product) { create(:product, available_on: Time.current.tomorrow, name: "inactive") }
     let(:base_attributes) { Api::ApiHelpers.product_attributes }
@@ -351,7 +350,7 @@ module Spree
           expect(response.status).to eq 200
           expect(json_response['variants'].count).to eq(2) # 2 variants
 
-          variants = json_response['variants'].select { |v| !v['is_master'] }
+          variants = json_response['variants'].reject { |v| v['is_master'] }
           size_option_value = variants.last['option_values'].detect{ |x| x['option_type_name'] == 'size' }
           expect(size_option_value['name']).to eq('small')
 
@@ -375,7 +374,7 @@ module Spree
           } }
 
           expect(json_response['variants'].count).to eq(1)
-          variants = json_response['variants'].select { |v| !v['is_master'] }
+          variants = json_response['variants'].reject { |v| v['is_master'] }
           expect(variants.last['option_values'][0]['name']).to eq('large')
           expect(variants.last['sku']).to eq('456')
           expect(variants.count).to eq(1)

api/spec/requests/spree/api/promotion_application_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree::Api
   describe OrdersController, type: :request do
-
     before do
       stub_authentication!
     end

api/spec/requests/spree/api/promotions_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Spree::Api::PromotionsController, type: :request do
-
     shared_examples "a JSON response" do
       it 'should be ok' do
         subject

api/spec/requests/spree/api/properties_controller_spec.rb

@@ -3,7 +3,6 @@
 require 'spec_helper'
 module Spree
   describe Spree::Api::PropertiesController, type: :request do
-
     let!(:property_1) { Property.create!(name: "foo", presentation: "Foo") }
     let!(:property_2) { Property.create!(name: "bar", presentation: "Bar") }
 

api/spec/requests/spree/api/return_authorizations_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::ReturnAuthorizationsController, type: :request do
-
     let!(:order) { create(:shipped_order) }
 
     let(:product) { create(:product) }

api/spec/requests/spree/api/states_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::StatesController, type: :request do
-
     let!(:state) { create(:state, name: "Victoria") }
     let(:attributes) { [:id, :name, :abbr, :country_id] }
 

api/spec/requests/spree/api/stock_items_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::StockItemsController, type: :request do
-
     let!(:stock_location) { create(:stock_location_with_items) }
     let!(:stock_item) { stock_location.stock_items.order(:id).first }
     let!(:attributes) {

api/spec/requests/spree/api/stock_locations_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::StockLocationsController, type: :request do
-
     let!(:stock_location) { create(:stock_location) }
     let!(:attributes) { [:id, :name, :address1, :address2, :city, :state_id, :state_name, :country_id, :zipcode, :phone, :active] }
 

api/spec/requests/spree/api/stock_movements_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::StockMovementsController, type: :request do
-
     let!(:stock_location) { create(:stock_location_with_items) }
     let!(:stock_item) { stock_location.stock_items.order(:id).first }
     let!(:stock_movement) { create(:stock_movement, stock_item: stock_item) }

api/spec/requests/spree/api/stores_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::StoresController, type: :request do
-
     let!(:store) do
       create(:store, name: "My Spree Store", url: "spreestore.example.com")
     end
@@ -20,8 +19,7 @@ module Spree
         create(:store,
           name: "Extra Store",
           url: "spreestore-5.example.com",
-          default: false
-        )
+          default: false)
       end
 
       it "can list the available stores" do

api/spec/requests/spree/api/taxonomies_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::TaxonomiesController, type: :request do
-
     let(:taxonomy) { create(:taxonomy) }
     let(:taxon) { create(:taxon, name: "Ruby", taxonomy: taxonomy) }
     let(:taxon2) { create(:taxon, name: "Rails", taxonomy: taxonomy) }

api/spec/requests/spree/api/taxons_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::TaxonsController, type: :request do
-
     let(:taxonomy) { create(:taxonomy) }
     let(:taxon) { create(:taxon, name: "Ruby", taxonomy: taxonomy) }
     let(:taxon2) { create(:taxon, name: "Rails", taxonomy: taxonomy) }

api/spec/requests/spree/api/unauthenticated_products_controller_spec.rb

@@ -5,7 +5,6 @@
 
 module Spree
   describe Spree::Api::ProductsController, type: :request do
-
     let!(:product) { create(:product) }
     let(:attributes) { [:id, :name, :description, :price, :available_on, :slug, :meta_description, :meta_keywords, :taxon_ids, :meta_title] }
 

api/spec/requests/spree/api/users_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::UsersController, type: :request do
-
     let(:user) { create(:user, spree_api_key: SecureRandom.hex) }
     let(:stranger) { create(:user, email: '[email protected]') }
     let(:attributes) { [:id, :email, :created_at, :updated_at] }

api/spec/requests/spree/api/variants_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::VariantsController, type: :request do
-
     let!(:product) { create(:product) }
     let!(:variant) do
       variant = product.master
@@ -89,7 +88,6 @@ module Spree
       end
 
       context "stock filtering" do
-
         context "only variants in stock" do
           subject { get spree.api_variants_path, params: { in_stock_only: "true" } }
 

api/spec/requests/spree/api/zones_controller_spec.rb

@@ -4,7 +4,6 @@
 
 module Spree
   describe Api::ZonesController, type: :request do
-
     let!(:attributes) { [:id, :name, :zone_members] }
     let!(:zone) { create(:zone, name: 'Europe') }
 

api/spec/spec_helper.rb

@@ -11,7 +11,7 @@
 require 'solidus_api'
 require 'spree/testing_support/dummy_app'
 DummyApp.setup(
-  gem_root: File.expand_path('../../', __FILE__),
+  gem_root: File.expand_path('..', __dir__),
   lib_name: 'solidus_api'
 )
 

api/spec/test_views/spree/api/widgets/_widget.json.jbuilder

@@ -1,2 +1,3 @@
 # frozen_string_literal: true
+
 json.(widget, :id, :name, :position)

api/spec/test_views/spree/api/widgets/index.json.jbuilder

@@ -5,5 +5,5 @@ json.widgets(@collection) do |widget|
   json.partial!("spree/api/widgets/widget", widget: widget)
 end
 json.count @collection.count
-json.current_page (params[:page] or 1)
+json.current_page (params[:page] || 1)
 json.pages @collection.total_pages

backend/Rakefile

@@ -12,7 +12,7 @@ RSpec::Core::RakeTask.new
 task default: [:spec, 'spec:js']
 
 DummyApp::RakeTasks.new(
-  gem_root: File.expand_path('../', __FILE__),
+  gem_root: File.expand_path(__dir__),
   lib_name: 'solidus_backend'
 )
 
@@ -28,7 +28,7 @@ task :teaspoon do
     driver_options: ENV["driver_options"],
   }
 
-  options.delete_if { |k, v| v.nil? }
+  options.delete_if { |_k, v| v.nil? }
 
   abort("rake teaspoon failed") if Teaspoon::Console.new(options).failures?
 end
@@ -37,7 +37,7 @@ desc "Run javascript specs"
 task 'spec:js' => :teaspoon
 
 namespace :teaspoon do
-  task :server  do
+  task :server do
     require 'teaspoon'
     Rake::Task['dummy_environment'].invoke
     require 'teaspoon/server'