diff --git a/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb b/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb index 68dfb9fb0..ce616c1b3 100644 --- a/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb +++ b/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb @@ -137,7 +137,7 @@ module JamRuby self.fetch_recipients do |receiver, sessions_and_latency| self.opt_in_count += 1 bset = EmailBatchSet.scheduled_session_set(self, receiver, sessions_and_latency) - UserMailer.scheduled_session_daily(receiver, sessions_and_latency).deliver + UserMailer.scheduled_session_daily(receiver, sessions_and_latency).deliver_now end self.test_emails = _count_recipients.inspect diff --git a/ruby/lib/jam_ruby/models/recurly_transaction_web_hook.rb b/ruby/lib/jam_ruby/models/recurly_transaction_web_hook.rb index 9d0fc9bd4..88baa78ae 100644 --- a/ruby/lib/jam_ruby/models/recurly_transaction_web_hook.rb +++ b/ruby/lib/jam_ruby/models/recurly_transaction_web_hook.rb @@ -117,19 +117,19 @@ module JamRuby AdminMailer.recurly_alerts(transaction.user, { subject: "NOTICE: #{transaction.user.email} has had JamTrack: #{jam_track.name} revoked", body: "A #{transaction.transaction_type} event came from Recurly for sale with Recurly invoice ID #{sale.recurly_invoice_id}. We deleted their right to the track in our own database as a result." - }).deliver + }).deliver_now else AdminMailer.recurly_alerts(transaction.user, { subject: "NOTICE: #{transaction.user.email} got a refund, but unable to find JamTrackRight to delete", body: "This should just mean the user already has no rights to the JamTrackRight when the refund came in. Not a big deal, but sort of weird..." - }).deliver + }).deliver_now end else AdminMailer.recurly_alerts(transaction.user, { subject: "ACTION REQUIRED: #{transaction.user.email} got a refund it was not for total value of a JamTrack sale", body: "We received a #{transaction.transaction_type} notice for an amount that was not the same as the original sale. So, no action was taken in the database. sale total: #{sale.recurly_total_in_cents}, refund amount: #{transaction.amount_in_cents}" - }).deliver + }).deliver_now end @@ -137,13 +137,13 @@ module JamRuby AdminMailer.recurly_alerts(transaction.user, { subject: "ACTION REQUIRED: #{transaction.user.email} has refund on invoice with multiple JamTracks", body: "You will have to manually revoke any JamTrackRights in our database for the appropriate JamTracks" - }).deliver + }).deliver_now end else AdminMailer.recurly_alerts(transaction.user, { subject: "ACTION REQUIRED: #{transaction.user.email} has refund with no correlator to sales", body: "You will have to manually revoke any JamTrackRights in our database for the appropriate JamTracks" - }).deliver + }).deliver_now end diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb index c9c2d77b8..a4748fad5 100644 --- a/ruby/lib/jam_ruby/models/user.rb +++ b/ruby/lib/jam_ruby/models/user.rb @@ -334,7 +334,7 @@ module JamRuby end def friends?(user) - self.friends.exists?(user) + self.friends.exists?(user.id) end def friend_count diff --git a/ruby/spec/jam_ruby/models/recording_spec.rb b/ruby/spec/jam_ruby/models/recording_spec.rb index dc7ac70ee..e54ae3b4f 100644 --- a/ruby/spec/jam_ruby/models/recording_spec.rb +++ b/ruby/spec/jam_ruby/models/recording_spec.rb @@ -291,7 +291,7 @@ describe Recording do @recording.stop @recording.keep(@user) @recording2 = Recording.start(@music_session, @user) - @music_session.recordings.exists?(@recording2).should be_true + @music_session.recordings.exists?(@recording2.id).should be_true end it "should NOT attach the recording to all users in a the music session when recording started" do diff --git a/web/Gemfile b/web/Gemfile index 96604366d..fd6dfa4c9 100644 --- a/web/Gemfile +++ b/web/Gemfile @@ -17,12 +17,14 @@ else ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" end end +gem 'rails', '> 4.2' +gem 'railties', '> 4.2' +gem 'protected_attributes' +gem 'rails-observers' #gem 'license_finder' gem 'oj', '2.10.2' gem 'builder' -gem 'rails', '~>3.2.22' -gem 'railties', '~>3.2.22' gem 'jquery-rails' gem 'jquery-ui-rails', '4.2.1' gem 'bootstrap-sass', '2.0.4' @@ -53,12 +55,12 @@ gem 'fb_graph', '2.5.9' gem 'sendgrid', '1.2.0' gem 'filepicker-rails', '0.1.0' gem 'aws-sdk', '~> 1' -gem 'aasm', '3.0.16' +gem 'aasm' #, '3.0.16' gem 'carmen' -gem 'carrierwave', '0.9.0' +gem 'carrierwave' #, '0.9.0' gem 'carrierwave_direct' gem 'fog' -gem 'jquery-payment-rails' +gem 'jquery-payment-rails', github: 'sethcall/jquery-payment-rails' gem 'haml-rails' gem 'unf' #optional fog dependency gem 'devise', '3.3.0' #3.4.0 causes uninitialized constant ActionController::Metal (NameError) @@ -111,7 +113,7 @@ group :development, :test do # gem 'jasmine', '1.3.1' gem 'pry' gem 'execjs', '1.4.0' - gem 'factory_girl_rails', '4.1.0' # in dev because in use by rake task + gem 'factory_girl_rails' # , '4.1.0' # in dev because in use by rake task gem 'database_cleaner', '1.3.0' #in dev because in use by rake task gem 'test-unit' # gem 'teaspoon' diff --git a/web/config/application.rb b/web/config/application.rb index 534079cc6..b51ef2a5b 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -100,6 +100,7 @@ if defined?(Bundler) config.recaptcha_public_key = '6Let8dgSAAAAAFheKGWrs6iaq_hIlPOZ2f3Bb56B' config.recaptcha_private_key = '6Let8dgSAAAAAJzFxL9w2QR5auxjk0ol1_xAtOGO' + config.active_record.raise_in_transactional_callbacks = true # create one user per real jamkazam employee? config.bootstrap_dev_users = true diff --git a/websocket-gateway/Gemfile b/websocket-gateway/Gemfile index 85cd2851e..4a66c6e99 100644 --- a/websocket-gateway/Gemfile +++ b/websocket-gateway/Gemfile @@ -17,6 +17,11 @@ else gem 'jam_ruby', "0.1.#{ENV["BUILD_NUMBER"]}" ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" end +gem 'activerecord', '> 4.2' +gem 'actionpack', '> 4.2' +gem 'actionmailer', '> 4.2' +gem 'protected_attributes' +gem 'rails-observers' #gem 'license_finder' gem 'uuidtools', '2.1.2' @@ -24,14 +29,11 @@ gem 'bcrypt-ruby', '3.0.1' gem 'ruby-protocol-buffers', '1.2.2' gem 'em-websocket', '>=0.4.0' #, :path=> "#{workspace}/em-websocket-jam" gem 'amqp' -gem 'activerecord', '3.2.22' -gem 'actionpack', '3.2.22' gem 'logging' gem 'will_paginate' -gem 'actionmailer' gem 'sendgrid' gem 'rb-readline' -gem 'aasm', '3.0.16' +gem 'aasm' #, '3.0.16' gem 'carrierwave' gem 'fog' gem 'devise', '3.3.0' # 3.4.0 causes uninitialized constant ActionController::Metal (NameError) @@ -45,7 +47,7 @@ gem 'resque-failed-job-mailer' gem 'resque-lonely_job', '~> 1.0.0' gem 'resque_mailer' gem 'geokit' -gem 'geokit-rails', '2.0.1' +gem 'geokit-rails' #, '2.0.1' gem 'mime-types', '1.25.1' gem 'rest-client' gem 'netaddr' @@ -67,7 +69,7 @@ group :test do gem 'rspec', '2.14.1' # can go to 3.0, but requires changes to tests due to should removal, be_truthy, and other changes gem 'factory_girl' #gem 'spork', '0.9.0' - gem 'database_cleaner', '0.7.0' + gem 'database_cleaner' #, '0.7.0' gem 'guard', '>= 0.10.0' gem 'guard-rspec', '>= 0.7.3' gem 'pg_migrate','0.1.13' #:path => "#{workspace}/pg_migrate_ruby"