Commit: 0445b3e73ebc342e818bea9a09c5e6da331cb229 - mmw_serv (git)

Commit MetaInfo

• Révision: 0445b3e73ebc342e818bea9a09c5e6da331cb229 (tree)
• l'heure: 2017-07-25 00:31:16
• Auteur: HMML <hmml3939@gmai...>
• Commiter: HMML

Message de Log

Add user with cancancan and devise.

Change Summary

• modified: Gemfile
• modified: Gemfile.lock
• add: app/assets/javascripts/users.coffee
• modified: app/assets/stylesheets/scaffolds.scss
• add: app/assets/stylesheets/users.scss
• modified: app/controllers/application_controller.rb
• modified: app/controllers/areas_controller.rb
• add: app/controllers/users_controller.rb
• add: app/helpers/users_helper.rb
• add: app/models/ability.rb
• add: app/models/user.rb
• add: app/views/users/_form.html.haml
• add: app/views/users/_user.json.jbuilder
• add: app/views/users/edit.html.haml
• add: app/views/users/index.html.haml
• add: app/views/users/index.json.jbuilder
• add: app/views/users/new.html.haml
• add: app/views/users/show.html.haml
• add: app/views/users/show.json.jbuilder
• modified: config/application.rb
• add: config/initializers/devise.rb
• add: config/locales/devise.en.yml
• modified: config/routes.rb
• add: db/migrate/20170724141958_create_users.rb
• add: db/migrate/20170724142504_add_devise_to_users.rb
• modified: db/schema.rb
• add: spec/controllers/users_controller_spec.rb
• add: spec/factories/users.rb
• add: spec/models/user_spec.rb
• delete: spec/routing/areas_routing_spec.rb
• delete: spec/routing/dist_signals_routing_spec.rb
• delete: spec/routing/forecasts_routing_spec.rb
• add: spec/routing/users_routing_spec.rb

Modification

--- a/Gemfile
+++ b/Gemfile
@@ -47,6 +47,8 @@ gem 'yaml_db'
 gem 'awesome_print'
 gem 'webpacker', '~> 2.0'
 gem 'webpacker-react', "~> 0.3.1"
+gem 'cancancan'
+gem 'devise'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,6 +54,7 @@ GEM
     autoprefixer-rails (7.1.2.2)
       execjs
     awesome_print (1.8.0)
+    bcrypt (3.1.11)
     better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -66,6 +67,7 @@ GEM
       sass (>= 3.3.4)
     builder (3.2.3)
     byebug (9.0.6)
+    cancancan (2.0.0)
     capistrano (3.8.2)
       airbrussh (>= 1.0.0)
       i18n
@@ -106,6 +108,12 @@ GEM
     delayed_job_active_record (4.1.2)
       activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
+    devise (4.3.0)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 5.2)
+      responders
+      warden (~> 1.2.3)
     diff-lcs (1.3)
     enum_help (0.0.17)
       activesupport (>= 3.0.0)
@@ -215,6 +223,7 @@ GEM
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    orm_adapter (0.5.0)
     pg (0.18.4)
     pry (0.10.4)
       coderay (~> 1.1.0)
@@ -350,6 +359,8 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
+    warden (1.2.7)
+      rack (>= 1.0)
     web-console (3.5.1)
       actionview (>= 5.0)
       activemodel (>= 5.0)
@@ -383,6 +394,7 @@ DEPENDENCIES
   binding_of_caller
   bootstrap-sass
   byebug
+  cancancan
   capistrano-bundler
   capistrano-deploy_into_docker (>= 0.2.1)
   capistrano-rails
@@ -390,6 +402,7 @@ DEPENDENCIES
   coffee-rails (~> 4.2)
   database_cleaner
   delayed_job_active_record
+  devise
   enum_help
   factory_girl_rails (>= 4.0.0)
   faker

--- /dev/null
+++ b/app/assets/javascripts/users.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

--- a/app/assets/stylesheets/scaffolds.scss
+++ b/app/assets/stylesheets/scaffolds.scss
@@ -1,17 +1,16 @@
 body {
   background-color: #fff;
   color: #333;
+  margin: 33px;
   font-family: verdana, arial, helvetica, sans-serif;
   font-size: 13px;
   line-height: 18px;
-  margin: 33px;
 }
 
 p, ol, ul, td {
   font-family: verdana, arial, helvetica, sans-serif;
   font-size: 13px;
   line-height: 18px;
-  margin: 33px;
 }
 
 pre {
@@ -38,9 +37,7 @@ th {
 }
 
 td {
-  padding-bottom: 7px;
-  padding-left: 5px;
-  padding-right: 5px;
+  padding: 0 5px 7px;
 }
 
 div {
@@ -62,8 +59,7 @@ div {
 #error_explanation {
   width: 450px;
   border: 2px solid red;
-  padding: 7px;
-  padding-bottom: 0;
+  padding: 7px 7px 0;
   margin-bottom: 20px;
   background-color: #f0f0f0;
 
@@ -72,8 +68,7 @@ div {
     font-weight: bold;
     padding: 5px 5px 5px 15px;
     font-size: 12px;
-    margin: -7px;
-    margin-bottom: 0;
+    margin: -7px -7px 0;
     background-color: #c00;
     color: #fff;
   }

--- /dev/null
+++ b/app/assets/stylesheets/users.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the Users controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -19,8 +19,4 @@ class ApplicationController < ActionController::Base
   def _log(level, msg)
     logger.public_send level, "#{msg} (addr: #{request.remote_ip}, ua: #{request.user_agent})"
   end
-
-  def current_user
-    :todo
-  end
 end

--- a/app/controllers/areas_controller.rb
+++ b/app/controllers/areas_controller.rb
@@ -1,10 +1,7 @@
 class AreasController < ApplicationController
-  before_action :set_area, only: [:show, :edit, :update, :destroy]
-
-  respond_to :html
+  load_and_authorize_resource
 
   def index
-    @areas = Area.all
     respond_with(@areas)
   end
 
@@ -13,7 +10,6 @@ class AreasController < ApplicationController
   end
 
   def new
-    @area = Area.new
     respond_with(@area)
   end
 
@@ -21,7 +17,6 @@ class AreasController < ApplicationController
   end
 
   def create
-    @area = Area.new(area_params)
     @area.save
     respond_with(@area)
   end
@@ -37,11 +32,11 @@ class AreasController < ApplicationController
   end
 
   private
-    def set_area
-      @area = Area.find(params[:id])
-    end
+  def set_area
+    @area = Area.find(params[:id])
+  end
 
-    def area_params
-      params.require(:area).permit(:ns, :code, :country, :pref, :name)
-    end
+  def area_params
+    params.require(:area).permit(:ns, :code, :country, :pref, :name)
+  end
 end

--- /dev/null
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,47 @@
+class UsersController < ApplicationController
+  before_action :set_user, only: [:show, :edit, :update, :destroy]
+
+  respond_to :html
+
+  def index
+    @users = User.all
+    respond_with(@users)
+  end
+
+  def show
+    respond_with(@user)
+  end
+
+  def new
+    @user = User.new
+    respond_with(@user)
+  end
+
+  def edit
+  end
+
+  def create
+    @user = User.new(user_params)
+    @user.save
+    respond_with(@user)
+  end
+
+  def update
+    @user.update(user_params)
+    respond_with(@user)
+  end
+
+  def destroy
+    @user.destroy
+    respond_with(@user)
+  end
+
+  private
+    def set_user
+      @user = User.find(params[:id])
+    end
+
+    def user_params
+      params.require(:user).permit(:name, :lang, :tw_uid, :tw_nick, :tw_name, :tw_img_url, :tw_updated_at)
+    end
+end

--- /dev/null
+++ b/app/helpers/users_helper.rb
@@ -0,0 +1,2 @@
+module UsersHelper
+end

--- /dev/null
+++ b/app/models/ability.rb
@@ -0,0 +1,7 @@
+class Ability
+  include CanCan::Ability
+
+  def initialize(user)
+    can :manage, :all
+  end
+end

--- /dev/null
+++ b/app/models/user.rb
@@ -0,0 +1,6 @@
+class User < ApplicationRecord
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable
+end

--- /dev/null
+++ b/app/views/users/_form.html.haml
@@ -0,0 +1,14 @@
+= simple_form_for(@user) do |f|
+  = f.error_notification
+
+  .form-inputs
+    = f.input :name
+    = f.input :lang
+    = f.input :tw_uid
+    = f.input :tw_nick
+    = f.input :tw_name
+    = f.input :tw_img_url
+    = f.input :tw_updated_at
+
+  .form-actions
+    = f.button :submit

--- /dev/null
+++ b/app/views/users/_user.json.jbuilder
@@ -0,0 +1,2 @@
+json.extract! user, :id, :name, :lang, :tw_uid, :tw_nick, :tw_name, :tw_img_url, :tw_updated_at, :created_at, :updated_at
+json.url user_url(user, format: :json)

--- /dev/null
+++ b/app/views/users/edit.html.haml
@@ -0,0 +1,7 @@
+%h1 Editing user
+
+= render 'form'
+
+= link_to 'Show', @user
+\|
+= link_to 'Back', users_path

--- /dev/null
+++ b/app/views/users/index.html.haml
@@ -0,0 +1,33 @@
+%h1 Listing users
+
+%table
+  %thead
+    %tr
+      %th Name
+      %th Lang
+      %th Tw uid
+      %th Tw nick
+      %th Tw name
+      %th Tw img url
+      %th Tw updated at
+      %th
+      %th
+      %th
+
+  %tbody
+    - @users.each do |user|
+      %tr
+        %td= user.name
+        %td= user.lang
+        %td= user.tw_uid
+        %td= user.tw_nick
+        %td= user.tw_name
+        %td= user.tw_img_url
+        %td= user.tw_updated_at
+        %td= link_to 'Show', user
+        %td= link_to 'Edit', edit_user_path(user)
+        %td= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' }
+
+%br
+
+= link_to 'New User', new_user_path

--- /dev/null
+++ b/app/views/users/index.json.jbuilder
@@ -0,0 +1 @@
+json.array! @users, partial: 'users/user', as: :user

--- /dev/null
+++ b/app/views/users/new.html.haml
@@ -0,0 +1,5 @@
+%h1 New user
+
+= render 'form'
+
+= link_to 'Back', users_path

--- /dev/null
+++ b/app/views/users/show.html.haml
@@ -0,0 +1,27 @@
+%p#notice= notice
+
+%p
+  %b Name:
+  = @user.name
+%p
+  %b Lang:
+  = @user.lang
+%p
+  %b Tw uid:
+  = @user.tw_uid
+%p
+  %b Tw nick:
+  = @user.tw_nick
+%p
+  %b Tw name:
+  = @user.tw_name
+%p
+  %b Tw img url:
+  = @user.tw_img_url
+%p
+  %b Tw updated at:
+  = @user.tw_updated_at
+
+= link_to 'Edit', edit_user_path(@user)
+\|
+= link_to 'Back', users_path

--- /dev/null
+++ b/app/views/users/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "users/user", user: @user

--- a/config/application.rb
+++ b/config/application.rb
@@ -18,10 +18,23 @@ module MmwPsh
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
+    config.generators do |g|
+      g.test_framework :rspec,
+        fixtures: true,
+        view_specs: false,
+        helper_specs: false,
+        routing_specs: true,
+        controller_specs: true,
+        request_specs: false
+      g.fixture_replacement :factory_girl, dir: "spec/factories"
+    end
+
     #config.i18n.default_locale = :en
     #config.i18n.available_locales = [:en, :ja]
     #config.i18n.enforce_available_locales = true
     config.encoding = "utf-8"
 
+    config.hub_secret_default = ''
+    config.hub_secrets = {}
   end
 end

--- /dev/null
+++ b/config/initializers/devise.rb
@@ -0,0 +1,277 @@
+# 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.
+  # Devise will use the `secret_key_base` as its `secret_key`
+  # by default. You can change it below and use your own secret key.
+  # config.secret_key = '96c5eed0efb5fc47b419a0dc9c4995f065bad19602dac8a9ff0594dff7978b272b2b86a2e4917028c46a4c95d9f367bbde6587f4b59153ca3642c3068800eedc'
+
+  # ==> 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 = '[e-mail]'
+
+  # Configure the class responsible to send e-mails.
+  # config.mailer = 'Devise::Mailer'
+
+  # Configure the parent class responsible to send e-mails.
+  # config.parent_mailer = 'ActionMailer::Base'
+
+  # ==> 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
+
+  # When false, Devise will not attempt to reload routes on eager load.
+  # This can reduce the time taken to boot the app but if your application
+  # requires the Devise mappings to be loaded during boot time the application
+  # won't boot properly.
+  # config.reload_routes = true
+
+  # ==> Configuration for :database_authenticatable
+  # For bcrypt, this is the cost for hashing the password and defaults to 11. If
+  # using other algorithms, it sets how many times you want the password to be hashed.
+  #
+  # 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
+  # algorithm), 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 : 11
+
+  # Set up a pepper to generate the hashed password.
+  # config.pepper = 'b8e81a80376bb42d6f44f82f116195e9ead6fcb84dfd97eba67d90ed4f9a1f6550172b8c6ab6b2ccc8b682a08a8d435bf31dc244645d38bc36f834055cba874a'
+
+  # Send a notification to the original email when the user's email is changed.
+  # config.send_email_changed_notification = false
+
+  # Send a notification email when the user's password is changed.
+  # config.send_password_change_notification = false
+
+  # ==> 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 = 6..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[^@\s]+@[^@\s]+\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
+
+  # ==> 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
+
+  # When set to false, does not sign a user in automatically after their password is
+  # reset. Defaults to true, so a user is signed in automatically after a reset.
+  # config.sign_in_after_reset_password = true
+
+  # ==> Configuration for :encryptable
+  # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
+  # You can use :sha1, :sha512 or algorithms 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

--- /dev/null
+++ b/config/locales/devise.en.yml
@@ -0,0 +1,64 @@
+# 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"
+      email_changed:
+        subject: "Email Changed"
+      password_change:
+        subject: "Password Changed"
+    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:"

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,11 +1,12 @@
 Rails.application.routes.draw do
+  devise_for :users
+  resources :users
   resources :forecasts
   resources :areas
   get  'sub', to: 'subscribe#verify'
   post 'sub', to: 'subscribe#distribute'
 
   resources :dist_signals, only: %i(index show)
-  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 
   root 'dummy_error_controller#index'
 end

--- /dev/null
+++ b/db/migrate/20170724141958_create_users.rb
@@ -0,0 +1,15 @@
+class CreateUsers < ActiveRecord::Migration[5.1]
+  def change
+    create_table :users do |t|
+      t.string :name
+      t.string :lang
+      t.string :tw_uid
+      t.string :tw_nick
+      t.string :tw_name
+      t.text :tw_img_url
+      t.datetime :tw_updated_at
+
+      t.timestamps
+    end
+  end
+end

--- /dev/null
+++ b/db/migrate/20170724142504_add_devise_to_users.rb
@@ -0,0 +1,48 @@
+class AddDeviseToUsers < ActiveRecord::Migration[5.1]
+  def self.up
+    change_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.string   :current_sign_in_ip
+      t.string   :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
+
+      # Uncomment below if timestamps were not included in your original model.
+      # t.timestamps null: false
+    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
+
+  def self.down
+    # By default, we don't want to make any assumption about how to roll back a migration when your
+    # model already existed. Please edit below which fields you would like to remove in this migration.
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

--- 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: 20170615165118) do
+ActiveRecord::Schema.define(version: 20170724142504) do
 
   create_table "areas", force: :cascade do |t|
     t.string "ns"
@@ -63,4 +63,28 @@ ActiveRecord::Schema.define(version: 20170615165118) do
     t.index ["area_id"], name: "index_forecasts_on_area_id"
   end
 
+  create_table "users", force: :cascade do |t|
+    t.string "name"
+    t.string "lang"
+    t.string "tw_uid"
+    t.string "tw_nick"
+    t.string "tw_name"
+    t.text "tw_img_url"
+    t.datetime "tw_updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    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.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  end
+
 end

--- /dev/null
+++ b/spec/controllers/users_controller_spec.rb
@@ -0,0 +1,141 @@
+require 'rails_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+#
+# Also compared to earlier versions of this generator, there are no longer any
+# expectations of assigns and templates rendered. These features have been
+# removed from Rails core in Rails 5, but can be added back in via the
+# `rails-controller-testing` gem.
+
+RSpec.describe UsersController, type: :controller do
+
+  # This should return the minimal set of attributes required to create a valid
+  # User. As you add validations to User, be sure to
+  # adjust the attributes here as well.
+  let(:valid_attributes) {
+    skip("Add a hash of attributes valid for your model")
+  }
+
+  let(:invalid_attributes) {
+    skip("Add a hash of attributes invalid for your model")
+  }
+
+  # This should return the minimal set of values that should be in the session
+  # in order to pass any filters (e.g. authentication) defined in
+  # UsersController. Be sure to keep this updated too.
+  let(:valid_session) { {} }
+
+  describe "GET #index" do
+    it "returns a success response" do
+      user = User.create! valid_attributes
+      get :index, params: {}, session: valid_session
+      expect(response).to be_success
+    end
+  end
+
+  describe "GET #show" do
+    it "returns a success response" do
+      user = User.create! valid_attributes
+      get :show, params: {id: user.to_param}, session: valid_session
+      expect(response).to be_success
+    end
+  end
+
+  describe "GET #new" do
+    it "returns a success response" do
+      get :new, params: {}, session: valid_session
+      expect(response).to be_success
+    end
+  end
+
+  describe "GET #edit" do
+    it "returns a success response" do
+      user = User.create! valid_attributes
+      get :edit, params: {id: user.to_param}, session: valid_session
+      expect(response).to be_success
+    end
+  end
+
+  describe "POST #create" do
+    context "with valid params" do
+      it "creates a new User" do
+        expect {
+          post :create, params: {user: valid_attributes}, session: valid_session
+        }.to change(User, :count).by(1)
+      end
+
+      it "redirects to the created user" do
+        post :create, params: {user: valid_attributes}, session: valid_session
+        expect(response).to redirect_to(User.last)
+      end
+    end
+
+    context "with invalid params" do
+      it "returns a success response (i.e. to display the 'new' template)" do
+        post :create, params: {user: invalid_attributes}, session: valid_session
+        expect(response).to be_success
+      end
+    end
+  end
+
+  describe "PUT #update" do
+    context "with valid params" do
+      let(:new_attributes) {
+        skip("Add a hash of attributes valid for your model")
+      }
+
+      it "updates the requested user" do
+        user = User.create! valid_attributes
+        put :update, params: {id: user.to_param, user: new_attributes}, session: valid_session
+        user.reload
+        skip("Add assertions for updated state")
+      end
+
+      it "redirects to the user" do
+        user = User.create! valid_attributes
+        put :update, params: {id: user.to_param, user: valid_attributes}, session: valid_session
+        expect(response).to redirect_to(user)
+      end
+    end
+
+    context "with invalid params" do
+      it "returns a success response (i.e. to display the 'edit' template)" do
+        user = User.create! valid_attributes
+        put :update, params: {id: user.to_param, user: invalid_attributes}, session: valid_session
+        expect(response).to be_success
+      end
+    end
+  end
+
+  describe "DELETE #destroy" do
+    it "destroys the requested user" do
+      user = User.create! valid_attributes
+      expect {
+        delete :destroy, params: {id: user.to_param}, session: valid_session
+      }.to change(User, :count).by(-1)
+    end
+
+    it "redirects to the users list" do
+      user = User.create! valid_attributes
+      delete :destroy, params: {id: user.to_param}, session: valid_session
+      expect(response).to redirect_to(users_url)
+    end
+  end
+
+end

--- /dev/null
+++ b/spec/factories/users.rb
@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :user do
+    name "MyString"
+    lang "MyString"
+    tw_uid "MyString"
+    tw_nick "MyString"
+    tw_name "MyString"
+    tw_img_url "MyText"
+    tw_updated_at "2017-07-24 23:19:58"
+  end
+end

--- /dev/null
+++ b/spec/models/user_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe User, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

--- a/spec/routing/areas_routing_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require "rails_helper"
-
-RSpec.describe AreasController, type: :routing do
-  describe "routing" do
-
-    it "routes to #index" do
-      expect(:get => "/areas").to route_to("areas#index")
-    end
-
-    it "routes to #new" do
-      expect(:get => "/areas/new").to route_to("areas#new")
-    end
-
-    it "routes to #show" do
-      expect(:get => "/areas/1").to route_to("areas#show", :id => "1")
-    end
-
-    it "routes to #edit" do
-      expect(:get => "/areas/1/edit").to route_to("areas#edit", :id => "1")
-    end
-
-    it "routes to #create" do
-      expect(:post => "/areas").to route_to("areas#create")
-    end
-
-    it "routes to #update via PUT" do
-      expect(:put => "/areas/1").to route_to("areas#update", :id => "1")
-    end
-
-    it "routes to #update via PATCH" do
-      expect(:patch => "/areas/1").to route_to("areas#update", :id => "1")
-    end
-
-    it "routes to #destroy" do
-      expect(:delete => "/areas/1").to route_to("areas#destroy", :id => "1")
-    end
-
-  end
-end

--- a/spec/routing/dist_signals_routing_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require "rails_helper"
-
-RSpec.describe DistSignalsController, type: :routing do
-  describe "routing" do
-
-    it "routes to #index" do
-      expect(:get => "/dist_signals").to route_to("dist_signals#index")
-    end
-
-    xit "routes to #new" do
-      expect(:get => "/dist_signals/new").to route_to("dist_signals#new")
-    end
-
-    it "routes to #show" do
-      expect(:get => "/dist_signals/1").to route_to("dist_signals#show", :id => "1")
-    end
-
-    xit "routes to #edit" do
-      expect(:get => "/dist_signals/1/edit").to route_to("dist_signals#edit", :id => "1")
-    end
-
-    xit "routes to #create" do
-      expect(:post => "/dist_signals").to route_to("dist_signals#create")
-    end
-
-    xit "routes to #update via PUT" do
-      expect(:put => "/dist_signals/1").to route_to("dist_signals#update", :id => "1")
-    end
-
-    xit "routes to #update via PATCH" do
-      expect(:patch => "/dist_signals/1").to route_to("dist_signals#update", :id => "1")
-    end
-
-    xit "routes to #destroy" do
-      expect(:delete => "/dist_signals/1").to route_to("dist_signals#destroy", :id => "1")
-    end
-
-  end
-end

--- a/spec/routing/forecasts_routing_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require "rails_helper"
-
-RSpec.describe ForecastsController, type: :routing do
-  describe "routing" do
-
-    it "routes to #index" do
-      expect(:get => "/forecasts").to route_to("forecasts#index")
-    end
-
-    it "routes to #new" do
-      expect(:get => "/forecasts/new").to route_to("forecasts#new")
-    end
-
-    it "routes to #show" do
-      expect(:get => "/forecasts/1").to route_to("forecasts#show", :id => "1")
-    end
-
-    it "routes to #edit" do
-      expect(:get => "/forecasts/1/edit").to route_to("forecasts#edit", :id => "1")
-    end
-
-    it "routes to #create" do
-      expect(:post => "/forecasts").to route_to("forecasts#create")
-    end
-
-    it "routes to #update via PUT" do
-      expect(:put => "/forecasts/1").to route_to("forecasts#update", :id => "1")
-    end
-
-    it "routes to #update via PATCH" do
-      expect(:patch => "/forecasts/1").to route_to("forecasts#update", :id => "1")
-    end
-
-    it "routes to #destroy" do
-      expect(:delete => "/forecasts/1").to route_to("forecasts#destroy", :id => "1")
-    end
-
-  end
-end

--- /dev/null
+++ b/spec/routing/users_routing_spec.rb
@@ -0,0 +1,39 @@
+require "rails_helper"
+
+RSpec.describe UsersController, type: :routing do
+  describe "routing" do
+
+    it "routes to #index" do
+      expect(:get => "/users").to route_to("users#index")
+    end
+
+    it "routes to #new" do
+      expect(:get => "/users/new").to route_to("users#new")
+    end
+
+    it "routes to #show" do
+      expect(:get => "/users/1").to route_to("users#show", :id => "1")
+    end
+
+    it "routes to #edit" do
+      expect(:get => "/users/1/edit").to route_to("users#edit", :id => "1")
+    end
+
+    it "routes to #create" do
+      expect(:post => "/users").to route_to("users#create")
+    end
+
+    it "routes to #update via PUT" do
+      expect(:put => "/users/1").to route_to("users#update", :id => "1")
+    end
+
+    it "routes to #update via PATCH" do
+      expect(:patch => "/users/1").to route_to("users#update", :id => "1")
+    end
+
+    it "routes to #destroy" do
+      expect(:delete => "/users/1").to route_to("users#destroy", :id => "1")
+    end
+
+  end
+end