Merge pull request #707 from rubyforgood/ruby261

armahillo · web-flow · commit a83ae6afa84e · 2019-02-06T23:13:32.000-05:00
Update the ruby version to 2.6.1
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.5.3
+2.6.1
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-ruby "2.5.3"
+ruby "2.6.1"
 
 gem "api-auth", "~> 2.3"
 gem "bootstrap-sass"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -515,7 +515,7 @@ DEPENDENCIES
   yajl-ruby
 
 RUBY VERSION
-   ruby 2.5.3p105
+   ruby 2.6.1p33
 
 BUNDLED WITH
-   1.16.6
+   1.17.2
diff --git a/app/controllers/adjustments_controller.rb b/app/controllers/adjustments_controller.rb
@@ -5,7 +5,7 @@ class AdjustmentsController < ApplicationController
   # GET /adjustments.json
   def index
     @selected_location = filter_params[:at_location]
-    @adjustments = current_organization.adjustments.filter(filter_params)
+    @adjustments = current_organization.adjustments.class_filter(filter_params)
 
     @storage_locations = Adjustment.storage_locations_adjusted_for(current_organization).uniq
   end
diff --git a/app/controllers/audits_controller.rb b/app/controllers/audits_controller.rb
@@ -4,7 +4,7 @@ class AuditsController < ApplicationController
 
   def index
     @selected_location = filter_params[:at_location]
-    @audits = current_organization.audits.filter(filter_params)
+    @audits = current_organization.audits.class_filter(filter_params)
     @storage_locations = Audit.storage_locations_audited_for(current_organization).uniq
   end
 
diff --git a/app/controllers/barcode_items_controller.rb b/app/controllers/barcode_items_controller.rb
@@ -2,7 +2,7 @@ class BarcodeItemsController < ApplicationController
   def index
     @items = Item.gather_items(current_organization, @global)
     @canonical_items = CanonicalItem.all
-    @barcode_items = current_organization.barcode_items.include_global(false).filter(filter_params)
+    @barcode_items = current_organization.barcode_items.include_global(false).class_filter(filter_params)
   end
 
   def create
diff --git a/app/controllers/donations_controller.rb b/app/controllers/donations_controller.rb
@@ -30,7 +30,7 @@ def index
     @donations = current_organization.donations
                                      .includes(:line_items, :storage_location, :donation_site, :diaper_drive_participant)
                                      .order(created_at: :desc)
-                                     .filter(filter_params)
+                                     .class_filter(filter_params)
     # Are these going to be inefficient with large datasets?
     # Using the @donations allows drilling down instead of always starting with the total dataset
     @donations_quantity = @donations.collect(&:total_quantity).sum
diff --git a/app/controllers/items_controller.rb b/app/controllers/items_controller.rb
@@ -1,6 +1,6 @@
 class ItemsController < ApplicationController
   def index
-    @items = current_organization.items.includes(:canonical_item).alphabetized.filter(filter_params)
+    @items = current_organization.items.includes(:canonical_item).alphabetized.class_filter(filter_params)
     @storages = current_organization.storage_locations.order(id: :asc)
     @items_with_counts = ItemsByStorageCollectionQuery.new(organization: current_organization, filter_params: filter_params).call
     @items_by_storage_collection_and_quantity = ItemsByStorageCollectionAndQuantityQuery.new(organization: current_organization, filter_params: filter_params).call
diff --git a/app/controllers/purchases_controller.rb b/app/controllers/purchases_controller.rb
@@ -7,7 +7,7 @@ def index
     @purchases = current_organization.purchases
                                      .includes(:line_items, :storage_location)
                                      .order(created_at: :desc)
-                                     .filter(filter_params)
+                                     .class_filter(filter_params)
     # Are these going to be inefficient with large datasets?
     # Using the @purchases allows drilling down instead of always starting with the total dataset
     @storage_locations = @purchases.collect(&:storage_location).compact.uniq
diff --git a/app/controllers/storage_locations_controller.rb b/app/controllers/storage_locations_controller.rb
@@ -3,7 +3,7 @@ class StorageLocationsController < ApplicationController
 
   def index
     @items = current_organization.storage_locations.items_inventoried
-    @storage_locations = current_organization.storage_locations.includes(:inventory_items).filter(filter_params)
+    @storage_locations = current_organization.storage_locations.includes(:inventory_items).class_filter(filter_params)
   end
 
   def create
diff --git a/app/controllers/transfers_controller.rb b/app/controllers/transfers_controller.rb
@@ -1,6 +1,6 @@
 class TransfersController < ApplicationController
   def index
-    @transfers = current_organization.transfers.includes(:line_items).includes(:from).includes(:to).filter(filter_params)
+    @transfers = current_organization.transfers.includes(:line_items).includes(:from).includes(:to).class_filter(filter_params)
     @selected_from = filter_params[:from_location]
     @selected_to = filter_params[:to_location]
     @from_storage_locations = Transfer.storage_locations_transferred_from_in(current_organization)
diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb
@@ -4,7 +4,7 @@ module Filterable
   extend ActiveSupport::Concern
 
   module ClassMethods
-    def filter(filtering_params)
+    def class_filter(filtering_params)
       results = where(nil)
       filtering_params.each do |key, value|
         results = results.public_send(key, value) if value.present?
diff --git a/app/queries/items_by_storage_collection_query.rb b/app/queries/items_by_storage_collection_query.rb
@@ -24,7 +24,7 @@ def call
                         sum(inventory_items.quantity) as quantity
                       ')
                 .group("storage_locations.name, storage_locations.id, items.id, items.name")
-                .order(name: :asc).filter(filter_params)
+                .order(name: :asc).class_filter(filter_params)
   end
   # rubocop:enable Naming/MemoizedInstanceVariableName
 end
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
@@ -38,7 +38,7 @@
 # Feel free to add new variables to customise your setup.
 
 set :rvm_type, :user
-set :rvm_ruby_version, "2.5.3"
+set :rvm_ruby_version, "2.6.1"
 # Custom SSH Options
 # ==================
 # You may pass any option but keep in mind that net/ssh understands a
diff --git a/spec/models/item_spec.rb b/spec/models/item_spec.rb
@@ -30,7 +30,7 @@
 
   context "Filtering >" do
     it "can filter" do
-      expect(subject.class).to respond_to :filter
+      expect(subject.class).to respond_to :class_filter
     end
 
     it "->in_category returns all items in the provided category" do
