diff --git a/Gemfile b/Gemfile index 3d12323..63b0002 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,7 @@ source 'https://rubygems.org' gem 'rails' -gem 'sqlite3' -gem 'puma', '~> 3.11' +gem 'puma' gem 'sass-rails' gem 'uglifier' gem "haml-rails" @@ -11,8 +10,8 @@ gem "susy" , "2.2.12" gem 'high_voltage' gem 'opal', '~> 0.11.0' -gem 'opal-rails' , "0.9.4" -gem 'opal-jquery', git: 'https://github.com/opal/opal-jquery' +gem 'opal-rails' +gem 'opal-jquery' gem 'opal-browser' , "0.2.0" gem "rubyx" , "0.6" , git: "https://github.com/ruby-x/rubyx" , require: false diff --git a/Gemfile.lock b/Gemfile.lock index 3a7f708..35a972b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,6 @@ -GIT - remote: https://github.com/opal/opal-jquery - revision: f47a9b42da366cea270f743b05acf529f3077d35 - specs: - opal-jquery (0.4.2) - opal (>= 0.10.0, < 0.12.0) - GIT remote: https://github.com/ruby-x/rubyx - revision: fb6a1a0e017861be26d5b8dbceea801a22542416 + revision: a89301d623bc2ee80e20ef1f32aa7f92bc21dc42 specs: rubyx (0.6.0) parser (~> 2.3.0) @@ -15,104 +8,104 @@ GIT GIT remote: https://github.com/ruby-x/rubyx-debugger - revision: dbb400ac08feee88ac636517949c1527f2b889df + revision: 14297baeeb75337cc584d0331eba147622c088b5 specs: rubyx-debugger (0.3) GIT remote: https://github.com/ruby-x/rx-file - revision: c1de10352d8af105fe532008ceafcdd30b5fbdab + revision: 7c4a5546136d1bad065803da91778b209c18cb4d specs: rx-file (0.3.0) GEM remote: https://rubygems.org/ specs: - actioncable (5.2.1) - actionpack (= 5.2.1) + actioncable (5.2.2) + actionpack (= 5.2.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.1) - actionpack (= 5.2.1) - actionview (= 5.2.1) - activejob (= 5.2.1) + actionmailer (5.2.2) + actionpack (= 5.2.2) + actionview (= 5.2.2) + activejob (= 5.2.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.1) - actionview (= 5.2.1) - activesupport (= 5.2.1) + actionpack (5.2.2) + actionview (= 5.2.2) + activesupport (= 5.2.2) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.1) - activesupport (= 5.2.1) + actionview (5.2.2) + activesupport (= 5.2.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.1) - activesupport (= 5.2.1) + activejob (5.2.2) + activesupport (= 5.2.2) globalid (>= 0.3.6) - activemodel (5.2.1) - activesupport (= 5.2.1) - activerecord (5.2.1) - activemodel (= 5.2.1) - activesupport (= 5.2.1) + activemodel (5.2.2) + activesupport (= 5.2.2) + activerecord (5.2.2) + activemodel (= 5.2.2) + activesupport (= 5.2.2) arel (>= 9.0) - activestorage (5.2.1) - actionpack (= 5.2.1) - activerecord (= 5.2.1) + activestorage (5.2.2) + actionpack (= 5.2.2) + activerecord (= 5.2.2) marcel (~> 0.3.1) - activesupport (5.2.1) + activesupport (5.2.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) - airbrussh (1.3.0) + airbrussh (1.3.1) sshkit (>= 1.6.1, != 1.7.0) arel (9.0.0) ast (2.4.0) bindex (0.5.0) builder (3.2.3) byebug (10.0.2) - capistrano (3.10.2) + capistrano (3.11.0) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (1.3.0) + capistrano-bundler (1.5.0) capistrano (~> 3.1) - sshkit (~> 1.2) capistrano-passenger (0.2.0) capistrano (~> 3.0) - capistrano-rails (1.3.1) + capistrano-rails (1.4.0) capistrano (~> 3.1) capistrano-bundler (~> 1.1) - capistrano-rails-console (2.2.1) + capistrano-rails-console (2.3.0) capistrano (>= 3.5.0, < 4.0.0) - sshkit-interactive (~> 0.2.0) - capybara (3.0.2) + sshkit-interactive (~> 0.3.0) + capybara (3.13.2) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - xpath (~> 3.0) - capybara-screenshot (1.0.19) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy coderay (1.1.2) - concurrent-ruby (1.1.1) + concurrent-ruby (1.1.4) crass (1.0.4) diff-lcs (1.3) - erubi (1.7.1) + erubi (1.8.0) erubis (2.7.0) execjs (2.7.0) - ffi (1.9.23) - globalid (0.4.1) + ffi (1.10.0) + globalid (0.4.2) activesupport (>= 4.2.0) haml (5.0.4) temple (>= 0.8.0) @@ -126,16 +119,16 @@ GEM haml (>= 4.0.6, < 6.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - high_voltage (3.0.0) + high_voltage (3.1.0) hike (1.2.3) html2haml (2.2.0) erubis (~> 2.7.0) haml (>= 4.0, < 6) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - i18n (1.1.1) + i18n (1.5.3) concurrent-ruby (~> 1.0) - jquery-rails (4.3.1) + jquery-rails (4.3.3) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -152,18 +145,18 @@ GEM mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - method_source (0.9.1) - mimemagic (0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (4.2.0) + net-ssh (5.1.0) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) - opal (0.11.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) + opal (0.11.4) ast (>= 2.3.0) hike (~> 1.2) parser (= 2.3.3.1) @@ -173,73 +166,76 @@ GEM opal-browser (0.2.0) opal paggio - opal-rails (0.9.4) + opal-jquery (0.4.3) + opal (>= 0.10.0, < 0.12.0) + opal-rails (0.9.5) jquery-rails - opal (>= 0.10.0, < 0.12) + opal (>= 0.11.0, < 0.12) opal-activesupport (>= 0.0.5) opal-jquery (~> 0.4.0) - opal-sprockets (~> 0.4.1) + opal-sprockets (~> 0.4.2) rails (>= 4.1, < 6.0) sprockets-rails (>= 2.3.3, < 4.0) - opal-sprockets (0.4.1.0.11.0.3.1) + opal-sprockets (0.4.2.0.11.0.3.1) opal (~> 0.11.0) sprockets (~> 3.1) tilt (>= 1.4) paggio (0.2.6) parser (2.3.3.1) ast (~> 2.2) - public_suffix (3.0.2) - puma (3.11.4) - rack (2.0.5) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.6) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.1) - actioncable (= 5.2.1) - actionmailer (= 5.2.1) - actionpack (= 5.2.1) - actionview (= 5.2.1) - activejob (= 5.2.1) - activemodel (= 5.2.1) - activerecord (= 5.2.1) - activestorage (= 5.2.1) - activesupport (= 5.2.1) + rails (5.2.2) + actioncable (= 5.2.2) + actionmailer (= 5.2.2) + actionpack (= 5.2.2) + actionview (= 5.2.2) + activejob (= 5.2.2) + activemodel (= 5.2.2) + activerecord (= 5.2.2) + activestorage (= 5.2.2) + activesupport (= 5.2.2) bundler (>= 1.3.0) - railties (= 5.2.1) + railties (= 5.2.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (5.2.1) - actionpack (= 5.2.1) - activesupport (= 5.2.1) + railties (5.2.2) + actionpack (= 5.2.2) + activesupport (= 5.2.2) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (12.3.1) + rake (12.3.2) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) + rb-inotify (0.10.0) + ffi (~> 1.0) + regexp_parser (1.3.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-rails (3.7.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-support (~> 3.7.0) - rspec-support (3.7.1) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) ruby_dep (1.5.0) - ruby_parser (3.11.0) + ruby_parser (3.12.0) sexp_processor (~> 4.9) sass (3.4.25) sass-rails (5.0.7) @@ -262,23 +258,22 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) - sshkit (1.16.0) + sshkit (1.18.2) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - sshkit-interactive (0.2.3) + sshkit-interactive (0.3.0) sshkit (~> 1.12) susy (2.2.12) sass (>= 3.3.0, < 3.5) temple (0.8.0) - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.9) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.9) + uglifier (4.1.20) execjs (>= 0.3.0, < 3) - web-console (3.6.0) + web-console (3.7.0) actionview (>= 5.0) activemodel (>= 5.0) bindex (>= 0.4.0) @@ -286,7 +281,7 @@ GEM websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) - xpath (3.0.0) + xpath (3.2.0) nokogiri (~> 1.8) PLATFORMS @@ -307,9 +302,9 @@ DEPENDENCIES listen (>= 3.0.5, < 3.2) opal (~> 0.11.0) opal-browser (= 0.2.0) - opal-jquery! - opal-rails (= 0.9.4) - puma (~> 3.11) + opal-jquery + opal-rails + puma rails rspec-rails rubyx (= 0.6)! @@ -318,10 +313,9 @@ DEPENDENCIES sass-rails spring spring-watcher-listen (~> 2.0.0) - sqlite3 susy (= 2.2.12) uglifier web-console (>= 3.3.0) BUNDLED WITH - 1.16.1 + 1.17.2 diff --git a/app/models/application_record.rb b/app/models/application_record.rb deleted file mode 100644 index 10a4cba..0000000 --- a/app/models/application_record.rb +++ /dev/null @@ -1,3 +0,0 @@ -class ApplicationRecord < ActiveRecord::Base - self.abstract_class = true -end diff --git a/config/application.rb b/config/application.rb index e02acd9..d5944ee 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,6 +1,8 @@ require_relative 'boot' -require 'rails/all' +require "action_controller/railtie" +require "action_mailer/railtie" +require "sprockets/railtie" # Require the gems listed in Gemfile, including any gems # you've limited to :test, :development, or :production. diff --git a/config/database.yml b/config/database.yml deleted file mode 100644 index 0d02f24..0000000 --- a/config/database.yml +++ /dev/null @@ -1,25 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -# -default: &default - adapter: sqlite3 - pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - timeout: 5000 - -development: - <<: *default - database: db/development.sqlite3 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - <<: *default - database: db/test.sqlite3 - -production: - <<: *default - database: db/production.sqlite3 diff --git a/config/environments/development.rb b/config/environments/development.rb index 1311e3e..c066471 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -27,9 +27,6 @@ Rails.application.configure do 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 @@ -38,12 +35,6 @@ Rails.application.configure do # 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. diff --git a/config/environments/production.rb b/config/environments/production.rb index d14f59a..2e254bd 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -81,6 +81,4 @@ Rails.application.configure do config.logger = ActiveSupport::TaggedLogging.new(logger) end - # Do not dump schema after migrations. - config.active_record.dump_schema_after_migration = false end diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb index bbfc396..633c1c8 100644 --- a/config/initializers/wrap_parameters.rb +++ b/config/initializers/wrap_parameters.rb @@ -7,8 +7,3 @@ ActiveSupport.on_load(:action_controller) do wrap_parameters format: [:json] end - -# To enable root element in JSON for ActiveRecord objects. -# ActiveSupport.on_load(:active_record) do -# self.include_root_in_json = true -# end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index bbe1ba5..cc9b5d0 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -22,10 +22,6 @@ require 'rspec/rails' # # Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f } -# Checks for pending migrations and applies them before tests are run. -# If you are not using ActiveRecord, you can remove this line. -ActiveRecord::Migration.maintain_test_schema! - RSpec.configure do |config| # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures config.fixture_path = "#{::Rails.root}/spec/fixtures"