smartshack_simple_login 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33532189d8c466fddd30da716aafdaabcbf88079
-  data.tar.gz: 3de49bc6e9c11229bee49d15c94ec46a5531c33a
+  metadata.gz: 23087f208fe2c5d0c245699e792392a73f44ce49
+  data.tar.gz: 058bd4ba3a425f684f2d4c30ffa2bec2c3a059da
 SHA512:
-  metadata.gz: 7aa69f11eeda2e07d6731b714730a3ad0f6e1f0ccbb7c7fd6451085527a7ef095005a83692e38b9c9d8eee6acfcfcbfa60869918565063cb1ec2ad6d53d68fe0
-  data.tar.gz: af1529144f916a719145ded6a5275963522b1533657e83eaa54d2dcd9f0e32ae1f52a50d893ce056db786cc9cfea3f1530f6a73a519c7285154581a57599a8ac
+  metadata.gz: 3cdc9467697973b41c4b7c512698ab92e46e5b55bcd6120c4fc33a4a0fd097c78a2e4815c95922b998909bfa914870e1f2a58652549c41d69df132894792e0a1
+  data.tar.gz: bd6fb14a20f5bc0e57196d7668f4296b01d8ab44da9e18669a2d8fe157b77f7fcc19dbfd4f241e27ffba8d2451577a26db594aa175cfd1c7a844182c84815f7b

data/lib/generators/simple_login/simple_login_generator.rb

@@ -0,0 +1,56 @@
+module SimpleLogin
+  module Generators
+    class SimpleLoginGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path("../../templates", __FILE__)
+  
+      def controllers
+        template 'controllers/users_controller.rb', 'app/controllers/users_controller.rb'
+        template 'controllers/password_resets_controller.rb', 'app/controllers/password_resets_controller.rb'
+        template 'controllers/sessions_controller.rb', 'app/controllers/sessions_controller.rb'
+      end
+      
+      def mailers
+        template 'mailers/user_mailer.rb', 'app/mailers/user_mailer.rb'
+      end
+      def models
+        template 'models/user.rb', 'app/models/user.rb'
+        template 'models/concerns/password_reset.rb', 'app/models/concerns/password_reset.rb'
+      end
+      def views
+        directory 'views' , 'app/views'
+      end
+      
+      def migrations
+        template 'create_users.rb', 'db/migrations/create_users.rb'
+      end
+      
+      
+      def application
+        inject_into_file 'app/controllers/application_controller.rb', before: "end" do
+          "\n\nprivate\n" +
+          "def current_user\n" +
+          "  @current_user ||= User.find(session[:user_id]) if session[:user_id]\n" +
+          "end\n" +
+          "helper_method :current_user\n"
+        end
+      end
+      
+  
+  
+      def add_routes
+        route "get 'signup', to: 'users#new', as: 'signup'"
+        route "get 'login', to: 'sessions#new', as: 'login'"
+        route "get 'logout', to: 'sessions#destroy', as: 'logout'"
+
+        route "resources :users"
+        route "resources :sessions"
+        route "resources :password_resets"
+      end
+  
+      def add_gem
+        gem 'bcrypt-ruby', '~> 3.1.2'
+        gem 'simple_form'
+      end
+    end
+  end
+end

data/lib/generators/templates/controllers/password_resets_controller.rb

@@ -0,0 +1,38 @@
+class PasswordResetsController < ApplicationController
+  def new
+  end     
+  
+  def create  
+    user = User.find_by_email(params[:email])   
+    if user
+      if params[:type]
+        user.send_password_set
+      else
+        user.send_password_reset 
+      end
+      redirect_to root_url, notice: "Email został wysłany"  
+    else
+      redirect_to root_url, notice: "Email nie istnieje"
+    end
+  end   
+  
+  def edit
+    @user = User.find_by_password_reset_token!(params[:id])
+  end
+
+  def update
+    @user = User.find_by_password_reset_token!(params[:id])
+    if @user.password_reset_sent_at < 2.hours.ago  and @user.password_reset_sent_at != DateTime.new(2000,1,1)  
+      redirect_to new_password_reset_path, :notice => "Czas na reset hasła minął."
+    elsif @user.update(user_params)
+      redirect_to root_url, :notice => "Hasło zostało zmienione"
+    else
+      render :edit
+    end
+  end   
+  
+  private
+  def user_params
+    params.require(:user).permit(:password,:password_confirmation)
+  end
+end

data/lib/generators/templates/controllers/sessions_controller.rb

@@ -0,0 +1,25 @@
+class SessionsController < ApplicationController
+  def new   
+  end
+
+  def create
+    user = User.find_by_email(params[:email])
+    if user && user.authenticate(params[:password])
+      session[:user_id] = user.id         
+      redirect_to root_url, notice: "Zalogowano!"
+    else
+      flash.now.alert = "Email lub hasło są nieprawidłowe"
+      render "new"
+    end
+  end
+
+  def destroy
+    session[:user_id] = nil  
+    redirect_to root_url, notice: "Wylogowano!"
+  end
+
+private  
+  def use_https?
+    true
+  end
+end

data/lib/generators/templates/controllers/users_controller.rb

@@ -0,0 +1,59 @@
+class UsersController < ApplicationController
+  def new
+    @user = User.new
+  end
+      
+  def show
+    @user = User.find(params[:id])
+  end
+  def create
+    @user = User.new(user_params)   
+    
+    if @user.save  
+      redirect_to users_url, notice: "Użytkownik został dodany"
+    else
+      render "new"
+    end
+  end
+  
+  
+  def index
+    @users = User.all
+  end
+  
+  def edit
+    @user = User.find(params[:id]) 
+  end   
+  
+  def update
+    @user = User.find(params[:id])
+    respond_to do |format|
+      if @user.update(user_params)  
+        #śtrack_activity @user
+        format.html { redirect_to users_path, notice: 'Użytkownik zaktualizowany.' }
+      else
+        format.html { render action: "edit" }
+      end
+    end  
+    
+  end
+       
+  # DELETE /announcements/1
+  # DELETE /announcements/1.json
+  def destroy
+    @user = User.find(params[:id])     
+    @user.destroy
+    
+    respond_to do |format|
+      format.html { redirect_to users_path, notice: "Usunięto użytkownika" }
+      format.json { head :no_content }
+    end
+  end
+  
+  
+  private
+  def user_params
+    params.require(:user).permit(:email, :password,:password_confirmation)
+  end
+  
+end

data/lib/generators/templates/create_users.rb

@@ -0,0 +1,11 @@
+class CreateUsers < ActiveRecord::Migration
+  def change
+
+    create_table :users do |t|
+      t.string :email
+      t.string :password_digest
+
+      t.timestamps
+    end
+  end
+end

data/lib/generators/templates/mailers/user_mailer.rb

@@ -0,0 +1,19 @@
+class UserMailer < ActionMailer::Base
+  default from: "kontakt@jellyfish.megiteam.pl"
+
+  # Subject can be set in your I18n file at config/locales/en.yml
+  # with the following lookup:
+  #
+  #   en.user_mailer.password_reset.subject
+  #
+  def password_reset(user)
+    @user = user
+    mail :to => user.email, :subject => "Reset hasła"
+  end  
+  
+  
+  def password_set(user)
+    @user = user
+    mail to: user.email, subject: "Ustaweinie hasła"
+  end
+end

data/lib/generators/templates/models/concerns/password_reset.rb

@@ -0,0 +1,24 @@
+module PasswordReset
+  extend ActiveSupport::Concern
+  included do
+    def send_password_reset 
+      generate_token(:password_reset_token)
+      self.password_reset_sent_at = Time.zone.now
+      save!
+      UserMailer.password_reset(self).deliver 
+    end
+  
+    def send_password_set 
+      generate_token(:password_reset_token)
+      self.password_reset_sent_at = DateTime.new(2000,1,1)
+      save!
+      UserMailer.password_set(self).deliver 
+    end  
+  
+    def generate_token(column)
+      begin
+        self[column] = SecureRandom.urlsafe_base64
+      end while User.exists?(column => self[column])
+    end
+  end
+end

data/lib/generators/templates/models/user.rb

@@ -0,0 +1,5 @@
+class User < ActiveRecord::Base
+  has_secure_password
+  validates_uniqueness_of :email
+  include PasswordReset
+end

data/lib/generators/templates/views/password_resets/_form.html.erb

@@ -0,0 +1,6 @@
+<%= form_tag password_resets_path, :method => :post do %>
+    <%= hidden_field_tag :type, "set" %>
+    <%= hidden_field_tag :email, email %>
+
+  <div class="actions"><%= submit_tag "Reset hasła", class: "button" %></div>
+<% end %>

data/lib/generators/templates/views/password_resets/edit.html.erb

@@ -0,0 +1,23 @@
+<h1>Ustawianie nowego hasła</h1>
+
+<%= form_for @user, :url => password_reset_path(params[:id]) do |f| %>
+  <% if @user.errors.any? %>
+    <div class="error_messages">
+      <h2>Usuń błędy</h2>
+      <ul>
+        <% for message in @user.errors.full_messages %>
+          <li><%= message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+  <div class="field">
+    <%= f.label :password %>
+    <%= f.password_field :password %>
+  </div>
+  <div class="field">
+    <%= f.label :password_confirmation %>
+    <%= f.password_field :password_confirmation %>
+  </div>
+  <div class="actions"><%= f.submit "Ustaw hasło" %></div>
+<% end %>

data/lib/generators/templates/views/password_resets/new.html.erb

@@ -0,0 +1,8 @@
+<h1>Reset hasła</h1>
+<%= form_tag password_resets_path, :method => :post do %>
+  <div class="field">
+    <%= label_tag :email %>
+    <%= text_field_tag :email, params[:email] %>
+  </div>
+  <div class="actions"><%= submit_tag "Reset hasła" %></div>
+<% end %>

data/lib/generators/templates/views/sessions/new.html.erb

@@ -0,0 +1,17 @@
+
+<%= form_tag sessions_path do %>
+  <div class="field">
+    <%= label_tag :email %><br />
+    <%= text_field_tag :email, params[:email] %>
+  </div>
+  <div class="field">
+    <%= label_tag :password %><br />
+    <%= password_field_tag :password %>
+  </div>        
+
+  <div class="actions"><%= submit_tag "Zaloguj"%></div>     
+
+	<div class="reset">
+		<%= link_to "Zapomniałem hasła", new_password_reset_path %>
+	</div>
+<% end %>

data/lib/generators/templates/views/user_mailer/password_reset.text.erb

@@ -0,0 +1,5 @@
+Aby zresetować hasło kliknij poniższy link
+
+<%= edit_password_reset_url(@user.password_reset_token) %>
+
+Jeśli otrzymałeś ten email przez pomyłkę po prostu go zignoruj!

data/lib/generators/templates/views/user_mailer/password_set.text.erb

@@ -0,0 +1,5 @@
+Aby wejść na stronę i ustawić sobie hasło kliknij poniższy link
+
+<%= edit_password_reset_url(@user.password_reset_token,first: true) %>
+
+Jeśli otrzymałeś ten email przez pomyłkę po prostu go zignoruj!

data/lib/generators/templates/views/users/_form.html.erb

@@ -0,0 +1,6 @@
+<%= simple_form_for @user do |f| %>
+  <%= f.input :email %>
+  <%= f.input :password,label: "Hasło" %>
+  <%= f.input :password_confirmation, label: "Powtórz hasło" %>
+  <%= f.button :submit, "Zapisz" %>
+<% end %>                             

data/lib/generators/templates/views/users/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Edycja użytkownika</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Pokaż', @user %> |
+<%= link_to 'Powrót', users_path %>

data/lib/generators/templates/views/users/index.html.erb

@@ -0,0 +1,13 @@
+<h1>Użytkownicy</h1>
+<table>
+	<tr>
+    <th>email</th>
+  </tr>
+	<%@users.each do |u|%>
+	<tr>
+		<td><%= link_to  u.email, u %></td>
+	</tr>	
+	<% end%>
+</table> 
+<br />
+<%= link_to "Dodaj użytkownika", signup_path %>

data/lib/generators/templates/views/users/new.html.erb

@@ -0,0 +1,2 @@
+<h1>Sign Up</h1>
+<%= render "form"%>

data/lib/generators/templates/views/users/show.html.erb

@@ -0,0 +1,2 @@
+<%= @user.name%>
+<%= @user.email%>   

data/lib/simple_login/version.rb

@@ -1,3 +1,3 @@
 module SimpleLogin
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartshack_simple_login
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - jerzy czepiel
@@ -50,6 +50,27 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/.txt
+- lib/generators/.txt
+- lib/generators/simple_login/simple_login_generator.rb
+- lib/generators/templates/controllers/password_resets_controller.rb
+- lib/generators/templates/controllers/sessions_controller.rb
+- lib/generators/templates/controllers/users_controller.rb
+- lib/generators/templates/create_users.rb
+- lib/generators/templates/mailers/user_mailer.rb
+- lib/generators/templates/models/concerns/password_reset.rb
+- lib/generators/templates/models/user.rb
+- lib/generators/templates/views/password_resets/_form.html.erb
+- lib/generators/templates/views/password_resets/edit.html.erb
+- lib/generators/templates/views/password_resets/new.html.erb
+- lib/generators/templates/views/sessions/new.html.erb
+- lib/generators/templates/views/user_mailer/password_reset.text.erb
+- lib/generators/templates/views/user_mailer/password_set.text.erb
+- lib/generators/templates/views/users/_form.html.erb
+- lib/generators/templates/views/users/edit.html.erb
+- lib/generators/templates/views/users/index.html.erb
+- lib/generators/templates/views/users/new.html.erb
+- lib/generators/templates/views/users/show.html.erb
 - lib/simple_login.rb
 - lib/simple_login/version.rb
 - simple_login.gemspec