gennaro 0.2.1 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4d5143a79ab2cf7e6e3ccb6dea61bd0b7290de0
-  data.tar.gz: 462d31e7772aac3b15b27a2f7631b638f8101e7c
+  metadata.gz: 80405acaeb5e87ed31dc20a59b3cb045fb0b0636
+  data.tar.gz: b0354be72a53234219c5e458982514ea2b9d1549
 SHA512:
-  metadata.gz: 7a5f52841341d2b93d7c48b14e0eb44811bb0ea4afa1cc25dd1e07483d5970f4f00086eb208145106f663f0e74a1e59714fce38d33c3ba76adb6eeecfc75f9d1
-  data.tar.gz: 2b9cecbeca7b065ae60cbad34e2d54a7da2d399efd84c79a13d48732f605366b188d9e8b378ca2d82408c04fb6f8ce39d9f8aad52a8bee8f3cbc48f8f9b4f652
+  metadata.gz: d00251c816c985f2da759a2663ce5ce296c086c153e9975707333670e06f61e0ccc5021b68efeb11e63ec50e6388523dfd04c085180bcd238f7dd976cc8e5a2b
+  data.tar.gz: 78f08cfa769fece813ea53603a2353d2ee27b823a01c77a141e49f035aa115a36d203c9e83e4ad2e56b9ae58645e19121c59e4b66d254884bcc39911e6d596c6

data/bin/gennaro

@@ -57,5 +57,5 @@ else
   gennaro  = Gennaro.new template, options[:classname], options[:path], options[:force]
   gennaro.generate!
   gennaro.replace_tags!
-  puts "All done. Execute 'cd #{gennaro.path} && bundle install && rake test'"
+  puts "All done. Execute 'cd #{gennaro.path} && bundle install && rake'"
 end

data/lib/gennaro/gennaro.rb

@@ -41,6 +41,7 @@ class Gennaro
       s = File.read f
       File.open(f, ?w) { |f|
         s.gsub! '${ClassName}',      @classname
+        s.gsub! '${AppName}',        @appname
         s.gsub! '${GenerateString}', get_random_string(36)
         f.write s
       }

data/lib/gennaro/version.rb

@@ -10,6 +10,6 @@
 
 class Gennaro
   def self.version
-    '0.2.1'
+    '0.3'
   end
 end

data/templates/authentication/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'thin'
 gem 'sinatra'
 gem 'bcrypt-ruby'
 gem 'data_mapper'

data/templates/authentication/Rakefile

@@ -1,11 +1,15 @@
 #! /usr/bin/env ruby
 require 'rake'
 
-task :default => :test
+task :default => [ :test, :run ]
 
 task :test do
   FileUtils.cd 'spec' do
     sh 'rspec user_spec.rb --backtrace --color --format doc'
   end
   File.delete 'db/spec.db' if File.exists? 'db/spec.db'
+end
+
+task :run do
+  sh 'thin -R config.ru -p 4567 start'
 end

data/templates/authentication/app/controllers/application.rb

@@ -0,0 +1,22 @@
+#--
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+#++
+
+class ${ClassName}
+  before do
+    @title        = '${ClassName}'
+    @language     = request.env['HTTP_ACCEPT_LANGUAGE']
+    @current_url  = "http://#{request.env['HTTP_HOST']}#{request.env['REQUEST_URI']}"
+    @domain       = "http://#{request.env['HTTP_HOST']}"
+  end
+
+  get '/' do
+    'Hello, world!'
+  end
+end

data/templates/authentication/app/controllers/users.rb

@@ -9,78 +9,98 @@
 #++
 
 class ${ClassName}
-  post '/user/login/?' do
-    if logged_in?
-      return 'You are already logged in.'
-    end
-
-    if User.login params[:username], params[:password]
-      'Login successful.'
-    else
-      'Login failed.'
-    end
+  get '/user/login/?' do
+    erb :'user/login'
   end
 
-  post '/user/logout/?' do
+  get '/user/logout/?' do
     if logged_in?
       current_user.logout!
-      'Logout successful.'
+      delete_login!
+      @success = 'Logout successful.'
     else
-      'You are not logged in.'
+      @error   = 'You are not logged in.'
     end
+
+    erb :'user/logout'
   end
 
-  post '/user/signup/?' do
-    if logged_in?
-      return 'You are already logged in.'
+  get '/user/signup/?' do
+    erb :'user/signup'
+  end
+
+  get '/user/lost_password/?' do
+    erb :'user/lost_password'
+  end
+
+  get '/user/password_recovery/?' do
+    erb :'user/password_recovery'
+  end
+
+  post '/user/login/?' do
+    if not fields? :username, :password
+      @error   = 'You have to complete all the required fields.'
+    elsif logged_in?
+      @error   = 'You are already logged in.'
+    else
+      session  = User.login params[:username], params[:password]
+      if session
+        set_login! session
+        @success = 'Login successful.'
+      else
+        @error   = 'Login failed.'
+      end
     end
 
-    if User.exists? params[:username]
-      'The username you have chosen is already taken.'
+    erb :'user/login'
+  end
+
+  post '/user/signup/?' do
+    if not fields? :username, :email, :password
+      @error   = 'You have to complete all the required fields.'
+    elsif logged_in?
+      @error = 'You are already logged in.'
+    elsif User.exists? params[:username]
+      @error = 'The username you have chosen is already taken.'
     else
-      user = User.new params[:username], params[:email], params[:password], User.user
+      user = User.signup params[:username], params[:email], params[:password], User.user
       if user.errors.any?
-        user.errors.first
+        @error   = user.errors.first
       else
-        'Sign up successful.'
+        @success = 'Sign up successful.'
       end
     end
+
+    erb :'user/signup'
   end
 
   post '/user/lost_password/?' do
-    if logged_in?
-      return 'You are already logged in.'
-    end
-
-    if User.exists? params[:username]
-      User.lost_password params[:username]
+    if not fields? :username
+      @error   = 'You have to complete all the required fields.'
+    elsif logged_in?
+      @error   = 'You are already logged in.'
+    elsif User.exists? params[:username]
+      passcode = User.lost_password params[:username]
+      # send a mail or what you want
+      @success = 'You should receive a mail with the instructions to recover your password.'
     else
-      'The given username doesn\'t exists.'
+      @error   = 'The given username doesn\'t exists.'
     end
+
+    erb :'user/lost_password'
   end
 
   post '/user/password_recovery/?' do
-    if logged_in?
-      return 'You are already logged in.'
-    end
-
-    if User.password_recovery params[:username], params[:passcode], params[:password]
-      'Password set successful.'
+    if not fields? :username, :passcode, :password
+      @error   = 'You have to complete all the required fields.'
+    elsif logged_in?
+      @error   = 'You are already logged in.'
+    elsif User.password_recovery params[:username], params[:passcode], params[:password]
+      @success = 'Password set successful.'
     else
-      'Error setting the password.'
-    end
-  end
-
-  post '/user/new_password/?' do
-    unless logged_in?
-      return 'You need to log in.'
+      @error   = 'Error setting the password.'
     end
 
-    user = current_user.new_password params[:curr_password], params[:password]
-    if user
-      'Your new password has been set.'
-    else
-      'Error setting your new password.'
-    end
+    erb :'user/password_recovery'
   end
-end
+end

data/templates/authentication/app/helpers/application.rb

@@ -0,0 +1,20 @@
+#--
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+#++
+
+class ${ClassName}
+  helpers do
+    def fields?(*args)
+      args.each { |a|
+        return false unless params.include? a.to_s
+      }
+      true
+    end
+  end
+end

data/templates/authentication/app/helpers/cookie.rb

@@ -18,19 +18,16 @@ class ${ClassName}
       }
     end
 
-    def delete_cookie(key)
-      response.set_cookie key, {
-        :value   => '',
-        :expires => Time.now
-      }
+    def get_cookie(key)
+      request.cookies[key]
     end
 
     def cookie_exists?(key)
-      request.cookies.include? key
+      !!get_cookie(key)
     end
 
-    def get_cookie(key)
-      cookie_exists?(key) ? request.cookies[key] : nil
+    def delete_cookie(key)
+      set_cookie key, '', '/', Time.now
     end
   end
 end

data/templates/authentication/app/helpers/user.rb

@@ -12,7 +12,7 @@ class ${ClassName}
   helpers do
     def current_user
       guest = Guest.new
-      return guest unless cookie_exists? 'userid'
+      return guest unless cookie_exists? 'sessid'
       User.first(:session => get_cookie('sessid')) || guest
     end
 
@@ -20,5 +20,15 @@ class ${ClassName}
       current_user.is_a? User
     end
       alias_method :logged?, :logged_in?
+
+    def set_login(session)
+      set_cookie 'sessid', session
+    end
+      alias_method :set_login!, :set_login
+
+    def delete_login
+      delete_cookie 'sessid'
+    end
+      alias_method :delete_login!, :delete_login
   end
 end

data/templates/authentication/app/models/user.rb

@@ -30,8 +30,9 @@ class User
   property :updated_at,       DateTime
 
   def password=(password)
-    self.salt = BCrypt::Engine.generate_salt
-    self.salted_password = BCrypt::Engine.hash_secret password, self.salt
+    salt                 = BCrypt::Engine.generate_salt
+    self.salt            = salt
+    self.salted_password = BCrypt::Engine.hash_secret password, salt
   end
 
   def founder?
@@ -74,11 +75,6 @@ class User
   end
     alias_method :logout!, :logout
 
-  def new_password(curr_password, password)
-    return false unless self.salted_password == BCrypt::Engine.hash_secret(curr_password, self.salt)
-    self.password = password
-  end
-
   class << self
     def banned
       -1
@@ -127,7 +123,7 @@ class User
       user = User.first(:username => username)
       return false unless user
       if user.salted_password == BCrypt::Engine.hash_secret(password, user.salt)
-        user.update(:session => BCrypt::Engine.generate_salt)
+        return user.update(:session => BCrypt::Engine.generate_salt) ? user.session : false
       else
         false
       end
@@ -136,19 +132,6 @@ class User
       alias_method :signin,       :authentication
       alias_method :authenticate, :authentication
 
-    def logout(username)
-      user = User.first(:username => username)
-      return false unless user
-      user.update(:session => '')
-      user.session.empty?
-    end
-      alias_method :logout!, :logout
-
-    def logged?(username, session)
-      User.count(:username => username, :session => session) == 1
-    end
-      alias_method :logged_in?, :logged?
-
     def lost_password(username)
       user = User.first(:username => username)
       return false unless user
@@ -168,12 +151,5 @@ class User
         :password      => password
       })
     end
-
-    def new_password(username, curr_password, password)
-      user = User.first(:username => username)
-      return false unless user
-      return false unless user.salted_password == BCrypt::Engine.hash_secret(curr_password, user.salt)
-      user.update(:password => password)
-    end
   end
 end

data/templates/authentication/app/views/user/login.erb

@@ -0,0 +1,16 @@
+<%= erb :'template/header' %>
+
+<% if defined? @error %>
+  <p class="error"><%= @error %></p>
+<% elsif defined? @success %>
+  <p class="success"><%= @success %></p>
+<% else %>
+  <form action="<%= @current_url %>" method="post">
+    <input type="text"     placeholder="username" name="username"><br>
+    <input type="password" placeholder="password" name="password"><br>
+    <%= csrf_tag %>
+    <input type="submit" value="Login">
+  </form>
+<% end %>
+
+<%= erb :'template/footer' %>

data/templates/authentication/app/views/user/logout.erb

@@ -0,0 +1,9 @@
+<%= erb :'template/header' %>
+
+<% if defined? @error %>
+  <p class="error"><%= @error %></p>
+<% elsif defined? @success %>
+  <p class="success"><%= @success %></p>
+<% end %>
+
+<%= erb :'template/footer' %>

data/templates/authentication/app/views/user/lost_password.erb

@@ -0,0 +1,15 @@
+<%= erb :'template/header' %>
+
+<% if defined? @error %>
+  <p class="error"><%= @error %></p>
+<% elsif defined? @success %>
+  <p class="success"><%= @success %></p>
+<% else %>
+  <form action="<%= @current_url %>" method="post">
+    <input type="text" placeholder="username" name="username"><br>
+    <%= csrf_tag %>
+    <input type="submit" value="Request">
+  </form>
+<% end %>
+
+<%= erb :'template/footer' %>

data/templates/authentication/app/views/user/password_recovery.erb

@@ -0,0 +1,17 @@
+<%= erb :'template/header' %>
+
+<% if defined? @error %>
+  <p class="error"><%= @error %></p>
+<% elsif defined? @success %>
+  <p class="success"><%= @success %></p>
+<% else %>
+  <form action="<%= @current_url %>" method="post">
+    <input type="text"     placeholder="username"     name="username"><br>
+    <input type="password" placeholder="code"         name="passcode"><br>
+    <input type="password" placeholder="new password" name="password"><br>
+    <%= csrf_tag %>
+    <input type="submit" value="Recover">
+  </form>
+<% end %>
+
+<%= erb :'template/footer' %>

data/templates/authentication/app/views/user/signup.erb

@@ -0,0 +1,17 @@
+<%= erb :'template/header' %>
+
+<% if defined? @error %>
+  <p class="error"><%= @error %></p>
+<% elsif defined? @success %>
+  <p class="success"><%= @success %></p>
+<% else %>
+  <form action="<%= @current_url %>" method="post">
+    <input type="text"     placeholder="username" name="username"><br>
+    <input type="email"    placeholder="email"    name="email"   ><br>
+    <input type="password" placeholder="password" name="password"><br>
+    <%= csrf_tag %>
+    <input type="submit" value="Sign up">
+  </form>
+<% end %>
+
+<%= erb :'template/footer' %>

data/templates/authentication/app/views/user/template/footer.rb

@@ -0,0 +1,2 @@
+  </body>
+</html>

data/templates/authentication/app/views/user/template/header.erb

@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="robots" content="index, follow">
+    <title><%= @title %></title>
+  </head>
+<body>

data/templates/authentication/config.ru

@@ -0,0 +1,5 @@
+require 'bundler'
+Bundler.require
+
+require './example'
+run ${ClassName}

data/templates/authentication/views/user/login.erb

@@ -0,0 +1,16 @@
+<%= erb :'user/template/header' %>
+
+<% if defined? @error %>
+  <p class="error"><%= @error %></p>
+<% elsif defined? @success %>
+  <p class="success"><%= @success %></p>
+<% else %>
+  <form action="<%= @current_url %>" method="post">
+    <input type="text"     placeholder="username" name="username"><br>
+    <input type="password" placeholder="password" name="password"><br>
+    <%= csrf_tag %>
+    <input type="submit" value="Login">
+  </form>
+<% end %>
+
+<%= erb :'user/template/footer' %>

data/templates/authentication/views/user/logout.erb

@@ -0,0 +1,9 @@
+<%= erb :'user/template/header' %>
+
+<% if defined? @error %>
+  <p class="error"><%= @error %></p>
+<% elsif defined? @success %>
+  <p class="success"><%= @success %></p>
+<% end %>
+
+<%= erb :'user/template/footer' %>

data/templates/authentication/views/user/lost_password.erb

@@ -0,0 +1,15 @@
+<%= erb :'user/template/header' %>
+
+<% if defined? @error %>
+  <p class="error"><%= @error %></p>
+<% elsif defined? @success %>
+  <p class="success"><%= @success %></p>
+<% else %>
+  <form action="<%= @current_url %>" method="post">
+    <input type="text" placeholder="username" name="username"><br>
+    <%= csrf_tag %>
+    <input type="submit" value="Request">
+  </form>
+<% end %>
+
+<%= erb :'user/template/footer' %>

data/templates/authentication/views/user/new_password.erb

@@ -0,0 +1,16 @@
+<%= erb :'user/template/header' %>
+
+<% if defined? @error %>
+  <p class="error"><%= @error %></p>
+<% elsif defined? @success %>
+  <p class="success"><%= @success %></p>
+<% else %>
+  <form action="<%= @current_url %>" method="post">
+    <input type="password" placeholder="current password" name="curr_password"><br>
+    <input type="password" placeholder="new password"     name="password"     ><br>
+    <%= csrf_tag %>
+    <input type="submit" value="Send">
+  </form>
+<% end %>
+
+<%= erb :'user/template/footer' %>

data/templates/authentication/views/user/password_recovery.erb

@@ -0,0 +1,17 @@
+<%= erb :'user/template/header' %>
+
+<% if defined? @error %>
+  <p class="error"><%= @error %></p>
+<% elsif defined? @success %>
+  <p class="success"><%= @success %></p>
+<% else %>
+  <form action="<%= @current_url %>" method="post">
+    <input type="text"     placeholder="username"     name="username"><br>
+    <input type="password" placeholder="code"         name="passcode"><br>
+    <input type="password" placeholder="new password" name="password"><br>
+    <%= csrf_tag %>
+    <input type="submit" value="Recover">
+  </form>
+<% end %>
+
+<%= erb :'user/template/footer' %>

data/templates/authentication/views/user/signup.erb

@@ -0,0 +1,17 @@
+<%= erb :'user/template/header' %>
+
+<% if defined? @error %>
+  <p class="error"><%= @error %></p>
+<% elsif defined? @success %>
+  <p class="success"><%= @success %></p>
+<% else %>
+  <form action="<%= @current_url %>" method="post">
+    <input type="text"     placeholder="username" name="username"><br>
+    <input type="email"    placeholder="email"    name="email"   ><br>
+    <input type="password" placeholder="password" name="password"><br>
+    <%= csrf_tag %>
+    <input type="submit" value="Sign up">
+  </form>
+<% end %>
+
+<%= erb :'user/template/footer' %>

data/templates/authentication/views/user/template/footer.erb

@@ -0,0 +1,2 @@
+  </body>
+</html>

data/templates/authentication/views/user/template/header.erb

@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="robots" content="index, follow">
+    <title><%= @title %></title>
+  </head>
+<body>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gennaro
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.3'
 platform: ruby
 authors:
 - Giovanni Capuano
@@ -50,16 +50,34 @@ files:
 - lib/gennaro/gennaro.rb
 - lib/gennaro/version.rb
 - lib/gennaro.rb
+- templates/authentication/app/controllers/application.rb
 - templates/authentication/app/controllers/users.rb
+- templates/authentication/app/helpers/application.rb
 - templates/authentication/app/helpers/cookie.rb
 - templates/authentication/app/helpers/csrf.rb
 - templates/authentication/app/helpers/user.rb
 - templates/authentication/app/models/guest.rb
 - templates/authentication/app/models/user.rb
+- templates/authentication/app/views/user/login.erb
+- templates/authentication/app/views/user/logout.erb
+- templates/authentication/app/views/user/lost_password.erb
+- templates/authentication/app/views/user/password_recovery.erb
+- templates/authentication/app/views/user/signup.erb
+- templates/authentication/app/views/user/template/footer.rb
+- templates/authentication/app/views/user/template/header.erb
+- templates/authentication/config.ru
 - templates/authentication/Gemfile
 - templates/authentication/Rakefile
 - templates/authentication/spec/spec.rb
 - templates/authentication/spec/user_spec.rb
+- templates/authentication/views/user/login.erb
+- templates/authentication/views/user/logout.erb
+- templates/authentication/views/user/lost_password.erb
+- templates/authentication/views/user/new_password.erb
+- templates/authentication/views/user/password_recovery.erb
+- templates/authentication/views/user/signup.erb
+- templates/authentication/views/user/template/footer.erb
+- templates/authentication/views/user/template/header.erb
 - templates/authentication/_class_name_.rb
 - spec/gennaro_spec.rb
 - bin/gennaro