gennaro 0.3.2.1 → 0.3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb5cbc7f0475b5992ba8c1ea4dc14c115403f2f5
-  data.tar.gz: ecef9dc7e209dfc132ccd25fcef214c42cdba74b
+  metadata.gz: 736ce9fd63b913dff9a5d1620a7487d7eee9f87c
+  data.tar.gz: 185ec1cfb4c872fbc2b2f2c300f92d92d079745f
 SHA512:
-  metadata.gz: f9d26ac5edf7b4d3b1288c1b075c91182b7202e07aa9aef2bd7ae93ba66c4773526b2cb1648d3da0cc33dc8c2c24b778d8228e09e9741fdf6ca5dcc0b5ae43c6
-  data.tar.gz: 40ca8ce8866a00bd2a13970e7ac577f760e281f6bb05cc8054490152999be87a8e4b800a63f70cc1fbce7041b90518cd85d0507711de5e34debb827c1692018b
+  metadata.gz: f97009f17bd4ac06754f6eb794e5f3edfeb2b7199917ea6d1903bb22e46f4635c0feca5129309e275b27bb61c4cc1e071971122dc9c59c448ae0e2fbd9b3e8c5
+  data.tar.gz: fe65d76d7e25c7e5d3ac550e85cd1d92907ee70c4d817b2b2109b7ee4fc171c5ed1441fdc27a63d599c37bb9215f5619e78ad03a8e891b4725ff4682d1af213e

data/lib/gennaro/version.rb

@@ -10,6 +10,6 @@
 
 class Gennaro
   def self.version
-    '0.3.2.1'
+    '0.3.2.2'
   end
 end

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

@@ -41,6 +41,17 @@ class ${ClassName}
     erb :'user/password_recovery'
   end
 
+  get '/user/change_level/?' do
+    if not logged_in?
+      @error = 'You need to log in.'
+    elsif not current_user.staff?
+      @error = 'Go home, this is not a place for you.'
+    else
+      @users  = User.all
+    end
+    erb :'user/change_level'
+  end
+
   post '/user/login/?' do
     if not fields? :username, :password
       @error   = 'You have to complete all the required fields.'
@@ -108,4 +119,38 @@ class ${ClassName}
 
     erb :'user/password_recovery'
   end
+
+  post '/user/change_level/?' do
+    if not logged_in?
+      @error = 'You need to log in.'
+    elsif not current_user.staff?
+      @error = 'Go home, this is not a place for you.'
+    elsif fields? :username, :go
+      @user   = User.get params[:username]
+      @levels = User.levels
+    elsif not fields? :username, :level
+      @error = 'To change a user level, you need to send his username and level.'
+    else
+      level = case # I guess using #send could be dangerous
+        when 'banned'  then User.banned
+        when 'founder' then User.founder
+        when 'admin'   then User.admin
+        when 'smod'    then User.smod
+        when 'mod'     then User.mod
+        when 'user'    then User.user
+        else                nil
+      end
+      if level.nil?
+        @error = 'User level not recognized.'
+      else
+        user = User.change_level params[:username], level
+        if user
+          @success = 'User level set successful.'
+        else
+          @error   = 'Error setting the user level.'
+        end
+      end
+    end
+    erb :'user/change_level'
+  end
 end

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

@@ -12,16 +12,16 @@ class User
   include DataMapper::Resource
 
   property :id,       Serial
-  property :username, String, :unique => true,
-                              :length => 4..16,
-                              :format => /^[a-zA-Z0-9_\-\*^]*$/
-  property :email,    String, :unique => true,
-                              :format => :email_address
+  property :username, String, unique: true,
+                              length: 4..16,
+                              format: /^[a-zA-Z0-9_\-\*^]*$/
+  property :email,    String, unique: true,
+                              format: :email_address
 
-  property :permission_level, Integer, :default => 3
+  property :permission_level, Integer, default: 4
 
-  property :salt,             String, :length => 29
-  property :salted_password,  String, :length => 60
+  property :salt,             String, length: 29
+  property :salted_password,  String, length: 60
   property :lost_password,    String
   property :session,          String
 
@@ -78,6 +78,10 @@ class User
   end
     alias_method :logout!, :logout
 
+  def change_level(permission_level)
+    self.permission_level = permission_level
+  end
+
   class << self
     def banned
       -1
@@ -108,6 +112,18 @@ class User
       5
     end
 
+    def levels
+      {
+        :banned  => User.banned,
+        :founder => User.founder,
+        :admin   => User.admin,
+        :smod    => User.smod,
+        :gmod    => User.gmod,
+        :mod     => User.mod,
+        :user    => User.user
+      }
+    end
+
     def empty?
       User.count == 0
     end
@@ -162,5 +178,11 @@ class User
         :password      => password
       })
     end
+
+    def change_level(username, permission_level)
+      user = User.first username: username
+      return false unless user
+      user.update permission_level: permission_level
+    end
   end
 end

data/templates/authentication/spec/user_spec.rb

@@ -4,7 +4,7 @@ require './spec'
 require 'rspec'
 require 'rack/test'
 
-describe '${ClassName}' do
+describe 'Pigro' do
   def app
     Sinatra::Application
   end
@@ -60,4 +60,17 @@ describe '${ClassName}' do
 
     User.login(username, new_password).should be_true
   end
+
+  it 'change the user level' do
+    username  = 'Gennaro'
+    password  = 'sonounnuovobullo!'
+
+    User.login(username, password).should be_true
+    
+    user = User.get username
+    user.founder?
+
+    user.change_level User.banned
+    user.banned?
+  end
 end

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

@@ -0,0 +1,35 @@
+<%  @title = 'Change user level' %>
+<%= erb :'template/header' %>
+
+<% if defined? @error %>
+  <p class="error"><%= @error %></p>
+<% elsif defined? @success %>
+  <p class="success"><%= @success %></p>
+<% elsif defined? @users %>
+  <form action="<%= @current_url %>" method="post">
+
+    <select name="username">
+      <% @users.each { |user| %>
+        <option value="<%= user.username %>"><%= user.username %></option>
+      <% } %>
+    </select><br />
+
+    <%= csrf_tag %>
+    <input type="submit" name="go" value="Change">
+  </form>
+<% else %>
+  <form action="<%= @current_url %>" method="post">
+
+    <select name="level">
+      <% @levels.each_pair { |key, val| %>
+        <option value="<%= key %>" <%= 'selected' if val == @user.permission_level %>><%= key.capitalize %></option>
+      <% } %>
+    </select><br />
+
+    <%= csrf_tag %>
+    <input type="hidden" value="<%= @user.username %>" name="username">
+    <input type="submit" value="Change">
+  </form>
+<% end %>
+
+<%= erb :'template/footer' %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gennaro
 version: !ruby/object:Gem::Version
-  version: 0.3.2.1
+  version: 0.3.2.2
 platform: ruby
 authors:
 - Giovanni Capuano
@@ -66,6 +66,7 @@ files:
 - templates/authentication/views/index.erb
 - templates/authentication/views/template/footer.erb
 - templates/authentication/views/template/header.erb
+- templates/authentication/views/user/change_level.erb
 - templates/authentication/views/user/login.erb
 - templates/authentication/views/user/logout.erb
 - templates/authentication/views/user/lost_password.erb