From dc280ed31553183610d1ad1ffe6f08db5f395616 Mon Sep 17 00:00:00 2001 From: Kate Sandler Date: Mon, 8 Apr 2019 22:26:07 -0700 Subject: [PATCH 01/13] ran rails new --- .gitignore | 54 ++-- .ruby-version | 1 + Gemfile | 81 ++++++ Gemfile.lock | 274 ++++++++++++++++++ Guardfile | 9 + README.md | 89 +----- Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 16 + app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.css | 15 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 15 + app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 36 +++ bin/spring | 17 ++ bin/update | 31 ++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 26 ++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 ++++++ config/environment.rb | 5 + config/environments/development.rb | 61 ++++ config/environments/production.rb | 94 ++++++ config/environments/test.rb | 46 +++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 + config/initializers/backtrace_silencers.rb | 7 + .../initializers/content_security_policy.rb | 25 ++ config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 + config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 33 +++ config/puma.rb | 34 +++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 package.json | 5 + public/404.html | 67 +++++ public/422.html | 67 +++++ public/500.html | 66 +++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 1 + storage/.keep | 0 test/application_system_test_case.rb | 5 + test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 26 ++ tmp/.keep | 0 vendor/.keep | 0 81 files changed, 1410 insertions(+), 106 deletions(-) create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100755 bin/yarn create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/content_security_policy.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 package.json create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/application_system_test_case.rb create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore index 74b0d5d2c..11a546eaa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,36 +1,30 @@ -*.gem -*.rbc -/.config -/coverage/ -/InstalledFiles -/pkg/ -/spec/reports/ -/test/tmp/ -/test/version_tmp/ -/tmp/ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' -## Specific to RubyMotion: -.dat* -.repl_history -build/ +# Ignore bundler config. +/.bundle -## Documentation cache and generated files: -/.yardoc/ -/_yardoc/ -/doc/ -/rdoc/ +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep -## Environment normalisation: -/.bundle/ -/vendor/bundle -/lib/bundler/man/ +# Ignore uploaded files in development +/storage/* +!/storage/.keep -# for a library or gem, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# Gemfile.lock -# .ruby-version -# .ruby-gemset +/node_modules +/yarn-error.log -# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: -.rvmrc +/public/assets +.byebug_history +/coverage .DS_Store + + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..e665f46d3 --- /dev/null +++ b/Gemfile @@ -0,0 +1,81 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'mini_racer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-turbolinks' +gem 'jquery-rails' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'guard' + gem 'guard-minitest' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' + gem 'minitest-skip' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..bb872bace --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,274 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + archive-zip (0.12.0) + io-like (~> 0.3.0) + arel (9.0.0) + better_errors (2.5.1) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.7.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.4.3) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + capybara (3.16.1) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chromedriver-helper (2.1.1) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + debug_inspector (0.0.3) + erubi (1.8.0) + execjs (2.7.0) + ffi (1.10.0) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.15.0) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.8.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + minitest-skip (0.0.1) + minitest (~> 5.0) + msgpack (1.2.9) + multi_json (1.13.1) + nenv (0.3.0) + nio4r (2.3.1) + nokogiri (1.10.2) + mini_portile2 (~> 2.4.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + public_suffix (3.0.3) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + 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.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + regexp_parser (1.4.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + sass (3.7.4) + 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.141.0) + childprocess (~> 0.5) + rubyzip (~> 1.2, >= 1.2.2) + shellany (0.0.1) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tilt (2.0.9) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.20) + execjs (>= 0.3.0, < 3) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + byebug + capybara (>= 2.15) + chromedriver-helper + guard + guard-minitest + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + minitest-skip + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 2.0.1 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/README.md b/README.md index d838dfcb0..7db80e4ca 100644 --- a/README.md +++ b/README.md @@ -1,87 +1,24 @@ -# Task List +# README -Let's build a Task List in Rails! We will solve the problem of tracking tasks in a web application. This project will enable us to keep track of and persist, add, edit and remove tasks. This is an individual Stage 1 project. +This README would normally document whatever steps are necessary to get the +application up and running. -This project is due: **Monday April 15th**. +Things you may want to cover: -## Learning Goals +* Ruby version -Practice all aspects of Rails development. +* System dependencies -- Create a new Rails application -- Explore each aspect of the Rails Request Cycle: Model, View, Controller -- Implement RESTful routes using Rails standards -- Complete all CRUD actions in a Rails application +* Configuration -## Baseline +* Database creation -In this baseline, you'll create a new Rails application and get started with two of the major components: route, controller and view. +* Database initialization -- Fork and clone this repository to your computer -- Create a new Rails application using `rails new .` - - create a `Tasks` controller - - create a route to view the task `index` page - - create a controller action for the task `index` page which contains an array of hard-coded tasks - - create an ERB view to display the tasks from the controller action +* How to run the test suite -### Controller Tests +* Services (job queues, cache servers, search engines, etc.) -Tests have been created for waves 1 & 2. You can find the tests in `test/controllers/tasks_controller_test.rb`, and you can execute the tests with `$ rails test`. You may need to update the test file if your schema differs from the one in the spec. For waves 3 & 4, you will need to fill in your own tests. +* Deployment instructions -## Wave 1 - -This wave is where we introduce ActiveRecord to create a model. We use the model to persist our data. - -1. create a migration which will create a new `Task` model - - create the database schema and tables by running the `rails db:migrate` command - - the `Task` model should include _at least_ a name, a description and a completion date - - create at least 2 `Task` model instances using the `rails console` -1. update the controller's `index` action you created to retrieve and show `all` Task objects from the database - - you may need to update the view as well to use the model fields rather than the hard-coded data - -## Wave 2 - -In this wave, we will expand the actions we support and introduce forms for user interactivity and persistence. - -1. add support to `show` each task - - update the task list to link to a `show` action for each individual task - - create a route - - create a controller action - - create an ERB view -1. Create a new task: - - update the task list to have a link to add a new task - - this will give the user a new page with a **form** with the appropriate task fields - - the site should take the user back to the task list after the new task is added -1. Verify the success of your controller actions by uncommenting the wave 2 tests and executing them with `$ rails test`. - -## Wave 3 - -In this wave we will extend the interactivity with users, allowing them to edit existing tasks. - -1. Complete tests by uncommenting and filling in the contents of the Wave 3 tests for the `edit` and `update` actions. -1. Edit a task - - update each task's show page to include an edit link - - this will give the user a new page with a **form** that is pre-populated with the data about that task - - the site should take the user back to the task's show page after the task is updated - -1. **Optional** - - DRY up your code by reusing the view code from the `new` functionality - - Hint: Rendering _partials_ in Rails - -## Wave 4 - -In this wave, we will add the ability to delete tasks. We will also add the ability for a user to mark a task complete. Note: Marking a task complete will require going above and beyond the examples provided in lecture. You will also need to write controller tests for the delete and mark complete actions. - -1. Delete a task - On the task list, add a button or link for each task that will, once clicked: - 1. Ask the user to confirm that they definitely want to delete the task. - 1. Delete the task from the database and redirect the user back to the list of remaining tasks -1. Mark a task complete - - Add a button to the list of tasks on the home page that, when clicked, will mark a task complete - - Update the database with the task's completed date - -### Optional Design - -The focus of this project is to familiarize yourself with rails. Design of this application is optional and secondary to learning goals this project. If you do find you have time to style the design of your application, you can use or own design or the wireframes below. - -![Homepage Wireframe](/imgs/tasklist_homepage.jpg "Homepage Wireframe") +* ... diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 000000000..b16e53d6d --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 000000000..82e6f0f6c --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,16 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require rails-ujs +//= require activestorage +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 000000000..739aa5f02 --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the `rails generate channel` command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 000000000..d05ea0f51 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + *= require_tree . + *= require_self + */ diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..09705d12a --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::Base +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 000000000..de6be7945 --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 000000000..b9ce64348 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,15 @@ + + + + TaskList + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +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/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +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/bin/setup b/bin/setup new file mode 100755 index 000000000..94fd4d797 --- /dev/null +++ b/bin/setup @@ -0,0 +1,36 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # 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' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/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/bin/update b/bin/update new file mode 100755 index 000000000..58bfaed51 --- /dev/null +++ b/bin/update @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + 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' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 000000000..460dd565b --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + 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" + exit 1 + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..77b3ec01b --- /dev/null +++ b/config/application.rb @@ -0,0 +1,26 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module TaskList + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # 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. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +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/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..51266cdbe --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: TaskList_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..c4252f2ed --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +6MxU9wIglO0oyAh4A+T4TJ2cnQ0K4WN8jeAd7msG2F0AnCDWUCRQ59gy6y7FuiPZecxMhhsePchq9jXvVE9R94WPqHj6FyD2pj/tH1gGms4QdfEgVJ8DfWqV+p9fJmfWosJnH57n8D9DloFD2+SInAiCcjJxqaVz4zfDmuVqBI5rdDTZ6Jq3/6itpEedFkY5C9C9CR7F7+7AU0cFAAnAKJSng2uNDWJCeCda4Py9vetKRn1dQu6Lra6YfiJkI3UHV5Zzzj1dgYb+dd6XWhmrWj1IAUykfmzRiJQfSyeqqYH03nYMw0hCDOVYa+GIPzaUdchl3/D1M5elQQ7jkbuOaS3ZTb/2AYoFrlHQ6kqbX9/qj7f7c6razkqE0S61ALl1JeoOGNCHLO9SlaNtkfA4FqDBgQFbNnPIvPGg--pA3t3yvdyKTzd2ba--J4H16joMY2haW3avv3/bKw== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..40243c8b5 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: TaskList_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: TaskList + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# 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: TaskList_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: TaskList_production + username: TaskList + password: <%= ENV['TASKLIST_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..1311e3e4e --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,61 @@ +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 + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = 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 + + 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 + + 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 = true + + # 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 +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..4cef70af5 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,94 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # 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 + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # 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 = "TaskList_#{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 +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +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 + # your test database is "scratch space" for the test suite and is wiped + # 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 = 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 + + # 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 +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 000000000..4b828e80c --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# 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! diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 000000000..d3bcaa5ec --- /dev/null +++ b/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/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 000000000..5a6a32d37 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# 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 diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +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/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# 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. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/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/db/seeds.rb b/db/seeds.rb new file mode 100644 index 000000000..1beea2acc --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/package.json b/package.json new file mode 100644 index 000000000..f9cbc5515 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "TaskList", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 000000000..2be3af26f --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

You may have mistyped the address or the page may have moved.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/422.html b/public/422.html new file mode 100644 index 000000000..c08eac0d1 --- /dev/null +++ b/public/422.html @@ -0,0 +1,67 @@ + + + + The change you wanted was rejected (422) + + + + + + +
+
+

The change you wanted was rejected.

+

Maybe you tried to change something you didn't have access to.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/500.html b/public/500.html new file mode 100644 index 000000000..78a030af2 --- /dev/null +++ b/public/500.html @@ -0,0 +1,66 @@ + + + + We're sorry, but something went wrong (500) + + + + + + +
+
+

We're sorry, but something went wrong.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 000000000..e69de29bb diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 000000000..e69de29bb diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 000000000..d19212abd --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/system/.keep b/test/system/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..10594a324 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 65c04c2497bac599107845349c8db51e910c97ef Mon Sep 17 00:00:00 2001 From: Kate Sandler Date: Wed, 10 Apr 2019 00:25:05 -0700 Subject: [PATCH 02/13] Adds create, edit, and destroy into controller and adds basic views --- .vscode/settings.json | 3 + app/assets/javascripts/tasks.js | 2 + app/assets/stylesheets/tasks.scss | 3 + app/controllers/tasks_controller.rb | 41 +++++++ app/helpers/tasks_helper.rb | 2 + app/models/task.rb | 2 + app/views/tasks/edit.html.erb | 11 ++ app/views/tasks/index.html.erb | 8 ++ app/views/tasks/new.html.erb | 10 ++ app/views/tasks/show.html.erb | 5 + config/routes.rb | 4 + db/migrate/20190410055358_create_tasks.rb | 11 ++ db/schema.rb | 26 +++++ db/seeds.rb | 9 ++ test/controllers/tasks_controller_test.rb | 127 +--------------------- test/fixtures/tasks.yml | 11 ++ test/models/task_test.rb | 9 ++ 17 files changed, 160 insertions(+), 124 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 app/assets/javascripts/tasks.js create mode 100644 app/assets/stylesheets/tasks.scss create mode 100644 app/controllers/tasks_controller.rb create mode 100644 app/helpers/tasks_helper.rb create mode 100644 app/models/task.rb create mode 100644 app/views/tasks/edit.html.erb create mode 100644 app/views/tasks/index.html.erb create mode 100644 app/views/tasks/new.html.erb create mode 100644 app/views/tasks/show.html.erb create mode 100644 db/migrate/20190410055358_create_tasks.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/tasks.yml create mode 100644 test/models/task_test.rb diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..6649301f6 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "workbench.colorCustomizations": {} +} \ No newline at end of file diff --git a/app/assets/javascripts/tasks.js b/app/assets/javascripts/tasks.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/tasks.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss new file mode 100644 index 000000000..b57862ec7 --- /dev/null +++ b/app/assets/stylesheets/tasks.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the tasks controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb new file mode 100644 index 000000000..aabe02a17 --- /dev/null +++ b/app/controllers/tasks_controller.rb @@ -0,0 +1,41 @@ +# frozen_string_literal: true + +class TasksController < ApplicationController + def index + @tasks = Task.all + end + + def new + @task = Task.new + end + + def create + @task = Task.create task_params + redirect_to task_path(@task) + end + + def show + @task = Task.find(params[:id]) + end + + def edit + @task = Task.find(params[:id]) + end + + def update + @task = Task.find(params[:id]) + @task.update task_params + redirect_to task_path(@task) + end + + def destroy + Task.find(params[:id]).destroy + redirect_to root_path + end + + private + + def task_params + params.require(:task).permit(:title, :description) + end +end diff --git a/app/helpers/tasks_helper.rb b/app/helpers/tasks_helper.rb new file mode 100644 index 000000000..ce894d00c --- /dev/null +++ b/app/helpers/tasks_helper.rb @@ -0,0 +1,2 @@ +module TasksHelper +end diff --git a/app/models/task.rb b/app/models/task.rb new file mode 100644 index 000000000..3c2342421 --- /dev/null +++ b/app/models/task.rb @@ -0,0 +1,2 @@ +class Task < ApplicationRecord +end diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb new file mode 100644 index 000000000..c4dd6d912 --- /dev/null +++ b/app/views/tasks/edit.html.erb @@ -0,0 +1,11 @@ +

Edit This Task

+<%= form_for @task do |form| %> + + <%= label_tag(:title, "Title:") %> + <%= form.text_field :title %>
+ + <%= label_tag(:description, "Description") %> + <%= form.text_area :description %>
+ + <%= form.submit "Update" %> +<% end %> \ No newline at end of file diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb new file mode 100644 index 000000000..5818b1919 --- /dev/null +++ b/app/views/tasks/index.html.erb @@ -0,0 +1,8 @@ +

Tasktron 6000

+

<%= link_to "New Task", new_task_path %>

+

<% @tasks.each do |task| %> +

  • <%= link_to task.title, task_path(task.id) %> + <%= link_to "edit", edit_task_path(task[:id]) %> + <%= link_to "delete", task, method: :delete, data: { confirm: "Really, though?" }%> +
    • +<% end %>

    \ No newline at end of file diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb new file mode 100644 index 000000000..0998e6249 --- /dev/null +++ b/app/views/tasks/new.html.erb @@ -0,0 +1,10 @@ +

    Create a New Task

    +<%= form_for @task do |form| %> + + <%= label_tag(:title, "Title:") %> + <%= form.text_field :title %>
    + + <%= label_tag(:description, "Description") %> + <%= form.text_area :description %>
    + <%= form.submit "Create" %> +<% end %> \ No newline at end of file diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb new file mode 100644 index 000000000..335234f35 --- /dev/null +++ b/app/views/tasks/show.html.erb @@ -0,0 +1,5 @@ +

    Task Page

    +

    Title: <%= @task['title']%>

    +

    Description: <%= @task['description']%>

    + +<%= link_to "Back To Task List", tasks_path%> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 787824f88..593259534 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,7 @@ +# frozen_string_literal: true + Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + root 'tasks#index' + resources :tasks end diff --git a/db/migrate/20190410055358_create_tasks.rb b/db/migrate/20190410055358_create_tasks.rb new file mode 100644 index 000000000..1188433ea --- /dev/null +++ b/db/migrate/20190410055358_create_tasks.rb @@ -0,0 +1,11 @@ +class CreateTasks < ActiveRecord::Migration[5.2] + def change + create_table :tasks do |t| + t.string :title + t.text :description + t.string :completed + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..1b4ec21b6 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,26 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_04_10_055358) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "tasks", force: :cascade do |t| + t.string "title" + t.text "description" + t.string "completed" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2acc..929a1409a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This file should contain all the record creation needed to seed the database with its default values. # The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). # @@ -5,3 +7,10 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) +tasks = Task.create([ + { title: "Fake Task", description: "Don't work too hard on this. It's not a real task." }, + + { title: "Another Fake Task", description: "Get help. Fake tasks are really hard." }, + + { title: "Very Fake Task", description: "Remember to use soap." } + ]) diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb index 971913898..26e3345ce 100644 --- a/test/controllers/tasks_controller_test.rb +++ b/test/controllers/tasks_controller_test.rb @@ -1,128 +1,7 @@ require "test_helper" describe TasksController do - let (:task) { - Task.create name: "sample task", description: "this is an example for a test", - completion_date: Time.now + 5.days - } - - # Tests for Wave 1 - describe "index" do - it "can get the index path" do - # Act - get tasks_path - - # Assert - must_respond_with :success - end - - it "can get the root path" do - # Act - get root_path - - # Assert - must_respond_with :success - end - end - - # Unskip these tests for Wave 2 - describe "show" do - it "can get a valid task" do - skip - # Act - get task_path(task.id) - - # Assert - must_respond_with :success - end - - it "will redirect for an invalid task" do - skip - # Act - get task_path(-1) - - # Assert - must_respond_with :redirect - expect(flash[:error]).must_equal "Could not find task with id: -1" - end - end - - describe "new" do - it "can get the new task page" do - skip - - # Act - get new_task_path - - # Assert - must_respond_with :success - end - end - - describe "create" do - it "can create a new task" do - skip - - # Arrange - task_hash = { - task: { - name: "new task", - description: "new task description", - completion_date: nil, - }, - } - - # Act-Assert - expect { - post tasks_path, params: task_hash - }.must_change "Task.count", 1 - - new_task = Task.find_by(name: task_hash[:task][:name]) - expect(new_task.description).must_equal task_hash[:task][:description] - expect(new_task.due_date.to_time.to_i).must_equal task_hash[:task][:due_date].to_i - expect(new_task.completed).must_equal task_hash[:task][:completed] - - must_respond_with :redirect - must_redirect_to task_path(new_task.id) - end - end - - # Unskip and complete these tests for Wave 3 - describe "edit" do - it "can get the edit page for an existing task" do - skip - # Your code here - end - - it "will respond with redirect when attempting to edit a nonexistant task" do - skip - # Your code here - end - end - - # Uncomment and complete these tests for Wave 3 - describe "update" do - # Note: If there was a way to fail to save the changes to a task, that would be a great - # thing to test. - it "can update an existing task" do - skip - # Your code here - end - - it "will redirect to the root page if given an invalid id" do - skip - # Your code here - end - end - - # Complete these tests for Wave 4 - describe "destroy" do - # Your tests go here - - end - - # Complete for Wave 4 - describe "toggle_complete" do - # Your tests go here - end + # it "must be a real test" do + # flunk "Need real tests" + # end end diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml new file mode 100644 index 000000000..dab0baf7c --- /dev/null +++ b/test/fixtures/tasks.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + description: MyText + completed: MyString + +two: + title: MyString + description: MyText + completed: MyString diff --git a/test/models/task_test.rb b/test/models/task_test.rb new file mode 100644 index 000000000..7928a374f --- /dev/null +++ b/test/models/task_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Task do + let(:task) { Task.new } + + it "must be valid" do + value(task).must_be :valid? + end +end From 27565f5da0820a3a7165eb11b263b7acce157cab Mon Sep 17 00:00:00 2001 From: Kate Sandler Date: Wed, 10 Apr 2019 09:46:59 -0700 Subject: [PATCH 03/13] Shamelessly adds bootstrap --- Gemfile | 2 + Gemfile.lock | 17 +++++++ app/assets/javascripts/application.js | 3 ++ .../{application.css => application.css.scss} | 3 +- app/assets/stylesheets/tasks.scss | 50 +++++++++++++++++++ app/views/tasks/edit.html.erb | 4 +- app/views/tasks/index.html.erb | 8 ++- 7 files changed, 81 insertions(+), 6 deletions(-) rename app/assets/stylesheets/{application.css => application.css.scss} (94%) diff --git a/Gemfile b/Gemfile index e665f46d3..25b24149d 100644 --- a/Gemfile +++ b/Gemfile @@ -79,3 +79,5 @@ group :test do gem 'minitest-reporters' gem 'minitest-skip' end + +gem 'bootstrap' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index bb872bace..76743b657 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,6 +48,8 @@ GEM archive-zip (0.12.0) io-like (~> 0.3.0) arel (9.0.0) + autoprefixer-rails (9.5.1) + execjs better_errors (2.5.1) coderay (>= 1.0.0) erubi (>= 1.0.0) @@ -57,6 +59,10 @@ GEM debug_inspector (>= 0.0.1) bootsnap (1.4.3) msgpack (~> 1.0) + bootstrap (4.3.1) + autoprefixer-rails (>= 9.1.0) + popper_js (>= 1.14.3, < 2) + sassc-rails (>= 2.0.0) builder (3.2.3) byebug (11.0.1) capybara (3.16.1) @@ -145,6 +151,7 @@ GEM nenv (~> 0.1) shellany (~> 0.0) pg (1.1.4) + popper_js (1.14.5) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -198,6 +205,15 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassc (2.0.1) + ffi (~> 1.9) + rake + sassc-rails (2.1.0) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt selenium-webdriver (3.141.0) childprocess (~> 0.5) rubyzip (~> 1.2, >= 1.2.2) @@ -242,6 +258,7 @@ DEPENDENCIES better_errors binding_of_caller bootsnap (>= 1.1.0) + bootstrap byebug capybara (>= 2.15) chromedriver-helper diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 82e6f0f6c..52b1e5e74 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,3 +14,6 @@ //= require activestorage //= require turbolinks //= require_tree . +//= require jquery3 +//= require popper +//= require bootstrap diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css.scss similarity index 94% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.css.scss index d05ea0f51..594fb9eb6 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css.scss @@ -10,6 +10,5 @@ * files in this directory. Styles in this file should be added after the last require_* statement. * It is generally better to create a new file per style scope. * - *= require_tree . - *= require_self */ +@import 'bootstrap'; \ No newline at end of file diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss index b57862ec7..81da8ccf8 100644 --- a/app/assets/stylesheets/tasks.scss +++ b/app/assets/stylesheets/tasks.scss @@ -1,3 +1,53 @@ // Place all the styles related to the tasks controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ +div.container form { + display: flex; + align-items: top; +} + +div.container label { + min-width: 135px; + padding-right: 20px; +} + +div.container input, form select { + border: none; + border-bottom: 1px solid #888; + background: transparent; +} + +div.container { + background-color: #eee; +} + +div.container header { + background-color: orange; + color: white; + text-transform: uppercase; + padding: 10px 20px; +} + +div.container form { + padding-left: 20px; + padding-right: 20px + } + +div.container form textarea { + background-color: #ddd; + border: none; + } + +div.container form button { + padding: 10px 20px 20px 0; + text-align: right; + } + +div.container form button { + background-color: orange; + color: white; + padding: 10px 30px; + letter-spacing: 4px; + font-weight: normal; + text-transform: uppercase; + } \ No newline at end of file diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index c4dd6d912..c9396430c 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,4 +1,4 @@ -

    Edit This Task

    +

    Edit This Task

    <%= form_for @task do |form| %> <%= label_tag(:title, "Title:") %> @@ -8,4 +8,4 @@ <%= form.text_area :description %>
    <%= form.submit "Update" %> -<% end %> \ No newline at end of file +<% end %>
    \ No newline at end of file diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 5818b1919..95440a976 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,8 +1,12 @@ -

    Tasktron 6000

    +
    +

    Tasktron 6000

    +

    <%= link_to "New Task", new_task_path %>

    <% @tasks.each do |task| %>

  • <%= link_to task.title, task_path(task.id) %> <%= link_to "edit", edit_task_path(task[:id]) %> <%= link_to "delete", task, method: :delete, data: { confirm: "Really, though?" }%>
    • -<% end %>

    \ No newline at end of file +<% end %>

    +
    +
    \ No newline at end of file From 470854f223c18cff8a1dddf0c694cfaad483d636 Mon Sep 17 00:00:00 2001 From: Kate Sandler Date: Wed, 10 Apr 2019 17:35:36 -0700 Subject: [PATCH 04/13] Stylizes index --- app/assets/stylesheets/application.css.scss | 71 ++++++++++++++++++++- app/assets/stylesheets/tasks.scss | 50 --------------- app/controllers/tasks_controller.rb | 4 +- app/views/layouts/application.html.erb | 9 +-- app/views/tasks/edit.html.erb | 4 +- app/views/tasks/index.html.erb | 20 +++--- app/views/tasks/new.html.erb | 6 +- db/migrate/20190410055358_create_tasks.rb | 1 - test/controllers/tasks_controller_test.rb | 21 +++++- 9 files changed, 109 insertions(+), 77 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 594fb9eb6..f0f36521f 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -11,4 +11,73 @@ * It is generally better to create a new file per style scope. * */ -@import 'bootstrap'; \ No newline at end of file +@import 'bootstrap'; + +.list-group-item { + position: relative; + display: block; + padding: 0.75rem 1.25rem; + margin-bottom: -1px; + background-color: #fff; + border: 1px solid rgba(0, 0, 0, 0.125); +} + +.list-group-item:first-child { + border-top-left-radius: 0.25rem; + border-top-right-radius: 0.25rem; +} + +.list-group-item:last-child { + margin-bottom: 0; + border-bottom-right-radius: 0.25rem; + border-bottom-left-radius: 0.25rem; +} + +.list-group-item.disabled, .list-group-item:disabled { + color: #6c757d; + pointer-events: none; + background-color: #fff; +} + +ul { + border: 2px solid #FF635A +} + +header{ + text-align: center +} + +a { + text-decoration: none; + transition: color .4s; + color: rgb(255, 255, 255); +} +a:link, +a:visited { color: #37306A; } +a:hover { + text-decoration: none; + color: rgb(0, 0, 0); } +a:active { + transition: color .3s; + color: rgb(224, 211, 23); +} + +.container { + margin-top: 20px; +} + +.btn-group { + background-color: #37306A; +} + +.btn-primary > a { + color: #ffffff; +} + +.list-group-item { + background: #FF635A; +} + +.list-group-item:hover{ + background: rgb(255, 164, 90); +} \ No newline at end of file diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss index 81da8ccf8..b57862ec7 100644 --- a/app/assets/stylesheets/tasks.scss +++ b/app/assets/stylesheets/tasks.scss @@ -1,53 +1,3 @@ // Place all the styles related to the tasks controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ -div.container form { - display: flex; - align-items: top; -} - -div.container label { - min-width: 135px; - padding-right: 20px; -} - -div.container input, form select { - border: none; - border-bottom: 1px solid #888; - background: transparent; -} - -div.container { - background-color: #eee; -} - -div.container header { - background-color: orange; - color: white; - text-transform: uppercase; - padding: 10px 20px; -} - -div.container form { - padding-left: 20px; - padding-right: 20px - } - -div.container form textarea { - background-color: #ddd; - border: none; - } - -div.container form button { - padding: 10px 20px 20px 0; - text-align: right; - } - -div.container form button { - background-color: orange; - color: white; - padding: 10px 30px; - letter-spacing: 4px; - font-weight: normal; - text-transform: uppercase; - } \ No newline at end of file diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index aabe02a17..c88510b4d 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -12,14 +12,14 @@ def new def create @task = Task.create task_params redirect_to task_path(@task) - end + end def show @task = Task.find(params[:id]) end def edit - @task = Task.find(params[:id]) + @task = Task.find_by(id: params[:id]) end def update diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b9ce64348..7ca99e615 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,15 +1,16 @@ + TaskList <%= csrf_meta_tags %> <%= csp_meta_tag %> - - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - - <%= yield %> +
    + <%= yield %> +
    diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index c9396430c..06f704921 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,10 +1,10 @@

    Edit This Task

    <%= form_for @task do |form| %> - <%= label_tag(:title, "Title:") %> + <%= form.label :title, "Title:" %> <%= form.text_field :title %>
    - <%= label_tag(:description, "Description") %> + <%= form.label :description, "Description" %> <%= form.text_area :description %>
    <%= form.submit "Update" %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 95440a976..a2f8a1783 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,12 +1,12 @@ -
    -

    Tasktron 6000

    -
    + +
      +

      Tasktron 6000

      <%= link_to "New Task", new_task_path %>

      -

      <% @tasks.each do |task| %> -

    • <%= link_to task.title, task_path(task.id) %> - <%= link_to "edit", edit_task_path(task[:id]) %> - <%= link_to "delete", task, method: :delete, data: { confirm: "Really, though?" }%> +
      • + <% @tasks.each do |task| %> +
    • <%= link_to task.title, task_path(task.id) %> +
      + +
      • -<% end %>

      -
    -
    \ No newline at end of file +<% end %> \ No newline at end of file diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 0998e6249..5b202aed9 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,10 +1,8 @@

    Create a New Task

    <%= form_for @task do |form| %> - - <%= label_tag(:title, "Title:") %> + <%= form.label "Title:" %> <%= form.text_field :title %>
    - - <%= label_tag(:description, "Description") %> + <%= form.label "Description:" %> <%= form.text_area :description %>
    <%= form.submit "Create" %> <% end %> \ No newline at end of file diff --git a/db/migrate/20190410055358_create_tasks.rb b/db/migrate/20190410055358_create_tasks.rb index 1188433ea..d9d628690 100644 --- a/db/migrate/20190410055358_create_tasks.rb +++ b/db/migrate/20190410055358_create_tasks.rb @@ -4,7 +4,6 @@ def change t.string :title t.text :description t.string :completed - t.timestamps end end diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb index 26e3345ce..5e1220254 100644 --- a/test/controllers/tasks_controller_test.rb +++ b/test/controllers/tasks_controller_test.rb @@ -1,7 +1,22 @@ +# frozen_string_literal: true + require "test_helper" describe TasksController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "show" do + it "should be able to show a valid task" do + task = Task.create(title: "test task") + + get task_path(task.id) + must_respond_with :success + end + + it "renders 404 not found for an invalid task" do + task_id = Task.last.id + 1 + + get edit_task_path(task_id) + + must_respond_with :not_found + end + end end From d9ab28908f45d3605aefd0d030b156fcb9e34b12 Mon Sep 17 00:00:00 2001 From: Kate Sandler Date: Thu, 11 Apr 2019 09:35:18 -0700 Subject: [PATCH 05/13] Style and schema change -- migrate for completed_at --- app/assets/images/doodles.png | Bin 0 -> 33671 bytes app/assets/stylesheets/application.css.scss | 72 +++++++++++++----- app/models/task.rb | 3 + app/views/layouts/application.html.erb | 2 +- app/views/tasks/edit.html.erb | 16 ++-- app/views/tasks/index.html.erb | 10 ++- app/views/tasks/new.html.erb | 13 ++-- db/migrate/20190410055358_create_tasks.rb | 2 + ...0190411162045_add_completed_at_to_tasks.rb | 5 ++ db/schema.rb | 3 +- db/seeds.rb | 2 - 11 files changed, 90 insertions(+), 38 deletions(-) create mode 100644 app/assets/images/doodles.png create mode 100644 db/migrate/20190411162045_add_completed_at_to_tasks.rb diff --git a/app/assets/images/doodles.png b/app/assets/images/doodles.png new file mode 100644 index 0000000000000000000000000000000000000000..855a89e9e687a831f3d87d9a8ded43c3e1fbce5b GIT binary patch literal 33671 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 literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index f0f36521f..5c94d09f4 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -12,25 +12,24 @@ * */ @import 'bootstrap'; +@import url('https://fonts.googleapis.com/css?family=Space+Mono'); .list-group-item { position: relative; display: block; - padding: 0.75rem 1.25rem; + padding: 1.25rem 1.25rem; margin-bottom: -1px; - background-color: #fff; - border: 1px solid rgba(0, 0, 0, 0.125); + border: 1px dashed rgba(0, 0, 0, 0.342); } -.list-group-item:first-child { - border-top-left-radius: 0.25rem; - border-top-right-radius: 0.25rem; +.list-group-item:last-of-type { + border-bottom-left-radius: .9rem; + border-bottom-right-radius: .9rem; } -.list-group-item:last-child { +.list-group { margin-bottom: 0; - border-bottom-right-radius: 0.25rem; - border-bottom-left-radius: 0.25rem; + border-radius: 1.2rem; } .list-group-item.disabled, .list-group-item:disabled { @@ -40,34 +39,50 @@ } ul { - border: 2px solid #FF635A + border: 5px solid darkmagenta; + border-radius: 0.5rem; } header{ - text-align: center + text-align: center; + background-color: rgb(156, 179, 53); + border-top-left-radius: .9rem; + border-top-right-radius: .9rem; } a { text-decoration: none; transition: color .4s; - color: rgb(255, 255, 255); + color: rgb(179, 27, 128); } a:link, -a:visited { color: #37306A; } +a:visited { color: rgb(179, 27, 128); } a:hover { text-decoration: none; - color: rgb(0, 0, 0); } + color: rgb(144, 16, 123); } a:active { transition: color .3s; color: rgb(224, 211, 23); } +li > a { +margin-left: 10px; +font-size: 1.5em; +font-weight: 600; +} + .container { margin-top: 20px; } -.btn-group { - background-color: #37306A; +button.left { + border-top-left-radius: 0.40rem; + border-bottom-left-radius: 0.40rem; +} + +button.right { + border-top-right-radius: 0.40rem; + border-bottom-right-radius: 0.40rem; } .btn-primary > a { @@ -75,9 +90,30 @@ a:active { } .list-group-item { - background: #FF635A; + background: #999; } .list-group-item:hover{ - background: rgb(255, 164, 90); + background: #666; +} + +.list-form-item, .list-form-item:hover { + background:rgb(255, 255, 255); +} + +input, textarea { + background-color: transparent; + border: none; +} + +.btn span.glyphicon { + opacity: 0; +} +.btn.active span.glyphicon { + opacity: 1; +} + +body { + font-family: 'Space Mono', monospace; + background-image: image-url('doodles.png'); } \ No newline at end of file diff --git a/app/models/task.rb b/app/models/task.rb index 3c2342421..0edeff025 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -1,2 +1,5 @@ class Task < ApplicationRecord + def completed? + !completed_at.blank? + end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7ca99e615..12e4efb4d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,7 +9,7 @@ <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> -
    +
    <%= yield %>
    diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index 06f704921..2a538cba4 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,11 +1,15 @@ -

    Edit This Task

    + +
      +

      Edit This Task

      <%= form_for @task do |form| %> - <%= form.label :title, "Title:" %> - <%= form.text_field :title %>
      +
    • <%= form.label :title, "Title:" %> + <%= form.text_field :title %>
      • - <%= form.label :description, "Description" %> - <%= form.text_area :description %>
      +
    • <%= form.label :description, "Description:" %> + <%= form.text_area :description %>
      • - <%= form.submit "Update" %> +
    • + +
      • <% end %>
    \ No newline at end of file diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index a2f8a1783..478cd23d3 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -4,9 +4,11 @@

    <%= link_to "New Task", new_task_path %>

    <% @tasks.each do |task| %> -
  • <%= link_to task.title, task_path(task.id) %> -
    - -
    +
  • + <%= link_to "Complete", complete_item_path(task), method: :patch %> + <%= link_to task.title, task_path(task.id) %> +
    + +
    • <% end %> \ No newline at end of file diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 5b202aed9..c388dd58c 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,8 +1,9 @@

    Create a New Task

    +
      <%= form_for @task do |form| %> - <%= form.label "Title:" %> - <%= form.text_field :title %>
      - <%= form.label "Description:" %> - <%= form.text_area :description %>
      - <%= form.submit "Create" %> -<% end %> \ No newline at end of file +
    • <%= form.label "Title:" %>
      • +
    • <%= form.text_field :title %>

      • +
    • <%= form.label "Description:" %>
      • +
    • <%= form.text_area :description %>

      • +
    • <%= form.submit "Create" %>
      • +<% end %>
    \ No newline at end of file diff --git a/db/migrate/20190410055358_create_tasks.rb b/db/migrate/20190410055358_create_tasks.rb index d9d628690..0f01a383c 100644 --- a/db/migrate/20190410055358_create_tasks.rb +++ b/db/migrate/20190410055358_create_tasks.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class CreateTasks < ActiveRecord::Migration[5.2] def change create_table :tasks do |t| diff --git a/db/migrate/20190411162045_add_completed_at_to_tasks.rb b/db/migrate/20190411162045_add_completed_at_to_tasks.rb new file mode 100644 index 000000000..bcc5b558a --- /dev/null +++ b/db/migrate/20190411162045_add_completed_at_to_tasks.rb @@ -0,0 +1,5 @@ +class AddCompletedAtToTasks < ActiveRecord::Migration[5.2] + def change + add_column :tasks, :completed_at, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index 1b4ec21b6..7903c40f9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_04_10_055358) do +ActiveRecord::Schema.define(version: 2019_04_11_162045) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -21,6 +21,7 @@ t.string "completed" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.datetime "completed_at" end end diff --git a/db/seeds.rb b/db/seeds.rb index 929a1409a..2157902f9 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -9,8 +9,6 @@ # Character.create(name: 'Luke', movie: movies.first) tasks = Task.create([ { title: "Fake Task", description: "Don't work too hard on this. It's not a real task." }, - { title: "Another Fake Task", description: "Get help. Fake tasks are really hard." }, - { title: "Very Fake Task", description: "Remember to use soap." } ]) From 7b9d2a95dc93f96ccf935b4a914a33a13299b464 Mon Sep 17 00:00:00 2001 From: Kate Sandler Date: Thu, 11 Apr 2019 15:24:42 -0700 Subject: [PATCH 06/13] Add a due date and completed function --- app/assets/stylesheets/application.css.scss | 7 + app/controllers/tasks_controller.rb | 13 +- app/models/task.rb | 2 + app/views/tasks/index.html.erb | 17 ++- config/routes.rb | 6 +- .../20190411172257_add_due_date_to_tasks.rb | 5 + db/schema.rb | 9 +- test/controllers/tasks_controller_test.rb | 121 ++++++++++++++++-- 8 files changed, 163 insertions(+), 17 deletions(-) create mode 100644 db/migrate/20190411172257_add_due_date_to_tasks.rb diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 5c94d09f4..8df4dbee1 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -113,6 +113,13 @@ input, textarea { opacity: 1; } +.custom-control-label::before, +.custom-control-label::after { + top: .8rem; + width: 1.25rem; + height: 1.25rem; +} + body { font-family: 'Space Mono', monospace; background-image: image-url('doodles.png'); diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index c88510b4d..681d30944 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -25,7 +25,12 @@ def edit def update @task = Task.find(params[:id]) @task.update task_params - redirect_to task_path(@task) + if !@task + redirect_to task_path(@task.id), flash: + { error: "Could not find task with id: #{params[:id]}" } + else + redirect_to task_path(@task) + end end def destroy @@ -33,6 +38,12 @@ def destroy redirect_to root_path end + def complete + @task = Task.find(params[:id]) + @task.update_attribute(:completed_at, Time.now) + redirect_to root_path + end + private def task_params diff --git a/app/models/task.rb b/app/models/task.rb index 0edeff025..eaeab8bb4 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Task < ApplicationRecord def completed? !completed_at.blank? diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 478cd23d3..dc780f69d 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -4,11 +4,24 @@

    <%= link_to "New Task", new_task_path %>

    <% @tasks.each do |task| %> + <% if task.completed? %> +
  • +

    <%= link_to task.title, task_path(task.id) %>

     +
    + +
    +

    +

    Completed <%= time_ago_in_words(task.completed_at)%> ago.

    +
    • + <% else %>
  • - <%= link_to "Complete", complete_item_path(task), method: :patch %> <%= link_to task.title, task_path(task.id) %>
    +

    +

    Completed <%= time_ago_in_words(task.completed_at) %> ago.

    • -<% end %> \ No newline at end of file + <% end %> + <% end %> + \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 593259534..1170daad1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,9 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root 'tasks#index' - resources :tasks + resources :tasks do + member do + patch :complete + end + end end diff --git a/db/migrate/20190411172257_add_due_date_to_tasks.rb b/db/migrate/20190411172257_add_due_date_to_tasks.rb new file mode 100644 index 000000000..973cec285 --- /dev/null +++ b/db/migrate/20190411172257_add_due_date_to_tasks.rb @@ -0,0 +1,5 @@ +class AddDueDateToTasks < ActiveRecord::Migration[5.2] + def change + add_column :tasks, :due_date, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index 7903c40f9..676f343a9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. @@ -10,8 +12,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_04_11_162045) do - +ActiveRecord::Schema.define(version: 20_190_411_172_257) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -21,7 +22,7 @@ t.string "completed" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.datetime "completed_at" + t.datetime "completed_at", null: false + t.datetime "due_date", null: false end - end diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb index 5e1220254..0af3899b2 100644 --- a/test/controllers/tasks_controller_test.rb +++ b/test/controllers/tasks_controller_test.rb @@ -1,22 +1,125 @@ # frozen_string_literal: true -require "test_helper" +# require "test_helper" + +# describe TasksController do +# describe "show" do +# it "should be able to show a valid task" do +# task = Task.create(title: "test task") +# get task_path(task.id) +# must_respond_with :success +# end + +require "test_helper" describe TasksController do + let (:task) do + Task.create title: "sample task", description: "this is an example for a test", + completed_at: Time.now + 5.days + end + # Tests for Wave 1 + describe "index" do + it "can get the index path" do + # Act + get tasks_path + # Assert + must_respond_with :success + end + it "can get the root path" do + # Act + get root_path + # Assert + must_respond_with :success + end + end + # Unskip these tests for Wave 2 describe "show" do - it "should be able to show a valid task" do - task = Task.create(title: "test task") - + it "can get a valid task" do + # Act get task_path(task.id) + # Assert must_respond_with :success end + it "will redirect for an invalid task" do + # Act + get task_path(-1) + # Assert + must_respond_with :redirect + expect(flash[:error]).must_equal "Could not find task with id: -1" + end + end + describe "new" do + it "can get the new task page" do + # Act + get new_task_path + # Assert + must_respond_with :success + end + end + describe "create" do + it "can create a new task" do + # Arrange + task_hash = { + task: { + name: "new task", + description: "new task description", + completion_date: nil + } + } + # Act-Assert + expect do + post tasks_path, params: task_hash + end.must_change "Task.count", 1 + new_task = Task.find_by(title: task_hash[:task][:title]) + expect(new_task.description).must_equal task_hash[:task][:description] + expect(new_task.due_date.to_time.to_i).must_equal task_hash[:task][:due_date].to_i + expect(new_task.completed).must_equal task_hash[:task][:completed] + must_respond_with :redirect + must_redirect_to task_path(new_task.id) + end + end - it "renders 404 not found for an invalid task" do - task_id = Task.last.id + 1 - - get edit_task_path(task_id) + # Unskip and complete these tests for Wave 3 + describe "edit" do + it "can get the edit page for an existing task" do + skip + # Your code here + end + it "will respond with redirect when attempting to edit a nonexistant task" do + skip + # Your code here + end + end - must_respond_with :not_found + # Uncomment and complete these tests for Wave 3 + describe "update" do + # Note: If there was a way to fail to save the changes to a task, that would be a great + # thing to test. + it "can update an existing task" do + skip + # Your code here + end + it "will redirect to the root page if given an invalid id" do + skip + # Your code here end end + # Complete these tests for Wave 4 + describe "destroy" do + # Your tests go here + end + # Complete for Wave 4 + describe "mark_complete" do + # Your tests go here + end end + +# it "renders 404 not found for an invalid task" do +# task_id = Task.last.id + 1 + +# get edit_task_path(task_id) + +# must_respond_with :not_found +# # end +# # end +# # end From a4e426edaf30a916071e0ace71ffb76c5e5b8d92 Mon Sep 17 00:00:00 2001 From: Kate Sandler Date: Thu, 11 Apr 2019 17:17:53 -0700 Subject: [PATCH 07/13] [ddr/ks] set db so completed is bool, remove completed_at --- db/migrate/20190410055358_create_tasks.rb | 2 +- db/migrate/20190411162045_add_completed_at_to_tasks.rb | 5 ----- db/schema.rb | 5 ++--- 3 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 db/migrate/20190411162045_add_completed_at_to_tasks.rb diff --git a/db/migrate/20190410055358_create_tasks.rb b/db/migrate/20190410055358_create_tasks.rb index 0f01a383c..cfa89493c 100644 --- a/db/migrate/20190410055358_create_tasks.rb +++ b/db/migrate/20190410055358_create_tasks.rb @@ -5,7 +5,7 @@ def change create_table :tasks do |t| t.string :title t.text :description - t.string :completed + t.boolean :completed t.timestamps end end diff --git a/db/migrate/20190411162045_add_completed_at_to_tasks.rb b/db/migrate/20190411162045_add_completed_at_to_tasks.rb deleted file mode 100644 index bcc5b558a..000000000 --- a/db/migrate/20190411162045_add_completed_at_to_tasks.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddCompletedAtToTasks < ActiveRecord::Migration[5.2] - def change - add_column :tasks, :completed_at, :datetime - end -end diff --git a/db/schema.rb b/db/schema.rb index 7903c40f9..b69c43038 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_04_11_162045) do +ActiveRecord::Schema.define(version: 2019_04_10_055358) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -18,10 +18,9 @@ create_table "tasks", force: :cascade do |t| t.string "title" t.text "description" - t.string "completed" + t.boolean "completed" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.datetime "completed_at" end end From c255b6ba2bd7a8abfa442755bb32c687084d8221 Mon Sep 17 00:00:00 2001 From: Kate Sandler Date: Thu, 11 Apr 2019 19:12:54 -0700 Subject: [PATCH 08/13] getting back to getting tests working --- app/models/concerns/datetime_validator.rb | 9 +++++++++ app/views/tasks/_form.html.erb | 13 +++++++++++++ app/views/tasks/index.html.erb | 2 +- config/routes.rb | 2 ++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 app/models/concerns/datetime_validator.rb create mode 100644 app/views/tasks/_form.html.erb diff --git a/app/models/concerns/datetime_validator.rb b/app/models/concerns/datetime_validator.rb new file mode 100644 index 000000000..b62da2d68 --- /dev/null +++ b/app/models/concerns/datetime_validator.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class DatetimeValidator < ActiveModel::Validator + def validate(record) + Time.parse(record.due_date.to_s) + rescue ArgumentError + record.errors[:due_date] << "Invalid date format" + end +end diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb new file mode 100644 index 000000000..f4b9e2c12 --- /dev/null +++ b/app/views/tasks/_form.html.erb @@ -0,0 +1,13 @@ +<%= form_for(task) do |f| %> +
    + <%= f.label :title %> + <%= f.text_field :title %> +
    +
    + <%= f.label :due_date %> + <%= f.text_field :due_date %> +
    +
    + <%= f.submit %> +
    +<% end %> \ No newline at end of file diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 478cd23d3..46863777a 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -5,7 +5,7 @@ <% @tasks.each do |task| %>
  • - <%= link_to "Complete", complete_item_path(task), method: :patch %> + <%= link_to "Complete", complete_task_path(task), method: :patch %> <%= link_to task.title, task_path(task.id) %>
    diff --git a/config/routes.rb b/config/routes.rb index 593259534..86a5d856b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,6 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root 'tasks#index' resources :tasks + # get '/tasks', to: task#index, as: tasks + # To make the "complete_tasks_path", use syntax to create a route given some verb, path, controller, action, and name end From 5042ec9531d215d4968079dbad8f3c14e16573b2 Mon Sep 17 00:00:00 2001 From: Kate Sandler Date: Fri, 12 Apr 2019 11:29:24 -0700 Subject: [PATCH 09/13] fixes logic for completed tasks, css tweaks --- app/models/task.rb | 2 +- app/views/tasks/index.html.erb | 7 ++---- app/views/tasks/new.html.erb | 16 +++++++------ app/views/tasks/show.html.erb | 12 ++++++---- db/schema.rb | 6 ++--- db/seeds.rb | 28 +++++++++++++---------- test/controllers/tasks_controller_test.rb | 5 ++-- 7 files changed, 41 insertions(+), 35 deletions(-) diff --git a/app/models/task.rb b/app/models/task.rb index eaeab8bb4..3d69ed318 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Task < ApplicationRecord - def completed? + def completed !completed_at.blank? end end diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index a40534089..bdb9b5f04 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -4,24 +4,21 @@

    <%= link_to "New Task", new_task_path %>

    <% @tasks.each do |task| %> - <% if task.completed? %> + <% if task.completed %>

  • <%= link_to task.title, task_path(task.id) %>
    -

    Completed <%= time_ago_in_words(task.completed_at)%> ago.

    • <% else %>
  • - <%= link_to "Complete", complete_task_path(task), method: :patch %> <%= link_to task.title, task_path(task.id) %>
    -

    -

    Completed <%= time_ago_in_words(task.completed_at) %> ago.

    +
    • <% end %> <% end %> diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index c388dd58c..898c74e41 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,9 +1,11 @@ -

    Create a New Task

    +
      +

      Create a New Task

      <%= form_for @task do |form| %> -
    • <%= form.label "Title:" %>
      • -
    • <%= form.text_field :title %>

      • -
    • <%= form.label "Description:" %>
      • -
    • <%= form.text_area :description %>

      • -
    • <%= form.submit "Create" %>
      • -<% end %>
    \ No newline at end of file +
  • <%= form.label "Title:" %> + <%= form.text_field :title %>
    • +
  • <%= form.label "Description:" %> + <%= form.text_area :description %>
    + +<% end %>
    • +
    \ No newline at end of file diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 335234f35..ddb602184 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,5 +1,9 @@ -

    Task Page

    -

    Title: <%= @task['title']%>

    +
    +
      +

      Task Page

      +

    • Title: <%= @task['title']%>

      Description: <%= @task['description']%>

      - -<%= link_to "Back To Task List", tasks_path%> \ No newline at end of file +
      • +
    +
    \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index 3e8ff8507..68dbbb823 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -12,7 +12,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20_190_410_055_358) do +ActiveRecord::Schema.define(version: 20_190_411_172_257) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -22,7 +22,7 @@ t.boolean "completed" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.datetime "completed_at", null: false - t.datetime "due_date", null: false + t.datetime "completed_at" + t.datetime "due_date" end end diff --git a/db/seeds.rb b/db/seeds.rb index 2157902f9..441b634b7 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,14 +1,18 @@ # frozen_string_literal: true -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). -# -# Examples: -# -# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) -# Character.create(name: 'Luke', movie: movies.first) -tasks = Task.create([ - { title: "Fake Task", description: "Don't work too hard on this. It's not a real task." }, - { title: "Another Fake Task", description: "Get help. Fake tasks are really hard." }, - { title: "Very Fake Task", description: "Remember to use soap." } - ]) +def random_time + Time.at(rand * Time.now.to_i) +end + +tasks = [ + { title: "Not a real task", description: "", completed_at: random_time }, + { title: "Pretty important task", description: "" }, + { title: "Pet Eugene. Feed Eugene. Give Eugene whatever he wants.", description: "" }, + { title: "Don't forget to", description: "", completed_at: random_time }, + { title: "Feed Igor", description: "", completed_at: random_time }, + { title: "Nap.", description: "" } +] + +tasks.each do |task| + Task.create task +end diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb index 0af3899b2..5c8cf6fcb 100644 --- a/test/controllers/tasks_controller_test.rb +++ b/test/controllers/tasks_controller_test.rb @@ -63,7 +63,7 @@ task: { name: "new task", description: "new task description", - completion_date: nil + completed_at: nil } } # Act-Assert @@ -93,8 +93,7 @@ # Uncomment and complete these tests for Wave 3 describe "update" do - # Note: If there was a way to fail to save the changes to a task, that would be a great - # thing to test. + # Note: If there was a way to fail to save the changes to a task, that would be a great thing to test. it "can update an existing task" do skip # Your code here From c42a70f0d0dadbf98b2ce1d51c76b610f78a574e Mon Sep 17 00:00:00 2001 From: Kate Sandler Date: Tue, 16 Apr 2019 23:19:25 -0700 Subject: [PATCH 10/13] Rolling back changes that broke things. --- app/assets/stylesheets/application.css.scss | 1 + app/controllers/tasks_controller.rb | 10 ++++++--- app/views/tasks/_form.html.erb | 23 +++++++++------------ app/views/tasks/edit.html.erb | 14 +------------ app/views/tasks/index.html.erb | 1 + app/views/tasks/new.html.erb | 11 +++------- app/views/tasks/show.html.erb | 1 + db/schema.rb | 18 ++-------------- 8 files changed, 26 insertions(+), 53 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 8df4dbee1..894b5dfea 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -23,6 +23,7 @@ } .list-group-item:last-of-type { + width: 100%; border-bottom-left-radius: .9rem; border-bottom-right-radius: .9rem; } diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 681d30944..c6732e2c3 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -40,13 +40,17 @@ def destroy def complete @task = Task.find(params[:id]) - @task.update_attribute(:completed_at, Time.now) - redirect_to root_path + if @task.completed_at.nil? + @task.update_attribute(:completed_at, Time.now) + redirect_to root_path + else + @task.update_attribute(:completed_at, nil) end +end private def task_params - params.require(:task).permit(:title, :description) + params.require(:task).permit(:title, :completed_at, :description) end end diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index f4b9e2c12..4816ebfbd 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -1,13 +1,10 @@ -<%= form_for(task) do |f| %> -
    - <%= f.label :title %> - <%= f.text_field :title %> -
    -
    - <%= f.label :due_date %> - <%= f.text_field :due_date %> -
    -
    - <%= f.submit %> -
    -<% end %> \ No newline at end of file +<%= form_for @task do |f| %> + +
  • <%= f.label :title, "Title:" %> + <%= f.text_field :title %>
    • +
  • <%= f.label :description, "Description:" %> + <%= f.text_area :description %>
    • +
  • + +
    • +<% end %>
    \ No newline at end of file diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb index 2a538cba4..1be7cf700 100644 --- a/app/views/tasks/edit.html.erb +++ b/app/views/tasks/edit.html.erb @@ -1,15 +1,3 @@ -

      Edit This Task

      -<%= form_for @task do |form| %> - -
    • <%= form.label :title, "Title:" %> - <%= form.text_field :title %>
      • - -
    • <%= form.label :description, "Description:" %> - <%= form.text_area :description %>
      • - -
    • - -
      • -<% end %>
    \ No newline at end of file +<%= render partial: "form" %> \ No newline at end of file diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index bdb9b5f04..c4e754068 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -11,6 +11,7 @@

    Completed <%= time_ago_in_words(task.completed_at)%> ago.

    + <% else %>
  • diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 898c74e41..7cbbb3df7 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,11 +1,6 @@
      -

      Create a New Task

      -<%= form_for @task do |form| %> -
    • <%= form.label "Title:" %> - <%= form.text_field :title %>
      • -
    • <%= form.label "Description:" %> - <%= form.text_area :description %>
      - -<% end %>
    +

    "New Task"

    +<%= render partial: "form" %> +
    \ No newline at end of file diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index ddb602184..20811fe9e 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,3 +1,4 @@ +

    <%= flash[:error] if flash[:error] %>

      Task Page

      diff --git a/db/schema.rb b/db/schema.rb index 68dbbb823..1aa11a8a3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,16 +1,3 @@ -# frozen_string_literal: true - -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended that you check this file into your version control system. ActiveRecord::Schema.define(version: 20_190_411_172_257) do # These are extensions that must be enabled in order to support this database @@ -19,10 +6,9 @@ create_table "tasks", force: :cascade do |t| t.string "title" t.text "description" - t.boolean "completed" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.datetime "completed_at" - t.datetime "due_date" + t.datetime "completed_at", null: false + t.boolean "completed" end end From 988a96ccaec436dbe96eccea38330cc9e502f9a3 Mon Sep 17 00:00:00 2001 From: Kate Sandler Date: Wed, 17 Apr 2019 05:58:17 -0700 Subject: [PATCH 11/13] Putting all my current messes up so we're fixing what needs fixed. --- Gemfile | 5 +- Gemfile.lock | 21 ++- app/assets/stylesheets/application.css.scss | 129 +++++++------- app/controllers/tasks_controller.rb | 10 +- app/models/application_record.rb | 1 + app/models/concerns/datetime_validator.rb | 9 - app/models/task.rb | 2 +- app/views/layouts/application.html.erb | 3 +- app/views/tasks/_form.html.erb | 9 +- app/views/tasks/index.html.erb | 12 +- app/views/tasks/new.html.erb | 2 +- app/views/tasks/show.html.erb | 9 +- db/migrate/20190410055358_create_tasks.rb | 12 -- .../20190411172257_add_due_date_to_tasks.rb | 5 - .../20190417110347_change_column_null.rb | 5 + db/migrate/20190417112727_change_column.rb | 5 + db/schema.rb | 14 +- db/seeds.rb | 49 ++++-- test/controllers/tasks_controller_test.rb | 163 +++++++++++++----- test/fixtures/files/.keep | 0 test/fixtures/tasks.yml | 11 -- test/test_helper.rb | 7 +- true | 2 + 23 files changed, 292 insertions(+), 193 deletions(-) delete mode 100644 app/models/concerns/datetime_validator.rb delete mode 100644 db/migrate/20190410055358_create_tasks.rb delete mode 100644 db/migrate/20190411172257_add_due_date_to_tasks.rb create mode 100644 db/migrate/20190417110347_change_column_null.rb create mode 100644 db/migrate/20190417112727_change_column.rb delete mode 100644 test/fixtures/files/.keep delete mode 100644 test/fixtures/tasks.yml create mode 100644 true diff --git a/Gemfile b/Gemfile index 25b24149d..97323b0c5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.5.1' +ruby '2.5.3' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.3' @@ -80,4 +80,5 @@ group :test do gem 'minitest-skip' end -gem 'bootstrap' \ No newline at end of file +gem 'bootstrap' +gem 'rubocop-performance' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 76743b657..b732970a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,6 +48,7 @@ GEM archive-zip (0.12.0) io-like (~> 0.3.0) arel (9.0.0) + ast (2.4.0) autoprefixer-rails (9.5.1) execjs better_errors (2.5.1) @@ -104,6 +105,7 @@ GEM i18n (1.6.0) concurrent-ruby (~> 1.0) io-like (0.3.0) + jaro_winkler (1.5.2) jbuilder (2.8.0) activesupport (>= 4.2.0) multi_json (>= 1.2) @@ -150,6 +152,9 @@ GEM notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) + parallel (1.17.0) + parser (2.6.2.1) + ast (~> 2.4.0) pg (1.1.4) popper_js (1.14.5) pry (0.12.2) @@ -157,6 +162,7 @@ GEM method_source (~> 0.9.0) pry-rails (0.3.9) pry (>= 0.10.4) + psych (3.1.0) public_suffix (3.0.3) puma (3.12.1) rack (2.0.7) @@ -186,11 +192,22 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) + rainbow (3.0.0) rake (12.3.2) rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) regexp_parser (1.4.0) + rubocop (0.67.2) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.5, != 2.5.1.1) + psych (>= 3.1.0) + rainbow (>= 2.2.2, < 4.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 1.6) + rubocop-performance (1.1.0) + rubocop (>= 0.67.0) ruby-progressbar (1.10.0) ruby_dep (1.5.0) rubyzip (1.2.2) @@ -240,6 +257,7 @@ GEM thread_safe (~> 0.1) uglifier (4.1.20) execjs (>= 0.3.0, < 3) + unicode-display_width (1.5.0) web-console (3.7.0) actionview (>= 5.0) activemodel (>= 5.0) @@ -275,6 +293,7 @@ DEPENDENCIES pry-rails puma (~> 3.11) rails (~> 5.2.3) + rubocop-performance sass-rails (~> 5.0) selenium-webdriver spring @@ -285,7 +304,7 @@ DEPENDENCIES web-console (>= 3.3.0) RUBY VERSION - ruby 2.5.1p57 + ruby 2.5.3p105 BUNDLED WITH 2.0.1 diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 894b5dfea..efb1d73e5 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -1,127 +1,116 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's - * vendor/assets/stylesheets directory can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS - * files in this directory. Styles in this file should be added after the last require_* statement. - * It is generally better to create a new file per style scope. - * - */ + @import 'bootstrap'; -@import url('https://fonts.googleapis.com/css?family=Space+Mono'); +@import url('https://fonts.googleapis.com/css?family=Gaegu'); + +body { + font-family: 'Gaegu', monospace; + font-size: 1.25rem; + background-color: fff; + color:#212121; +} + +.container { + margin-top: 20px; + max-width: 80%; +} .list-group-item { position: relative; display: block; padding: 1.25rem 1.25rem; margin-bottom: -1px; - border: 1px dashed rgba(0, 0, 0, 0.342); + border-top: 1px dashed #323a45; } .list-group-item:last-of-type { width: 100%; - border-bottom-left-radius: .9rem; - border-bottom-right-radius: .9rem; + border-bottom-left-radius: 32px; + border-bottom-right-radius: 32px; } .list-group { margin-bottom: 0; - border-radius: 1.2rem; -} - -.list-group-item.disabled, .list-group-item:disabled { - color: #6c757d; - pointer-events: none; - background-color: #fff; + border-radius: 36px; } ul { - border: 5px solid darkmagenta; - border-radius: 0.5rem; + border: 2px solid #b9b9b9; } header{ + color: #345A5E; text-align: center; - background-color: rgb(156, 179, 53); - border-top-left-radius: .9rem; - border-top-right-radius: .9rem; + background-color: #fff; + border-top-left-radius: 33px; + border-top-right-radius: 33px; + margin-bottom: 10px; } -a { - text-decoration: none; - transition: color .4s; - color: rgb(179, 27, 128); -} +a, a:link, -a:visited { color: rgb(179, 27, 128); } -a:hover { +a:visited, +a:hover { + color: #360036; text-decoration: none; - color: rgb(144, 16, 123); } -a:active { - transition: color .3s; - color: rgb(224, 211, 23); } li > a { + line-height: 2.5; margin-left: 10px; -font-size: 1.5em; font-weight: 600; } -.container { - margin-top: 20px; -} - button.left { - border-top-left-radius: 0.40rem; - border-bottom-left-radius: 0.40rem; + background-color: #e7f4e4; + border-top-left-radius: 15px; + border-bottom-left-radius: 15px; } button.right { - border-top-right-radius: 0.40rem; - border-bottom-right-radius: 0.40rem; + background-color: #f9dede; + border-top-right-radius: 15px; + border-bottom-right-radius: 15px; +} + +button.full { + background-color: #d4f0f8; + width: 130px; + border-radius: 15px; } -.btn-primary > a { - color: #ffffff; +.completed { + margin-right: 10px; + font-weight: bold; + text-transform: uppercase; } .list-group-item { - background: #999; + background: #eef6f8; } .list-group-item:hover{ - background: #666; + background:#dbf2f8; } .list-form-item, .list-form-item:hover { - background:rgb(255, 255, 255); + background: #fff; } input, textarea { background-color: transparent; - border: none; -} - -.btn span.glyphicon { - opacity: 0; -} -.btn.active span.glyphicon { - opacity: 1; + border: 1px dotted #b9b9b9; } -.custom-control-label::before, -.custom-control-label::after { - top: .8rem; - width: 1.25rem; - height: 1.25rem; +button > input { + border: none; } -body { - font-family: 'Space Mono', monospace; - background-image: image-url('doodles.png'); +textarea { + display : block; + padding : 10px; + margin : 10px 0 0 -10px; + width : 80%; + height : 200px; + resize : none; + overflow: auto; } \ No newline at end of file diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index c6732e2c3..b82a42bf1 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -10,7 +10,7 @@ def new end def create - @task = Task.create task_params + @task = Task.create(task_params) redirect_to task_path(@task) end @@ -42,15 +42,15 @@ def complete @task = Task.find(params[:id]) if @task.completed_at.nil? @task.update_attribute(:completed_at, Time.now) - redirect_to root_path else - @task.update_attribute(:completed_at, nil) + @task.update_attribute(:completed_at, 'nil') + end + redirect_to root_path end -end private def task_params - params.require(:task).permit(:title, :completed_at, :description) + params.require(:task).permit(:title, :description) end end diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 10a4cba84..504a5dbf5 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -1,3 +1,4 @@ + class ApplicationRecord < ActiveRecord::Base self.abstract_class = true end diff --git a/app/models/concerns/datetime_validator.rb b/app/models/concerns/datetime_validator.rb deleted file mode 100644 index b62da2d68..000000000 --- a/app/models/concerns/datetime_validator.rb +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -class DatetimeValidator < ActiveModel::Validator - def validate(record) - Time.parse(record.due_date.to_s) - rescue ArgumentError - record.errors[:due_date] << "Invalid date format" - end -end diff --git a/app/models/task.rb b/app/models/task.rb index 3d69ed318..bf7ae95dd 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -4,4 +4,4 @@ class Task < ApplicationRecord def completed !completed_at.blank? end -end +end \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 12e4efb4d..ffdfb92dd 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,6 @@ - TaskList <%= csrf_meta_tags %> <%= csp_meta_tag %> @@ -9,7 +8,7 @@ <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> -
      +
      <%= yield %>
      diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index 4816ebfbd..0e706cab8 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -1,10 +1,13 @@ <%= form_for @task do |f| %> -
    • <%= f.label :title, "Title:" %> +
    • + <%= f.label :title, "Title:" %> <%= f.text_field :title %>
      • -
    • <%= f.label :description, "Description:" %> +
    • + <%= f.label :description, "Description:" %> <%= f.text_area :description %>
    • - +
      • + <% end %>
      \ No newline at end of file diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index c4e754068..f2a6d37d9 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,25 +1,25 @@
        -

        Tasktron 6000

        -

        <%= link_to "New Task", new_task_path %>

        +

        KATE'S TASK LIST

        +
        <% @tasks.each do |task| %> <% if task.completed %>
      • -

        <%= link_to task.title, task_path(task.id) %>

         + + <%= link_to task.title, task_path(task.id) %>
        -

        Completed <%= time_ago_in_words(task.completed_at)%> ago.

        - +
        Completed <%= time_ago_in_words(task.completed_at)%> ago.
        • <% else %>
      • + <%= link_to task.title, task_path(task.id) %>
        -
        • <% end %> <% end %> diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb index 7cbbb3df7..e2c9a0495 100644 --- a/app/views/tasks/new.html.erb +++ b/app/views/tasks/new.html.erb @@ -1,6 +1,6 @@
          -

          "New Task"

          +

          New Task

          <%= render partial: "form" %>
        \ No newline at end of file diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 20811fe9e..fad982d49 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,10 +1,11 @@

        <%= flash[:error] if flash[:error] %>

          -

          Task Page

          -

        • Title: <%= @task['title']%>

          -

          Description: <%= @task['description']%>

          -
        \ No newline at end of file diff --git a/db/migrate/20190410055358_create_tasks.rb b/db/migrate/20190410055358_create_tasks.rb deleted file mode 100644 index cfa89493c..000000000 --- a/db/migrate/20190410055358_create_tasks.rb +++ /dev/null @@ -1,12 +0,0 @@ -# frozen_string_literal: true - -class CreateTasks < ActiveRecord::Migration[5.2] - def change - create_table :tasks do |t| - t.string :title - t.text :description - t.boolean :completed - t.timestamps - end - end -end diff --git a/db/migrate/20190411172257_add_due_date_to_tasks.rb b/db/migrate/20190411172257_add_due_date_to_tasks.rb deleted file mode 100644 index 973cec285..000000000 --- a/db/migrate/20190411172257_add_due_date_to_tasks.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddDueDateToTasks < ActiveRecord::Migration[5.2] - def change - add_column :tasks, :due_date, :datetime - end -end diff --git a/db/migrate/20190417110347_change_column_null.rb b/db/migrate/20190417110347_change_column_null.rb new file mode 100644 index 000000000..0fd24a6ca --- /dev/null +++ b/db/migrate/20190417110347_change_column_null.rb @@ -0,0 +1,5 @@ +class ChangeColumnNull < ActiveRecord::Migration[5.2] + def change + change_column_null(:tasks, :completed_at, true) + end +end diff --git a/db/migrate/20190417112727_change_column.rb b/db/migrate/20190417112727_change_column.rb new file mode 100644 index 000000000..7cf0e07a8 --- /dev/null +++ b/db/migrate/20190417112727_change_column.rb @@ -0,0 +1,5 @@ +class ChangeColumn < ActiveRecord::Migration[5.2] + def change + change_column :tasks, :completed_at, :datetime, :null => true + end +end diff --git a/db/schema.rb b/db/schema.rb index 1aa11a8a3..8d6ae3707 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,5 +1,17 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_04_17_112727) do -ActiveRecord::Schema.define(version: 20_190_411_172_257) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" diff --git a/db/seeds.rb b/db/seeds.rb index 441b634b7..eaa59d1b3 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,18 +1,39 @@ # frozen_string_literal: true -def random_time - Time.at(rand * Time.now.to_i) -end +# def random_time +# Time.at(rand * Time.now.to_i) +# end -tasks = [ - { title: "Not a real task", description: "", completed_at: random_time }, - { title: "Pretty important task", description: "" }, - { title: "Pet Eugene. Feed Eugene. Give Eugene whatever he wants.", description: "" }, - { title: "Don't forget to", description: "", completed_at: random_time }, - { title: "Feed Igor", description: "", completed_at: random_time }, - { title: "Nap.", description: "" } -] +# tasks = [ +# { title: "Not a real task", description: "", completed_at: random_time }, +# { title: "Pretty important task", description: "" }, +# { title: "Pet Eugene. Feed Eugene. Give Eugene whatever he wants.", description: "" }, +# { title: "Don't forget to", description: "", completed_at: random_time }, +# { title: "Feed Igor", description: "", completed_at: random_time }, +# { title: "Nap.", description: "" } +# ] -tasks.each do |task| - Task.create task -end +# tasks.each do |task| +# Task.create task +# end + +# def random_time +# Time.at(rand * Time.now.to_i) +# end + +# tasks = [ +# { title: 'The First Task', description: '', completed_at: random_time }, +# { title: 'Go to Brunch', description: '' }, +# { title: 'Go to Lunch', description: '', completed_at: random_time }, +# { title: 'Go to Second Lunch', description: '' }, +# { title: 'Play Video Games', description: '', completed_at: random_time }, +# { title: "High Five Somebody You Don't Know", description: '', completed_at: random_time }, +# { title: 'Plant Flowers', description: '', completed_at: random_time }, +# { title: 'Call Mom', description: '' }, +# { title: 'She worries, you know.', description: '' }, +# { title: 'Nap.', description: '', completed_at: random_time } +# ] + +# tasks.each do |task| +# Task.create task +# end diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb index 5c8cf6fcb..2be8a3980 100644 --- a/test/controllers/tasks_controller_test.rb +++ b/test/controllers/tasks_controller_test.rb @@ -11,21 +11,21 @@ # must_respond_with :success # end -require "test_helper" +require 'test_helper' describe TasksController do let (:task) do - Task.create title: "sample task", description: "this is an example for a test", - completed_at: Time.now + 5.days + Task.create title: 'sample task', description: 'this is an example for a test', + completed_at: nil end # Tests for Wave 1 - describe "index" do - it "can get the index path" do + describe 'index' do + it 'can get the index path' do # Act get tasks_path # Assert must_respond_with :success end - it "can get the root path" do + it 'can get the root path' do # Act get root_path # Assert @@ -33,46 +33,45 @@ end end # Unskip these tests for Wave 2 - describe "show" do - it "can get a valid task" do + describe 'show' do + it 'can get a valid task' do # Act get task_path(task.id) # Assert must_respond_with :success end - it "will redirect for an invalid task" do + it 'will redirect for an invalid task' do # Act get task_path(-1) # Assert must_respond_with :redirect - expect(flash[:error]).must_equal "Could not find task with id: -1" + expect(flash[:error]).must_equal 'Could not find task with id: -1' end end - describe "new" do - it "can get the new task page" do + describe 'new' do + it 'can get the new task page' do # Act get new_task_path # Assert must_respond_with :success end end - describe "create" do - it "can create a new task" do + describe 'create' do + it 'can create a new task' do # Arrange task_hash = { task: { - name: "new task", - description: "new task description", + name: 'new task', + description: 'new task description', completed_at: nil } } # Act-Assert expect do post tasks_path, params: task_hash - end.must_change "Task.count", 1 + end.must_change 'Task.count', 1 new_task = Task.find_by(title: task_hash[:task][:title]) expect(new_task.description).must_equal task_hash[:task][:description] - expect(new_task.due_date.to_time.to_i).must_equal task_hash[:task][:due_date].to_i expect(new_task.completed).must_equal task_hash[:task][:completed] must_respond_with :redirect must_redirect_to task_path(new_task.id) @@ -80,45 +79,123 @@ end # Unskip and complete these tests for Wave 3 - describe "edit" do - it "can get the edit page for an existing task" do - skip + describe 'edit' do + it 'can get the edit page for an existing task' do # Your code here end - it "will respond with redirect when attempting to edit a nonexistant task" do - skip + it 'will respond with redirect when attempting to edit a nonexistant task' do # Your code here end end # Uncomment and complete these tests for Wave 3 - describe "update" do - # Note: If there was a way to fail to save the changes to a task, that would be a great thing to test. - it "can update an existing task" do - skip - # Your code here + describe 'update' do + it 'can update an existing task' do + # Arrange + test_id = Task.last.id + task_hash = { + task: { + name: 'updated task title', + description: 'updated description' + } + } + + expect do + patch task_path(test_id), params: task_hash + end.wont_change 'Task.count' + + updated_task = Task.find_by(name: task_hash[:task][:name]) + + expect(updated_task.description).must_equal task_hash[:task][:description] + + must_respond_with :redirect + must_redirect_to task_path(test_id) end - it "will redirect to the root page if given an invalid id" do + + it 'will redirect to the root page if given an invalid id' do skip - # Your code here + # Act + patch task_path(-1) + + # Assert + must_respond_with :redirect + expect(flash[:error]).must_equal 'Could not find task with id: -1' + + must_redirect_to root_path end end + # Complete these tests for Wave 4 - describe "destroy" do - # Your tests go here + describe 'destroy' do + it 'removes the test from the database' do + # Arrange + test_id = Task.last.id + + # Act + expect do + delete task_path(test_id) + end.must_change 'Task.count', -1 + + # Assert + expect(Task.find_by(id: test_id)).must_equal nil + + must_respond_with :redirect + must_redirect_to root_path + end + + it 'redirects to root if the task does not exist' do + # Arrange + test_id = -1 + + # Act + delete task_path(test_id) + + # Assert + must_respond_with :redirect + expect(flash[:error]).must_equal 'Could not find task with id: -1' + + must_redirect_to root_path + end end + # Complete for Wave 4 - describe "mark_complete" do - # Your tests go here - end -end + describe 'complete' do + it 'can mark an incomplete task complete without changing anything else' do + # Arrange + test_task = Task.last + test_task.update completed_at: nil + initial_attributes = test_task.attributes.clone + task_hash = { + task: { + completed_at: Time.now.to_date + } + } + + # Act-Assert + expect do + patch complete(test_task.id), params: task_hash + end.wont_change 'Task.count' -# it "renders 404 not found for an invalid task" do -# task_id = Task.last.id + 1 + test_task.reload -# get edit_task_path(task_id) + # Completion date should change, but nothing else should. + expect(test_task.name).must_equal initial_attributes['name'] + expect(test_task.description).must_equal initial_attributes['description'] + expect(test_task.completed_at).must_equal task_hash[:task][:completed_at] -# must_respond_with :not_found -# # end -# # end -# # end + must_respond_with :redirect + must_redirect_to root_path + end + + it 'will redirect to the root page if given an invalid id' do + # Act + patch task_path(-1) + + # Assert + must_respond_with :redirect + expect(flash[:error]).must_equal 'Could not find task with id: -1' + + must_redirect_to root_path + end + end +end diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml deleted file mode 100644 index dab0baf7c..000000000 --- a/test/fixtures/tasks.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - title: MyString - description: MyText - completed: MyString - -two: - title: MyString - description: MyText - completed: MyString diff --git a/test/test_helper.rb b/test/test_helper.rb index 10594a324..1d4cd5d14 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,8 +1,10 @@ +# frozen_string_literal: true + ENV["RAILS_ENV"] = "test" -require File.expand_path("../../config/environment", __FILE__) +require File.expand_path('../config/environment', __dir__) require "rails/test_help" require "minitest/rails" -require "minitest/reporters" # for Colorized output +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( @@ -11,7 +13,6 @@ Minitest.backtrace_filter ) - # To add Capybara feature tests add `gem "minitest-rails-capybara"` # to the test group in the Gemfile and uncomment the following: # require "minitest/rails/capybara" diff --git a/true b/true new file mode 100644 index 000000000..4d575af33 --- /dev/null +++ b/true @@ -0,0 +1,2 @@ + invoke active_record + identical db/migrate/20190417112727_change_column.rb From 312de69cdd894868d5773fe5fbe852a77ad0e79d Mon Sep 17 00:00:00 2001 From: Kate Sandler Date: Wed, 17 Apr 2019 06:23:26 -0700 Subject: [PATCH 12/13] Continued backwards time-travel. Working on local machine. --- app/views/tasks/show.html.erb | 1 - db/migrate/20190410055358_create_tasks.rb | 10 ++++++++++ db/schema.rb | 5 ++--- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20190410055358_create_tasks.rb diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index fad982d49..3d13963d9 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -4,7 +4,6 @@

        <%= @task['title']%>

      • Description: <%= @task['description']%>

        -
      • Created <%= time_ago_in_words(@task.created_at)%> ago.
      diff --git a/db/migrate/20190410055358_create_tasks.rb b/db/migrate/20190410055358_create_tasks.rb new file mode 100644 index 000000000..fa86c4611 --- /dev/null +++ b/db/migrate/20190410055358_create_tasks.rb @@ -0,0 +1,10 @@ +class CreateTasks < ActiveRecord::Migration[5.2] + def change + create_table :tasks do |t| + t.string :title + t.text :description + t.boolean :completed + t.datetime :completed_at + end + end +end \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index 8d6ae3707..551fe3ff5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -18,9 +18,8 @@ create_table "tasks", force: :cascade do |t| t.string "title" t.text "description" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.datetime "completed_at", null: false t.boolean "completed" + t.datetime "completed_at" end + end From 051e68467aabdd585d376a73912a3f54975d26ee Mon Sep 17 00:00:00 2001 From: Kate Sandler Date: Wed, 17 Apr 2019 18:30:22 -0700 Subject: [PATCH 13/13] TDD improvements for RESTful routes --- app/controllers/tasks_controller.rb | 23 ++++++-- test/controllers/tasks_controller_test.rb | 71 +++++++++++++++-------- 2 files changed, 63 insertions(+), 31 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index b82a42bf1..cd786a6cd 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -15,7 +15,11 @@ def create end def show - @task = Task.find(params[:id]) + @task = Task.find_by(id: params[:id]) + if !@task + redirect_to tasks_path, flash: + { error: "Could not find task with id: #{params[:id]}" } + end end def edit @@ -23,27 +27,34 @@ def edit end def update - @task = Task.find(params[:id]) - @task.update task_params + @task = Task.find_by(id: params[:id]) if !@task - redirect_to task_path(@task.id), flash: + redirect_to tasks_path, flash: { error: "Could not find task with id: #{params[:id]}" } else + @task.update task_params + redirect_to task_path(@task) end end def destroy - Task.find(params[:id]).destroy - redirect_to root_path + begin + Task.find(params[:id]).destroy + redirect_to root_path + rescue ActiveRecord::RecordNotFound + head :not_found + end end def complete @task = Task.find(params[:id]) if @task.completed_at.nil? @task.update_attribute(:completed_at, Time.now) + @task.update_attribute(:completed, true) else @task.update_attribute(:completed_at, 'nil') + @task.update_attribute(:completed, false) end redirect_to root_path end diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb index 2be8a3980..485449cb5 100644 --- a/test/controllers/tasks_controller_test.rb +++ b/test/controllers/tasks_controller_test.rb @@ -10,8 +10,10 @@ # get task_path(task.id) # must_respond_with :success # end +# require 'test_helper' + describe TasksController do let (:task) do Task.create title: 'sample task', description: 'this is an example for a test', @@ -25,6 +27,7 @@ # Assert must_respond_with :success end + it 'can get the root path' do # Act get root_path @@ -34,9 +37,12 @@ end # Unskip these tests for Wave 2 describe 'show' do + before do + Task.create title: "This is a test", description: "Only a test" + end it 'can get a valid task' do # Act - get task_path(task.id) + get task_path(Task.first.id) # Assert must_respond_with :success end @@ -56,6 +62,7 @@ must_respond_with :success end end + describe 'create' do it 'can create a new task' do # Arrange @@ -69,10 +76,15 @@ # Act-Assert expect do post tasks_path, params: task_hash + # Assert - Creates a task end.must_change 'Task.count', 1 + + # Assert - the new task has the right data new_task = Task.find_by(title: task_hash[:task][:title]) expect(new_task.description).must_equal task_hash[:task][:description] - expect(new_task.completed).must_equal task_hash[:task][:completed] + expect(new_task.completed).must_equal false + + # Assert - It should redirect you someplace must_respond_with :redirect must_redirect_to task_path(new_task.id) end @@ -81,21 +93,26 @@ # Unskip and complete these tests for Wave 3 describe 'edit' do it 'can get the edit page for an existing task' do + skip # Your code here end it 'will respond with redirect when attempting to edit a nonexistant task' do + skip # Your code here end end # Uncomment and complete these tests for Wave 3 describe 'update' do + before do + Task.create title: "This is a test", description: "Only a test" + end it 'can update an existing task' do # Arrange test_id = Task.last.id task_hash = { task: { - name: 'updated task title', + title: 'updated task title', description: 'updated description' } } @@ -104,7 +121,7 @@ patch task_path(test_id), params: task_hash end.wont_change 'Task.count' - updated_task = Task.find_by(name: task_hash[:task][:name]) + updated_task = Task.find_by(title: task_hash[:task][:title]) expect(updated_task.description).must_equal task_hash[:task][:description] @@ -113,20 +130,29 @@ end it 'will redirect to the root page if given an invalid id' do - skip - # Act - patch task_path(-1) + # Act test_id = Task.last.id + task_hash = { + task: { + title: 'updated task title', + description: 'updated description' + } + } + patch task_path(-1), params: task_hash # Assert must_respond_with :redirect expect(flash[:error]).must_equal 'Could not find task with id: -1' - must_redirect_to root_path + must_redirect_to tasks_path end end # Complete these tests for Wave 4 describe 'destroy' do + before do + Task.create title: "This is a test", description: "Only a test" + end + it 'removes the test from the database' do # Arrange test_id = Task.last.id @@ -148,41 +174,36 @@ test_id = -1 # Act + delete task_path(test_id) # Assert - must_respond_with :redirect - expect(flash[:error]).must_equal 'Could not find task with id: -1' - - must_redirect_to root_path + must_respond_with :not_found end end # Complete for Wave 4 describe 'complete' do + before do + Task.create title: "This is a test", description: "Only a test" + end + it 'can mark an incomplete task complete without changing anything else' do # Arrange test_task = Task.last - test_task.update completed_at: nil initial_attributes = test_task.attributes.clone - task_hash = { - task: { - completed_at: Time.now.to_date - } - } # Act-Assert expect do - patch complete(test_task.id), params: task_hash + patch complete_task_path(test_task.id) end.wont_change 'Task.count' test_task.reload - - # Completion date should change, but nothing else should. - expect(test_task.name).must_equal initial_attributes['name'] + # Completion date should change, but nothing else should. + expect(test_task.title).must_equal initial_attributes['title'] expect(test_task.description).must_equal initial_attributes['description'] - expect(test_task.completed_at).must_equal task_hash[:task][:completed_at] - + expect(test_task.completed?).must_equal true; + # expect(test_task.completed_at).must_equal task_hash[:task][:completed_at] must_respond_with :redirect must_redirect_to root_path end @@ -195,7 +216,7 @@ must_respond_with :redirect expect(flash[:error]).must_equal 'Could not find task with id: -1' - must_redirect_to root_path + must_redirect_to tasks_path end end end