From 637b4666ff3f68f3e29ee8ecb302f119dee024cd Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sat, 2 May 2015 11:34:11 +0200 Subject: [PATCH 01/15] Fixing shadows. SVG dummy images now get proper shadows. Formerly shadows were shown around the square box of the dummy images. But as we use images with rounded corners shadows look terrible around the boxes. Now they render properly. --- app/assets/stylesheets/my.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/my.scss b/app/assets/stylesheets/my.scss index 48a41bb..b6d0658 100644 --- a/app/assets/stylesheets/my.scss +++ b/app/assets/stylesheets/my.scss @@ -151,7 +151,7 @@ html, body { img { - box-shadow: 0 0 10px 0px #888888; + filter: drop-shadow( 0px 0px 5px #888888 ); } } From 979deabb2924e8823b085d376edad8492419740d Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sat, 2 May 2015 11:34:56 +0200 Subject: [PATCH 02/15] Reference to deprecated upload path removed. --- app/views/welcome/about.slim | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/welcome/about.slim b/app/views/welcome/about.slim index db7df42..cd8f8b4 100644 --- a/app/views/welcome/about.slim +++ b/app/views/welcome/about.slim @@ -101,8 +101,7 @@ p ' Whether you are a developer or not - we appreciate if you upload screenshots. ' See if your favorite package does not yet have a screenshot and - a href=upload_package_path upload one - ' . + ' upload one. h2 Statistics From 8bf4190b0fef290be881cce59ae7ffedc0b5fc49 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sat, 2 May 2015 11:36:28 +0200 Subject: [PATCH 03/15] Using localhost Postgres instance. Populating test and dev, too. --- bin/get-data-from-old-live-server.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/bin/get-data-from-old-live-server.sh b/bin/get-data-from-old-live-server.sh index cd48b3a..530fc5f 100755 --- a/bin/get-data-from-old-live-server.sh +++ b/bin/get-data-from-old-live-server.sh @@ -1,9 +1,9 @@ #!/bin/sh -ex -#IMAGE_DEST=../public -IMAGE_DEST=/local/screenshots -#DB_HOST=localhost -DB_HOST=torf +IMAGE_DEST=public/screenshots +#IMAGE_DEST=/local/screenshots +DB_HOST=localhost +#DB_HOST=torf echo Getting screenshot files rsync -v root@screenshots.debian.net:/home/debshots/debshots-screenshots.tar /tmp @@ -14,13 +14,19 @@ rsync -v root@screenshots.debian.net:/home/debshots/debshots.sql /tmp echo Dropping existing database set +e psql -h $DB_HOST postgres debshots -c 'drop database debshots' +psql -h $DB_HOST postgres debshots -c 'drop database debshots_dev' +psql -h $DB_HOST postgres debshots -c 'drop database debshots_test' set -e echo Creating new database psql -h $DB_HOST postgres debshots -c 'create database debshots owner debshots' +psql -h $DB_HOST postgres debshots -c 'create database debshots_dev owner debshots' +psql -h $DB_HOST postgres debshots -c 'create database debshots_test owner debshots' echo Restoring PostgreSQL dump psql -h $DB_HOST debshots debshots < /tmp/debshots.sql +psql -h $DB_HOST debshots_dev debshots < /tmp/debshots.sql +psql -h $DB_HOST debshots_test debshots < /tmp/debshots.sql echo Unpacking screenshots tarball #cd ../public From 6cd34f49a4d48eb35818b0543e3ebc433c190dd6 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sat, 2 May 2015 11:36:53 +0200 Subject: [PATCH 04/15] Rubyracer Javascript interpreter added --- Gemfile | 2 +- Gemfile.lock | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 0c3a223..be58c93 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem 'uglifier', '>= 1.3.0' gem 'coffee-rails', '~> 4.1.0' # See https://github.com/sstephenson/execjs#readme for more supported runtimes -# gem 'therubyracer', platforms: :ruby +gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 285b496..cb09d29 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -111,6 +111,7 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.2) + libv8 (3.16.14.7) listen (2.10.0) celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) @@ -186,6 +187,7 @@ GEM ffi (>= 0.5.0) rdoc (4.2.0) json (~> 1.4) + ref (1.0.5) ruby-graphviz (1.0.9) sass (3.4.13) sass-rails (5.0.3) @@ -216,6 +218,9 @@ GEM activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) temple (0.7.5) + therubyracer (0.12.2) + libv8 (~> 3.16.14.0) + ref thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) @@ -261,6 +266,7 @@ DEPENDENCIES sdoc (~> 0.4.0) slim-rails spring + therubyracer uglifier (>= 1.3.0) web-console (~> 2.0) will_paginate From bd03b7627347cf963522df05954bf394837a07e7 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sat, 2 May 2015 11:37:14 +0200 Subject: [PATCH 05/15] Deployment notes added. --- README.Developer | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/README.Developer b/README.Developer index f5cb03b..2646416 100644 --- a/README.Developer +++ b/README.Developer @@ -77,3 +77,28 @@ end A separate validation in the Screenshots model has been implemented already. This unique constraint would raise an error and not trigger a validation error properly unless the separate model validation is in place. + +-- + +Deployment +---------- + +- unpack the project +- install Ruby 2.0.0 via rvm (see rvm.io) +- sudo apt-get install libbz2-dev libpq-dev +- sudo apt-get install postgresql +- set /etc/postgres/.../pg_hba.conf: + local all all md5 +- sudo su - postgres + - createuser -s -P debshots + - createdb debshots + - createdb debshots_dev + - createdb debshots_test +- bin/get-data-from-old-live-server.sh +- gem install bundle +- bundler +- RAILS_ENV=development rake db:migrate +- RAILS_ENV=test rake db:migrate +- RAILS_ENV=production rake db:migrate +- RAILS_ENV=production rake assets:precompile +- RAILS_ENV=production rails s From 84b2af5f600aeb8f120577526acf8d342354fcec Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sat, 2 May 2015 11:56:27 +0200 Subject: [PATCH 06/15] image_url() fixed. Wrong quotes. Interpolates path correctly now. --- app/models/screenshot.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/screenshot.rb b/app/models/screenshot.rb index a9b4c2c..5524ab0 100644 --- a/app/models/screenshot.rb +++ b/app/models/screenshot.rb @@ -42,7 +42,7 @@ class Screenshot < ActiveRecord::Base # Return Debshots 1.x path to allow migration of images into Paperclip filesystem schema def image_url(size) - '#{Rails.configuration.images_path_prefix}/#{self.package.name[0]}/#{self.package.name}/#{self.id}_#{size}.png' + "#{Rails.configuration.images_path_prefix}/#{self.package.name[0]}/#{self.package.name}/#{self.id}_#{size}.png" end From 10ad679b4d55cc6f6f2574a693a8438200dc23bf Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sat, 2 May 2015 12:23:23 +0200 Subject: [PATCH 07/15] Apply shadow effect even to dummy image --- app/views/packages/details.slim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index c773bbc..973bfb2 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -10,14 +10,14 @@ .small-12.columns a.black.fancybox href=screenshot.image.url(:large, timestamp: false) rel='fancybox-thumb' title=screenshot.caption = image_tag(screenshot.image.url(:large, timestamp: false), alt: screenshot.caption) - .imgcaption =screenshot.caption // TODO: Enable button only if admin or uploader a.button.tiny.alert[ href=delete_screenshot_path(@package.name, screenshot.id) onclick="return confirm('Really delete the screenshot?');" ] Delete screenshot - else - img src='/images/dummy/no-screenshots-available.svg' width='100%' + .row.listview + img src='/images/dummy/no-screenshots-available.svg' width='100%' // TODO: Enable comments in a later version // = partial '/package/comments' From 9f0a81152f3e405220d5580c8af953f968b17f9e Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sat, 2 May 2015 12:37:00 +0200 Subject: [PATCH 08/15] Complete deployment information --- README.Developer | 53 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/README.Developer b/README.Developer index 2646416..dc6a10a 100644 --- a/README.Developer +++ b/README.Developer @@ -83,22 +83,41 @@ properly unless the separate model validation is in place. Deployment ---------- -- unpack the project -- install Ruby 2.0.0 via rvm (see rvm.io) -- sudo apt-get install libbz2-dev libpq-dev -- sudo apt-get install postgresql -- set /etc/postgres/.../pg_hba.conf: - local all all md5 -- sudo su - postgres +To prepare your computer to run Debshots 2.x either for development +or production you need to… + +- unpack the project onto your disk somewhere +- install Ruby 2.0.0 via rvm (see http://rvm.io/) +- install the library header packages so that the required Ruby gems + can be compiled: + sudo apt-get install libbz2-dev libpq-dev +- install a PostgreSQL database: + sudo apt-get install postgresql +- edit the PostgreSQL authentication configuration at + /etc/postgres/.../pg_hba.conf to allow password-based logins + from localhost. Change the line starting with *local* to read: + local all all md5 +- create a user and databases + - sudo su - postgres - createuser -s -P debshots - - createdb debshots + - createdb debshots +- for development only: + - sudo su - postgres - createdb debshots_dev - - createdb debshots_test -- bin/get-data-from-old-live-server.sh -- gem install bundle -- bundler -- RAILS_ENV=development rake db:migrate -- RAILS_ENV=test rake db:migrate -- RAILS_ENV=production rake db:migrate -- RAILS_ENV=production rake assets:precompile -- RAILS_ENV=production rails s +- migrate the data from the Debshots 1.x based production server: + - bin/get-data-from-old-live-server.sh +- install all Ruby gems required to run the application: + - gem install bundle + - bundler +- run database migrations for development + - RAILS_ENV=development rake db:migrate +- import long description information for the packages into development database + - RAILS_ENV=development rake debshots:update_longdescription_from_deb_repos +- run database migrations for production + - RAILS_ENV=production rake db:migrate +- RAILS_ENV=production rake debshots:update_longdescription_from_deb_repos + - import long description information for the packages into production database +- prepare the static assets (CSS, JS) for production + - RAILS_ENV=production rake assets:precompile +- run the production web server + - RAILS_ENV=production rails s From 3988c7ddf37861e87719a0b6714c4944c236703a Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sat, 2 May 2015 16:16:29 +0200 Subject: [PATCH 09/15] Devise authentication added - no registration though --- Gemfile | 3 + Gemfile.lock | 14 + app/models/user.rb | 6 + config/initializers/devise.rb | 259 ++++++++++++++++++ config/locales/devise.en.yml | 60 ++++ config/routes.rb | 1 + .../20150502140613_devise_create_users.rb | 42 +++ db/schema.rb | 20 +- test/fixtures/users.yml | 12 + test/models/user_test.rb | 13 + 10 files changed, 429 insertions(+), 1 deletion(-) create mode 100644 app/models/user.rb create mode 100644 config/initializers/devise.rb create mode 100644 config/locales/devise.en.yml create mode 100644 db/migrate/20150502140613_devise_create_users.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/models/user_test.rb diff --git a/Gemfile b/Gemfile index be58c93..232c30a 100644 --- a/Gemfile +++ b/Gemfile @@ -102,3 +102,6 @@ gem 'cookies_eu' # Requires: apt-get install libbz2-dev gem 'bzip2-ruby', :git => 'https://github.com/chewi/bzip2-ruby.git' + +# Authentication +gem 'devise' diff --git a/Gemfile.lock b/Gemfile.lock index cb09d29..74cabaf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,6 +43,7 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) arel (6.0.0) + bcrypt (3.1.10) better_errors (2.1.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -72,6 +73,13 @@ GEM jquery-cookie-rails jquery-rails debug_inspector (0.0.2) + devise (3.4.1) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 3.2.6, < 5) + responders + thread_safe (~> 0.1) + warden (~> 1.2.3) erubis (2.7.0) execjs (2.5.2) fancybox2-rails (0.2.8) @@ -135,6 +143,7 @@ GEM notiffany (0.0.6) nenv (~> 0.1) shellany (~> 0.0) + orm_adapter (0.5.0) paperclip (4.2.1) activemodel (>= 3.0.0) activesupport (>= 3.0.0) @@ -188,6 +197,8 @@ GEM rdoc (4.2.0) json (~> 1.4) ref (1.0.5) + responders (2.1.0) + railties (>= 4.2.0, < 5) ruby-graphviz (1.0.9) sass (3.4.13) sass-rails (5.0.3) @@ -231,6 +242,8 @@ GEM uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) + warden (1.2.3) + rack (>= 1.0) web-console (2.1.2) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) @@ -250,6 +263,7 @@ DEPENDENCIES bzip2-ruby! coffee-rails (~> 4.1.0) cookies_eu + devise fancybox2-rails (~> 0.2.8) foundation-rails guard-minitest diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000..8017568 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,6 @@ +class User < ActiveRecord::Base + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, # :registerable, + :recoverable, :rememberable, :trackable, :validatable +end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 0000000..1b124d9 --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,259 @@ +# Use this hook to configure devise mailer, warden hooks and so forth. +# Many of these configuration options can be set straight in your model. +Devise.setup do |config| + # The secret key used by Devise. Devise uses this key to generate + # random tokens. Changing this key will render invalid all existing + # confirmation, reset password and unlock tokens in the database. + # config.secret_key = '0ffca1a34e24005081c746c492915c1e2f5d904495c00eb64cb5e0a599da99c5cb5e787751ffc91e88d4aaaeb042556aac4347d3f9f88f0a14e9d14c1011d040' + + # ==> Mailer Configuration + # Configure the e-mail address which will be shown in Devise::Mailer, + # note that it will be overwritten if you use your own mailer class + # with default "from" parameter. + config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' + + # Configure the class responsible to send e-mails. + # config.mailer = 'Devise::Mailer' + + # ==> ORM configuration + # Load and configure the ORM. Supports :active_record (default) and + # :mongoid (bson_ext recommended) by default. Other ORMs may be + # available as additional gems. + require 'devise/orm/active_record' + + # ==> Configuration for any authentication mechanism + # Configure which keys are used when authenticating a user. The default is + # just :email. You can configure it to use [:username, :subdomain], so for + # authenticating a user, both parameters are required. Remember that those + # parameters are used only when authenticating and not when retrieving from + # session. If you need permissions, you should implement that in a before filter. + # You can also supply a hash where the value is a boolean determining whether + # or not authentication should be aborted when the value is not present. + # config.authentication_keys = [ :email ] + + # Configure parameters from the request object used for authentication. Each entry + # given should be a request method and it will automatically be passed to the + # find_for_authentication method and considered in your model lookup. For instance, + # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. + # The same considerations mentioned for authentication_keys also apply to request_keys. + # config.request_keys = [] + + # Configure which authentication keys should be case-insensitive. + # These keys will be downcased upon creating or modifying a user and when used + # to authenticate or find a user. Default is :email. + config.case_insensitive_keys = [ :email ] + + # Configure which authentication keys should have whitespace stripped. + # These keys will have whitespace before and after removed upon creating or + # modifying a user and when used to authenticate or find a user. Default is :email. + config.strip_whitespace_keys = [ :email ] + + # Tell if authentication through request.params is enabled. True by default. + # It can be set to an array that will enable params authentication only for the + # given strategies, for example, `config.params_authenticatable = [:database]` will + # enable it only for database (email + password) authentication. + # config.params_authenticatable = true + + # Tell if authentication through HTTP Auth is enabled. False by default. + # It can be set to an array that will enable http authentication only for the + # given strategies, for example, `config.http_authenticatable = [:database]` will + # enable it only for database authentication. The supported strategies are: + # :database = Support basic authentication with authentication key + password + # config.http_authenticatable = false + + # If 401 status code should be returned for AJAX requests. True by default. + # config.http_authenticatable_on_xhr = true + + # The realm used in Http Basic Authentication. 'Application' by default. + # config.http_authentication_realm = 'Application' + + # It will change confirmation, password recovery and other workflows + # to behave the same regardless if the e-mail provided was right or wrong. + # Does not affect registerable. + # config.paranoid = true + + # By default Devise will store the user in session. You can skip storage for + # particular strategies by setting this option. + # Notice that if you are skipping storage for all authentication paths, you + # may want to disable generating routes to Devise's sessions controller by + # passing skip: :sessions to `devise_for` in your config/routes.rb + config.skip_session_storage = [:http_auth] + + # By default, Devise cleans up the CSRF token on authentication to + # avoid CSRF token fixation attacks. This means that, when using AJAX + # requests for sign in and sign up, you need to get a new CSRF token + # from the server. You can disable this option at your own risk. + # config.clean_up_csrf_token_on_authentication = true + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 10. If + # using other encryptors, it sets how many times you want the password re-encrypted. + # + # Limiting the stretches to just one in testing will increase the performance of + # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use + # a value less than 10 in other environments. Note that, for bcrypt (the default + # encryptor), the cost increases exponentially with the number of stretches (e.g. + # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation). + config.stretches = Rails.env.test? ? 1 : 10 + + # Setup a pepper to generate the encrypted password. + # config.pepper = '4e67fe88a63233857f81364360fc52630c1c8d0e92e459edb2c445afb1b5ae5863d38c77a572facbfe4a9e3c551a77eb5c46d0467c0000ed1da93c0fa90d96c6' + + # ==> Configuration for :confirmable + # A period that the user is allowed to access the website even without + # confirming their account. For instance, if set to 2.days, the user will be + # able to access the website for two days without confirming their account, + # access will be blocked just in the third day. Default is 0.days, meaning + # the user cannot access the website without confirming their account. + # config.allow_unconfirmed_access_for = 2.days + + # A period that the user is allowed to confirm their account before their + # token becomes invalid. For example, if set to 3.days, the user can confirm + # their account within 3 days after the mail was sent, but on the fourth day + # their account can't be confirmed with the token any more. + # Default is nil, meaning there is no restriction on how long a user can take + # before confirming their account. + # config.confirm_within = 3.days + + # If true, requires any email changes to be confirmed (exactly the same way as + # initial account confirmation) to be applied. Requires additional unconfirmed_email + # db field (see migrations). Until confirmed, new email is stored in + # unconfirmed_email column, and copied to email column on successful confirmation. + config.reconfirmable = true + + # Defines which key will be used when confirming an account + # config.confirmation_keys = [ :email ] + + # ==> Configuration for :rememberable + # The time the user will be remembered without asking for credentials again. + # config.remember_for = 2.weeks + + # Invalidates all the remember me tokens when the user signs out. + config.expire_all_remember_me_on_sign_out = true + + # If true, extends the user's remember period when remembered via cookie. + # config.extend_remember_period = false + + # Options to be passed to the created cookie. For instance, you can set + # secure: true in order to force SSL only cookies. + # config.rememberable_options = {} + + # ==> Configuration for :validatable + # Range for password length. + config.password_length = 8..128 + + # Email regex used to validate email formats. It simply asserts that + # one (and only one) @ exists in the given string. This is mainly + # to give user feedback and not to assert the e-mail validity. + # config.email_regexp = /\A[^@]+@[^@]+\z/ + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # If true, expires auth token on session timeout. + # config.expire_auth_token_on_timeout = false + + # ==> Configuration for :lockable + # Defines which strategy will be used to lock an account. + # :failed_attempts = Locks an account after a number of failed attempts to sign in. + # :none = No lock strategy. You should handle locking by yourself. + # config.lock_strategy = :failed_attempts + + # Defines which key will be used when locking and unlocking an account + # config.unlock_keys = [ :email ] + + # Defines which strategy will be used to unlock an account. + # :email = Sends an unlock link to the user email + # :time = Re-enables login after a certain amount of time (see :unlock_in below) + # :both = Enables both strategies + # :none = No unlock strategy. You should handle unlocking by yourself. + # config.unlock_strategy = :both + + # Number of authentication tries before locking an account if lock_strategy + # is failed attempts. + # config.maximum_attempts = 20 + + # Time interval to unlock the account if :time is enabled as unlock_strategy. + # config.unlock_in = 1.hour + + # Warn on the last attempt before the account is locked. + # config.last_attempt_warning = true + + # ==> Configuration for :recoverable + # + # Defines which key will be used when recovering the password for an account + # config.reset_password_keys = [ :email ] + + # Time interval you can reset your password with a reset password key. + # Don't put a too small interval or your users won't have the time to + # change their passwords. + config.reset_password_within = 6.hours + + # ==> Configuration for :encryptable + # Allow you to use another encryption algorithm besides bcrypt (default). You can use + # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1, + # :authlogic_sha512 (then you should set stretches above to 20 for default behavior) + # and :restful_authentication_sha1 (then you should set stretches to 10, and copy + # REST_AUTH_SITE_KEY to pepper). + # + # Require the `devise-encryptable` gem when using anything other than bcrypt + # config.encryptor = :sha512 + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Set this configuration to false if you want /users/sign_out to sign out + # only the current scope. By default, Devise signs out all scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The "*/*" below is required to match Internet Explorer requests. + # config.navigational_formats = ['*/*', :html] + + # The default HTTP method used to sign out a resource. Default is :delete. + config.sign_out_via = :delete + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.intercept_401 = false + # manager.default_strategies(scope: :user).unshift :some_external_strategy + # end + + # ==> Mountable engine configurations + # When using Devise inside an engine, let's call it `MyEngine`, and this engine + # is mountable, there are some extra configurations to be taken into account. + # The following options are available, assuming the engine is mounted as: + # + # mount MyEngine, at: '/my_engine' + # + # The router that invoked `devise_for`, in the example above, would be: + # config.router_name = :my_engine + # + # When using omniauth, Devise cannot automatically set Omniauth path, + # so you need to do it manually. For the users scope, it would be: + # config.omniauth_path_prefix = '/my_engine/users/auth' +end diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml new file mode 100644 index 0000000..26a10f2 --- /dev/null +++ b/config/locales/devise.en.yml @@ -0,0 +1,60 @@ +# Additional translations at https://github.com/plataformatec/devise/wiki/I18n + +en: + devise: + confirmations: + confirmed: "Your email address has been successfully confirmed." + send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes." + failure: + already_authenticated: "You are already signed in." + inactive: "Your account is not activated yet." + invalid: "Invalid %{authentication_keys} or password." + locked: "Your account is locked." + last_attempt: "You have one more attempt before your account is locked." + not_found_in_database: "Invalid %{authentication_keys} or password." + timeout: "Your session expired. Please sign in again to continue." + unauthenticated: "You need to sign in or sign up before continuing." + unconfirmed: "You have to confirm your email address before continuing." + mailer: + confirmation_instructions: + subject: "Confirmation instructions" + reset_password_instructions: + subject: "Reset password instructions" + unlock_instructions: + subject: "Unlock instructions" + omniauth_callbacks: + failure: "Could not authenticate you from %{kind} because \"%{reason}\"." + success: "Successfully authenticated from %{kind} account." + passwords: + no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." + send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." + updated: "Your password has been changed successfully. You are now signed in." + updated_not_active: "Your password has been changed successfully." + registrations: + destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon." + signed_up: "Welcome! You have signed up successfully." + signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." + signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." + signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account." + update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address." + updated: "Your account has been updated successfully." + sessions: + signed_in: "Signed in successfully." + signed_out: "Signed out successfully." + already_signed_out: "Signed out successfully." + unlocks: + send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes." + send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes." + unlocked: "Your account has been unlocked successfully. Please sign in to continue." + errors: + messages: + already_confirmed: "was already confirmed, please try signing in" + confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" + expired: "has expired, please request a new one" + not_found: "not found" + not_locked: "was not locked" + not_saved: + one: "1 error prohibited this %{resource} from being saved:" + other: "%{count} errors prohibited this %{resource} from being saved:" diff --git a/config/routes.rb b/config/routes.rb index f9c2c2d..637aa4f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Debshots::Application.routes.draw do + devise_for :users ##get "packages/index" ##get "packages" => "packages#index" ##get "packages/:page/:display" => "packages#index" diff --git a/db/migrate/20150502140613_devise_create_users.rb b/db/migrate/20150502140613_devise_create_users.rb new file mode 100644 index 0000000..1b9d546 --- /dev/null +++ b/db/migrate/20150502140613_devise_create_users.rb @@ -0,0 +1,42 @@ +class DeviseCreateUsers < ActiveRecord::Migration + def change + create_table(:users) do |t| + ## Database authenticatable + t.string :email, null: false, default: "" + t.string :encrypted_password, null: false, default: "" + + ## Recoverable + t.string :reset_password_token + t.datetime :reset_password_sent_at + + ## Rememberable + t.datetime :remember_created_at + + ## Trackable + t.integer :sign_in_count, default: 0, null: false + t.datetime :current_sign_in_at + t.datetime :last_sign_in_at + t.inet :current_sign_in_ip + t.inet :last_sign_in_ip + + ## Confirmable + # t.string :confirmation_token + # t.datetime :confirmed_at + # t.datetime :confirmation_sent_at + # t.string :unconfirmed_email # Only if using reconfirmable + + ## Lockable + # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts + # t.string :unlock_token # Only if unlock strategy is :email or :both + # t.datetime :locked_at + + + t.timestamps + end + + add_index :users, :email, unique: true + add_index :users, :reset_password_token, unique: true + # add_index :users, :confirmation_token, unique: true + # add_index :users, :unlock_token, unique: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 38a5710..9790684 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150426141106) do +ActiveRecord::Schema.define(version: 20150502140613) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -71,5 +71,23 @@ ActiveRecord::Schema.define(version: 20150426141106) do add_index "screenshots", ["id", "approved"], name: "id_approved", using: :btree add_index "screenshots", ["id", "uploaderhash"], name: "id_uploaderhash", using: :btree + create_table "users", force: :cascade do |t| + t.string "email", default: "", null: false + t.string "encrypted_password", default: "", null: false + t.string "reset_password_token" + t.datetime "reset_password_sent_at" + t.datetime "remember_created_at" + t.integer "sign_in_count", default: 0, null: false + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.inet "current_sign_in_ip" + t.inet "last_sign_in_ip" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree + add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree + add_foreign_key "screenshots", "packages", name: "screenshots_package_id_fkey" end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000..8787f86 --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,12 @@ +# Read about fixtures at +# http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000..32b0a18 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,13 @@ +require "test_helper" + +class UserTest < ActiveSupport::TestCase + + def user + @user ||= User.new + end + + def test_valid + assert user.valid? + end + +end From cd6fb9ca23efb12ce4bd26de11292aa7d338fa4c Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sat, 2 May 2015 16:16:40 +0200 Subject: [PATCH 10/15] Moved flash messages to general layout --- app/views/layouts/application.html.slim | 2 ++ app/views/packages/details.slim | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index 92a803f..91a2a73 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -15,6 +15,8 @@ html body // TODO: move topbar somewhere else than packages = render 'layouts/topbar' + #messages + = render 'layouts/messages' #content = yield = render 'layouts/footer' diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index 973bfb2..2909ae2 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -23,7 +23,6 @@ // = partial '/package/comments' .small-5.medium-5.columns - = render 'layouts/messages' .bigpanel p.subtitle Details // TODO: split long_description by

tags From a2acb87cfc57d9e8ffc69eee6bfd7658cdcd0ace Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sun, 3 May 2015 13:30:07 +0200 Subject: [PATCH 11/15] Devise schema removed --- db/schema.rb | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 9790684..38a5710 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150502140613) do +ActiveRecord::Schema.define(version: 20150426141106) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -71,23 +71,5 @@ ActiveRecord::Schema.define(version: 20150502140613) do add_index "screenshots", ["id", "approved"], name: "id_approved", using: :btree add_index "screenshots", ["id", "uploaderhash"], name: "id_uploaderhash", using: :btree - create_table "users", force: :cascade do |t| - t.string "email", default: "", null: false - t.string "encrypted_password", default: "", null: false - t.string "reset_password_token" - t.datetime "reset_password_sent_at" - t.datetime "remember_created_at" - t.integer "sign_in_count", default: 0, null: false - t.datetime "current_sign_in_at" - t.datetime "last_sign_in_at" - t.inet "current_sign_in_ip" - t.inet "last_sign_in_ip" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree - add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree - add_foreign_key "screenshots", "packages", name: "screenshots_package_id_fkey" end From 567d61ce1ec690f58729d475393f8cb2a6081135 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sun, 3 May 2015 13:30:16 +0200 Subject: [PATCH 12/15] Broken fixtures commented out --- test/fixtures/users.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 8787f86..ea31e45 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -5,8 +5,8 @@ # model remove the '{}' from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} +#one: {} # column: value # -two: {} +#two: {} # column: value From 5c31a94aef55227da07205fbc0c9ba9ac0c48ff6 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sun, 3 May 2015 13:31:13 +0200 Subject: [PATCH 13/15] Devise removed. Broke tests. Trying another auth gem. --- Gemfile | 3 - Gemfile.lock | 14 - app/models/user.rb | 6 - config/initializers/devise.rb | 259 ------------------ config/locales/devise.en.yml | 60 ---- config/routes.rb | 1 - .../20150502140613_devise_create_users.rb | 42 --- test/models/user_test.rb | 13 - 8 files changed, 398 deletions(-) delete mode 100644 app/models/user.rb delete mode 100644 config/initializers/devise.rb delete mode 100644 config/locales/devise.en.yml delete mode 100644 db/migrate/20150502140613_devise_create_users.rb delete mode 100644 test/models/user_test.rb diff --git a/Gemfile b/Gemfile index 232c30a..be58c93 100644 --- a/Gemfile +++ b/Gemfile @@ -102,6 +102,3 @@ gem 'cookies_eu' # Requires: apt-get install libbz2-dev gem 'bzip2-ruby', :git => 'https://github.com/chewi/bzip2-ruby.git' - -# Authentication -gem 'devise' diff --git a/Gemfile.lock b/Gemfile.lock index 74cabaf..cb09d29 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,7 +43,6 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) arel (6.0.0) - bcrypt (3.1.10) better_errors (2.1.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -73,13 +72,6 @@ GEM jquery-cookie-rails jquery-rails debug_inspector (0.0.2) - devise (3.4.1) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) - responders - thread_safe (~> 0.1) - warden (~> 1.2.3) erubis (2.7.0) execjs (2.5.2) fancybox2-rails (0.2.8) @@ -143,7 +135,6 @@ GEM notiffany (0.0.6) nenv (~> 0.1) shellany (~> 0.0) - orm_adapter (0.5.0) paperclip (4.2.1) activemodel (>= 3.0.0) activesupport (>= 3.0.0) @@ -197,8 +188,6 @@ GEM rdoc (4.2.0) json (~> 1.4) ref (1.0.5) - responders (2.1.0) - railties (>= 4.2.0, < 5) ruby-graphviz (1.0.9) sass (3.4.13) sass-rails (5.0.3) @@ -242,8 +231,6 @@ GEM uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) - warden (1.2.3) - rack (>= 1.0) web-console (2.1.2) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) @@ -263,7 +250,6 @@ DEPENDENCIES bzip2-ruby! coffee-rails (~> 4.1.0) cookies_eu - devise fancybox2-rails (~> 0.2.8) foundation-rails guard-minitest diff --git a/app/models/user.rb b/app/models/user.rb deleted file mode 100644 index 8017568..0000000 --- a/app/models/user.rb +++ /dev/null @@ -1,6 +0,0 @@ -class User < ActiveRecord::Base - # Include default devise modules. Others available are: - # :confirmable, :lockable, :timeoutable and :omniauthable - devise :database_authenticatable, # :registerable, - :recoverable, :rememberable, :trackable, :validatable -end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb deleted file mode 100644 index 1b124d9..0000000 --- a/config/initializers/devise.rb +++ /dev/null @@ -1,259 +0,0 @@ -# Use this hook to configure devise mailer, warden hooks and so forth. -# Many of these configuration options can be set straight in your model. -Devise.setup do |config| - # The secret key used by Devise. Devise uses this key to generate - # random tokens. Changing this key will render invalid all existing - # confirmation, reset password and unlock tokens in the database. - # config.secret_key = '0ffca1a34e24005081c746c492915c1e2f5d904495c00eb64cb5e0a599da99c5cb5e787751ffc91e88d4aaaeb042556aac4347d3f9f88f0a14e9d14c1011d040' - - # ==> Mailer Configuration - # Configure the e-mail address which will be shown in Devise::Mailer, - # note that it will be overwritten if you use your own mailer class - # with default "from" parameter. - config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' - - # Configure the class responsible to send e-mails. - # config.mailer = 'Devise::Mailer' - - # ==> ORM configuration - # Load and configure the ORM. Supports :active_record (default) and - # :mongoid (bson_ext recommended) by default. Other ORMs may be - # available as additional gems. - require 'devise/orm/active_record' - - # ==> Configuration for any authentication mechanism - # Configure which keys are used when authenticating a user. The default is - # just :email. You can configure it to use [:username, :subdomain], so for - # authenticating a user, both parameters are required. Remember that those - # parameters are used only when authenticating and not when retrieving from - # session. If you need permissions, you should implement that in a before filter. - # You can also supply a hash where the value is a boolean determining whether - # or not authentication should be aborted when the value is not present. - # config.authentication_keys = [ :email ] - - # Configure parameters from the request object used for authentication. Each entry - # given should be a request method and it will automatically be passed to the - # find_for_authentication method and considered in your model lookup. For instance, - # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. - # The same considerations mentioned for authentication_keys also apply to request_keys. - # config.request_keys = [] - - # Configure which authentication keys should be case-insensitive. - # These keys will be downcased upon creating or modifying a user and when used - # to authenticate or find a user. Default is :email. - config.case_insensitive_keys = [ :email ] - - # Configure which authentication keys should have whitespace stripped. - # These keys will have whitespace before and after removed upon creating or - # modifying a user and when used to authenticate or find a user. Default is :email. - config.strip_whitespace_keys = [ :email ] - - # Tell if authentication through request.params is enabled. True by default. - # It can be set to an array that will enable params authentication only for the - # given strategies, for example, `config.params_authenticatable = [:database]` will - # enable it only for database (email + password) authentication. - # config.params_authenticatable = true - - # Tell if authentication through HTTP Auth is enabled. False by default. - # It can be set to an array that will enable http authentication only for the - # given strategies, for example, `config.http_authenticatable = [:database]` will - # enable it only for database authentication. The supported strategies are: - # :database = Support basic authentication with authentication key + password - # config.http_authenticatable = false - - # If 401 status code should be returned for AJAX requests. True by default. - # config.http_authenticatable_on_xhr = true - - # The realm used in Http Basic Authentication. 'Application' by default. - # config.http_authentication_realm = 'Application' - - # It will change confirmation, password recovery and other workflows - # to behave the same regardless if the e-mail provided was right or wrong. - # Does not affect registerable. - # config.paranoid = true - - # By default Devise will store the user in session. You can skip storage for - # particular strategies by setting this option. - # Notice that if you are skipping storage for all authentication paths, you - # may want to disable generating routes to Devise's sessions controller by - # passing skip: :sessions to `devise_for` in your config/routes.rb - config.skip_session_storage = [:http_auth] - - # By default, Devise cleans up the CSRF token on authentication to - # avoid CSRF token fixation attacks. This means that, when using AJAX - # requests for sign in and sign up, you need to get a new CSRF token - # from the server. You can disable this option at your own risk. - # config.clean_up_csrf_token_on_authentication = true - - # ==> Configuration for :database_authenticatable - # For bcrypt, this is the cost for hashing the password and defaults to 10. If - # using other encryptors, it sets how many times you want the password re-encrypted. - # - # Limiting the stretches to just one in testing will increase the performance of - # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use - # a value less than 10 in other environments. Note that, for bcrypt (the default - # encryptor), the cost increases exponentially with the number of stretches (e.g. - # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation). - config.stretches = Rails.env.test? ? 1 : 10 - - # Setup a pepper to generate the encrypted password. - # config.pepper = '4e67fe88a63233857f81364360fc52630c1c8d0e92e459edb2c445afb1b5ae5863d38c77a572facbfe4a9e3c551a77eb5c46d0467c0000ed1da93c0fa90d96c6' - - # ==> Configuration for :confirmable - # A period that the user is allowed to access the website even without - # confirming their account. For instance, if set to 2.days, the user will be - # able to access the website for two days without confirming their account, - # access will be blocked just in the third day. Default is 0.days, meaning - # the user cannot access the website without confirming their account. - # config.allow_unconfirmed_access_for = 2.days - - # A period that the user is allowed to confirm their account before their - # token becomes invalid. For example, if set to 3.days, the user can confirm - # their account within 3 days after the mail was sent, but on the fourth day - # their account can't be confirmed with the token any more. - # Default is nil, meaning there is no restriction on how long a user can take - # before confirming their account. - # config.confirm_within = 3.days - - # If true, requires any email changes to be confirmed (exactly the same way as - # initial account confirmation) to be applied. Requires additional unconfirmed_email - # db field (see migrations). Until confirmed, new email is stored in - # unconfirmed_email column, and copied to email column on successful confirmation. - config.reconfirmable = true - - # Defines which key will be used when confirming an account - # config.confirmation_keys = [ :email ] - - # ==> Configuration for :rememberable - # The time the user will be remembered without asking for credentials again. - # config.remember_for = 2.weeks - - # Invalidates all the remember me tokens when the user signs out. - config.expire_all_remember_me_on_sign_out = true - - # If true, extends the user's remember period when remembered via cookie. - # config.extend_remember_period = false - - # Options to be passed to the created cookie. For instance, you can set - # secure: true in order to force SSL only cookies. - # config.rememberable_options = {} - - # ==> Configuration for :validatable - # Range for password length. - config.password_length = 8..128 - - # Email regex used to validate email formats. It simply asserts that - # one (and only one) @ exists in the given string. This is mainly - # to give user feedback and not to assert the e-mail validity. - # config.email_regexp = /\A[^@]+@[^@]+\z/ - - # ==> Configuration for :timeoutable - # The time you want to timeout the user session without activity. After this - # time the user will be asked for credentials again. Default is 30 minutes. - # config.timeout_in = 30.minutes - - # If true, expires auth token on session timeout. - # config.expire_auth_token_on_timeout = false - - # ==> Configuration for :lockable - # Defines which strategy will be used to lock an account. - # :failed_attempts = Locks an account after a number of failed attempts to sign in. - # :none = No lock strategy. You should handle locking by yourself. - # config.lock_strategy = :failed_attempts - - # Defines which key will be used when locking and unlocking an account - # config.unlock_keys = [ :email ] - - # Defines which strategy will be used to unlock an account. - # :email = Sends an unlock link to the user email - # :time = Re-enables login after a certain amount of time (see :unlock_in below) - # :both = Enables both strategies - # :none = No unlock strategy. You should handle unlocking by yourself. - # config.unlock_strategy = :both - - # Number of authentication tries before locking an account if lock_strategy - # is failed attempts. - # config.maximum_attempts = 20 - - # Time interval to unlock the account if :time is enabled as unlock_strategy. - # config.unlock_in = 1.hour - - # Warn on the last attempt before the account is locked. - # config.last_attempt_warning = true - - # ==> Configuration for :recoverable - # - # Defines which key will be used when recovering the password for an account - # config.reset_password_keys = [ :email ] - - # Time interval you can reset your password with a reset password key. - # Don't put a too small interval or your users won't have the time to - # change their passwords. - config.reset_password_within = 6.hours - - # ==> Configuration for :encryptable - # Allow you to use another encryption algorithm besides bcrypt (default). You can use - # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1, - # :authlogic_sha512 (then you should set stretches above to 20 for default behavior) - # and :restful_authentication_sha1 (then you should set stretches to 10, and copy - # REST_AUTH_SITE_KEY to pepper). - # - # Require the `devise-encryptable` gem when using anything other than bcrypt - # config.encryptor = :sha512 - - # ==> Scopes configuration - # Turn scoped views on. Before rendering "sessions/new", it will first check for - # "users/sessions/new". It's turned off by default because it's slower if you - # are using only default views. - # config.scoped_views = false - - # Configure the default scope given to Warden. By default it's the first - # devise role declared in your routes (usually :user). - # config.default_scope = :user - - # Set this configuration to false if you want /users/sign_out to sign out - # only the current scope. By default, Devise signs out all scopes. - # config.sign_out_all_scopes = true - - # ==> Navigation configuration - # Lists the formats that should be treated as navigational. Formats like - # :html, should redirect to the sign in page when the user does not have - # access, but formats like :xml or :json, should return 401. - # - # If you have any extra navigational formats, like :iphone or :mobile, you - # should add them to the navigational formats lists. - # - # The "*/*" below is required to match Internet Explorer requests. - # config.navigational_formats = ['*/*', :html] - - # The default HTTP method used to sign out a resource. Default is :delete. - config.sign_out_via = :delete - - # ==> OmniAuth - # Add a new OmniAuth provider. Check the wiki for more information on setting - # up on your models and hooks. - # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' - - # ==> Warden configuration - # If you want to use other strategies, that are not supported by Devise, or - # change the failure app, you can configure them inside the config.warden block. - # - # config.warden do |manager| - # manager.intercept_401 = false - # manager.default_strategies(scope: :user).unshift :some_external_strategy - # end - - # ==> Mountable engine configurations - # When using Devise inside an engine, let's call it `MyEngine`, and this engine - # is mountable, there are some extra configurations to be taken into account. - # The following options are available, assuming the engine is mounted as: - # - # mount MyEngine, at: '/my_engine' - # - # The router that invoked `devise_for`, in the example above, would be: - # config.router_name = :my_engine - # - # When using omniauth, Devise cannot automatically set Omniauth path, - # so you need to do it manually. For the users scope, it would be: - # config.omniauth_path_prefix = '/my_engine/users/auth' -end diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml deleted file mode 100644 index 26a10f2..0000000 --- a/config/locales/devise.en.yml +++ /dev/null @@ -1,60 +0,0 @@ -# Additional translations at https://github.com/plataformatec/devise/wiki/I18n - -en: - devise: - confirmations: - confirmed: "Your email address has been successfully confirmed." - send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes." - send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes." - failure: - already_authenticated: "You are already signed in." - inactive: "Your account is not activated yet." - invalid: "Invalid %{authentication_keys} or password." - locked: "Your account is locked." - last_attempt: "You have one more attempt before your account is locked." - not_found_in_database: "Invalid %{authentication_keys} or password." - timeout: "Your session expired. Please sign in again to continue." - unauthenticated: "You need to sign in or sign up before continuing." - unconfirmed: "You have to confirm your email address before continuing." - mailer: - confirmation_instructions: - subject: "Confirmation instructions" - reset_password_instructions: - subject: "Reset password instructions" - unlock_instructions: - subject: "Unlock instructions" - omniauth_callbacks: - failure: "Could not authenticate you from %{kind} because \"%{reason}\"." - success: "Successfully authenticated from %{kind} account." - passwords: - no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." - send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes." - send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." - updated: "Your password has been changed successfully. You are now signed in." - updated_not_active: "Your password has been changed successfully." - registrations: - destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon." - signed_up: "Welcome! You have signed up successfully." - signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." - signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." - signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account." - update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address." - updated: "Your account has been updated successfully." - sessions: - signed_in: "Signed in successfully." - signed_out: "Signed out successfully." - already_signed_out: "Signed out successfully." - unlocks: - send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes." - send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes." - unlocked: "Your account has been unlocked successfully. Please sign in to continue." - errors: - messages: - already_confirmed: "was already confirmed, please try signing in" - confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" - expired: "has expired, please request a new one" - not_found: "not found" - not_locked: "was not locked" - not_saved: - one: "1 error prohibited this %{resource} from being saved:" - other: "%{count} errors prohibited this %{resource} from being saved:" diff --git a/config/routes.rb b/config/routes.rb index 637aa4f..f9c2c2d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,4 @@ Debshots::Application.routes.draw do - devise_for :users ##get "packages/index" ##get "packages" => "packages#index" ##get "packages/:page/:display" => "packages#index" diff --git a/db/migrate/20150502140613_devise_create_users.rb b/db/migrate/20150502140613_devise_create_users.rb deleted file mode 100644 index 1b9d546..0000000 --- a/db/migrate/20150502140613_devise_create_users.rb +++ /dev/null @@ -1,42 +0,0 @@ -class DeviseCreateUsers < ActiveRecord::Migration - def change - create_table(:users) do |t| - ## Database authenticatable - t.string :email, null: false, default: "" - t.string :encrypted_password, null: false, default: "" - - ## Recoverable - t.string :reset_password_token - t.datetime :reset_password_sent_at - - ## Rememberable - t.datetime :remember_created_at - - ## Trackable - t.integer :sign_in_count, default: 0, null: false - t.datetime :current_sign_in_at - t.datetime :last_sign_in_at - t.inet :current_sign_in_ip - t.inet :last_sign_in_ip - - ## Confirmable - # t.string :confirmation_token - # t.datetime :confirmed_at - # t.datetime :confirmation_sent_at - # t.string :unconfirmed_email # Only if using reconfirmable - - ## Lockable - # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts - # t.string :unlock_token # Only if unlock strategy is :email or :both - # t.datetime :locked_at - - - t.timestamps - end - - add_index :users, :email, unique: true - add_index :users, :reset_password_token, unique: true - # add_index :users, :confirmation_token, unique: true - # add_index :users, :unlock_token, unique: true - end -end diff --git a/test/models/user_test.rb b/test/models/user_test.rb deleted file mode 100644 index 32b0a18..0000000 --- a/test/models/user_test.rb +++ /dev/null @@ -1,13 +0,0 @@ -require "test_helper" - -class UserTest < ActiveSupport::TestCase - - def user - @user ||= User.new - end - - def test_valid - assert user.valid? - end - -end From be788fa45b82d93f4513d984cc7ff391eb695930 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sun, 3 May 2015 14:37:33 +0200 Subject: [PATCH 14/15] Debugger gem added Use "debugger" in the code to run it --- Gemfile | 2 +- Gemfile.lock | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index be58c93..4b7e0dc 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,7 @@ end # gem 'capistrano', group: :development # Use debugger -# gem 'debugger', group: [:development, :test] +gem 'debugger', group: [:development, :test] # PostgreSQL support gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index cb09d29..9b96332 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,6 +72,12 @@ GEM jquery-cookie-rails jquery-rails debug_inspector (0.0.2) + debugger (1.6.8) + columnize (>= 0.3.1) + debugger-linecache (~> 1.2.0) + debugger-ruby_core_source (~> 1.3.5) + debugger-linecache (1.2.0) + debugger-ruby_core_source (1.3.8) erubis (2.7.0) execjs (2.5.2) fancybox2-rails (0.2.8) @@ -250,6 +256,7 @@ DEPENDENCIES bzip2-ruby! coffee-rails (~> 4.1.0) cookies_eu + debugger fancybox2-rails (~> 0.2.8) foundation-rails guard-minitest From f73353d42012710d3bfceeff19ecdba15f7adb6e Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sun, 3 May 2015 14:37:45 +0200 Subject: [PATCH 15/15] Removed Devise cruft. --- test/fixtures/users.yml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 test/fixtures/users.yml diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml deleted file mode 100644 index ea31e45..0000000 --- a/test/fixtures/users.yml +++ /dev/null @@ -1,12 +0,0 @@ -# Read about fixtures at -# http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html - -# This model initially had no columns defined. If you add columns to the -# model remove the '{}' from the fixture names and add the columns immediately -# below each fixture, per the syntax in the comments below -# -#one: {} -# column: value -# -#two: {} -# column: value