pause

admin/app/admin/score_history.rb

@@ -37,7 +37,7 @@ ActiveAdmin.register JamRuby::ScoreHistory, :as => 'Score History' do
   filter :to_latitude
   filter :to_longitude
   
-  before_filter only: :index do
+  before_action only: :index do
     @per_page = 1_000_000 if request.format == 'text/csv'
   end
 

admin/app/admin/students.rb

@@ -9,7 +9,7 @@ ActiveAdmin.register JamRuby::User, :as => 'Students' do
   config.filters = true
 
   def   booked_anything(scope)
-    scope.joins(:student_lesson_bookings).where('lesson_bookings.active = true').uniq
+    scope.joins(:student_lesson_bookings).where('lesson_bookings.active = true').distinct
   end
 
   filter :jamuser_full_name_or_email_cont, label: 'Name Or Email', as: :string
@@ -69,4 +69,4 @@ ActiveAdmin.register JamRuby::User, :as => 'Students' do
   end
 
 
-end
+end

admin/app/controllers/application_controller.rb

@@ -3,7 +3,7 @@ class ApplicationController < ActionController::Base
 
   protect_from_forgery
 
-  before_filter :prepare_gon
+  before_action :prepare_gon
 
   def prepare_gon
     @olark_enabled = false

admin/app/models/cohort.rb

@@ -1,6 +1,6 @@
 require 'date'
 
-class Cohort < ActiveRecord::Base
+class Cohort < ApplicationRecord
 
   EARLIEST_DATE = Time.parse('2014-03-01')
   TOTAL_COHORT_DATE = Time.at(0)
@@ -75,7 +75,7 @@ class Cohort < ActiveRecord::Base
   end
 
   def self.generate_monthly_cohorts(monthly_start, monthly_end)
-    Cohort.delete_all(['all_time = ?',false])
+    Cohort.where(['all_time = ?',false]).delete_all()
     self.cohort_group_ranges.collect do |range|
       next if range.first > monthly_end
       cc = Cohort.new
@@ -90,7 +90,7 @@ class Cohort < ActiveRecord::Base
   end
 
   def self.generate_all_time_cohorts
-    Cohort.delete_all("all_time = 't'")
+    Cohort.where("all_time = 't'").delete_all()
     self.cohort_group_ranges.collect do |range|
       unless cc = Cohort.where(group_start: range.first).where(all_time: true).limit(1).first
         cc = Cohort.new

admin/app/uploaders/image_uploader.rb

@@ -2,8 +2,8 @@
 
 class ImageUploader < CarrierWave::Uploader::Base
   include CarrierWaveDirect::Uploader
-  include CarrierWave::MimeTypes
+  #include CarrierWave::MimeTypes
-  process :set_content_type
+  #process :set_content_type
 
 
   def initialize(*)

admin/config/environments/development.rb

@@ -28,6 +28,7 @@ JamAdmin::Application.configure do
   # Raise exception on mass assignment protection for Active Record models
   config.active_record.mass_assignment_sanitizer = :strict
 
+  config.assets.quiet = true
 
   # Do not compress assets
   config.assets.compress = false

admin/config/initializers/active_admin.rb

@@ -137,7 +137,7 @@ ActiveAdmin.setup do |config|
   # You can add before, after and around filters to all of your
   # Active Admin resources and pages from here.
   #
-  # config.before_filter :do_something_awesome
+  # config.before_action :do_something_awesome
 
 
   # == Register Stylesheets & Javascripts

ruby/Gemfile

@@ -22,14 +22,16 @@ end
 
 
 # on mac, bundle config build.pg --with-cflags="-Wno-error=implicit-function-declaration"
-gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw]
+gem 'pg'  #, '0.17.1', :platform => [:mri, :mswin, :mingw]
 #gem 'jdbc_postgres', :platform => [:jruby]
 
-gem 'activerecord', '= 4.2.8'
+gem 'activerecord', '= 5.1.7'
-gem 'railties', '= 4.2.8'
+#gem 'railties', '= 5.2.5'
-gem 'actionmailer', '= 4.2.8'
+gem 'actionmailer', '= 5.1.7'
-gem 'rails-observers', '0.1.2'
+gem 'rails-observers'
-gem 'protected_attributes' # needed to support attr_accessible
+#gem 'rails-observers', '0.1.2'
+#gem 'protected_attributes' # needed to support attr_accessible
+gem 'protected_attributes_continued'
 
 # PINNED TO SUPPORT BOTH 2.3.1 and 2.4.1 Ruby simultaneously
 # This should be the same in ruby/admin/web/websocket-gateway
@@ -61,13 +63,13 @@ gem 'kickbox'
 gem 'will_paginate'
 gem 'sendgrid', '1.2.0'
 gem 'aws-sdk', '~> 1'
-gem 'carrierwave', '0.9.0'
+gem 'carrierwave'#, '0.9.0'
 gem 'aasm'
-gem 'devise', '3.3.0' # 3.4.0 causes: uninitialized constant ActionController::Metal (NameError)
+gem 'devise' #'3.3.0' # 3.4.0 causes: uninitialized constant ActionController::Metal (NameError)
 gem 'postgres-copy'
 gem 'geokit'
 gem 'geokit-rails'
-gem 'postgres_ext'
+#gem 'postgres_ext'
 gem 'resque'
 gem 'resque-retry'
 gem 'resque-failed-job-mailer' #, :path => "/Users/seth/workspace/resque_failed_job_mailer"
@@ -96,7 +98,7 @@ group :test do
   gem 'factory_girl', '4.5.0'
   gem "rspec", "2.11"
   gem 'spork', '0.9.0'
-  gem 'database_cleaner', '1.4.1'
+  gem 'database_cleaner' #, '1.4.1'
   gem 'faker', '1.3.0'
   gem 'resque_spec' #, :path => "/home/jam/src/resque_spec/"
   gem 'timecop'

ruby/Gemfile.lock

@@ -13,43 +13,46 @@ GEM
   remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/
   specs:
     CFPropertyList (2.3.6)
-    aasm (5.1.1)
+    aasm (5.2.0)
       concurrent-ruby (~> 1.0)
-    actionmailer (4.2.8)
+    actioncable (5.1.7)
-      actionpack (= 4.2.8)
+      actionpack (= 5.1.7)
-      actionview (= 4.2.8)
+      nio4r (~> 2.0)
-      activejob (= 4.2.8)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
-    actionpack (4.2.8)
+    actionpack (5.1.7)
-      actionview (= 4.2.8)
+      actionview (= 5.1.7)
-      activesupport (= 4.2.8)
+      activesupport (= 5.1.7)
-      rack (~> 1.6)
+      rack (~> 2.0)
-      rack-test (~> 0.6.2)
+      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.8)
+    actionview (5.1.7)
-      activesupport (= 4.2.8)
+      activesupport (= 5.1.7)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.8)
+    activejob (5.1.7)
-      activesupport (= 4.2.8)
+      activesupport (= 5.1.7)
-      globalid (>= 0.3.0)
+      globalid (>= 0.3.6)
-    activemodel (4.2.8)
+    activemodel (5.1.7)
-      activesupport (= 4.2.8)
+      activesupport (= 5.1.7)
-      builder (~> 3.1)
+    activerecord (5.1.7)
-    activerecord (4.2.8)
+      activemodel (= 5.1.7)
-      activemodel (= 4.2.8)
+      activesupport (= 5.1.7)
-      activesupport (= 4.2.8)
+      arel (~> 8.0)
-      arel (~> 6.0)
     activerecord-import (0.4.1)
       activerecord (>= 3.0)
-    activesupport (4.2.8)
+    activesupport (5.1.7)
-      i18n (~> 0.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
@@ -64,7 +67,7 @@ GEM
       amq-client (~> 1.0.2)
       amq-protocol (>= 1.3.0)
       eventmachine
-    arel (6.0.4)
+    arel (8.0.0)
     auto_strip_attributes (2.6.0)
       activerecord (>= 4.0)
     aws-sdk (1.67.0)
@@ -76,22 +79,31 @@ GEM
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     builder (3.2.4)
-    carrierwave (0.9.0)
+    carrierwave (2.2.1)
-      activemodel (>= 3.2.0)
+      activemodel (>= 5.0.0)
-      activesupport (>= 3.2.0)
+      activesupport (>= 5.0.0)
-      json (>= 1.7)
+      addressable (~> 2.6)
+      image_processing (~> 1.1)
+      marcel (~> 1.0.0)
+      mini_mime (>= 0.1.3)
+      ssrf_filter (~> 1.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.8)
     crack (0.4.5)
       rexml
     crass (1.0.6)
     dante (0.2.0)
-    database_cleaner (1.4.1)
+    database_cleaner (2.0.1)
-    devise (3.3.0)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    devise (4.8.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0)
-      thread_safe (~> 0.1)
+      responders
       warden (~> 1.2.3)
     diff-lcs (1.1.3)
     domain_name (0.5.20190701)
@@ -106,17 +118,18 @@ GEM
       multi_json
     email_validator (1.6.0)
       activemodel
-    erubis (2.7.0)
+    erubi (1.10.0)
     et-orbi (1.2.4)
       tzinfo
     eventmachine (1.0.4)
-    excon (0.78.1)
+    excon (0.81.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     faker (1.3.0)
       i18n (~> 0.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
+    ffi (1.15.0)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
     fog (1.41.0)
@@ -267,7 +280,7 @@ GEM
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.2.5)
-    fugit (1.4.2)
+    fugit (1.4.5)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
     geokit (1.13.1)
@@ -286,6 +299,9 @@ GEM
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     icalendar (2.4.0)
+    image_processing (1.12.1)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     inflecto (0.0.2)
     ipaddress (0.8.3)
     iso-639 (0.3.5)
@@ -296,76 +312,75 @@ GEM
     little-plugger (1.1.4)
     logging (1.7.2)
       little-plugger (>= 1.1.3)
-    loofah (2.9.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    marcel (1.0.1)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
+    mime-types-data (3.2021.0225)
-    mini_mime (1.0.2)
+    mini_magick (4.11.0)
+    mini_mime (1.1.0)
     mini_portile2 (2.4.0)
-    minitest (5.14.3)
+    minitest (5.14.4)
-    mono_logger (1.1.0)
+    mono_logger (1.1.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
+    nio4r (2.5.7)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.4)
+    nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
     oj (2.17.1)
     optimist (3.0.1)
     orm_adapter (0.5.0)
-    pg (0.17.1)
+    pg (1.2.3)
-    pg_array_parser (0.0.9)
+    postgres-copy (1.5.0)
-    postgres-copy (1.2.0)
+      activerecord (>= 5.1)
-      activerecord (>= 4.0, < 5.1)
       pg (>= 0.17)
       responders
-    postgres_ext (3.0.1)
+    protected_attributes_continued (1.8.1)
-      activerecord (~> 4.0)
+      activemodel (>= 5.0)
-      arel (>= 4.0.1)
+    pry (0.14.1)
-      pg_array_parser (~> 0.0.9)
-    protected_attributes (1.1.4)
-      activemodel (>= 4.0.1, < 5.0)
-    pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
     raabro (1.4.0)
-    rack (1.6.13)
+    rack (2.2.3)
-    rack-protection (1.5.5)
+    rack-protection (2.1.0)
       rack
-    rack-test (0.6.3)
+    rack-test (1.1.0)
-      rack (>= 1.0)
+      rack (>= 1.0, < 3)
-    rails (4.2.8)
+    rails (5.1.7)
-      actionmailer (= 4.2.8)
+      actioncable (= 5.1.7)
-      actionpack (= 4.2.8)
+      actionmailer (= 5.1.7)
-      actionview (= 4.2.8)
+      actionpack (= 5.1.7)
-      activejob (= 4.2.8)
+      actionview (= 5.1.7)
-      activemodel (= 4.2.8)
+      activejob (= 5.1.7)
-      activerecord (= 4.2.8)
+      activemodel (= 5.1.7)
-      activesupport (= 4.2.8)
+      activerecord (= 5.1.7)
-      bundler (>= 1.3.0, < 2.0)
+      activesupport (= 5.1.7)
-      railties (= 4.2.8)
+      bundler (>= 1.3.0)
-      sprockets-rails
+      railties (= 5.1.7)
-    rails-deprecated_sanitizer (1.0.3)
+      sprockets-rails (>= 2.0.0)
-      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (2.0.3)
-    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0)
-      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (>= 1.6)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails-observers (0.1.2)
+    rails-observers (0.1.5)
-      activemodel (~> 4.0)
+      activemodel (>= 4.0)
-    railties (4.2.8)
+    railties (5.1.7)
-      actionpack (= 4.2.8)
+      actionpack (= 5.1.7)
-      activesupport (= 4.2.8)
+      activesupport (= 5.1.7)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (13.0.3)
@@ -378,9 +393,9 @@ GEM
     redis (3.3.0)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
-    responders (2.4.1)
+    responders (3.0.1)
-      actionpack (>= 4.2.0, < 6.0)
+      actionpack (>= 5.0)
-      railties (>= 4.2.0, < 6.0)
+      railties (>= 5.0)
     resque (1.27.4)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
@@ -411,7 +426,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -425,6 +440,9 @@ GEM
       ruby-prof
     ruby-prof (0.15.9)
     ruby-protocol-buffers (1.2.2)
+    ruby-vips (2.1.2)
+      ffi (~> 1.12)
+    ruby2_keywords (0.0.4)
     rubyzip (1.2.0)
     rufus-scheduler (3.7.0)
       fugit (~> 1.1, >= 1.1.6)
@@ -442,10 +460,11 @@ GEM
     simplecov-html (0.7.1)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sinatra (1.4.8)
+    sinatra (2.1.0)
-      rack (~> 1.5)
+      mustermann (~> 1.0)
-      rack-protection (~> 1.4)
+      rack (~> 2.2)
-      tilt (>= 1.3, < 3)
+      rack-protection (= 2.1.0)
+      tilt (~> 2.0)
     spork (0.9.0)
     sprockets (3.6.3)
       concurrent-ruby (~> 1.0)
@@ -454,7 +473,8 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    stripe (5.29.0)
+    ssrf_filter (1.0.7)
+    stripe (5.32.1)
     stripe-ruby-mock (3.0.1)
       dante (>= 0.2.0)
       multi_json (~> 1.0)
@@ -462,9 +482,9 @@ GEM
     thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    time_difference (0.5.0)
+    time_difference (0.7.0)
-      activesupport
+      activesupport (~> 5.1)
-    timecop (0.9.2)
+    timecop (0.9.4)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
     unf (0.1.4)
@@ -473,15 +493,20 @@ GEM
     uuidtools (2.1.2)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    warden (1.2.7)
+    warden (1.2.9)
-      rack (>= 1.0)
+      rack (>= 2.0.9)
-    webmock (3.11.2)
+    webmock (3.13.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.7.0)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
     will_paginate (3.3.0)
     xml-simple (1.1.8)
-    xmlrpc (0.3.1)
+    xmlrpc (0.3.2)
+      webrick
     zip-codes (0.2.1)
 
 PLATFORMS
@@ -489,8 +514,8 @@ PLATFORMS
 
 DEPENDENCIES
   aasm
-  actionmailer (= 4.2.8)
+  actionmailer (= 5.1.7)
-  activerecord (= 4.2.8)
+  activerecord (= 5.1.7)
   activerecord-import (~> 0.4.1)
   amqp (= 1.0.2)
   auto_strip_attributes
@@ -498,9 +523,9 @@ DEPENDENCIES
   bcrypt (= 3.1.15)
   bcrypt-ruby
   builder
-  carrierwave (= 0.9.0)
+  carrierwave
-  database_cleaner (= 1.4.1)
+  database_cleaner
-  devise (= 3.3.0)
+  devise
   elasticsearch
   email_validator (= 1.6.0)
   eventmachine (= 1.0.4)
@@ -520,13 +545,11 @@ DEPENDENCIES
   logging (= 1.7.2)
   nokogiri (= 1.10.10)
   oj (= 2.17.1)
-  pg (= 0.17.1)
+  pg
   postgres-copy
-  postgres_ext
+  protected_attributes_continued
-  protected_attributes
   pry
-  rails-observers (= 0.1.2)
+  rails-observers
-  railties (= 4.2.8)
   recurly (= 2.18.16)
   redis (= 3.3.0)
   redis-namespace (= 1.5.2)
@@ -562,4 +585,4 @@ RUBY VERSION
    ruby 2.4.1p111
 
 BUNDLED WITH
-   1.17.3
+   2.2.15

ruby/db/migrate/20210202183522_create_init_structure.rb

@@ -1,4 +1,4 @@
-class CreateInitStructure < ActiveRecord::Migration
+class CreateInitStructure < ActiveRecord::Migration[4.2]
   def up
     # this can't apply in production or staging, -- and schema.rb captures this test/dev environments
     return if ENV['RAILS_ENV'] == 'production'

ruby/db/migrate/20210214142857_pay_pal_field_for_affiliate.rb

@@ -1,4 +1,4 @@
-  class PayPalFieldForAffiliate < ActiveRecord::Migration
+  class PayPalFieldForAffiliate < ActiveRecord::Migration[4.2]
     def self.up
       execute "ALTER TABLE affiliate_partners ADD COLUMN paypal_id VARCHAR(255)"
       execute %(

ruby/db/migrate/20210224171323_change_affiliate_distributions_sale_line_item_id_not_null.rb

@@ -1,4 +1,4 @@
-  class ChangeAffiliateDistributionsSaleLineItemIdNotNull < ActiveRecord::Migration
+  class ChangeAffiliateDistributionsSaleLineItemIdNotNull < ActiveRecord::Migration[4.2]
     def self.up
       #change_column_null :affiliate_distributions, :sale_line_item_id, true
       execute "ALTER TABLE affiliate_distributions ALTER COLUMN sale_line_item_id DROP NOT NULL"

ruby/db/migrate/20210224182154_add_recurly_transactions_last_sync_at_to_generic_state.rb

@@ -1,4 +1,4 @@
-  class AddRecurlyTransactionsLastSyncAtToGenericState < ActiveRecord::Migration
+  class AddRecurlyTransactionsLastSyncAtToGenericState < ActiveRecord::Migration[4.2]
     
     def self.up
       #add_column :generic_state, :recurly_transactions_last_sync_at, :datetime

ruby/db/migrate/20210226112943_add_product_type_to_affiliate_distributions.rb

@@ -1,4 +1,4 @@
-  class AddProductTypeToAffiliateDistributions < ActiveRecord::Migration
+  class AddProductTypeToAffiliateDistributions < ActiveRecord::Migration[4.2]
     
     def self.up
       execute("ALTER TABLE affiliate_distributions ADD COLUMN product_type VARCHAR(64)")

ruby/db/migrate/20210226113811_set_default_for_affiliate_distributions_product_type.rb

@@ -1,4 +1,4 @@
-  class SetDefaultForAffiliateDistributionsProductType < ActiveRecord::Migration
+  class SetDefaultForAffiliateDistributionsProductType < ActiveRecord::Migration[4.2]
     
     def self.up
       execute("UPDATE affiliate_distributions SET product_type = 'JamTrack'")

ruby/db/migrate/20210301233601_add_product_code_to_affiliate_distributions.rb

@@ -1,4 +1,4 @@
-  class AddProductCodeToAffiliateDistributions < ActiveRecord::Migration
+  class AddProductCodeToAffiliateDistributions < ActiveRecord::Migration[4.2]
     def self.up
       execute("ALTER TABLE affiliate_distributions ADD COLUMN product_code VARCHAR(64)")
     end

ruby/db/migrate/20210305055542_jam_track_share_in_cents_to_affiliate_partners.rb

@@ -1,4 +1,4 @@
-  class JamTrackShareInCentsToAffiliatePartners < ActiveRecord::Migration
+  class JamTrackShareInCentsToAffiliatePartners < ActiveRecord::Migration[4.2]
     
     def self.up
       execute("ALTER TABLE affiliate_partners ADD COLUMN jamtrack_share_in_cents NUMERIC(8,2)")

ruby/db/migrate/20210305060423_set_default_values_of_jam_track_share_in_cents.rb

@@ -1,4 +1,4 @@
-  class SetDefaultValuesOfJamTrackShareInCents < ActiveRecord::Migration
+  class SetDefaultValuesOfJamTrackShareInCents < ActiveRecord::Migration[4.2]
     
     def self.up
       execute("UPDATE affiliate_partners SET jamtrack_share_in_cents = 25")

ruby/db/migrate/20210309111429_add_first_subscribed_at_to_users.rb

@@ -1,4 +1,4 @@
-  class AddFirstSubscribedAtToUsers < ActiveRecord::Migration
+  class AddFirstSubscribedAtToUsers < ActiveRecord::Migration[4.2]
     
     def self.up
       execute("ALTER TABLE users ADD COLUMN first_subscribed_at TIMESTAMP WITHOUT TIME ZONE")

ruby/db/migrate/20210310205805_add_external_id_to_affiliate_distributions.rb

@@ -1,4 +1,4 @@
-  class AddExternalIdToAffiliateDistributions < ActiveRecord::Migration
+  class AddExternalIdToAffiliateDistributions < ActiveRecord::Migration[4.2]
 
     def self.up
       execute("ALTER TABLE affiliate_distributions ADD COLUMN external_id character varying(64)")

ruby/db/migrate/20210311173309_change_affiliate_partners_rate_default.rb

@@ -1,4 +1,4 @@
-  class ChangeAffiliatePartnersRateDefault < ActiveRecord::Migration
+  class ChangeAffiliatePartnersRateDefault < ActiveRecord::Migration[4.2]
     def self.up
       execute("ALTER TABLE affiliate_partners ALTER COLUMN rate SET DEFAULT 0.30")
     end

ruby/db/migrate/20210329150012_add_use_video_conferencing_server_to_users.rb

@@ -1,4 +1,4 @@
-  class AddUseVideoConferencingServerToUsers < ActiveRecord::Migration
+  class AddUseVideoConferencingServerToUsers < ActiveRecord::Migration[4.2]
     def self.up
       execute("ALTER TABLE users ADD COLUMN use_video_conferencing_server BOOLEAN DEFAULT FALSE;")
     end

ruby/db/migrate/20210330024748_create_temp_tokens.rb

@@ -1,4 +1,4 @@
-  class CreateTempTokens < ActiveRecord::Migration
+  class CreateTempTokens < ActiveRecord::Migration[4.2]
     
     def self.up
       execute( <<-SQL 

ruby/lib/jam_ruby.rb

@@ -1,7 +1,7 @@
 require "pg"
 require "active_record"
 require "rails/railtie"
-require "protected_attributes"
+require "protected_attributes_continued"
 require "rails-observers"
 require "rails/observers/active_model"
 require "rails/observers/activerecord/active_record"
@@ -19,7 +19,7 @@ require "sendgrid"
 require "postgres-copy"
 require "geokit"
 require "geokit-rails"
-require "postgres_ext"
+#require "postgres_ext"
 require 'builder'
 require 'cgi'
 require 'resque_mailer'
@@ -31,7 +31,8 @@ require 'stripe'
 require 'zip-codes'
 require 'email_validator'
 
-ActiveRecord::Base.raise_in_transactional_callbacks = true
+#ActiveRecord::Base.raise_in_transactional_callbacks = true
+require "jam_ruby/app/models/application_record"
 require "jam_ruby/lib/timezone"
 require "jam_ruby/constants/limits"
 require "jam_ruby/constants/notification_types"

ruby/lib/jam_ruby/app/models/application_record.rb

@@ -0,0 +1,4 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
+

ruby/lib/jam_ruby/app/uploaders/jam_track_right_uploader.rb

@@ -1,8 +1,8 @@
 class JamTrackRightUploader < CarrierWave::Uploader::Base
   # include CarrierWaveDirect::Uploader
-  include CarrierWave::MimeTypes
+  #include CarrierWave::MimeTypes
 
-  process :set_content_type
+  #process :set_content_type
 
   def initialize(*)
     super

ruby/lib/jam_ruby/app/uploaders/jam_track_track_uploader.rb

@@ -1,8 +1,8 @@
 class JamTrackTrackUploader < CarrierWave::Uploader::Base
   # include CarrierWaveDirect::Uploader
-  include CarrierWave::MimeTypes
+  #include CarrierWave::MimeTypes
 
-  process :set_content_type
+  #process :set_content_type
 
   def initialize(*)
     super

ruby/lib/jam_ruby/app/uploaders/jam_track_uploader.rb

@@ -1,8 +1,8 @@
 class JamTrackUploader < CarrierWave::Uploader::Base
   # include CarrierWaveDirect::Uploader
-  include CarrierWave::MimeTypes
+  #include CarrierWave::MimeTypes
 
-  process :set_content_type
+  #process :set_content_type
 
   def initialize(*)
     super

ruby/lib/jam_ruby/app/uploaders/max_mind_release_uploader.rb

@@ -1,7 +1,7 @@
 class MaxMindReleaseUploader < CarrierWave::Uploader::Base
   # include CarrierWaveDirect::Uploader
-  include CarrierWave::MimeTypes
+  #include CarrierWave::MimeTypes
-  process :set_content_type
+  #process :set_content_type
 
   after :store, :update_extras
 

ruby/lib/jam_ruby/app/uploaders/mix_uploader.rb

@@ -1,8 +1,8 @@
 class MixUploader < CarrierWave::Uploader::Base
   # include CarrierWaveDirect::Uploader
-  include CarrierWave::MimeTypes
+  #include CarrierWave::MimeTypes
 
-  process :set_content_type
+  #process :set_content_type
   process :add_metadata
 
   version :mp3_url do

ruby/lib/jam_ruby/app/uploaders/recorded_track_uploader.rb

@@ -1,8 +1,8 @@
 class RecordedTrackUploader < CarrierWave::Uploader::Base
   # include CarrierWaveDirect::Uploader
-  include CarrierWave::MimeTypes
+  # include CarrierWave::MimeTypes
 
-  process :set_content_type
+  #process :set_content_type
   process :add_metadata
 
   def initialize(*)

ruby/lib/jam_ruby/models/active_music_session.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class ActiveMusicSession < ActiveRecord::Base
+  class ActiveMusicSession < ApplicationRecord
 
     @@log = Logging.logger[ActiveMusicSession]
 
@@ -979,4 +979,4 @@ module JamRuby
       music_session.lesson_session
     end
   end
-end
+end

ruby/lib/jam_ruby/models/affiliate_distribution.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class AffiliateDistribution < ActiveRecord::Base
+  class AffiliateDistribution < ApplicationRecord
 
 
     belongs_to :sale_line_item, class_name: 'JamRuby::SaleLineItem'

ruby/lib/jam_ruby/models/affiliate_legalese.rb

@@ -1,4 +1,4 @@
-class JamRuby::AffiliateLegalese < ActiveRecord::Base
+class JamRuby::AffiliateLegalese < ApplicationRecord
   self.table_name = 'affiliate_legalese'
 
   has_many :affiliate_partners, :class_name => "JamRuby::AffiliatePartner", :foreign_key => :legalese_id

ruby/lib/jam_ruby/models/affiliate_link.rb

@@ -1,4 +1,4 @@
-class JamRuby::AffiliateLink < ActiveRecord::Base
+class JamRuby::AffiliateLink < ApplicationRecord
 
   attr_accessible :link, :name, as: :admin
 

ruby/lib/jam_ruby/models/affiliate_monthly_payment.rb

@@ -1,4 +1,4 @@
-class JamRuby::AffiliateMonthlyPayment < ActiveRecord::Base
+class JamRuby::AffiliateMonthlyPayment < ApplicationRecord
 
   belongs_to :affiliate_partner, class_name: 'JamRuby::AffiliatePartner', inverse_of: :months
 

ruby/lib/jam_ruby/models/affiliate_partner.rb

@@ -1,4 +1,4 @@
-class JamRuby::AffiliatePartner < ActiveRecord::Base
+class JamRuby::AffiliatePartner < ApplicationRecord
   self.table_name = 'affiliate_partners'
 
   belongs_to :partner_user, :class_name => "JamRuby::User", :foreign_key => :partner_user_id, inverse_of: :affiliate_partner

ruby/lib/jam_ruby/models/affiliate_payment.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class AffiliatePayment < ActiveRecord::Base
+  class AffiliatePayment < ApplicationRecord
 
     belongs_to :affiliate_monthly_payment
     belongs_to :affiliate_quarterly_payment

ruby/lib/jam_ruby/models/affiliate_quarterly_payment.rb

@@ -1,4 +1,4 @@
-class JamRuby::AffiliateQuarterlyPayment < ActiveRecord::Base
+class JamRuby::AffiliateQuarterlyPayment < ApplicationRecord
 
   belongs_to :affiliate_partner, class_name: 'JamRuby::AffiliatePartner', inverse_of: :quarters
 

ruby/lib/jam_ruby/models/affiliate_referral_visit.rb

@@ -1,4 +1,4 @@
-class JamRuby::AffiliateReferralVisit < ActiveRecord::Base
+class JamRuby::AffiliateReferralVisit < ApplicationRecord
 
   belongs_to :affiliate_partner, class_name: 'JamRuby::AffiliatePartner', inverse_of: :visits
 

ruby/lib/jam_ruby/models/affiliate_traffic_total.rb

@@ -1,4 +1,4 @@
-class JamRuby::AffiliateTrafficTotal < ActiveRecord::Base
+class JamRuby::AffiliateTrafficTotal < ApplicationRecord
 
   belongs_to :affiliate_partner, class_name: 'JamRuby::AffiliatePartner', inverse_of: :traffic_totals
 

ruby/lib/jam_ruby/models/anonymous_user.rb

@@ -20,11 +20,11 @@ module JamRuby
     end
 
     def destroy_all_shopping_carts
-      ShoppingCart.destroy_all(anonymous_user_id: @id)
+      ShoppingCart.where(anonymous_user_id: @id).destroy_all()
     end
 
     def destroy_jam_track_shopping_carts
-      ShoppingCart.destroy_all(anonymous_user_id: @id, cart_type: JamTrack::PRODUCT_TYPE)
+      ShoppingCart.where(anonymous_user_id: @id, cart_type: JamTrack::PRODUCT_TYPE).destroy_all()
     end
 
     def admin

ruby/lib/jam_ruby/models/ars.rb

@@ -1,6 +1,6 @@
 
 module JamRuby
-  class Ars < ActiveRecord::Base
+  class Ars < ApplicationRecord
 
     attr_accessible :active, :name, :id_int, :ip,  as: :admin
 
@@ -11,4 +11,4 @@ module JamRuby
       Ars.where(active: true, beta: beta).where('ip is not NULL').where("ip != ''").all
     end
   end
-end
+end

ruby/lib/jam_ruby/models/artifact_update.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class ArtifactUpdate < ActiveRecord::Base
+  class ArtifactUpdate < ApplicationRecord
 
     DEFAULT_ENVIRONMENT = 'public'
     CLIENT_PREFIX = 'JamClient'

ruby/lib/jam_ruby/models/backing_track.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class BackingTrack < ActiveRecord::Base
+  class BackingTrack < ApplicationRecord
 
     self.table_name = "backing_tracks"
     self.primary_key = 'id'
@@ -16,4 +16,4 @@ module JamRuby
     end
 
   end
-end
+end

ruby/lib/jam_ruby/models/band.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class Band < ActiveRecord::Base
+  class Band < ApplicationRecord
     include HtmlSanitize
       html_sanitize strict: [:biography, :website, :name]
 
@@ -110,7 +110,7 @@ module JamRuby
         .order('created_at DESC')
         .limit(10)
 
-      result = recordings.concat(msh)
+      result = recordings.to_a.concat(msh.to_a)
       result.sort! {|a,b| b.created_at <=> a.created_at}.first(5)
     end
 
@@ -218,8 +218,8 @@ module JamRuby
       end
 
       unless band.new_record?
-        OnlinePresence.delete_all(["player_id = ?", band.id])
+        OnlinePresence.where(["player_id = ?", band.id]).delete_all()
-        PerformanceSample.delete_all(["player_id = ?", band.id])
+        PerformanceSample.where(["player_id = ?", band.id]).delete_all()
       end
 
       online_presences = params[:online_presences]

ruby/lib/jam_ruby/models/band_invitation.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class BandInvitation < ActiveRecord::Base
+  class BandInvitation < ApplicationRecord
 
     self.table_name = "band_invitations"
 

ruby/lib/jam_ruby/models/band_musician.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class BandMusician < ActiveRecord::Base
+  class BandMusician < ApplicationRecord
 
     self.table_name = "bands_musicians"
 
@@ -28,4 +28,4 @@ module JamRuby
     end
 
   end
-end
+end

ruby/lib/jam_ruby/models/broadcast.rb

@@ -1,6 +1,6 @@
 
 module JamRuby
-  class Broadcast < ActiveRecord::Base
+  class Broadcast < ApplicationRecord
 
     @@log = Logging.logger[Broadcast]
 

ruby/lib/jam_ruby/models/broadcast_notification.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class BroadcastNotification < ActiveRecord::Base
+  class BroadcastNotification < ApplicationRecord
 
     attr_accessible :title, :message, :button_label, :frequency, :button_url, as: :admin
 

ruby/lib/jam_ruby/models/broadcast_notification_view.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class BroadcastNotificationView < ActiveRecord::Base
+  class BroadcastNotificationView < ApplicationRecord
 
     belongs_to :broadcast_notification, :class_name => 'JamRuby::BroadcastNotification'
     belongs_to :user, :class_name => 'JamRuby::User'

ruby/lib/jam_ruby/models/calendar.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class Calendar < ActiveRecord::Base
+  class Calendar < ApplicationRecord
     include HtmlSanitize
     html_sanitize strict: [:name, :description]
     attr_accessible :name, :description, :target_uid, :trigger_delete, :start_at, :end_at

ruby/lib/jam_ruby/models/campaign_spend.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class CampaignSpend < ActiveRecord::Base
+  class CampaignSpend < ApplicationRecord
 
   end
 end

ruby/lib/jam_ruby/models/charge.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class Charge < ActiveRecord::Base
+  class Charge < ApplicationRecord
 
     attr_accessor :stripe_charge
 
@@ -152,4 +152,4 @@ module JamRuby
       self.save(validate: false)
     end
   end
-end
+end

ruby/lib/jam_ruby/models/chat_message.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class ChatMessage < ActiveRecord::Base
+  class ChatMessage < ApplicationRecord
     include HtmlSanitize
     html_sanitize strict: [:message]
 
@@ -193,4 +193,4 @@ module JamRuby
       end
     end
   end
-end
+end

ruby/lib/jam_ruby/models/city.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class City < ActiveRecord::Base
+  class City < ApplicationRecord
 
     self.table_name = 'cities'
 

ruby/lib/jam_ruby/models/claimed_recording.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class ClaimedRecording < ActiveRecord::Base
+  class ClaimedRecording < ApplicationRecord
     include HtmlSanitize
     html_sanitize strict: [:name, :description]
 

ruby/lib/jam_ruby/models/client_live_stream.rb

@@ -1,6 +1,6 @@
 
 module JamRuby
-  class ClientLiveStream < ActiveRecord::Base
+  class ClientLiveStream < ApplicationRecord
 
     @@log = Logging.logger[ClientLiveStream]
 

ruby/lib/jam_ruby/models/connection.rb

@@ -1,7 +1,7 @@
 require 'aasm'
 
 module JamRuby
-  class Connection < ActiveRecord::Base
+  class Connection < ApplicationRecord
 
     include HtmlSanitize
     include AASM
@@ -203,7 +203,7 @@ module JamRuby
     end
 
     def report_add_participant
-      if self.music_session_id_changed? &&
+      if self.saved_change_to_music_session_id? &&
           self.music_session.present? &&
           self.connected? &&
           self.as_musician? &&

ruby/lib/jam_ruby/models/country.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class Country < ActiveRecord::Base
+  class Country < ApplicationRecord
 
     @@log = Logging.logger[Country]
 
@@ -35,7 +35,7 @@ module JamRuby
 
           csv = ::CSV.new(io, {encoding: 'ISO-8859-1', headers: false})
           csv.each do |row|
-            vals = vals+sep+"(#{ActiveRecord::Base.quote_value(row[0], nil)}, #{ActiveRecord::Base.quote_value(row[1], nil)})"
+            vals = vals+sep+"(#{ActiveRecord::Base.connection.quote(row[0])}, #{ActiveRecord::Base.connection.quote(row[1])})"
             sep = ','
             i += 1
 

ruby/lib/jam_ruby/models/crash_dump.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class CrashDump < ActiveRecord::Base
+  class CrashDump < ApplicationRecord
 
     include JamRuby::S3AnalyticsManagerMixin
 

ruby/lib/jam_ruby/models/diagnostic.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class Diagnostic < ActiveRecord::Base
+  class Diagnostic < ApplicationRecord
 
     # occurs when the client does not see a heartbeat from the server in a while
     NO_HEARTBEAT_ACK = 'NO_HEARTBEAT_ACK'

ruby/lib/jam_ruby/models/download_tracker.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class DownloadTracker < ActiveRecord::Base
+  class DownloadTracker < ApplicationRecord
 
     @@log = Logging.logger[DownloadTracker]
 
@@ -145,4 +145,4 @@ module JamRuby
       end
     end
   end
-end
+end

ruby/lib/jam_ruby/models/email_batch.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class EmailBatch < ActiveRecord::Base
+  class EmailBatch < ApplicationRecord
     self.table_name = "email_batches"
 
     has_many :email_batch_sets, :class_name => 'JamRuby::EmailBatchSet'

ruby/lib/jam_ruby/models/email_batch_set.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class EmailBatchSet < ActiveRecord::Base
+  class EmailBatchSet < ApplicationRecord
     self.table_name = "email_batch_sets"
 
     belongs_to :email_batch, :class_name => 'JamRuby::EmailBatch'

ruby/lib/jam_ruby/models/email_blacklist.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class EmailBlacklist < ActiveRecord::Base
+  class EmailBlacklist < ApplicationRecord
 
     attr_accessible :email, :source, :notes, as: :admin
 

ruby/lib/jam_ruby/models/event.rb

@@ -1,4 +1,4 @@
-class JamRuby::Event < ActiveRecord::Base
+class JamRuby::Event < ApplicationRecord
 
   attr_accessible :slug, :title, :description, :show_sponser, :social_description, as: :admin
 

ruby/lib/jam_ruby/models/event_brite_order.rb

@@ -1,4 +1,4 @@
-class JamRuby::EventBriteOrder < ActiveRecord::Base
+class JamRuby::EventBriteOrder < ApplicationRecord
 
 
   belongs_to :live_stream, class_name: 'JamRuby::LiveStream'

ruby/lib/jam_ruby/models/event_brite_order_upload.rb

@@ -1,4 +1,4 @@
-class JamRuby::EventBriteOrderUpload < ActiveRecord::Base
+class JamRuby::EventBriteOrderUpload < ApplicationRecord
   has_many :event_brite_orders, class_name: 'JamRuby::EventBriteOrder'
 
   validates :upload_file_name, presence: true

ruby/lib/jam_ruby/models/event_session.rb

@@ -1,4 +1,4 @@
-class JamRuby::EventSession < ActiveRecord::Base
+class JamRuby::EventSession < ApplicationRecord
 
   attr_accessible :event_id, :user_id, :band_id, :starts_at, :ends_at,  :pinned_state, :position, :img_url, :img_width, :img_height, :ordinal, as: :admin
 

ruby/lib/jam_ruby/models/facebook_signup.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class FacebookSignup < ActiveRecord::Base
+  class FacebookSignup < ApplicationRecord
 
     before_create :generate_lookup_id
 

ruby/lib/jam_ruby/models/fan_invitation.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class FanInvitation < ActiveRecord::Base
+  class FanInvitation < ApplicationRecord
 
     FRIENDSHIP_REQUIRED_VALIDATION_ERROR = "You can only invite friends"
     MEMBERSHIP_REQUIRED_OF_MUSIC_SESSION = "You must be a member of the music session to send invitations on behalf of it"

ruby/lib/jam_ruby/models/feed.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class Feed < ActiveRecord::Base
+  class Feed < ApplicationRecord
 
     belongs_to :recording, class_name: "JamRuby::Recording", inverse_of: :feed, foreign_key: 'recording_id'
     belongs_to :music_session, class_name: "JamRuby::MusicSession", inverse_of: :feed, foreign_key: 'music_session_id'
@@ -32,8 +32,13 @@ module JamRuby
       target_band = params[:band]
 
       # TODO: SPEED UP QUERY. CURRENTLY TAKES FOR EVER.
-      if target_user or target_band
+      if target_user or target_band and !APP_CONFIG.personal_feed_enabled
-        return { query: [], next_page: nil}
+        if params[:hash]
+          return { query: [], next_page: nil}
+        else
+          return [[], nil]
+        end
+
       end
 
       #query = Feed.includes([:recording]).includes([:music_session]).limit(limit)
@@ -132,4 +137,4 @@ module JamRuby
       end
     end
   end
-end
+end

ruby/lib/jam_ruby/models/fingerprint_whitelist.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class FingerprintWhitelist < ActiveRecord::Base
+  class FingerprintWhitelist < ApplicationRecord
 
     @@log = Logging.logger[FingerprintWhitelist]
 
@@ -14,4 +14,4 @@ module JamRuby
       "#{fingerprint}"
     end
   end
-end
+end

ruby/lib/jam_ruby/models/follow.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class Follow < ActiveRecord::Base
+  class Follow < ApplicationRecord
 
     belongs_to :user, :class_name => "JamRuby::User", :foreign_key => "user_id"
     belongs_to :followable, :polymorphic => true
@@ -10,4 +10,4 @@ module JamRuby
     end
 
   end
-end 
+end 

ruby/lib/jam_ruby/models/fraud_alert.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class FraudAlert < ActiveRecord::Base
+  class FraudAlert < ApplicationRecord
 
     @@log = Logging.logger[MachineExtra]
 
@@ -23,4 +23,4 @@ module JamRuby
       APP_CONFIG.admin_root_url + "/admin/fraud_alerts/" + id
     end
   end
-end
+end

ruby/lib/jam_ruby/models/friend_request.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class FriendRequest < ActiveRecord::Base
+  class FriendRequest < ApplicationRecord
     include HtmlSanitize
     html_sanitize strict: [:message]
 

ruby/lib/jam_ruby/models/friendship.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class Friendship < ActiveRecord::Base
+  class Friendship < ApplicationRecord
 
     attr_accessible :user_id, :friend_id
 
@@ -67,4 +67,4 @@ module JamRuby
       self.user.update_progression_field(:first_friended_at)
     end
   end
-end
+end

ruby/lib/jam_ruby/models/generic_state.rb

@@ -1,6 +1,6 @@
 
 module JamRuby
-  class GenericState < ActiveRecord::Base
+  class GenericState < ApplicationRecord
 
 
     attr_accessible :top_message,  :event_page_top_logo_url, :connection_policy,  as: :admin

ruby/lib/jam_ruby/models/genre.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class Genre < ActiveRecord::Base
+  class Genre < ApplicationRecord
 
     self.primary_key = 'id'
 

ruby/lib/jam_ruby/models/genre_jam_track.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class GenreJamTrack < ActiveRecord::Base
+  class GenreJamTrack < ApplicationRecord
 
     self.table_name = 'genres_jam_tracks'
 

ruby/lib/jam_ruby/models/genre_player.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class GenrePlayer < ActiveRecord::Base
+  class GenrePlayer < ApplicationRecord
 
     PROFILE = 'profile'
     VIRTUAL_BAND = 'virtual_band'

ruby/lib/jam_ruby/models/geo_ip_blocks.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class GeoIpBlocks < ActiveRecord::Base
+  class GeoIpBlocks < ApplicationRecord
 
     # index names created on the copied table used during import.
     # they do not exist except during import

ruby/lib/jam_ruby/models/geo_ip_locations.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class GeoIpLocations < ActiveRecord::Base
+  class GeoIpLocations < ApplicationRecord
 
     # index names created on the copied table used during import.
     # they do not exist except during import

ruby/lib/jam_ruby/models/get_work.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class GetWork < ActiveRecord::Base
+  class GetWork < ApplicationRecord
 
     self.table_name = "connections"
 

ruby/lib/jam_ruby/models/gift_card.rb

@@ -1,6 +1,6 @@
 # represents the gift card you hold in your hand
 module JamRuby
-  class GiftCard < ActiveRecord::Base
+  class GiftCard < ApplicationRecord
 
     @@log = Logging.logger[GiftCard]
 

ruby/lib/jam_ruby/models/gift_card_purchase.rb

@@ -1,6 +1,6 @@
 # reperesents the gift card you buy from the site (but physical gift card is modeled by GiftCard)
 module JamRuby
-  class GiftCardPurchase < ActiveRecord::Base
+  class GiftCardPurchase < ApplicationRecord
 
     @@log = Logging.logger[GiftCardPurchase]
 

ruby/lib/jam_ruby/models/gift_card_type.rb

@@ -1,6 +1,6 @@
 # reperesents the gift card you buy from the site (but physical gift card is modeled by GiftCard)
 module JamRuby
-  class GiftCardType < ActiveRecord::Base
+  class GiftCardType < ApplicationRecord
 
     @@log = Logging.logger[GiftCardType]
 

ruby/lib/jam_ruby/models/icecast_admin_authentication.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class IcecastAdminAuthentication < ActiveRecord::Base
+  class IcecastAdminAuthentication < ApplicationRecord
 
     attr_accessible :source_pass, :relay_user, :relay_pass, :admin_user, :admin_pass, as: :admin
 
@@ -35,4 +35,4 @@ module JamRuby
       end
     end
   end
-end
+end

ruby/lib/jam_ruby/models/icecast_directory.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class IcecastDirectory < ActiveRecord::Base
+  class IcecastDirectory < ApplicationRecord
 
     attr_accessible :yp_url_timeout, :yp_url, as: :admin
 
@@ -29,4 +29,4 @@ module JamRuby
       end
     end
   end
-end
+end

ruby/lib/jam_ruby/models/icecast_limit.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class IcecastLimit < ActiveRecord::Base
+  class IcecastLimit < ApplicationRecord
 
     attr_accessible :clients, :sources, :queue_size, :client_timeout, :header_timeout, :source_timeout, :burst_size,
                     as: :admin

ruby/lib/jam_ruby/models/icecast_listen_socket.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class IcecastListenSocket < ActiveRecord::Base
+  class IcecastListenSocket < ApplicationRecord
 
     attr_accessible :port, :bind_address, :shoutcast_mount, :shoutcast_compat, as: :admin
 
@@ -33,4 +33,4 @@ module JamRuby
       end
     end
   end
-end
+end

ruby/lib/jam_ruby/models/icecast_logging.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class IcecastLogging < ActiveRecord::Base
+  class IcecastLogging < ApplicationRecord
 
     attr_accessible :access_log, :error_log, :playlist_log, :log_level, :log_archive, :log_size, as: :admin
 
@@ -34,4 +34,4 @@ module JamRuby
       end
     end
   end
-end
+end

ruby/lib/jam_ruby/models/icecast_master_server_relay.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class IcecastMasterServerRelay < ActiveRecord::Base
+  class IcecastMasterServerRelay < ApplicationRecord
 
     attr_accessible :master_server, :master_server_port, :master_update_interval, :master_username, :master_pass,
                     :relays_on_demand, as: :admin
@@ -35,4 +35,4 @@ module JamRuby
         builder.tag! 'relays-on-demand', relays_on_demand
     end
   end
-end
+end

ruby/lib/jam_ruby/models/icecast_mount.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class IcecastMount < ActiveRecord::Base
+  class IcecastMount < ApplicationRecord
 
     @@log = Logging.logger[IcecastMount]
 
@@ -51,22 +51,22 @@ module JamRuby
     def after_save
       server.update_attribute(:config_changed, 1) unless no_config_changed
 
-      if !sourced_was && sourced
+      if !sourced_before_last_save && sourced
 
         # went from NOT SOURCED to SOURCED
         notify_source_up
 
-      elsif sourced_was && !sourced
+      elsif sourced_before_last_save && !sourced
 
         # went from SOURCED to NOT SOURCED
         notify_source_down
 
       end
 
-      if source_direction_was != source_direction
+      if source_direction_before_last_save != source_direction
         # temporarily removed; it seems better to leave all the data in for now.   It should never be that much
         # if the requested source direction has changed, then delete diagnostic info
-        #IcecastSourceChange.delete_all(["icecast_mount_id = ?", self.id]) if source_direction
+        #IcecastSourceChange.where(["icecast_mount_id = ?", self.id]).delete_all() if source_direction
 
         # and tell anyone listening that the direction has changed
         # SubscriptionMessage.mount_source_direction(self)
@@ -368,4 +368,4 @@ module JamRuby
       resolve_int(field)
     end
   end
-end
+end

ruby/lib/jam_ruby/models/icecast_mount_template.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class IcecastMountTemplate < ActiveRecord::Base
+  class IcecastMountTemplate < ApplicationRecord
 
     attr_accessor   :hostname, :default_mime_type # used by jam-admin
 
@@ -59,4 +59,4 @@ module JamRuby
       mount
     end
   end
-end
+end

ruby/lib/jam_ruby/models/icecast_path.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class IcecastPath < ActiveRecord::Base
+  class IcecastPath < ApplicationRecord
 
     attr_accessible :base_dir, :log_dir, :pid_file, :web_root, :admin_root, :allow_ip, :deny_ip, :alias_source,
                     :alias_dest, as: :admin
@@ -38,4 +38,4 @@ module JamRuby
       end
     end
   end
-end
+end

ruby/lib/jam_ruby/models/icecast_relay.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class IcecastRelay < ActiveRecord::Base
+  class IcecastRelay < ApplicationRecord
 
     attr_accessible :server, :port, :mount, :local_mount, :relay_username, :relay_pass, :relay_shoutcast_metadata, :on_demand,
                     as: :admin
@@ -37,4 +37,4 @@ module JamRuby
       end
     end
   end
-end
+end

ruby/lib/jam_ruby/models/icecast_security.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class IcecastSecurity < ActiveRecord::Base
+  class IcecastSecurity < ApplicationRecord
 
     attr_accessible :chroot, :change_owner_user, :change_owner_group, as: :admin
 
@@ -32,4 +32,4 @@ module JamRuby
       end
     end
   end
-end
+end

ruby/lib/jam_ruby/models/icecast_server.rb

@@ -1,5 +1,5 @@
 module JamRuby
-  class IcecastServer < ActiveRecord::Base
+  class IcecastServer < ApplicationRecord
 
     attr_accessor :skip_config_changed_flag
 
@@ -191,4 +191,4 @@ module JamRuby
 
 
   end
-end
+end