From 0c83c6278092cabda16401a15f973f5af86519f9 Mon Sep 17 00:00:00 2001 From: Nuwan Date: Fri, 18 Nov 2022 17:47:49 +0530 Subject: [PATCH] rails upgrade from 5.1.0 to 5.2.8 --- .ruby-version | 1 + admin/config/environments/development.rb | 2 +- ruby/Gemfile | 26 +- ruby/Gemfile.alt | 115 --- ruby/Gemfile.lock | 354 ++----- ruby/Gemfile.lock.bk | 598 +++++++++++ web/Gemfile | 41 +- web/Gemfile.lock | 531 ++++------ web/Gemfile.lock.bk | 966 ++++++++++++++++++ web/bin/bundle | 3 +- web/bin/rails | 5 + web/bin/rake | 5 + web/bin/setup | 4 +- web/bin/spring | 17 + web/bin/update | 6 +- web/bin/yarn | 6 +- web/config/application.rb | 49 +- web/config/boot.rb | 1 + web/config/environment.rb | 10 +- web/config/environments/development.rb | 65 +- web/config/environments/production.rb | 102 +- web/config/environments/test.rb | 62 +- .../initializers/backtrace_silencers.rb | 2 +- .../initializers/content_security_policy.rb | 25 + web/config/initializers/cookies_serializer.rb | 2 + .../new_framework_defaults_5_2.rb | 35 + web/config/puma.rb | 24 +- web/config/routes.rb | 2 +- web/config/spring.rb | 4 +- web/config/storage.yml | 34 + websocket-gateway/Gemfile.lock | 60 +- 31 files changed, 2322 insertions(+), 835 deletions(-) create mode 100644 .ruby-version delete mode 100644 ruby/Gemfile.alt create mode 100644 ruby/Gemfile.lock.bk create mode 100644 web/Gemfile.lock.bk create mode 100755 web/bin/spring create mode 100644 web/config/initializers/content_security_policy.rb create mode 100644 web/config/initializers/new_framework_defaults_5_2.rb create mode 100644 web/config/storage.yml diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..35d16fb1a --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.5.7 diff --git a/admin/config/environments/development.rb b/admin/config/environments/development.rb index df5b43848..28b6fea65 100644 --- a/admin/config/environments/development.rb +++ b/admin/config/environments/development.rb @@ -34,7 +34,7 @@ JamAdmin::Application.configure do config.assets.compress = false # Expands the lines which load the assets - config.assets.debug = true + config.assets.debug = false # Set the logging destination(s) config.log_to = %w[stdout file] diff --git a/ruby/Gemfile b/ruby/Gemfile index 5e40065a5..f63a08241 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -25,9 +25,9 @@ end gem 'pg' #, '0.17.1', :platform => [:mri, :mswin, :mingw] #gem 'jdbc_postgres', :platform => [:jruby] -gem 'activerecord', '= 5.1.7' +gem 'activerecord', '= 5.2.8' #gem 'railties', '= 5.2.5' -gem 'actionmailer', '= 5.1.7' +gem 'actionmailer', '= 5.2.8' gem 'rails-observers' #gem 'rails-observers', '0.1.2' #gem 'protected_attributes' # needed to support attr_accessible @@ -36,18 +36,18 @@ 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 ####### -gem 'nokogiri', '1.10.10' # added to pin before 1.11.0, which requires at leaost ruby 2.5. unpin we go above -gem 'sprockets', '3.6.3' # added to pin before 4.0.0, which requiurse at least ruby 2.5 -gem 'fog-brightbox', '0.11.0' # pinned until we are on ruby 2.5; then remove -gem 'faraday', '0.9.2' # pinned untnil we are on ruby 2.5; then remove -gem 'ruby-prof', '0.15.9' # pinned until we are on ruby 2.5; then remove -gem 'rubyzip', '1.2.0' # pinned until we are on ruby 2.5; then remove +gem 'nokogiri'#, '1.10.10' # added to pin before 1.11.0, which requires at leaost ruby 2.5. unpin we go above +gem 'sprockets'#, '3.6.3' # added to pin before 4.0.0, which requiurse at least ruby 2.5 +gem 'fog-brightbox'#, '0.11.0' # pinned until we are on ruby 2.5; then remove +gem 'faraday'#, '0.9.2' # pinned untnil we are on ruby 2.5; then remove +gem 'ruby-prof'#, '0.15.9' # pinned until we are on ruby 2.5; then remove +gem 'rubyzip'#, '1.2.0' # pinned until we are on ruby 2.5; then remove gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate -gem 'icalendar', '2.4.0' # pinned until we are on ruby 2.5; then remove -gem 'email_validator', '1.6.0' # pinned until we are on ruby 2.5, then remove -gem 'redis', '3.3.0' # pinned until we are on 2.5; then remove -gem 'redis-namespace', '1.5.2' # pinned until we are on 2.5; then remove -gem 'oj', '2.17.1' # pinned until we are on 2.5; then remove +gem 'icalendar'#, '2.4.0' # pinned until we are on ruby 2.5; then remove +gem 'email_validator'#, '1.6.0' # pinned until we are on ruby 2.5, then remove +gem 'redis'#, '3.3.0' # pinned until we are on 2.5; then remove +gem 'redis-namespace'#, '1.5.2' # pinned until we are on 2.5; then remove +gem 'oj'#, '2.17.1' # pinned until we are on 2.5; then remove ####### gem "activerecord-import", "~> 0.4.1" diff --git a/ruby/Gemfile.alt b/ruby/Gemfile.alt deleted file mode 100644 index 78b244e46..000000000 --- a/ruby/Gemfile.alt +++ /dev/null @@ -1,115 +0,0 @@ -#ruby=1.9.3 -source 'http://rubygems.org' -unless ENV["LOCAL_DEV"] == "1" - source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/' -end - -ruby_version = ENV["JAM_RUBY_VERSION"] -ruby_version = "2.3.1" if ruby_version.nil? - -ruby ruby_version - -# Look for $WORKSPACE, otherwise use "workspace" as dev path. -devenv = ENV["BUILD_NUMBER"].nil? -if devenv - #gem 'jam_db', :path=> "../db/target/ruby_package" - gem 'jampb', :path => "../pb/target/ruby/jampb" -else - #gem 'jam_db' - gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}" - ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" -end - -if ENV['MODERN_OS'] == "1" - gem 'pg', '0.21.0' -else - # on mac, bundle config build.pg --with-cflags="-Wno-error=implicit-function-declaration" - gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw] -end -#gem 'jdbc_postgres', :platform => [:jruby] - -gem 'activerecord', '= 4.2.8' -gem 'railties', '= 4.2.8' -gem 'actionmailer', '= 4.2.8' -gem 'rails-observers', '0.1.2' -gem 'protected_attributes' # needed to support attr_accessible - -# PINNED TO SUPPORT BOTH 2.3.1 and 2.4.1 Ruby simultaneously -# This should be the same in ruby/admin/web/websocket-gateway -####### -gem 'nokogiri', '1.10.10' # added to pin before 1.11.0, which requires at leaost ruby 2.5. unpin we go above -gem 'sprockets', '3.6.3' # added to pin before 4.0.0, which requiurse at least ruby 2.5 -gem 'fog-brightbox', '0.11.0' # pinned until we are on ruby 2.5; then remove -gem 'faraday', '0.9.2' # pinned untnil we are on ruby 2.5; then remove -gem 'ruby-prof', '0.15.9' # pinned until we are on ruby 2.5; then remove -gem 'rubyzip', '1.2.0' # pinned until we are on ruby 2.5; then remove -gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate -gem 'icalendar', '2.4.0' # pinned until we are on ruby 2.5; then remove -gem 'email_validator', '1.6.0' # pinned until we are on ruby 2.5, then remove -gem 'redis', '3.3.0' # pinned until we are on 2.5; then remove -gem 'redis-namespace', '1.5.2' # pinned until we are on 2.5; then remove -gem 'oj', '2.17.1' # pinned until we are on 2.5; then remove -####### - -gem "activerecord-import", "~> 0.4.1" -gem "auto_strip_attributes" -gem "json", "1.8.6" -gem 'uuidtools', '2.1.2' -gem 'bcrypt', '3.1.15' -gem 'bcrypt-ruby' #, '3.0.1' -gem 'ruby-protocol-buffers', '1.2.2' -gem 'eventmachine', '1.0.4' -gem 'amqp', '1.0.2' -gem 'kickbox' -gem 'will_paginate' -gem 'sendgrid', '1.2.0' -gem 'aws-sdk', '~> 1' -gem 'carrierwave', '0.9.0' -gem 'aasm' -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 'resque' -gem 'resque-retry' -gem 'resque-failed-job-mailer' #, :path => "/Users/seth/workspace/resque_failed_job_mailer" -gem 'resque-lonely_job', '~> 1.0.0' -gem 'resque_mailer' - -gem 'builder' -gem 'fog' -gem 'rest-client' -gem 'iso-639' -gem 'sanitize' -#gem 'influxdb' -gem 'sendgrid_toolkit', '>= 1.1.1' -gem 'stripe' -gem 'zip-codes' - - -gem 'elasticsearch' - -gem 'logging', '1.7.2' - -group :test do - gem 'pry' - gem 'simplecov', '~> 0.7.1' - gem 'simplecov-rcov' - gem 'factory_girl', '4.5.0' - gem "rspec", "2.11" - gem 'spork', '0.9.0' - gem 'database_cleaner', '1.4.1' - gem 'faker', '1.3.0' - gem 'resque_spec' #, :path => "/home/jam/src/resque_spec/" - gem 'timecop' - gem 'rspec-prof' - gem 'time_difference' -# gem 'byebug' - gem 'stripe-ruby-mock' - gem 'webmock', '~> 3.11', '>= 3.11.2' - -end - -# Specify your gem's dependencies in jam_ruby.gemspec -gemspec diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 0f44ff99c..a1429f646 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -12,53 +12,45 @@ GEM remote: http://rubygems.org/ remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/ specs: - CFPropertyList (2.3.6) aasm (5.4.0) concurrent-ruby (~> 1.0) - actioncable (5.1.7) - actionpack (= 5.1.7) - nio4r (~> 2.0) - websocket-driver (~> 0.6.1) - actionmailer (5.1.7) - actionpack (= 5.1.7) - actionview (= 5.1.7) - activejob (= 5.1.7) + actionmailer (5.2.8) + actionpack (= 5.2.8) + actionview (= 5.2.8) + activejob (= 5.2.8) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.7) - actionview (= 5.1.7) - activesupport (= 5.1.7) - rack (~> 2.0) + actionpack (5.2.8) + actionview (= 5.2.8) + activesupport (= 5.2.8) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.7) - activesupport (= 5.1.7) + actionview (5.2.8) + activesupport (= 5.2.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.7) - activesupport (= 5.1.7) + activejob (5.2.8) + activesupport (= 5.2.8) globalid (>= 0.3.6) - activemodel (5.1.7) - activesupport (= 5.1.7) - activerecord (5.1.7) - activemodel (= 5.1.7) - activesupport (= 5.1.7) - arel (~> 8.0) + activemodel (5.2.8) + activesupport (= 5.2.8) + activerecord (5.2.8) + activemodel (= 5.2.8) + activesupport (= 5.2.8) + arel (>= 9.0) activerecord-import (0.4.1) activerecord (>= 3.0) - activesupport (5.1.7) + activesupport (5.2.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) - aliyun-sdk (0.8.0) - nokogiri (~> 1.6) - rest-client (~> 2.0) amq-client (1.0.4) amq-protocol (>= 1.9.0) eventmachine @@ -67,7 +59,7 @@ GEM amq-client (~> 1.0.2) amq-protocol (>= 1.3.0) eventmachine - arel (8.0.0) + arel (9.0.0) auto_strip_attributes (2.6.0) activerecord (>= 4.0) aws-sdk (1.67.0) @@ -89,6 +81,7 @@ GEM ssrf_filter (~> 1.0) coderay (1.1.3) concurrent-ruby (1.1.10) + connection_pool (2.3.0) crack (0.4.5) rexml crass (1.0.6) @@ -108,15 +101,16 @@ GEM diff-lcs (1.1.3) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - elasticsearch (7.4.0) - elasticsearch-api (= 7.4.0) - elasticsearch-transport (= 7.4.0) - elasticsearch-api (7.4.0) + dry-inflector (0.2.0) + elastic-transport (8.1.0) + faraday (< 3) multi_json - elasticsearch-transport (7.4.0) - faraday + elasticsearch (8.5.1) + elastic-transport (~> 8) + elasticsearch-api (= 8.5.1) + elasticsearch-api (8.5.1) multi_json - email_validator (1.6.0) + email_validator (2.2.4) activemodel erubi (1.11.0) et-orbi (1.2.7) @@ -127,156 +121,60 @@ GEM activesupport (>= 3.0.0) faker (1.3.0) i18n (~> 0.5) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) + faraday (1.10.2) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) ffi (1.15.5) - fission (0.5.0) - CFPropertyList (~> 2.2) - fog (1.41.0) - fog-aliyun (>= 0.1.0) - fog-atmos - fog-aws (>= 0.6.0) - fog-brightbox (~> 0.4) - fog-cloudatcost (~> 0.1.0) - fog-core (~> 1.45) - fog-digitalocean (>= 0.3.0) - fog-dnsimple (~> 1.0) - fog-dynect (~> 0.0.2) - fog-ecloud (~> 0.1) - fog-google (<= 0.1.0) - fog-internet-archive - fog-joyent + fog (1.24.0) + fog-brightbox + fog-core (~> 1.23) fog-json - fog-local - fog-openstack - fog-powerdns (>= 0.1.1) - fog-profitbricks - fog-rackspace fog-radosgw (>= 0.0.2) - fog-riakcs fog-sakuracloud (>= 0.0.4) - fog-serverlove fog-softlayer - fog-storm_on_demand - fog-terremark - fog-vmfusion - fog-voxel - fog-vsphere (>= 0.4.0) - fog-xenserver - fog-xml (~> 0.1.1) ipaddress (~> 0.5) - json (>= 1.8, < 2.0) - fog-aliyun (0.4.0) - addressable (~> 2.8.0) - aliyun-sdk (~> 0.8.0) - fog-core + nokogiri (~> 1.5, >= 1.5.11) + fog-brightbox (1.8.0) + dry-inflector + fog-core (>= 1.45, < 3.0) fog-json - ipaddress (~> 0.8) - xml-simple (~> 1.1) - fog-atmos (0.1.0) - fog-core - fog-xml - fog-aws (2.0.1) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-brightbox (0.11.0) - fog-core (~> 1.22) - fog-json - inflecto (~> 0.0.2) - fog-cloudatcost (0.1.2) - fog-core (~> 1.36) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) fog-core (1.45.0) builder excon (~> 0.58) formatador (~> 0.2) - fog-digitalocean (0.4.0) - fog-core - fog-json - fog-xml - ipaddress (>= 0.5) - fog-dnsimple (1.0.0) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-dynect (0.0.3) - fog-core - fog-json - fog-xml - fog-ecloud (0.3.0) - fog-core - fog-xml - fog-google (0.1.0) - fog-core - fog-json - fog-xml - fog-internet-archive (0.0.2) - fog-core - fog-json - fog-xml - fog-joyent (0.0.1) - fog-core (~> 1.42) - fog-json (>= 1.0) fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-local (0.8.0) - fog-core (>= 1.27, < 3.0) - fog-openstack (0.3.10) - fog-core (>= 1.45, <= 2.1.0) - fog-json (>= 1.0) - ipaddress (>= 0.8) - fog-powerdns (0.2.0) - fog-core - fog-json - fog-xml - fog-profitbricks (4.1.1) - fog-core (~> 1.42) - fog-json (~> 1.0) - fog-rackspace (0.1.6) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) fog-radosgw (0.0.5) fog-core (>= 1.21.0) fog-json fog-xml (>= 0.0.1) - fog-riakcs (0.1.0) - fog-core - fog-json - fog-xml fog-sakuracloud (1.7.5) fog-core fog-json - fog-serverlove (0.1.2) - fog-core - fog-json fog-softlayer (1.1.4) fog-core fog-json - fog-storm_on_demand (0.1.1) - fog-core - fog-json - fog-terremark (0.1.0) - fog-core - fog-xml - fog-vmfusion (0.1.0) - fission - fog-core - fog-voxel (0.1.0) - fog-core - fog-xml - fog-vsphere (3.5.2) - fog-core - rbvmomi (>= 1.9, < 3) - fog-xenserver (1.0.0) - fog-core - fog-xml - xmlrpc fog-xml (0.1.4) fog-core nokogiri (>= 1.5.11, < 2.0.0) @@ -285,11 +183,10 @@ GEM et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) geokit (1.13.1) - geokit-rails (2.3.2) - geokit (~> 1.5) - rails (>= 3.0) - globalid (0.4.2) - activesupport (>= 4.2.0) + geokit-rails (1.1.4) + geokit (>= 1.5.0) + globalid (1.0.0) + activesupport (>= 5.0) hashdiff (1.0.1) http-accept (1.7.0) http-cookie (1.0.5) @@ -299,16 +196,17 @@ GEM multi_xml (>= 0.5.2) i18n (0.9.5) concurrent-ruby (~> 1.0) - icalendar (2.4.0) + icalendar (2.8.0) + ice_cube (~> 0.16) + ice_cube (0.16.4) image_processing (1.12.2) 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) json (1.8.6) - kickbox (2.0.4) - faraday (~> 0.9) + kickbox (2.0.5) + faraday (~> 1.0) json (>= 1.8) little-plugger (1.1.4) logging (1.7.2) @@ -325,7 +223,7 @@ GEM mime-types-data (3.2022.0105) mini_magick (4.11.0) mini_mime (1.1.2) - mini_portile2 (2.4.0) + mini_portile2 (2.6.1) minitest (5.15.0) mono_logger (1.1.1) multi_json (1.15.0) @@ -334,15 +232,12 @@ GEM mustermann (2.0.2) ruby2_keywords (~> 0.0.1) netrc (0.11.0) - nio4r (2.5.8) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - nokogumbo (2.0.5) - nokogiri (~> 1.8, >= 1.8.4) - oj (2.17.1) - optimist (3.0.1) + nokogiri (1.12.5) + mini_portile2 (~> 2.6.1) + racc (~> 1.4) + oj (3.13.23) orm_adapter (0.5.0) - pg (1.2.3) + pg (1.4.5) postgres-copy (1.6.1) activerecord (>= 5.1) pg (>= 0.17) @@ -353,23 +248,12 @@ GEM method_source (~> 1.0) public_suffix (4.0.7) raabro (1.4.0) + racc (1.6.0) rack (2.2.4) rack-protection (2.2.2) rack rack-test (2.0.2) rack (>= 1.3) - rails (5.1.7) - actioncable (= 5.1.7) - actionmailer (= 5.1.7) - actionpack (= 5.1.7) - actionview (= 5.1.7) - activejob (= 5.1.7) - activemodel (= 5.1.7) - activerecord (= 5.1.7) - activesupport (= 5.1.7) - bundler (>= 1.3.0) - railties (= 5.1.7) - sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -377,31 +261,28 @@ GEM loofah (~> 2.3) rails-observers (0.1.5) activemodel (>= 4.0) - railties (5.1.7) - actionpack (= 5.1.7) - activesupport (= 5.1.7) + railties (5.2.8) + actionpack (= 5.2.8) + activesupport (= 5.2.8) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + thor (>= 0.19.0, < 2.0) rake (13.0.6) - rbvmomi (2.4.1) - builder (~> 3.0) - json (>= 1.8) - nokogiri (~> 1.5) - optimist (~> 3.0) recurly (2.18.16) - redis (3.3.0) - redis-namespace (1.5.2) - redis (~> 3.0, >= 3.0.4) + redis (5.0.5) + redis-client (>= 0.9.0) + redis-client (0.11.2) + connection_pool + redis-namespace (1.9.0) + redis (>= 4) responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) - resque (1.27.4) + resque (2.4.0) mono_logger (~> 1.0) multi_json (~> 1.0) - redis-namespace (~> 1.3) + redis-namespace (~> 1.6) sinatra (>= 0.9.2) - vegas (~> 0.1.2) resque-failed-job-mailer (0.0.3) resque-lonely_job (1.0.2) resque (>= 1.2) @@ -438,18 +319,17 @@ GEM rspec-prof (0.0.5) rspec ruby-prof - ruby-prof (0.15.9) + ruby-prof (1.4.3) ruby-protocol-buffers (1.2.2) ruby-vips (2.1.4) ffi (~> 1.12) ruby2_keywords (0.0.5) - rubyzip (1.2.0) + rubyzip (2.3.2) rufus-scheduler (3.8.2) fugit (~> 1.1, >= 1.1.6) - sanitize (5.2.3) + sanitize (6.0.0) crass (~> 1.0.2) - nokogiri (>= 1.8.0) - nokogumbo (~> 2.0) + nokogiri (>= 1.12.0) sendgrid (1.2.0) json sendgrid_toolkit (1.4.0) @@ -466,13 +346,9 @@ GEM rack-protection (= 2.2.2) tilt (~> 2.0) spork (0.9.0) - sprockets (3.6.3) + sprockets (4.1.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) ssrf_filter (1.0.8) stripe (5.55.0) stripe-ruby-mock (3.0.1) @@ -482,8 +358,8 @@ GEM thor (1.2.1) thread_safe (0.3.6) tilt (2.0.11) - time_difference (0.7.0) - activesupport (~> 5.1) + time_difference (0.5.0) + activesupport timecop (0.9.5) tzinfo (1.2.10) thread_safe (~> 0.1) @@ -491,32 +367,22 @@ GEM unf_ext unf_ext (0.0.8.2) uuidtools (2.1.2) - vegas (0.1.11) - rack (>= 1.0.0) warden (1.2.9) rack (>= 2.0.9) webmock (3.18.1) addressable (>= 2.8.0) 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.1) - xml-simple (1.1.9) - rexml - xmlrpc (0.3.2) - webrick zip-codes (0.2.1) PLATFORMS - ruby + -darwin-21 DEPENDENCIES aasm - actionmailer (= 5.1.7) - activerecord (= 5.1.7) + actionmailer (= 5.2.8) + activerecord (= 5.2.8) activerecord-import (~> 0.4.1) amqp (= 1.0.2) auto_strip_attributes @@ -528,32 +394,32 @@ DEPENDENCIES database_cleaner devise elasticsearch - email_validator (= 1.6.0) + email_validator eventmachine (= 1.0.4) factory_girl (= 4.5.0) faker (= 1.3.0) - faraday (= 0.9.2) + faraday fog - fog-brightbox (= 0.11.0) + fog-brightbox geokit geokit-rails - icalendar (= 2.4.0) + icalendar iso-639 jam_ruby! jampb! json (= 1.8.6) kickbox logging (= 1.7.2) - nokogiri (= 1.10.10) - oj (= 2.17.1) + nokogiri + oj pg postgres-copy protected_attributes_continued pry rails-observers recurly (= 2.18.16) - redis (= 3.3.0) - redis-namespace (= 1.5.2) + redis + redis-namespace resque resque-failed-job-mailer resque-lonely_job (~> 1.0.0) @@ -563,16 +429,16 @@ DEPENDENCIES rest-client rspec (= 2.11) rspec-prof - ruby-prof (= 0.15.9) + ruby-prof ruby-protocol-buffers (= 1.2.2) - rubyzip (= 1.2.0) + rubyzip sanitize sendgrid (= 1.2.0) sendgrid_toolkit (>= 1.1.1) simplecov (~> 0.7.1) simplecov-rcov spork (= 0.9.0) - sprockets (= 3.6.3) + sprockets stripe stripe-ruby-mock time_difference @@ -583,7 +449,7 @@ DEPENDENCIES zip-codes RUBY VERSION - ruby 2.4.1p111 + ruby 2.5.7p206 BUNDLED WITH - 2.2.15 + 2.3.26 diff --git a/ruby/Gemfile.lock.bk b/ruby/Gemfile.lock.bk new file mode 100644 index 000000000..5acb16eaa --- /dev/null +++ b/ruby/Gemfile.lock.bk @@ -0,0 +1,598 @@ +PATH + remote: ../pb/target/ruby/jampb + specs: + jampb (0.1.1) + +PATH + remote: . + specs: + jam_ruby (0.1.1) + +GEM + remote: http://rubygems.org/ + remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/ + specs: + CFPropertyList (2.3.6) + aasm (5.4.0) + concurrent-ruby (~> 1.0) + actioncable (5.2.0) + actionpack (= 5.2.0) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.0) + actionview (= 5.2.0) + activesupport (= 5.2.0) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.0) + activesupport (= 5.2.0) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.0) + activesupport (= 5.2.0) + globalid (>= 0.3.6) + activemodel (5.2.0) + activesupport (= 5.2.0) + activerecord (5.2.0) + activemodel (= 5.2.0) + activesupport (= 5.2.0) + arel (>= 9.0) + activerecord-import (0.4.1) + activerecord (>= 3.0) + activestorage (5.2.0) + actionpack (= 5.2.0) + activerecord (= 5.2.0) + marcel (~> 0.3.1) + activesupport (5.2.0) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + aliyun-sdk (0.8.0) + nokogiri (~> 1.6) + rest-client (~> 2.0) + amq-client (1.0.4) + amq-protocol (>= 1.9.0) + eventmachine + amq-protocol (2.3.2) + amqp (1.0.2) + amq-client (~> 1.0.2) + amq-protocol (>= 1.3.0) + eventmachine + arel (9.0.0) + auto_strip_attributes (2.6.0) + activerecord (>= 4.0) + aws-sdk (1.67.0) + aws-sdk-v1 (= 1.67.0) + aws-sdk-v1 (1.67.0) + json (~> 1.4) + nokogiri (~> 1) + bcrypt (3.1.15) + bcrypt-ruby (3.1.5) + bcrypt (>= 3.1.3) + builder (3.2.4) + carrierwave (2.2.0) + activemodel (>= 5.0.0) + activesupport (>= 5.0.0) + addressable (~> 2.6) + image_processing (~> 1.1) + mimemagic (>= 0.3.0) + mini_mime (>= 0.1.3) + ssrf_filter (~> 1.0) + coderay (1.1.3) + concurrent-ruby (1.1.10) + crack (0.4.5) + rexml + crass (1.0.6) + dante (0.2.0) + database_cleaner (2.0.1) + 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.1) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0) + responders + warden (~> 1.2.3) + diff-lcs (1.1.3) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + elasticsearch (7.4.0) + elasticsearch-api (= 7.4.0) + elasticsearch-transport (= 7.4.0) + elasticsearch-api (7.4.0) + multi_json + elasticsearch-transport (7.4.0) + faraday + multi_json + email_validator (1.6.0) + activemodel + erubi (1.11.0) + et-orbi (1.2.7) + tzinfo + eventmachine (1.0.4) + excon (0.94.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.5) + fission (0.5.0) + CFPropertyList (~> 2.2) + fog (1.41.0) + fog-aliyun (>= 0.1.0) + fog-atmos + fog-aws (>= 0.6.0) + fog-brightbox (~> 0.4) + fog-cloudatcost (~> 0.1.0) + fog-core (~> 1.45) + fog-digitalocean (>= 0.3.0) + fog-dnsimple (~> 1.0) + fog-dynect (~> 0.0.2) + fog-ecloud (~> 0.1) + fog-google (<= 0.1.0) + fog-internet-archive + fog-joyent + fog-json + fog-local + fog-openstack + fog-powerdns (>= 0.1.1) + fog-profitbricks + fog-rackspace + fog-radosgw (>= 0.0.2) + fog-riakcs + fog-sakuracloud (>= 0.0.4) + fog-serverlove + fog-softlayer + fog-storm_on_demand + fog-terremark + fog-vmfusion + fog-voxel + fog-vsphere (>= 0.4.0) + fog-xenserver + fog-xml (~> 0.1.1) + ipaddress (~> 0.5) + json (>= 1.8, < 2.0) + fog-aliyun (0.4.0) + addressable (~> 2.8.0) + aliyun-sdk (~> 0.8.0) + fog-core + fog-json + ipaddress (~> 0.8) + xml-simple (~> 1.1) + fog-atmos (0.1.0) + fog-core + fog-xml + fog-aws (2.0.1) + fog-core (~> 1.38) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-brightbox (0.11.0) + fog-core (~> 1.22) + fog-json + inflecto (~> 0.0.2) + fog-cloudatcost (0.1.2) + fog-core (~> 1.36) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-core (1.45.0) + builder + excon (~> 0.58) + formatador (~> 0.2) + fog-digitalocean (0.4.0) + fog-core + fog-json + fog-xml + ipaddress (>= 0.5) + fog-dnsimple (1.0.0) + fog-core (~> 1.38) + fog-json (~> 1.0) + fog-dynect (0.0.3) + fog-core + fog-json + fog-xml + fog-ecloud (0.3.0) + fog-core + fog-xml + fog-google (0.1.0) + fog-core + fog-json + fog-xml + fog-internet-archive (0.0.2) + fog-core + fog-json + fog-xml + fog-joyent (0.0.1) + fog-core (~> 1.42) + fog-json (>= 1.0) + fog-json (1.2.0) + fog-core + multi_json (~> 1.10) + fog-local (0.8.0) + fog-core (>= 1.27, < 3.0) + fog-openstack (0.3.10) + fog-core (>= 1.45, <= 2.1.0) + fog-json (>= 1.0) + ipaddress (>= 0.8) + fog-powerdns (0.2.0) + fog-core + fog-json + fog-xml + fog-profitbricks (4.1.1) + fog-core (~> 1.42) + fog-json (~> 1.0) + fog-rackspace (0.1.6) + fog-core (>= 1.35) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) + fog-radosgw (0.0.5) + fog-core (>= 1.21.0) + fog-json + fog-xml (>= 0.0.1) + fog-riakcs (0.1.0) + fog-core + fog-json + fog-xml + fog-sakuracloud (1.7.5) + fog-core + fog-json + fog-serverlove (0.1.2) + fog-core + fog-json + fog-softlayer (1.1.4) + fog-core + fog-json + fog-storm_on_demand (0.1.1) + fog-core + fog-json + fog-terremark (0.1.0) + fog-core + fog-xml + fog-vmfusion (0.1.0) + fission + fog-core + fog-voxel (0.1.0) + fog-core + fog-xml + fog-vsphere (3.5.2) + fog-core + rbvmomi (>= 1.9, < 3) + fog-xenserver (1.0.0) + fog-core + fog-xml + xmlrpc + fog-xml (0.1.4) + fog-core + nokogiri (>= 1.5.11, < 2.0.0) + formatador (0.3.0) + fugit (1.7.2) + et-orbi (~> 1, >= 1.2.7) + raabro (~> 1.4) + geokit (1.13.1) + geokit-rails (2.3.2) + geokit (~> 1.5) + rails (>= 3.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + hashdiff (1.0.1) + http-accept (1.7.0) + http-cookie (1.0.5) + domain_name (~> 0.5) + httparty (0.20.0) + mime-types (~> 3.0) + multi_xml (>= 0.5.2) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + icalendar (2.4.0) + image_processing (1.12.2) + 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) + json (1.8.6) + kickbox (2.0.4) + faraday (~> 0.9) + json (>= 1.8) + little-plugger (1.1.4) + logging (1.7.2) + little-plugger (>= 1.1.3) + loofah (2.19.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mime-types (3.4.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2022.0105) + mimemagic (0.3.10) + nokogiri (~> 1) + rake + mini_magick (4.11.0) + mini_mime (1.1.2) + mini_portile2 (2.4.0) + minitest (5.15.0) + mono_logger (1.1.1) + multi_json (1.15.0) + multi_xml (0.6.0) + multipart-post (2.2.3) + mustermann (2.0.2) + ruby2_keywords (~> 0.0.1) + netrc (0.11.0) + nio4r (2.5.8) + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) + nokogumbo (2.0.5) + nokogiri (~> 1.8, >= 1.8.4) + oj (2.17.1) + optimist (3.0.1) + orm_adapter (0.5.0) + pg (1.2.3) + postgres-copy (1.6.1) + activerecord (>= 5.1) + pg (>= 0.17) + protected_attributes_continued (1.8.2) + activemodel (>= 5.0) + pry (0.14.1) + coderay (~> 1.1) + method_source (~> 1.0) + public_suffix (4.0.7) + raabro (1.4.0) + rack (2.2.4) + rack-protection (2.2.2) + rack + rack-test (2.0.2) + rack (>= 1.3) + rails (5.2.0) + actioncable (= 5.2.0) + actionmailer (= 5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + activemodel (= 5.2.0) + activerecord (= 5.2.0) + activestorage (= 5.2.0) + activesupport (= 5.2.0) + bundler (>= 1.3.0) + railties (= 5.2.0) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.4.3) + loofah (~> 2.3) + rails-observers (0.1.5) + activemodel (>= 4.0) + railties (5.2.0) + actionpack (= 5.2.0) + activesupport (= 5.2.0) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (13.0.6) + rbvmomi (2.4.1) + builder (~> 3.0) + json (>= 1.8) + nokogiri (~> 1.5) + optimist (~> 3.0) + recurly (2.18.16) + redis (3.3.0) + redis-namespace (1.5.2) + redis (~> 3.0, >= 3.0.4) + responders (3.0.1) + actionpack (>= 5.0) + railties (>= 5.0) + resque (1.27.4) + mono_logger (~> 1.0) + multi_json (~> 1.0) + redis-namespace (~> 1.3) + sinatra (>= 0.9.2) + vegas (~> 0.1.2) + resque-failed-job-mailer (0.0.3) + resque-lonely_job (1.0.2) + resque (>= 1.2) + resque-retry (1.7.6) + resque (>= 1.25, < 3.0) + resque-scheduler (~> 4.0) + resque-scheduler (4.7.0) + mono_logger (~> 1.0) + redis (>= 3.3) + resque (>= 1.27) + rufus-scheduler (~> 3.2, != 3.3) + resque_mailer (2.4.3) + actionmailer (>= 3.0) + activesupport (>= 3.0) + resque_spec (0.15.0) + resque (>= 1.19.0) + rspec-core (>= 2.5.0) + rspec-expectations (>= 2.5.0) + rspec-mocks (>= 2.5.0) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + rexml (3.2.5) + rspec (2.11.0) + rspec-core (~> 2.11.0) + rspec-expectations (~> 2.11.0) + rspec-mocks (~> 2.11.0) + rspec-core (2.11.1) + rspec-expectations (2.11.3) + diff-lcs (~> 1.1.3) + rspec-mocks (2.11.3) + rspec-prof (0.0.5) + rspec + ruby-prof + ruby-prof (0.15.9) + ruby-protocol-buffers (1.2.2) + ruby-vips (2.1.4) + ffi (~> 1.12) + ruby2_keywords (0.0.5) + rubyzip (1.2.0) + rufus-scheduler (3.8.2) + fugit (~> 1.1, >= 1.1.6) + sanitize (5.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.8.0) + nokogumbo (~> 2.0) + sendgrid (1.2.0) + json + sendgrid_toolkit (1.4.0) + httparty (>= 0.7.6) + simplecov (0.7.1) + multi_json (~> 1.0) + simplecov-html (~> 0.7.1) + simplecov-html (0.7.1) + simplecov-rcov (0.3.1) + simplecov (>= 0.4.1) + sinatra (2.2.2) + mustermann (~> 2.0) + rack (~> 2.2) + rack-protection (= 2.2.2) + tilt (~> 2.0) + spork (0.9.0) + sprockets (3.6.3) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.2) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + ssrf_filter (1.0.8) + stripe (5.55.0) + stripe-ruby-mock (3.0.1) + dante (>= 0.2.0) + multi_json (~> 1.0) + stripe (> 5, < 6) + thor (1.2.1) + thread_safe (0.3.6) + tilt (2.0.11) + time_difference (0.7.0) + activesupport (~> 5.1) + timecop (0.9.5) + tzinfo (1.2.10) + thread_safe (~> 0.1) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + uuidtools (2.1.2) + vegas (0.1.11) + rack (>= 1.0.0) + warden (1.2.9) + rack (>= 2.0.9) + webmock (3.18.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.7.0) + websocket-driver (0.7.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + will_paginate (3.3.1) + xml-simple (1.1.9) + rexml + xmlrpc (0.3.2) + webrick + zip-codes (0.2.1) + +PLATFORMS + -darwin-21 + +DEPENDENCIES + aasm + actionmailer (= 5.2.0) + activerecord (= 5.2.0) + activerecord-import (~> 0.4.1) + amqp (= 1.0.2) + auto_strip_attributes + aws-sdk (~> 1) + bcrypt (= 3.1.15) + bcrypt-ruby + builder + carrierwave + database_cleaner + devise + elasticsearch + email_validator (= 1.6.0) + eventmachine (= 1.0.4) + factory_girl (= 4.5.0) + faker (= 1.3.0) + faraday (= 0.9.2) + fog + fog-brightbox (= 0.11.0) + geokit + geokit-rails + icalendar (= 2.4.0) + iso-639 + jam_ruby! + jampb! + json (= 1.8.6) + kickbox + logging (= 1.7.2) + nokogiri (= 1.10.10) + oj (= 2.17.1) + pg + postgres-copy + protected_attributes_continued + pry + rails-observers + recurly (= 2.18.16) + redis (= 3.3.0) + redis-namespace (= 1.5.2) + resque + resque-failed-job-mailer + resque-lonely_job (~> 1.0.0) + resque-retry + resque_mailer + resque_spec + rest-client + rspec (= 2.11) + rspec-prof + ruby-prof (= 0.15.9) + ruby-protocol-buffers (= 1.2.2) + rubyzip (= 1.2.0) + sanitize + sendgrid (= 1.2.0) + sendgrid_toolkit (>= 1.1.1) + simplecov (~> 0.7.1) + simplecov-rcov + spork (= 0.9.0) + sprockets (= 3.6.3) + stripe + stripe-ruby-mock + time_difference + timecop + uuidtools (= 2.1.2) + webmock (~> 3.11, >= 3.11.2) + will_paginate + zip-codes + +RUBY VERSION + ruby 2.4.1p111 + +BUNDLED WITH + 2.3.12 diff --git a/web/Gemfile b/web/Gemfile index c63f70837..cce5cb928 100644 --- a/web/Gemfile +++ b/web/Gemfile @@ -22,7 +22,7 @@ else ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" end end -gem 'rails', '= 5.1.7' +gem 'rails', '= 6.0.0' #gem 'railties', '= 5.1.7' gem 'auto_strip_attributes', '2.6.0' #gem 'protected_attributes' @@ -32,18 +32,18 @@ gem 'rails-observers' # PINNED TO SUPPORT BOTH 2.3.1 and 2.4.1 Ruby simultaneously # This should be the same in ruby/admin/web/websocket-gateway ####### -gem 'nokogiri', '1.10.10' # added to pin before 1.11.0, which requires at leaost ruby 2.5. unpin we go above +gem 'nokogiri'#, '1.10.10' # added to pin before 1.11.0, which requires at leaost ruby 2.5. unpin we go above gem 'sprockets', '3.6.3' # added to pin before 4.0.0, which requiurse at least ruby 2.5 -gem 'fog-brightbox', '0.11.0' # pinned until we are on ruby 2.5; then remove -gem 'faraday', '0.9.2' # pinned untnil we are on ruby 2.5; then remove -gem 'ruby-prof', '0.15.9' # pinned until we are on ruby 2.5; then remove -gem 'rubyzip', '1.2.1' # pinned until we are on ruby 2.5; then remove +gem 'fog-brightbox'#, '0.11.0' # pinned until we are on ruby 2.5; then remove +gem 'faraday'#, '0.9.2' # pinned untnil we are on ruby 2.5; then remove +gem 'ruby-prof'#, '0.15.9' # pinned until we are on ruby 2.5; then remove +gem 'rubyzip'#, '1.2.1' # pinned until we are on ruby 2.5; then remove gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate -gem 'icalendar', '2.4.0' # pinned until we are on ruby 2.5; then remove -gem 'email_validator', '1.6.0' # pinned until we are on ruby 2.5, then remove -gem 'redis', '3.3.3' # pinned until we are on 2.5; then remove -gem 'redis-namespace', '1.5.3' # pinned until we are on 2.5; then remove -gem 'oj', '3.1.3' # pinned until we are on 2.5; then remove +gem 'icalendar'#, '2.4.0' # pinned until we are on ruby 2.5; then remove +gem 'email_validator'#, '1.6.0' # pinned until we are on ruby 2.5, then remove +gem 'redis'#, '3.3.3' # pinned until we are on 2.5; then remove +gem 'redis-namespace'#, '1.5.3' # pinned until we are on 2.5; then remove +gem 'oj' #, '3.1.3' # pinned until we are on 2.5; then remove gem 'bcrypt', '3.1.13' gem 'sass-rails', '5.0.7' # compiler mismatch issue between build and www gem 'sass', '3.5.5 '# compiler mismatch issue between build and www @@ -105,7 +105,9 @@ gem 'carrierwave' #, '0.11.2' #, '0.9.0' gem 'carrierwave_direct' gem 'fog' #gem 'jquery-payment-rails', github: 'sethcall/jquery-payment-rails' -gem 'haml-rails', '0.9.0' # pinned because upgrading lets u not do = "{% if(data.feed_item['has_mount?']) { %}" . ? is bad +#gem 'haml', '5.1.2' +#gem 'haml-rails', '0.9.0' # pinned because upgrading lets u not do = "{% if(data.feed_item['has_mount?']) { %}" . ? is bad +gem 'haml-rails'#, '2.0.0' gem 'unf' #optional fog dependency gem 'devise'# , '3.3.0' #3.4.0 causes uninitialized constant ActionController::Metal (NameError) gem 'postgres-copy' @@ -158,6 +160,15 @@ gem 'webpacker', '4.3.0' # unpin when on Ralis 5.2 gem 'rails-controller-testing' +gem 'bootsnap', '>= 1.1.0', require: false + +gem 'activestorage', '~> 5.2' + +gem 'net-ssh' + +gem 'xmlrpc' + + if ENV['FASTER_PATH'] == '1' # https://github.com/danielpclark/faster_path # supposed to dramatically speed up page load time. Gotta install rust. go to github if interested @@ -207,6 +218,12 @@ group :development, :test do gem 'puma' gem 'byebug' end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + #gem "spring" +end + group :unix do # gem 'therubyracer' #, '0.11.0beta8' end diff --git a/web/Gemfile.lock b/web/Gemfile.lock index 6c008c4fe..cc9c7ce6f 100644 --- a/web/Gemfile.lock +++ b/web/Gemfile.lock @@ -16,51 +16,51 @@ PATH GEM remote: http://rubygems.org/ specs: - CFPropertyList (2.3.6) - aasm (5.2.0) + aasm (5.4.0) concurrent-ruby (~> 1.0) - actioncable (5.1.7) - actionpack (= 5.1.7) + actioncable (5.2.8) + actionpack (= 5.2.8) nio4r (~> 2.0) - websocket-driver (~> 0.6.1) - actionmailer (5.1.7) - actionpack (= 5.1.7) - actionview (= 5.1.7) - activejob (= 5.1.7) + websocket-driver (>= 0.6.1) + actionmailer (5.2.8) + actionpack (= 5.2.8) + actionview (= 5.2.8) + activejob (= 5.2.8) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.7) - actionview (= 5.1.7) - activesupport (= 5.1.7) - rack (~> 2.0) + actionpack (5.2.8) + actionview (= 5.2.8) + activesupport (= 5.2.8) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.7) - activesupport (= 5.1.7) + actionview (5.2.8) + activesupport (= 5.2.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.7) - activesupport (= 5.1.7) + activejob (5.2.8) + activesupport (= 5.2.8) globalid (>= 0.3.6) - activemodel (5.1.7) - activesupport (= 5.1.7) - activerecord (5.1.7) - activemodel (= 5.1.7) - activesupport (= 5.1.7) - arel (~> 8.0) - activesupport (5.1.7) + activemodel (5.2.8) + activesupport (= 5.2.8) + activerecord (5.2.8) + activemodel (= 5.2.8) + activesupport (= 5.2.8) + arel (>= 9.0) + activestorage (5.2.8) + actionpack (= 5.2.8) + activerecord (= 5.2.8) + marcel (~> 1.0.0) + activesupport (5.2.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - aliyun-sdk (0.8.0) - nokogiri (~> 1.6) - rest-client (~> 2.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) amq-client (0.9.12) amq-protocol (>= 1.2.0) eventmachine @@ -69,9 +69,8 @@ GEM amq-client (~> 0.9.5) amq-protocol (>= 0.9.4) eventmachine - arel (8.0.0) - arr-pm (0.0.11) - cabin (> 0) + arel (9.0.0) + arr-pm (0.0.12) auto_strip_attributes (2.6.0) activerecord (>= 4.0) autoparse (0.3.3) @@ -89,6 +88,8 @@ GEM execjs (~> 2.0) backports (3.23.0) bcrypt (3.1.13) + bootsnap (1.13.0) + msgpack (~> 1.2) bootstrap-will_paginate (0.0.6) will_paginate bower-rails (0.9.2) @@ -122,19 +123,18 @@ GEM carrierwave (>= 2.2.0) fog-aws cause (0.1) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) + childprocess (3.0.0) clamp (1.0.1) coderay (1.1.3) - coffee-rails (4.2.2) + coffee-rails (5.0.0) coffee-script (>= 2.2.0) - railties (>= 4.0.0) + railties (>= 5.2.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.9) - connection_pool (2.2.5) + concurrent-ruby (1.1.10) + connection_pool (2.3.0) crack (0.4.5) rexml crass (1.0.6) @@ -153,27 +153,27 @@ GEM diff-lcs (1.5.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) - elasticsearch (7.4.0) - elasticsearch-api (= 7.4.0) - elasticsearch-transport (= 7.4.0) - elasticsearch-api (7.4.0) + dotenv (2.8.1) + dry-inflector (0.2.0) + elastic-transport (8.1.0) + faraday (< 3) multi_json - elasticsearch-transport (7.4.0) - faraday + elasticsearch (8.5.1) + elastic-transport (~> 8) + elasticsearch-api (= 8.5.1) + elasticsearch-api (8.5.1) multi_json em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) - email_validator (1.6.0) + email_validator (2.2.4) activemodel equalizer (0.0.11) - erubi (1.10.0) - erubis (2.7.0) - et-orbi (1.2.6) + erubi (1.11.0) + et-orbi (1.2.7) tzinfo eventmachine (1.2.3) - excon (0.91.0) + excon (0.94.0) execjs (2.6.0) extlib (0.9.16) factory_girl (4.9.0) @@ -183,158 +183,68 @@ GEM railties (>= 3.0.0) faker (1.3.0) i18n (~> 0.5) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) + faraday (1.10.2) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - fission (0.5.0) - CFPropertyList (~> 2.2) - fog (1.41.0) - fog-aliyun (>= 0.1.0) - fog-atmos - fog-aws (>= 0.6.0) - fog-brightbox (~> 0.4) - fog-cloudatcost (~> 0.1.0) - fog-core (~> 1.45) - fog-digitalocean (>= 0.3.0) - fog-dnsimple (~> 1.0) - fog-dynect (~> 0.0.2) - fog-ecloud (~> 0.1) - fog-google (<= 0.1.0) - fog-internet-archive - fog-joyent + fog (1.24.0) + fog-brightbox + fog-core (~> 1.23) fog-json - fog-local - fog-openstack - fog-powerdns (>= 0.1.1) - fog-profitbricks - fog-rackspace fog-radosgw (>= 0.0.2) - fog-riakcs fog-sakuracloud (>= 0.0.4) - fog-serverlove fog-softlayer - fog-storm_on_demand - fog-terremark - fog-vmfusion - fog-voxel - fog-vsphere (>= 0.4.0) - fog-xenserver - fog-xml (~> 0.1.1) ipaddress (~> 0.5) - json (>= 1.8, < 2.0) - fog-aliyun (0.3.19) - aliyun-sdk (~> 0.8.0) - fog-core - fog-json - ipaddress (~> 0.8) - xml-simple (~> 1.1) - fog-atmos (0.1.0) - fog-core - fog-xml + nokogiri (~> 1.5, >= 1.5.11) fog-aws (2.0.1) fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-brightbox (0.11.0) - fog-core (~> 1.22) + fog-brightbox (1.8.0) + dry-inflector + fog-core (>= 1.45, < 3.0) fog-json - inflecto (~> 0.0.2) - fog-cloudatcost (0.1.2) - fog-core (~> 1.36) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) fog-core (1.45.0) builder excon (~> 0.58) formatador (~> 0.2) - fog-digitalocean (0.4.0) - fog-core - fog-json - fog-xml - ipaddress (>= 0.5) - fog-dnsimple (1.0.0) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-dynect (0.0.3) - fog-core - fog-json - fog-xml - fog-ecloud (0.3.0) - fog-core - fog-xml - fog-google (0.1.0) - fog-core - fog-json - fog-xml - fog-internet-archive (0.0.2) - fog-core - fog-json - fog-xml - fog-joyent (0.0.1) - fog-core (~> 1.42) - fog-json (>= 1.0) fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-local (0.8.0) - fog-core (>= 1.27, < 3.0) - fog-openstack (0.3.10) - fog-core (>= 1.45, <= 2.1.0) - fog-json (>= 1.0) - ipaddress (>= 0.8) - fog-powerdns (0.2.0) - fog-core - fog-json - fog-xml - fog-profitbricks (4.1.1) - fog-core (~> 1.42) - fog-json (~> 1.0) - fog-rackspace (0.1.6) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) fog-radosgw (0.0.5) fog-core (>= 1.21.0) fog-json fog-xml (>= 0.0.1) - fog-riakcs (0.1.0) - fog-core - fog-json - fog-xml fog-sakuracloud (1.7.5) fog-core fog-json - fog-serverlove (0.1.2) - fog-core - fog-json fog-softlayer (1.1.4) fog-core fog-json - fog-storm_on_demand (0.1.1) - fog-core - fog-json - fog-terremark (0.1.0) - fog-core - fog-xml - fog-vmfusion (0.1.0) - fission - fog-core - fog-voxel (0.1.0) - fog-core - fog-xml - fog-vsphere (3.5.0) - fog-core - rbvmomi (>= 1.9, < 3) - fog-xenserver (1.0.0) - fog-core - fog-xml - xmlrpc fog-xml (0.1.4) fog-core nokogiri (>= 1.5.11, < 2.0.0) @@ -349,17 +259,18 @@ GEM pleaserun (~> 0.0.29) rexml stud - fugit (1.5.2) - et-orbi (~> 1.1, >= 1.1.8) + fugit (1.7.2) + et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) geokit (1.13.1) geokit-rails (2.3.2) geokit (~> 1.5) rails (>= 3.0) - git (1.10.2) + git (1.12.0) + addressable (~> 2.8) rchardet (~> 1.8) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (1.0.0) + activesupport (>= 5.0) god (0.13.7) gon (4.1.1) actionpack (>= 2.3.0) @@ -375,21 +286,17 @@ GEM retriable (>= 1.4) signet (>= 0.5.0) uuidtools (>= 2.1.0) - haml (4.0.7) + haml (6.0.10) + temple (>= 0.8.2) + thor tilt - haml-rails (0.9.0) - actionpack (>= 4.0.1) - activesupport (>= 4.0.1) - haml (>= 4.0.6, < 5.0) - html2haml (>= 1.0.1) - railties (>= 4.0.1) + haml-rails (2.1.0) + actionpack (>= 5.1) + activesupport (>= 5.1) + haml (>= 4.0.6) + railties (>= 5.1) hashdiff (1.0.1) hashie (5.0.0) - html2haml (2.2.0) - erubis (~> 2.7.0) - haml (>= 4.0, < 6) - nokogiri (>= 1.6.0) - ruby_parser (~> 3.5) htmlentities (4.3.4) http (4.4.1) addressable (~> 2.3) @@ -397,7 +304,7 @@ GEM http-form_data (~> 2.2) http-parser (~> 1.2.0) http-accept (1.7.0) - http-cookie (1.0.4) + http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) http-parser (1.2.3) @@ -408,11 +315,12 @@ GEM multi_xml (>= 0.5.2) i18n (0.9.5) concurrent-ruby (~> 1.0) - icalendar (2.4.0) - image_processing (1.12.1) + icalendar (2.8.0) + ice_cube (~> 0.16) + ice_cube (0.16.4) + image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) - inflecto (0.0.2) influxdb (0.3.14) cause json @@ -429,18 +337,22 @@ GEM jquery-ui-rails (4.2.1) railties (>= 3.2.16) json (1.8.6) - jwt (2.3.0) + jwt (2.5.0) kgio (2.11.4) - kickbox (2.0.4) - faraday (~> 0.9) + kickbox (2.0.5) + faraday (~> 1.0) json (>= 1.8) language_list (1.2.1) launchy (2.1.1) addressable (~> 2.3) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) little-plugger (1.1.4) logging (1.7.2) little-plugger (>= 1.1.3) - loofah (2.14.0) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -454,35 +366,38 @@ GEM mime-types-data (3.2022.0105) mini_magick (4.11.0) mini_mime (1.1.2) - mini_portile2 (2.4.0) + mini_portile2 (2.6.1) minitest (5.15.0) mono_logger (1.1.1) + msgpack (1.6.0) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.1.1) + multipart-post (2.2.3) mustache (0.99.8) - mustermann (1.1.1) + mustermann (2.0.2) ruby2_keywords (~> 0.0.1) naught (1.1.0) + net-ssh (6.1.0) netaddr (1.5.1) netrc (0.11.0) - newrelic_rpm (8.4.0) + newrelic_rpm (8.13.0) nio4r (2.5.8) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - nokogumbo (2.0.5) - nokogiri (~> 1.8, >= 1.8.4) + nokogiri (1.12.5) + mini_portile2 (~> 2.6.1) + racc (~> 1.4) non-stupid-digest-assets (1.0.9) sprockets (>= 2.0) - oauth (0.5.8) - oauth2 (1.4.7) - faraday (>= 0.8, < 2.0) + oauth (0.6.2) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + oauth2 (1.4.11) + faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) - oj (3.1.3) - omniauth (1.9.1) + rack (>= 1.2, < 4) + oj (3.13.23) + omniauth (1.9.2) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) omniauth-facebook (9.0.0) @@ -495,8 +410,8 @@ GEM omniauth-oauth (1.2.0) oauth omniauth (>= 1.0, < 3) - omniauth-oauth2 (1.7.2) - oauth2 (~> 1.4) + omniauth-oauth2 (1.7.3) + oauth2 (>= 1.4, < 3) omniauth (>= 1.9, < 3) omniauth-stripe-connect (2.10.1) omniauth (~> 1.3) @@ -504,15 +419,14 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - optimist (3.0.1) orm_adapter (0.5.0) paypal-sdk-core (0.3.4) multi_json (~> 1.0) xml-simple paypal-sdk-merchant-jk (1.118.1) paypal-sdk-core (~> 0.3.0) - pdf-core (0.7.0) - pg (1.2.3) + pdf-core (0.9.0) + pg (1.4.5) pleaserun (0.0.32) cabin (> 0) clamp @@ -520,13 +434,13 @@ GEM insist mustache (= 0.99.8) stud - postgres-copy (1.6.0) + postgres-copy (1.6.1) activerecord (>= 5.1) pg (>= 0.17) - power_assert (2.0.1) - prawn (2.2.2) - pdf-core (~> 0.7.0) - ttfunk (~> 1.5) + power_assert (2.0.2) + prawn (2.4.0) + pdf-core (~> 0.9.0) + ttfunk (~> 1.7) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) protected_attributes_continued (1.8.2) @@ -534,32 +448,34 @@ GEM pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (4.0.6) - puma (5.6.2) + public_suffix (4.0.7) + puma (6.0.0) nio4r (~> 2.0) raabro (1.4.0) rabl (0.13.1) activesupport (>= 2.3.14) - rack (2.2.3) + racc (1.6.0) + rack (2.2.4) rack-cors (1.1.1) rack (>= 2.0.0) - rack-protection (2.1.0) + rack-protection (2.2.2) rack - rack-proxy (0.7.2) + rack-proxy (0.7.4) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (5.1.7) - actioncable (= 5.1.7) - actionmailer (= 5.1.7) - actionpack (= 5.1.7) - actionview (= 5.1.7) - activejob (= 5.1.7) - activemodel (= 5.1.7) - activerecord (= 5.1.7) - activesupport (= 5.1.7) + rack-test (2.0.2) + rack (>= 1.3) + rails (5.2.8) + actioncable (= 5.2.8) + actionmailer (= 5.2.8) + actionpack (= 5.2.8) + actionview (= 5.2.8) + activejob (= 5.2.8) + activemodel (= 5.2.8) + activerecord (= 5.2.8) + activestorage (= 5.2.8) + activesupport (= 5.2.8) bundler (>= 1.3.0) - railties (= 5.1.7) + railties (= 5.2.8) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -568,26 +484,21 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) rails-observers (0.1.5) activemodel (>= 4.0) - railties (5.1.7) - actionpack (= 5.1.7) - activesupport (= 5.1.7) + railties (5.2.8) + actionpack (= 5.2.8) + activesupport (= 5.2.8) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + thor (>= 0.19.0, < 2.0) raindrops (0.20.0) rake (13.0.6) - rb-fsevent (0.11.1) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbvmomi (2.4.1) - builder (~> 3.0) - json (>= 1.8) - nokogiri (~> 1.5) - optimist (~> 3.0) rchardet (1.8.0) react-rails (1.3.3) babel-transpiler (>= 0.7.0) @@ -597,9 +508,9 @@ GEM rails (>= 3.2) tilt recurly (2.18.16) - redis (3.3.3) - redis-namespace (1.5.3) - redis (~> 3.0, >= 3.0.4) + redis (3.3.5) + redis-namespace (1.8.2) + redis (>= 3.0.4) regexp_parser (1.8.2) responders (3.0.1) actionpack (>= 5.0) @@ -640,37 +551,35 @@ GEM rexml (3.2.5) rspec-collection_matchers (1.2.0) rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec-core (3.12.0) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-rails (4.1.2) - actionpack (>= 4.2) - activesupport (>= 4.2) - railties (>= 4.2) + rspec-support (~> 3.12.0) + rspec-rails (5.1.2) + actionpack (>= 5.2) + activesupport (>= 5.2) + railties (>= 5.2) rspec-core (~> 3.10) rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.11.0) - ruby-prof (0.15.9) + rspec-support (3.12.0) + ruby-prof (1.4.3) ruby-protocol-buffers (1.2.2) ruby-vips (2.1.4) ffi (~> 1.12) ruby2_keywords (0.0.5) - ruby_parser (3.18.1) - sexp_processor (~> 4.16) - rubyzip (1.2.1) - rufus-scheduler (3.8.1) + ruby_dep (1.5.0) + rubyzip (2.3.2) + rufus-scheduler (3.8.2) fugit (~> 1.1, >= 1.1.6) - sanitize (5.2.3) + sanitize (6.0.0) crass (~> 1.0.2) - nokogiri (>= 1.8.0) - nokogumbo (~> 2.0) + nokogiri (>= 1.12.0) sass (3.5.5) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -682,15 +591,14 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - selenium-webdriver (3.14.0) - childprocess (~> 0.5) - rubyzip (~> 1.2) + selenium-webdriver (3.142.7) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) sendgrid (1.2.0) json sendgrid_toolkit (1.4.0) httparty (>= 0.7.6) - sexp_processor (4.16.0) - show_me_the_cookies (5.0.1) + show_me_the_cookies (6.0.0) capybara (>= 2, < 4) signet (0.5.0) addressable (>= 2.2.3) @@ -702,18 +610,21 @@ GEM multi_json (~> 1.0) simplecov-html (~> 0.7.1) simplecov-html (0.7.1) - simplecov-rcov (0.2.3) + simplecov-rcov (0.3.1) simplecov (>= 0.4.1) - sinatra (2.1.0) - mustermann (~> 1.0) + sinatra (2.2.2) + mustermann (~> 2.0) rack (~> 2.2) - rack-protection (= 2.1.0) + rack-protection (= 2.2.2) tilt (~> 2.0) - sitemap_generator (6.2.1) + sitemap_generator (6.3.0) builder (~> 3.0) slim (4.1.0) temple (>= 0.7.6, < 0.9) tilt (>= 2.0.6, < 2.1) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) spork (0.9.0) sprockets (3.6.3) concurrent-ruby (~> 1.0) @@ -726,17 +637,17 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - ssrf_filter (1.0.7) - stripe (5.43.0) + ssrf_filter (1.0.8) + stripe (8.0.0) stud (0.0.23) temple (0.8.2) - test-unit (3.5.3) + test-unit (3.5.5) power_assert thor (1.2.1) thread_safe (0.3.6) - tilt (2.0.10) - timecop (0.9.4) - ttfunk (1.6.2.1) + tilt (2.0.11) + timecop (0.9.5) + ttfunk (1.7.0) twitter (7.0.0) addressable (~> 2.3) buftok (~> 0.2.0) @@ -748,26 +659,27 @@ GEM multipart-post (~> 2.0) naught (~> 1.0) simple_oauth (~> 0.3.0) - tzinfo (1.2.9) + tzinfo (1.2.10) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.2) unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) uuidtools (2.1.2) vegas (0.1.11) rack (>= 1.0.0) + version_gem (1.1.1) warden (1.2.9) rack (>= 2.0.9) - webdrivers (4.1.2) + webdrivers (4.6.1) nokogiri (~> 1.6) - rubyzip (~> 1.0) + rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) - webmock (3.14.0) + webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -776,7 +688,7 @@ GEM rack-proxy (>= 0.6.1) railties (>= 4.2) webrick (1.7.0) - websocket-driver (0.6.5) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (3.3.1) @@ -792,20 +704,22 @@ GEM remote: https://rails-assets.org/ specs: rails-assets-bluebird (3.5.4) - rails-assets-classnames (2.2.5) + rails-assets-classnames (2.3.2) rails-assets-react-select (2.4.3) rails-assets-reflux (0.3.0) rails-assets-regenerator (0.4.8) PLATFORMS - ruby + -darwin-21 DEPENDENCIES aasm + activestorage (~> 5.2) amqp (= 0.9.8) auto_strip_attributes (= 2.6.0) aws-sdk (~> 1) bcrypt (= 3.1.13) + bootsnap (>= 1.1.0) bootstrap-will_paginate (= 0.0.6) bower-rails (~> 0.9.2) bugsnag (= 5.3.2) @@ -823,22 +737,22 @@ DEPENDENCIES devise elasticsearch em-websocket (>= 0.4.0) - email_validator (= 1.6.0) + email_validator eventmachine (= 1.2.3) execjs (= 2.6.0) factory_girl_rails faker (= 1.3.0) - faraday (= 0.9.2) + faraday fog - fog-brightbox (= 0.11.0) + fog-brightbox fpm (= 1.14.1) geokit-rails god gon (~> 4.1.0) google-api-client - haml-rails (= 0.9.0) + haml-rails htmlentities - icalendar (= 2.4.0) + icalendar influxdb (= 0.3.14) influxdb-rails (= 0.1.12) iso-639 @@ -850,13 +764,15 @@ DEPENDENCIES kickbox language_list launchy (= 2.1.1) + listen (>= 3.0.5, < 3.2) logging (= 1.7.2) multi_json + net-ssh netaddr (= 1.5.1) newrelic_rpm - nokogiri (= 1.10.10) + nokogiri non-stupid-digest-assets - oj (= 3.1.3) + oj omniauth omniauth-facebook omniauth-google-oauth2 (= 0.8.2) @@ -872,7 +788,7 @@ DEPENDENCIES rabl (= 0.13.1) rack-cors (~> 1.0, >= 1.0.6) rack-test - rails (= 5.1.7) + rails (= 5.2.8) rails-assets-bluebird! rails-assets-classnames! rails-assets-react-select! @@ -882,8 +798,8 @@ DEPENDENCIES rails-observers react-rails (= 1.3.3) recurly (= 2.18.16) - redis (= 3.3.3) - redis-namespace (= 1.5.3) + redis + redis-namespace responders resque resque-dynamic-queues @@ -897,9 +813,9 @@ DEPENDENCIES retriable (= 3.0.1) rspec-collection_matchers rspec-rails - ruby-prof (= 0.15.9) + ruby-prof ruby-protocol-buffers (= 1.2.2) - rubyzip (= 1.2.1) + rubyzip sanitize sass (= 3.5.5) sass-rails (= 5.0.7) @@ -928,10 +844,11 @@ DEPENDENCIES webmock (~> 3.11, >= 3.11.2) webpacker (= 4.3.0) will_paginate + xmlrpc zip-codes RUBY VERSION - ruby 2.4.1p111 + ruby 2.5.7p206 BUNDLED WITH - 2.3.12 + 2.3.26 diff --git a/web/Gemfile.lock.bk b/web/Gemfile.lock.bk new file mode 100644 index 000000000..2e7263dd2 --- /dev/null +++ b/web/Gemfile.lock.bk @@ -0,0 +1,966 @@ +PATH + remote: ../pb/target/ruby/jampb + specs: + jampb (0.1.1) + +PATH + remote: ../ruby + specs: + jam_ruby (0.1.1) + +PATH + remote: ../websocket-gateway + specs: + jam_websockets (0.1.1) + +GEM + remote: http://rubygems.org/ + specs: + CFPropertyList (2.3.6) + aasm (5.4.0) + concurrent-ruby (~> 1.0) + actioncable (5.2.0) + actionpack (= 5.2.0) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.0) + actionview (= 5.2.0) + activesupport (= 5.2.0) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.0) + activesupport (= 5.2.0) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.0) + activesupport (= 5.2.0) + globalid (>= 0.3.6) + activemodel (5.2.0) + activesupport (= 5.2.0) + activerecord (5.2.0) + activemodel (= 5.2.0) + activesupport (= 5.2.0) + arel (>= 9.0) + activestorage (5.2.0) + actionpack (= 5.2.0) + activerecord (= 5.2.0) + marcel (~> 0.3.1) + activesupport (5.2.0) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + aliyun-sdk (0.8.0) + nokogiri (~> 1.6) + rest-client (~> 2.0) + amq-client (0.9.12) + amq-protocol (>= 1.2.0) + eventmachine + amq-protocol (2.3.2) + amqp (0.9.8) + amq-client (~> 0.9.5) + amq-protocol (>= 0.9.4) + eventmachine + arel (9.0.0) + arr-pm (0.0.12) + auto_strip_attributes (2.6.0) + activerecord (>= 4.0) + autoparse (0.3.3) + addressable (>= 2.3.1) + extlib (>= 0.9.15) + multi_json (>= 1.0.0) + aws-sdk (1.67.0) + aws-sdk-v1 (= 1.67.0) + aws-sdk-v1 (1.67.0) + json (~> 1.4) + nokogiri (~> 1) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + backports (3.23.0) + bcrypt (3.1.13) + bootsnap (1.12.0) + msgpack (~> 1.2) + bootstrap-will_paginate (0.0.6) + will_paginate + bower-rails (0.9.2) + buftok (0.2.0) + bugsnag (5.3.2) + builder (3.2.4) + byebug (11.1.3) + cabin (0.9.0) + capybara (3.32.2) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.5) + xpath (~> 3.2) + capybara-screenshot (1.0.26) + capybara (>= 1.0, < 4) + launchy + carmen (1.1.3) + activesupport (>= 3.0.0) + carrierwave (2.2.0) + activemodel (>= 5.0.0) + activesupport (>= 5.0.0) + addressable (~> 2.6) + image_processing (~> 1.1) + mimemagic (>= 0.3.0) + mini_mime (>= 0.1.3) + ssrf_filter (~> 1.0) + carrierwave_direct (3.0.0) + carrierwave (>= 2.2.0) + fog-aws + cause (0.1) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + clamp (1.0.1) + coderay (1.1.3) + coffee-rails (5.0.0) + coffee-script (>= 2.2.0) + railties (>= 5.2.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + concurrent-ruby (1.1.10) + connection_pool (2.2.5) + crack (0.4.5) + rexml + crass (1.0.6) + database_cleaner (2.0.1) + 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.1) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0) + responders + warden (~> 1.2.3) + diff-lcs (1.5.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.8.1) + elasticsearch (7.4.0) + elasticsearch-api (= 7.4.0) + elasticsearch-transport (= 7.4.0) + elasticsearch-api (7.4.0) + multi_json + elasticsearch-transport (7.4.0) + faraday + multi_json + em-websocket (0.5.3) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0) + email_validator (1.6.0) + activemodel + equalizer (0.0.11) + erubi (1.11.0) + erubis (2.7.0) + et-orbi (1.2.7) + tzinfo + eventmachine (1.2.3) + excon (0.94.0) + execjs (2.6.0) + extlib (0.9.16) + factory_girl (4.9.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.9.0) + factory_girl (~> 4.9.0) + railties (>= 3.0.0) + faker (1.3.0) + i18n (~> 0.5) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + ffi (1.15.5) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake + fission (0.5.0) + CFPropertyList (~> 2.2) + fog (1.41.0) + fog-aliyun (>= 0.1.0) + fog-atmos + fog-aws (>= 0.6.0) + fog-brightbox (~> 0.4) + fog-cloudatcost (~> 0.1.0) + fog-core (~> 1.45) + fog-digitalocean (>= 0.3.0) + fog-dnsimple (~> 1.0) + fog-dynect (~> 0.0.2) + fog-ecloud (~> 0.1) + fog-google (<= 0.1.0) + fog-internet-archive + fog-joyent + fog-json + fog-local + fog-openstack + fog-powerdns (>= 0.1.1) + fog-profitbricks + fog-rackspace + fog-radosgw (>= 0.0.2) + fog-riakcs + fog-sakuracloud (>= 0.0.4) + fog-serverlove + fog-softlayer + fog-storm_on_demand + fog-terremark + fog-vmfusion + fog-voxel + fog-vsphere (>= 0.4.0) + fog-xenserver + fog-xml (~> 0.1.1) + ipaddress (~> 0.5) + json (>= 1.8, < 2.0) + fog-aliyun (0.4.0) + addressable (~> 2.8.0) + aliyun-sdk (~> 0.8.0) + fog-core + fog-json + ipaddress (~> 0.8) + xml-simple (~> 1.1) + fog-atmos (0.1.0) + fog-core + fog-xml + fog-aws (2.0.1) + fog-core (~> 1.38) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-brightbox (0.11.0) + fog-core (~> 1.22) + fog-json + inflecto (~> 0.0.2) + fog-cloudatcost (0.1.2) + fog-core (~> 1.36) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-core (1.45.0) + builder + excon (~> 0.58) + formatador (~> 0.2) + fog-digitalocean (0.4.0) + fog-core + fog-json + fog-xml + ipaddress (>= 0.5) + fog-dnsimple (1.0.0) + fog-core (~> 1.38) + fog-json (~> 1.0) + fog-dynect (0.0.3) + fog-core + fog-json + fog-xml + fog-ecloud (0.3.0) + fog-core + fog-xml + fog-google (0.1.0) + fog-core + fog-json + fog-xml + fog-internet-archive (0.0.2) + fog-core + fog-json + fog-xml + fog-joyent (0.0.1) + fog-core (~> 1.42) + fog-json (>= 1.0) + fog-json (1.2.0) + fog-core + multi_json (~> 1.10) + fog-local (0.8.0) + fog-core (>= 1.27, < 3.0) + fog-openstack (0.3.10) + fog-core (>= 1.45, <= 2.1.0) + fog-json (>= 1.0) + ipaddress (>= 0.8) + fog-powerdns (0.2.0) + fog-core + fog-json + fog-xml + fog-profitbricks (4.1.1) + fog-core (~> 1.42) + fog-json (~> 1.0) + fog-rackspace (0.1.6) + fog-core (>= 1.35) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) + fog-radosgw (0.0.5) + fog-core (>= 1.21.0) + fog-json + fog-xml (>= 0.0.1) + fog-riakcs (0.1.0) + fog-core + fog-json + fog-xml + fog-sakuracloud (1.7.5) + fog-core + fog-json + fog-serverlove (0.1.2) + fog-core + fog-json + fog-softlayer (1.1.4) + fog-core + fog-json + fog-storm_on_demand (0.1.1) + fog-core + fog-json + fog-terremark (0.1.0) + fog-core + fog-xml + fog-vmfusion (0.1.0) + fission + fog-core + fog-voxel (0.1.0) + fog-core + fog-xml + fog-vsphere (3.5.2) + fog-core + rbvmomi (>= 1.9, < 3) + fog-xenserver (1.0.0) + fog-core + fog-xml + xmlrpc + fog-xml (0.1.4) + fog-core + nokogiri (>= 1.5.11, < 2.0.0) + formatador (0.3.0) + fpm (1.14.1) + arr-pm (~> 0.0.11) + backports (>= 2.6.2) + cabin (>= 0.6.0) + clamp (~> 1.0.0) + git (>= 1.3.0, < 2.0) + json (>= 1.7.7, < 3.0) + pleaserun (~> 0.0.29) + rexml + stud + fugit (1.7.2) + et-orbi (~> 1, >= 1.2.7) + raabro (~> 1.4) + geokit (1.13.1) + geokit-rails (2.3.2) + geokit (~> 1.5) + rails (>= 3.0) + git (1.12.0) + addressable (~> 2.8) + rchardet (~> 1.8) + globalid (0.4.2) + activesupport (>= 4.2.0) + god (0.13.7) + gon (4.1.1) + actionpack (>= 2.3.0) + json + google-api-client (0.7.1) + addressable (>= 2.3.2) + autoparse (>= 0.3.3) + extlib (>= 0.9.15) + faraday (>= 0.9.0) + jwt (>= 0.1.5) + launchy (>= 2.1.1) + multi_json (>= 1.0.0) + retriable (>= 1.4) + signet (>= 0.5.0) + uuidtools (>= 2.1.0) + haml (5.1.2) + temple (>= 0.8.0) + tilt + haml-rails (1.0.0) + actionpack (>= 4.0.1) + activesupport (>= 4.0.1) + haml (>= 4.0.6, < 6.0) + html2haml (>= 1.0.1) + railties (>= 4.0.1) + hashdiff (1.0.1) + hashie (5.0.0) + html2haml (2.3.0) + erubis (~> 2.7.0) + haml (>= 4.0) + nokogiri (>= 1.6.0) + ruby_parser (~> 3.5) + htmlentities (4.3.4) + http (4.4.1) + addressable (~> 2.3) + http-cookie (~> 1.0) + http-form_data (~> 2.2) + http-parser (~> 1.2.0) + http-accept (1.7.0) + http-cookie (1.0.5) + domain_name (~> 0.5) + http-form_data (2.3.0) + http-parser (1.2.3) + ffi-compiler (>= 1.0, < 2.0) + http_parser.rb (0.6.0) + httparty (0.20.0) + mime-types (~> 3.0) + multi_xml (>= 0.5.2) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + icalendar (2.4.0) + image_processing (1.12.2) + mini_magick (>= 4.9.5, < 5) + ruby-vips (>= 2.0.17, < 3) + inflecto (0.0.2) + influxdb (0.3.14) + cause + json + influxdb-rails (0.1.12) + influxdb (~> 0.3.0) + railties + insist (1.0.0) + ipaddress (0.8.3) + iso-639 (0.3.5) + jquery-rails (4.4.0) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-ui-rails (4.2.1) + railties (>= 3.2.16) + json (1.8.6) + jwt (2.3.0) + kgio (2.11.4) + kickbox (2.0.4) + faraday (~> 0.9) + json (>= 1.8) + language_list (1.2.1) + launchy (2.1.1) + addressable (~> 2.3) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + little-plugger (1.1.4) + logging (1.7.2) + little-plugger (>= 1.1.3) + loofah (2.19.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + memoizable (0.4.2) + thread_safe (~> 0.3, >= 0.3.1) + method_source (1.0.0) + mime-types (3.4.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2022.0105) + mimemagic (0.3.10) + nokogiri (~> 1) + rake + mini_magick (4.11.0) + mini_mime (1.1.2) + mini_portile2 (2.4.0) + minitest (5.15.0) + mono_logger (1.1.1) + msgpack (1.6.0) + multi_json (1.15.0) + multi_xml (0.6.0) + multipart-post (2.2.3) + mustache (0.99.8) + mustermann (2.0.2) + ruby2_keywords (~> 0.0.1) + naught (1.1.0) + netaddr (1.5.1) + netrc (0.11.0) + newrelic_rpm (8.12.0) + nio4r (2.5.8) + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) + nokogumbo (2.0.5) + nokogiri (~> 1.8, >= 1.8.4) + non-stupid-digest-assets (1.0.9) + sprockets (>= 2.0) + oauth (0.6.2) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + oauth2 (1.4.8) + faraday (>= 0.8, < 3.0) + jwt (>= 1.0, < 3.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) + oj (3.1.3) + omniauth (1.9.2) + hashie (>= 3.4.6) + rack (>= 1.6.2, < 3) + omniauth-facebook (9.0.0) + omniauth-oauth2 (~> 1.2) + omniauth-google-oauth2 (0.8.2) + jwt (>= 2.0) + oauth2 (~> 1.1) + omniauth (~> 1.1) + omniauth-oauth2 (>= 1.6) + omniauth-oauth (1.2.0) + oauth + omniauth (>= 1.0, < 3) + omniauth-oauth2 (1.7.3) + oauth2 (>= 1.4, < 3) + omniauth (>= 1.9, < 3) + omniauth-stripe-connect (2.10.1) + omniauth (~> 1.3) + omniauth-oauth2 (~> 1.4) + omniauth-twitter (1.4.0) + omniauth-oauth (~> 1.1) + rack + optimist (3.0.1) + orm_adapter (0.5.0) + paypal-sdk-core (0.3.4) + multi_json (~> 1.0) + xml-simple + paypal-sdk-merchant-jk (1.118.1) + paypal-sdk-core (~> 0.3.0) + pdf-core (0.7.0) + pg (1.2.3) + pleaserun (0.0.32) + cabin (> 0) + clamp + dotenv + insist + mustache (= 0.99.8) + stud + postgres-copy (1.6.1) + activerecord (>= 5.1) + pg (>= 0.17) + power_assert (2.0.2) + prawn (2.2.2) + pdf-core (~> 0.7.0) + ttfunk (~> 1.5) + prawn-table (0.2.2) + prawn (>= 1.3.0, < 3.0.0) + protected_attributes_continued (1.8.2) + activemodel (>= 5.0) + pry (0.14.1) + coderay (~> 1.1) + method_source (~> 1.0) + public_suffix (4.0.7) + puma (6.0.0) + nio4r (~> 2.0) + raabro (1.4.0) + rabl (0.13.1) + activesupport (>= 2.3.14) + rack (2.2.4) + rack-cors (1.1.1) + rack (>= 2.0.0) + rack-protection (2.2.2) + rack + rack-proxy (0.7.4) + rack + rack-test (2.0.2) + rack (>= 1.3) + rails (5.2.0) + actioncable (= 5.2.0) + actionmailer (= 5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + activemodel (= 5.2.0) + activerecord (= 5.2.0) + activestorage (= 5.2.0) + activesupport (= 5.2.0) + bundler (>= 1.3.0) + railties (= 5.2.0) + sprockets-rails (>= 2.0.0) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.4.3) + loofah (~> 2.3) + rails-observers (0.1.5) + activemodel (>= 4.0) + railties (5.2.0) + actionpack (= 5.2.0) + activesupport (= 5.2.0) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + raindrops (0.20.0) + rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rbvmomi (2.4.1) + builder (~> 3.0) + json (>= 1.8) + nokogiri (~> 1.5) + optimist (~> 3.0) + rchardet (1.8.0) + react-rails (1.3.3) + babel-transpiler (>= 0.7.0) + coffee-script-source (~> 1.8) + connection_pool + execjs + rails (>= 3.2) + tilt + recurly (2.18.16) + redis (3.3.3) + redis-namespace (1.5.3) + redis (~> 3.0, >= 3.0.4) + regexp_parser (1.8.2) + responders (3.0.1) + actionpack (>= 5.0) + railties (>= 5.0) + resque (1.27.4) + mono_logger (~> 1.0) + multi_json (~> 1.0) + redis-namespace (~> 1.3) + sinatra (>= 0.9.2) + vegas (~> 0.1.2) + resque-dynamic-queues (0.8.1) + resque (~> 1.10) + resque-failed-job-mailer (0.0.3) + resque-lonely_job (1.0.2) + resque (>= 1.2) + resque-retry (1.7.6) + resque (>= 1.25, < 3.0) + resque-scheduler (~> 4.0) + resque-scheduler (4.3.0) + mono_logger (~> 1.0) + redis (~> 3.3) + resque (~> 1.26) + rufus-scheduler (~> 3.2) + resque_mailer (2.4.3) + actionmailer (>= 3.0) + activesupport (>= 3.0) + resque_spec (0.18.1) + resque (>= 1.26.0) + rspec-core (>= 3.0.0) + rspec-expectations (>= 3.0.0) + rspec-mocks (>= 3.0.0) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + retriable (3.0.1) + rexml (3.2.5) + rspec-collection_matchers (1.2.0) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (3.12.0) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-rails (5.1.2) + actionpack (>= 5.2) + activesupport (>= 5.2) + railties (>= 5.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.12.0) + ruby-prof (0.15.9) + ruby-protocol-buffers (1.2.2) + ruby-vips (2.1.4) + ffi (~> 1.12) + ruby2_keywords (0.0.5) + ruby_dep (1.5.0) + ruby_parser (3.19.1) + sexp_processor (~> 4.16) + rubyzip (1.2.1) + rufus-scheduler (3.8.2) + fugit (~> 1.1, >= 1.1.6) + sanitize (5.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.8.0) + nokogumbo (~> 2.0) + sass (3.5.5) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.14.0) + childprocess (~> 0.5) + rubyzip (~> 1.2) + sendgrid (1.2.0) + json + sendgrid_toolkit (1.4.0) + httparty (>= 0.7.6) + sexp_processor (4.16.1) + show_me_the_cookies (6.0.0) + capybara (>= 2, < 4) + signet (0.5.0) + addressable (>= 2.2.3) + faraday (>= 0.9.0.rc5) + jwt (>= 0.1.5) + multi_json (>= 1.0.0) + simple_oauth (0.3.1) + simplecov (0.7.1) + multi_json (~> 1.0) + simplecov-html (~> 0.7.1) + simplecov-html (0.7.1) + simplecov-rcov (0.3.1) + simplecov (>= 0.4.1) + sinatra (2.2.2) + mustermann (~> 2.0) + rack (~> 2.2) + rack-protection (= 2.2.2) + tilt (~> 2.0) + sitemap_generator (6.3.0) + builder (~> 3.0) + slim (4.1.0) + temple (>= 0.7.6, < 0.9) + tilt (>= 2.0.6, < 2.1) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) + spork (0.9.0) + sprockets (3.6.3) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) + sprockets-rails (2.3.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (>= 2.8, < 4.0) + ssrf_filter (1.0.8) + stripe (7.1.0) + stud (0.0.23) + temple (0.8.2) + test-unit (3.5.5) + power_assert + thor (1.2.1) + thread_safe (0.3.6) + tilt (2.0.11) + timecop (0.9.5) + ttfunk (1.6.2.1) + twitter (7.0.0) + addressable (~> 2.3) + buftok (~> 0.2.0) + equalizer (~> 0.0.11) + http (~> 4.0) + http-form_data (~> 2.0) + http_parser.rb (~> 0.6.0) + memoizable (~> 0.4.0) + multipart-post (~> 2.0) + naught (~> 1.0) + simple_oauth (~> 0.3.0) + tzinfo (1.2.10) + thread_safe (~> 0.1) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + unicorn (6.1.0) + kgio (~> 2.6) + raindrops (~> 0.7) + uuidtools (2.1.2) + vegas (0.1.11) + rack (>= 1.0.0) + version_gem (1.1.1) + warden (1.2.9) + rack (>= 2.0.9) + webdrivers (4.1.2) + nokogiri (~> 1.6) + rubyzip (~> 1.0) + selenium-webdriver (>= 3.0, < 4.0) + webmock (3.18.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + webpacker (4.3.0) + activesupport (>= 4.2) + rack-proxy (>= 0.6.1) + railties (>= 4.2) + webrick (1.7.0) + websocket-driver (0.7.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + will_paginate (3.3.1) + xml-simple (1.1.9) + rexml + xmlrpc (0.3.2) + webrick + xpath (3.2.0) + nokogiri (~> 1.8) + zip-codes (0.2.1) + +GEM + remote: https://rails-assets.org/ + specs: + rails-assets-bluebird (3.5.4) + rails-assets-classnames (2.3.2) + rails-assets-react-select (2.4.3) + rails-assets-reflux (0.3.0) + rails-assets-regenerator (0.4.8) + +PLATFORMS + -darwin-21 + +DEPENDENCIES + aasm + activestorage (~> 5.2) + amqp (= 0.9.8) + auto_strip_attributes (= 2.6.0) + aws-sdk (~> 1) + bcrypt (= 3.1.13) + bootsnap (>= 1.1.0) + bootstrap-will_paginate (= 0.0.6) + bower-rails (~> 0.9.2) + bugsnag (= 5.3.2) + builder + byebug + capybara (= 3.32.2) + capybara-screenshot + carmen + carrierwave + carrierwave_direct + cause + coffee-rails + coffee-script-source (= 1.12.2) + database_cleaner + devise + elasticsearch + em-websocket (>= 0.4.0) + email_validator (= 1.6.0) + eventmachine (= 1.2.3) + execjs (= 2.6.0) + factory_girl_rails + faker (= 1.3.0) + faraday (= 0.9.2) + fog + fog-brightbox (= 0.11.0) + fpm (= 1.14.1) + geokit-rails + god + gon (~> 4.1.0) + google-api-client + haml (= 5.1.2) + haml-rails (= 1.0.0) + htmlentities + icalendar (= 2.4.0) + influxdb (= 0.3.14) + influxdb-rails (= 0.1.12) + iso-639 + jam_ruby! + jam_websockets! + jampb! + jquery-rails (= 4.4.0) + jquery-ui-rails (= 4.2.1) + kickbox + language_list + launchy (= 2.1.1) + listen (>= 3.0.5, < 3.2) + logging (= 1.7.2) + multi_json + netaddr (= 1.5.1) + newrelic_rpm + nokogiri (= 1.10.10) + non-stupid-digest-assets + oj (= 3.1.3) + omniauth + omniauth-facebook + omniauth-google-oauth2 (= 0.8.2) + omniauth-stripe-connect + omniauth-twitter + paypal-sdk-merchant-jk (= 1.118.1) + pg + postgres-copy + prawn-table + protected_attributes_continued + pry + puma + rabl (= 0.13.1) + rack-cors (~> 1.0, >= 1.0.6) + rack-test + rails (= 5.2.0) + rails-assets-bluebird! + rails-assets-classnames! + rails-assets-react-select! + rails-assets-reflux (= 0.3.0)! + rails-assets-regenerator! + rails-controller-testing + rails-observers + react-rails (= 1.3.3) + recurly (= 2.18.16) + redis (= 3.3.3) + redis-namespace (= 1.5.3) + responders + resque + resque-dynamic-queues + resque-failed-job-mailer + resque-lonely_job (~> 1.0.0) + resque-retry + resque-scheduler (= 4.3.0) + resque_mailer + resque_spec + rest-client + retriable (= 3.0.1) + rspec-collection_matchers + rspec-rails + ruby-prof (= 0.15.9) + ruby-protocol-buffers (= 1.2.2) + rubyzip (= 1.2.1) + sanitize + sass (= 3.5.5) + sass-rails (= 5.0.7) + selenium-webdriver + sendgrid (= 1.2.0) + sendgrid_toolkit (>= 1.1.1) + show_me_the_cookies + signet (= 0.5.0) + simplecov (~> 0.7.1) + simplecov-rcov + sitemap_generator + slim + spork (= 0.9.0) + sprockets (= 3.6.3) + sprockets-es6 + sprockets-rails (= 2.3.2) + stripe + test-unit + timecop + twitter + uglifier + unf + unicorn + uuidtools (= 2.1.2) + webdrivers (~> 4.0) + webmock (~> 3.11, >= 3.11.2) + webpacker (= 4.3.0) + will_paginate + zip-codes + +RUBY VERSION + ruby 2.4.1p111 + +BUNDLED WITH + 2.3.12 diff --git a/web/bin/bundle b/web/bin/bundle index 66e9889e8..78b4cf842 100755 --- a/web/bin/bundle +++ b/web/bin/bundle @@ -1,3 +1,4 @@ #!/usr/bin/env ruby -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +#ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) load Gem.bin_path('bundler', 'bundle') diff --git a/web/bin/rails b/web/bin/rails index 073966023..d3d4f9423 100755 --- a/web/bin/rails +++ b/web/bin/rails @@ -1,4 +1,9 @@ #!/usr/bin/env ruby +# begin +# load File.expand_path('../spring', __FILE__) +# rescue LoadError => e +# raise unless e.message.include?('spring') +# end APP_PATH = File.expand_path('../config/application', __dir__) require_relative '../config/boot' require 'rails/commands' diff --git a/web/bin/rake b/web/bin/rake index 17240489f..279d1afaf 100755 --- a/web/bin/rake +++ b/web/bin/rake @@ -1,4 +1,9 @@ #!/usr/bin/env ruby +# begin +# load File.expand_path('../spring', __FILE__) +# rescue LoadError => e +# raise unless e.message.include?('spring') +# end require_relative '../config/boot' require 'rake' Rake.application.run diff --git a/web/bin/setup b/web/bin/setup index 78c4e861d..94fd4d797 100755 --- a/web/bin/setup +++ b/web/bin/setup @@ -1,10 +1,9 @@ #!/usr/bin/env ruby -require 'pathname' require 'fileutils' include FileUtils # path to your application root. -APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) +APP_ROOT = File.expand_path('..', __dir__) def system!(*args) system(*args) || abort("\n== Command #{args} failed ==") @@ -21,7 +20,6 @@ chdir APP_ROOT do # Install JavaScript dependencies if using Yarn # system('bin/yarn') - # puts "\n== Copying sample files ==" # unless File.exist?('config/database.yml') # cp 'config/database.yml.sample', 'config/database.yml' diff --git a/web/bin/spring b/web/bin/spring new file mode 100755 index 000000000..d89ee495f --- /dev/null +++ b/web/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads Spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == 'spring' } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/web/bin/update b/web/bin/update index a8e4462f2..58bfaed51 100755 --- a/web/bin/update +++ b/web/bin/update @@ -1,10 +1,9 @@ #!/usr/bin/env ruby -require 'pathname' require 'fileutils' include FileUtils # path to your application root. -APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) +APP_ROOT = File.expand_path('..', __dir__) def system!(*args) system(*args) || abort("\n== Command #{args} failed ==") @@ -18,6 +17,9 @@ chdir APP_ROOT do system! 'gem install bundler --conservative' system('bundle check') || system!('bundle install') + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + puts "\n== Updating database ==" system! 'bin/rails db:migrate' diff --git a/web/bin/yarn b/web/bin/yarn index c2bacef83..460dd565b 100755 --- a/web/bin/yarn +++ b/web/bin/yarn @@ -1,8 +1,8 @@ #!/usr/bin/env ruby -VENDOR_PATH = File.expand_path('..', __dir__) -Dir.chdir(VENDOR_PATH) do +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do begin - exec "yarnpkg #{ARGV.join(" ")}" + exec "yarnpkg", *ARGV rescue Errno::ENOENT $stderr.puts "Yarn executable was not detected in the system." $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" diff --git a/web/config/application.rb b/web/config/application.rb index d67dffda1..ac036cc75 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -1,43 +1,59 @@ -require File.expand_path('../boot', __FILE__) +require_relative 'boot' +require "rails" # Pick the frameworks you want: +require "active_model/railtie" +#require "active_job/railtie" require "active_record/railtie" +require "active_storage/engine" require "action_controller/railtie" require "action_mailer/railtie" -#require "active_resource/railtie" +require "action_view/railtie" +# require "action_cable/engine" require "sprockets/railtie" +#require "rails/test_unit/railtie" require 'shellwords' - - # initialize ActiveRecord's db connection # why? Because user.rb uses validates :acceptance, which needs a connection to the database. if there is better way... ActiveRecord::Base.establish_connection(YAML::load(File.open('config/database.yml'))[Rails.env]) if defined?(Bundler) - # If you precompile assets before deploying to production, use this line - Bundler.require(*Rails.groups) - # If you want your assets lazily compiled in production, use this line - # Bundler.require(:default, :assets, Rails.env) - end + # If you precompile assets before deploying to production, use this line + Bundler.require(*Rails.groups) + # If you want your assets lazily compiled in production, use this line + # Bundler.require(:default, :assets, Rails.env) +end - include JamRuby -# require "rails/test_unit/railtie" +include JamRuby - module SampleApp - class Application < Rails::Application - # Settings in config/environments/* take precedence over those specified here. +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module SampleApp + class Application < Rails::Application + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.0 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. # Custom directories with classes and modules you want to be autoloadable. - config.autoload_paths += %W(#{config.root}/lib) + #config.autoload_paths += %W(#{config.root}/lib) + config.eager_load_paths << Rails.root.join('lib') # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named. # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - config.eager_load = false + #config.eager_load = false # Activate observers that should always be running. # config.active_record.observers = :cacher, :garbage_collector, :forum_observer @@ -516,6 +532,5 @@ if defined?(Bundler) config.latency_data_host_auth_code = "c2VydmVyOnBhc3N3b3Jk" config.manual_override_installer_ends_with = "JamKazam-1.0.3776.dmg" config.spa_origin = "http://beta.jamkazam.local:3000" - end end diff --git a/web/config/boot.rb b/web/config/boot.rb index 30f5120df..b9e460cef 100644 --- a/web/config/boot.rb +++ b/web/config/boot.rb @@ -1,3 +1,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/web/config/environment.rb b/web/config/environment.rb index d1266f4fc..fe6348cce 100644 --- a/web/config/environment.rb +++ b/web/config/environment.rb @@ -4,9 +4,8 @@ if defined? FasterPath FasterPath.sledgehammer_everything! end - # Load the rails application -require File.expand_path('../application', __FILE__) +#require File.expand_path('../application', __FILE__) Mime::Type.register "audio/ogg", :audio_ogg @@ -17,7 +16,8 @@ ENV['FORK_PER_JOB'] = 'false' APP_CONFIG = Rails.application.config Stats.client = InfluxDB::Rails.client +# Load the Rails application. +require_relative 'application' -# Initialize the rails application -SampleApp::Application.initialize! - +# Initialize the Rails application. +Rails.application.initialize! diff --git a/web/config/environments/development.rb b/web/config/environments/development.rb index 7e7c9d95f..ff7deeac4 100644 --- a/web/config/environments/development.rb +++ b/web/config/environments/development.rb @@ -9,29 +9,71 @@ def audiomixer_workspace_path dev_path if File.exist? dev_path end -SampleApp::Application.configure do - # Settings specified here will take precedence over those in config/application.rb +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. # In the development environment your application's code is reloaded on # every request. This slows down response time but is perfect for development # since you don't have to restart the web server when you make code changes. config.cache_classes = false - config.assets.quiet = true + # Do not eager load code on boot. + config.eager_load = false - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true + # Show full error reports. + config.consider_all_requests_local = true - # Show full error reports and disable caching - config.consider_all_requests_local = true - config.action_controller.perform_caching = true + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true - # Don't care if the mailer can't send + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. config.action_mailer.raise_delivery_errors = false - # Print deprecation notices to the Rails logger + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = false + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker + + #==================== + # Log error messages when you accidentally call methods on nil. + config.whiny_nils = true + # Only use best-standards-support built into browsers config.action_dispatch.best_standards_support = :builtin @@ -41,9 +83,6 @@ SampleApp::Application.configure do # Do not compress assets config.assets.compress = false - # Expands the lines which load the assets - config.assets.debug = false - # Set the logging destination(s) config.log_to = %w[stdout file] config.log_level = :debug diff --git a/web/config/environments/production.rb b/web/config/environments/production.rb index 7c3e52560..9232ec007 100644 --- a/web/config/environments/production.rb +++ b/web/config/environments/production.rb @@ -1,24 +1,98 @@ -SampleApp::Application.configure do - # Settings specified here will take precedence over those in config/application.rb +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. - # Code is not reloaded between requests + # Code is not reloaded between requests. config.cache_classes = true - # Full error reports are disabled and caching is turned on + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. config.consider_all_requests_local = false config.action_controller.perform_caching = true + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + # config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "sample_app_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false + # Disable Rails's static asset server (Apache or nginx will already do this) config.serve_static_files = true # in true production we use false, but in 'fake production mode locally', this is useful - config.eager_load = true - # Compress JavaScripts and CSS config.assets.compress = false # this seems like a bad idea in early development phases - # Don't fallback to assets pipeline if a precompiled asset is missed - config.assets.compile = false - # Generate digests for assets URLs config.assets.digest = true @@ -34,9 +108,6 @@ SampleApp::Application.configure do # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. config.force_ssl = false - # See everything in the log (default is :info) - config.log_level = :debug - # Prepend all log lines with the following tags # config.log_tags = [ :subdomain, :uuid ] @@ -56,13 +127,6 @@ SampleApp::Application.configure do # Enable threaded mode # config.threadsafe! - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners - config.active_support.deprecation = :notify - # Set the logging destination(s) config.log_to = %w[file] diff --git a/web/config/environments/test.rb b/web/config/environments/test.rb index b4d99b49b..343402147 100644 --- a/web/config/environments/test.rb +++ b/web/config/environments/test.rb @@ -1,5 +1,5 @@ -SampleApp::Application.configure do - # Settings specified here will take precedence over those in config/application.rb +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. # The test environment is used exclusively to run your application's # test suite. You never need to work with it otherwise. Remember that @@ -7,6 +7,43 @@ SampleApp::Application.configure do # and recreated between test runs. Don't rely on the data there! config.cache_classes = true + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = true + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + # Configure static asset server for tests with Cache-Control for performance config.serve_static_files = true config.static_cache_control = "public, max-age=3600" @@ -21,29 +58,11 @@ SampleApp::Application.configure do config.assets.compile = true # Refuse to compile assets on-the-fly config.assets.digest = true config.assets.debug = false - config.action_controller.perform_caching = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - #config.action_controller.perform_caching = false - - # Raise exceptions instead of rendering exception templates - config.action_dispatch.show_exceptions = false - - # Disable request forgery protection in test environment - config.action_controller.allow_forgery_protection = false - - # Tell Action Mailer not to deliver emails to the real world. - # The :test delivery method accumulates sent emails in the - # ActionMailer::Base.deliveries array. - config.action_mailer.delivery_method = :test + # Raise exception on mass assignment protection for Active Record models config.active_record.mass_assignment_sanitizer = :strict - # Print deprecation notices to the stderr - config.active_support.deprecation = :stderr - require 'bcrypt' silence_warnings do BCrypt::Engine::DEFAULT_COST = BCrypt::Engine::MIN_COST @@ -136,4 +155,3 @@ SampleApp::Application.configure do config.latency_data_host = "http://jamkazam-mock-latency.com" #fake domain config.latency_data_host_auth_code = "c2VydmVyOnBhc3N3b3Jk" end - diff --git a/web/config/initializers/backtrace_silencers.rb b/web/config/initializers/backtrace_silencers.rb index 2eb641eb0..59385cdf3 100644 --- a/web/config/initializers/backtrace_silencers.rb +++ b/web/config/initializers/backtrace_silencers.rb @@ -4,4 +4,4 @@ # Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. -#Rails.backtrace_cleaner.remove_silencers! +# Rails.backtrace_cleaner.remove_silencers! diff --git a/web/config/initializers/content_security_policy.rb b/web/config/initializers/content_security_policy.rb new file mode 100644 index 000000000..d3bcaa5ec --- /dev/null +++ b/web/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/web/config/initializers/cookies_serializer.rb b/web/config/initializers/cookies_serializer.rb index 1389e86a3..06868cf5f 100644 --- a/web/config/initializers/cookies_serializer.rb +++ b/web/config/initializers/cookies_serializer.rb @@ -2,4 +2,6 @@ # Specify a serializer for the signed and encrypted cookie jars. # Valid options are :json, :marshal, and :hybrid. +#Rails.application.config.action_dispatch.cookies_serializer = :json Rails.application.config.action_dispatch.cookies_serializer = :marshal + diff --git a/web/config/initializers/new_framework_defaults_5_2.rb b/web/config/initializers/new_framework_defaults_5_2.rb new file mode 100644 index 000000000..421e5a2a3 --- /dev/null +++ b/web/config/initializers/new_framework_defaults_5_2.rb @@ -0,0 +1,35 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.2 upgrade. +# +# Once upgraded flip defaults one by one to migrate to the new default. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Make Active Record use stable #cache_key alongside new #cache_version method. +# This is needed for recyclable cache keys. +# Rails.application.config.active_record.cache_versioning = true + +# Use AES-256-GCM authenticated encryption for encrypted cookies. +# Also, embed cookie expiry in signed or encrypted cookies for increased security. +# +# This option is not backwards compatible with earlier Rails versions. +# It's best enabled when your entire app is migrated and stable on 5.2. +# +# Existing cookies will be converted on read then written with the new scheme. +# Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true + +# Use AES-256-GCM authenticated encryption as default cipher for encrypting messages +# instead of AES-256-CBC, when use_authenticated_message_encryption is set to true. +# Rails.application.config.active_support.use_authenticated_message_encryption = true + +# Add default protection from forgery to ActionController::Base instead of in +# ApplicationController. +# Rails.application.config.action_controller.default_protect_from_forgery = true + +# Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and +# 'f' after migrating old data. +# Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true + +# Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header. +# Rails.application.config.active_support.use_sha1_digests = true diff --git a/web/config/puma.rb b/web/config/puma.rb index 1e19380dc..a5eccf816 100644 --- a/web/config/puma.rb +++ b/web/config/puma.rb @@ -26,31 +26,9 @@ environment ENV.fetch("RAILS_ENV") { "development" } # Use the `preload_app!` method when specifying a `workers` number. # This directive tells Puma to first boot the application and load code # before forking the application. This takes advantage of Copy On Write -# process behavior so workers use less memory. If you use this option -# you need to make sure to reconnect any threads in the `on_worker_boot` -# block. +# process behavior so workers use less memory. # # preload_app! -# If you are preloading your application and using Active Record, it's -# recommended that you close any connections to the database before workers -# are forked to prevent connection leakage. -# -# before_fork do -# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) -# end - -# The code in the `on_worker_boot` will be called if you are using -# clustered mode by specifying a number of `workers`. After each worker -# process is booted, this block will be run. If you are using the `preload_app!` -# option, you will want to use this block to reconnect to any threads -# or connections that may have been created at application boot, as Ruby -# cannot share connections between processes. -# -# on_worker_boot do -# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) -# end -# - # Allow puma to be restarted by `rails restart` command. plugin :tmp_restart diff --git a/web/config/routes.rb b/web/config/routes.rb index a61245f4c..0ea853c2a 100644 --- a/web/config/routes.rb +++ b/web/config/routes.rb @@ -852,4 +852,4 @@ Rails.application.routes.draw do match 'jamblasters/pairing/store' => 'api_jamblasters#store_token', :via => :post match 'jamblasters/pairing/pair' => 'api_jamblasters#pair', :via => :post end -end +end \ No newline at end of file diff --git a/web/config/spring.rb b/web/config/spring.rb index c9119b40c..9fa7863f9 100644 --- a/web/config/spring.rb +++ b/web/config/spring.rb @@ -1,6 +1,6 @@ -%w( +%w[ .ruby-version .rbenv-vars tmp/restart.txt tmp/caching-dev.txt -).each { |path| Spring.watch(path) } +].each { |path| Spring.watch(path) } diff --git a/web/config/storage.yml b/web/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/web/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/websocket-gateway/Gemfile.lock b/websocket-gateway/Gemfile.lock index b4cb23a7c..bf6e68bcc 100644 --- a/websocket-gateway/Gemfile.lock +++ b/websocket-gateway/Gemfile.lock @@ -14,7 +14,7 @@ GEM remote: https://int.jamkazam.com/gems/ specs: CFPropertyList (2.3.6) - aasm (5.2.0) + aasm (5.4.0) concurrent-ruby (~> 1.0) actionmailer (4.2.8) actionpack (= 4.2.8) @@ -50,6 +50,8 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) aliyun-sdk (0.8.0) nokogiri (~> 1.6) rest-client (~> 2.0) @@ -58,8 +60,7 @@ GEM amq-protocol (>= 2.2.0) eventmachine arel (6.0.4) - arr-pm (0.0.11) - cabin (> 0) + arr-pm (0.0.12) auto_strip_attributes (2.6.0) activerecord (>= 4.0) aws-sdk (1.67.0) @@ -81,7 +82,7 @@ GEM cause (0.1) clamp (1.0.1) coderay (1.1.3) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) crass (1.0.6) cucumber (4.1.0) builder (~> 3.2, >= 3.2.3) @@ -124,7 +125,7 @@ GEM diff-lcs (1.3) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) + dotenv (2.8.1) elasticsearch (7.4.0) elasticsearch-api (= 7.4.0) elasticsearch-transport (= 7.4.0) @@ -139,11 +140,11 @@ GEM email_validator (1.6.0) activemodel erubis (2.7.0) - et-orbi (1.2.6) + et-orbi (1.2.7) tzinfo evented-spec (0.9.0) eventmachine (1.2.7) - excon (0.91.0) + excon (0.94.0) factory_girl (4.9.0) activesupport (>= 3.0.0) faraday (0.9.2) @@ -185,7 +186,8 @@ GEM fog-xml (~> 0.1.1) ipaddress (~> 0.5) json (>= 1.8, < 2.0) - fog-aliyun (0.3.19) + fog-aliyun (0.4.0) + addressable (~> 2.8.0) aliyun-sdk (~> 0.8.0) fog-core fog-json @@ -288,7 +290,7 @@ GEM fog-voxel (0.1.0) fog-core fog-xml - fog-vsphere (3.5.0) + fog-vsphere (3.5.2) fog-core rbvmomi (>= 1.9, < 3) fog-xenserver (1.0.0) @@ -299,29 +301,25 @@ GEM fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (0.3.0) - fpm (1.14.1) + fpm (1.15.0) arr-pm (~> 0.0.11) backports (>= 2.6.2) cabin (>= 0.6.0) clamp (~> 1.0.0) - git (>= 1.3.0, < 2.0) - json (>= 1.7.7, < 3.0) pleaserun (~> 0.0.29) rexml stud - fugit (1.5.2) - et-orbi (~> 1.1, >= 1.1.8) + fugit (1.7.2) + et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) geokit (1.13.1) geokit-rails (2.3.2) geokit (~> 1.5) rails (>= 3.0) - git (1.10.2) - rchardet (~> 1.8) globalid (0.4.2) activesupport (>= 4.2.0) http-accept (1.7.0) - http-cookie (1.0.4) + http-cookie (1.0.5) domain_name (~> 0.5) http_parser.rb (0.8.0) httparty (0.16.2) @@ -339,10 +337,10 @@ GEM json (>= 1.8) language_list (1.2.1) little-plugger (1.1.4) - logging (2.3.0) + logging (2.3.1) little-plugger (~> 1.1) multi_json (~> 1.14) - loofah (2.14.0) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -358,11 +356,11 @@ GEM multi_json (1.15.0) multi_test (0.1.2) multi_xml (0.6.0) - multipart-post (2.1.1) + multipart-post (2.2.3) mustache (0.99.8) netaddr (1.5.1) netrc (0.11.0) - newrelic_rpm (8.4.0) + newrelic_rpm (8.13.0) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) nokogumbo (2.0.5) @@ -397,6 +395,7 @@ GEM pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) + public_suffix (4.0.7) raabro (1.4.0) rack (1.6.13) rack-protection (1.5.5) @@ -420,7 +419,7 @@ GEM activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.4.2) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) rails-observers (0.1.5) activemodel (>= 4.0) @@ -436,7 +435,6 @@ GEM json (>= 1.8) nokogiri (~> 1.5) optimist (~> 3.0) - rchardet (1.8.0) recurly (2.18.16) redis (3.3.3) redis-namespace (1.5.3) @@ -456,11 +454,11 @@ GEM resque-retry (1.7.6) resque (>= 1.25, < 3.0) resque-scheduler (~> 4.0) - resque-scheduler (4.5.0) + resque-scheduler (4.7.0) mono_logger (~> 1.0) redis (>= 3.3) resque (>= 1.27) - rufus-scheduler (~> 3.2, < 3.7) + rufus-scheduler (~> 3.2, != 3.3) resque_mailer (2.4.3) actionmailer (>= 3.0) activesupport (>= 3.0) @@ -481,7 +479,7 @@ GEM ruby-prof (0.15.9) ruby-protocol-buffers (1.2.2) rubyzip (1.2.1) - rufus-scheduler (3.6.0) + rufus-scheduler (3.8.2) fugit (~> 1.1, >= 1.1.6) sanitize (5.2.3) crass (~> 1.0.2) @@ -495,7 +493,7 @@ GEM multi_json (~> 1.0) simplecov-html (~> 0.7.1) simplecov-html (0.7.1) - simplecov-rcov (0.2.3) + simplecov-rcov (0.3.1) simplecov (>= 0.4.1) sinatra (1.4.8) rack (~> 1.5) @@ -508,18 +506,18 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - stripe (5.43.0) + stripe (8.0.0) stud (0.0.23) sys-uname (1.2.2) ffi (~> 1.1) thor (1.2.1) thread_safe (0.3.6) - tilt (2.0.10) - tzinfo (1.2.9) + tilt (2.0.11) + tzinfo (1.2.10) thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.2) uuidtools (2.1.2) vegas (0.1.11) rack (>= 1.0.0)