gennaro 0.3.1.1 → 0.3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fa54f044221ea0cd5dac9a02f18d8c5042b547c
-  data.tar.gz: e1ad1f09ab1f55a14bec6e61edaf9707f718165f
+  metadata.gz: 48ecc5308d589cf1d483ebaf139439e2aa52d965
+  data.tar.gz: f87ae572b85862de95bf6365ac88366dfd369f1c
 SHA512:
-  metadata.gz: d314b58167bd5320fbfb5e46241bd5e547f07d08b44620c79f3417e29f4e45091896d3a1c3e6a99e2ed02f7ac8bfe4c9649c271432eaf21dab425ebf98874514
-  data.tar.gz: 0e987c997b3784438203c5a983b2dce4d6b06bdd3fbd16bd79bc995cc53974054134e9747d2bbd9f9ed5076a0053685b99eb5d52b6352a9bb945d9a4e97594e4
+  metadata.gz: 6695db947112c8a47d3ffcea8c92bbee4fb37562f437bb3c4dfacffc42968adea62c7f32d68a69005b4b2f42115ca4ffbbc3f7d4c008570a3b39b48eb4180e30
+  data.tar.gz: 04db7120acea41a6ae554e1a4ef9e8fcdbb26957881408719b596a0174eddfeb6cac7387a36c36794e9b05c8bdfb32d357ad022bc1f74f4519b237354c3c3132

data/lib/gennaro/version.rb

@@ -10,6 +10,6 @@
 
 class Gennaro
   def self.version
-    '0.3.1.1'
+    '0.3.1.2'
   end
 end

data/templates/authentication/_class_name_.rb

@@ -34,5 +34,5 @@ class ${ClassName} < Sinatra::Base
   Dir.glob("#{Dir.pwd}/app/controllers/*.rb") { |c| require c.chomp }
 
   DataMapper.finalize
-  User.auto_migrate!
+  DataMapper.auto_upgrade!
 end

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

@@ -17,6 +17,6 @@ class ${ClassName}
   end
 
   get '/' do
-    'Hello, world!'
+    erb :index
   end
 end

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

@@ -10,6 +10,7 @@
 
 class ${ClassName}
   get '/user/login/?' do
+    @error = 'You are already logged in.' if logged_in?
     erb :'user/login'
   end
 
@@ -26,14 +27,17 @@ class ${ClassName}
   end
 
   get '/user/signup/?' do
+    @error = 'You are already logged in.' if logged_in?
     erb :'user/signup'
   end
 
   get '/user/lost_password/?' do
+    @error = 'You are already logged in.' if logged_in?
     erb :'user/lost_password'
   end
 
   get '/user/password_recovery/?' do
+    @error = 'You are already logged in.' if logged_in?
     erb :'user/password_recovery'
   end
 
@@ -63,7 +67,8 @@ class ${ClassName}
     elsif User.exists? params[:username]
       @error = 'The username you have chosen is already taken.'
     else
-      user = User.signup params[:username], params[:email], params[:password], User.user
+      level = User.empty? ? User.founder : User.user
+      user  = User.signup params[:username], params[:email], params[:password], level
       if user.errors.any?
         @error   = user.errors.first
       else

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

@@ -35,8 +35,12 @@ class User
     self.salted_password = BCrypt::Engine.hash_secret password, salt
   end
 
+  def banned?
+    self.permission_level == User.banned
+  end
+
   def founder?
-    self.id == 1
+    self.permission_level == User.founder
   end
 
   def admin?
@@ -56,14 +60,14 @@ class User
     self.permission_level == User.user
   end
 
-  def banned?
-    self.permission_level == User.banned
-  end
-
   def guest?
     false
   end
 
+  def staff?
+    founder? || admin? || smod? || mod?
+  end
+
   def logged?(session)
     self.session == session
   end
@@ -80,33 +84,41 @@ class User
       -1
     end
 
-    def admin
+    def founder
       0
     end
 
-    def smod
+    def admin
       1
     end
+
+    def smod
+      2
+    end
       alias_method :gmod, :smod
 
     def mod
-      2
+      3
     end
 
     def user
-      3
+      4
     end
 
     def guest
-      4
+      5
+    end
+
+    def empty?
+      User.count == 0
     end
 
     def get(username)
-      User.first(:username => username)
+      User.first username: username
     end
 
     def exists?(username)
-      User.count(:username => username) == 1
+      User.count(username: username) == 1
     end
     
     def registration(username, email, password, permission_level, stuff = {})
@@ -120,10 +132,10 @@ class User
       alias_method :signup, :registration
 
     def authentication(username, password)
-      user = User.first(:username => username)
+      user = User.first username: username
       return false unless user
       if user.salted_password == BCrypt::Engine.hash_secret(password, user.salt)
-        return user.update(:session => BCrypt::Engine.generate_salt) ? user.session : false
+        return user.update(session: BCrypt::Engine.generate_salt) ? user.session : false
       else
         false
       end
@@ -133,9 +145,9 @@ class User
       alias_method :authenticate, :authentication
 
     def lost_password(username)
-      user = User.first(:username => username)
+      user = User.first username: username
       return false unless user
-      user.update(:lost_password => BCrypt::Engine.generate_salt)
+      user.update lost_password: BCrypt::Engine.generate_salt
       user.lost_password
     end
 

data/templates/authentication/spec/spec.rb

@@ -34,5 +34,5 @@ class ${ClassName} < Sinatra::Base
   Dir.glob('../app/controllers/*.rb') { |c| require c.chomp }
 
   DataMapper.finalize
-  User.auto_migrate!
+  DataMapper.auto_upgrade!
 end

data/templates/authentication/spec/user_spec.rb

@@ -4,7 +4,7 @@ require './spec'
 require 'rspec'
 require 'rack/test'
 
-describe 'App' do
+describe 'Stanco' do
   def app
     Sinatra::Application
   end
@@ -13,16 +13,16 @@ describe 'App' do
     username = 'Gennaro'
     email    = 'gennaro@bullo.pk'
     password = 'sonopropriounbullo!'
-    permission_level = User.user
+    level    = User.empty? ? User.founder : User.user
 
     User.exists?(username).should be_false
-    user = User.signup username, email, password, permission_level
-    user.errors.should be_empty
-    user.guest?.should be_false
-    user.user?.should  be_true
+    user = User.signup username, email, password, level
+    user.errors.should            be_empty
+    user.guest?.should            be_false
+    user.founder?.should          be_true
     User.exists?(username).should be_true
 
-    user = User.signup username, email, password, permission_level
+    user = User.signup username, email, password, level
     user.errors.should_not be_empty
   end
 
@@ -30,7 +30,7 @@ describe 'App' do
     username = 'Gennaro'
     password = 'sonopropriounbullo!'
 
-    User.exists?(username).should be_true
+    User.exists?(username).should         be_true
     User.login(username, password).should be_true
     user = User.get username
     user.session.should have(29).chars

data/templates/authentication/views/index.erb

@@ -0,0 +1,7 @@
+<%= erb :'template/header' %>
+  -- User --<br>
+  <a href="user/signup">Signup</a><br>
+  <a href="user/login">Login</a><br>
+  <a href="user/logout">Logout</a><br>
+  <a href="user/lost_password">Lost password</a>
+<%= erb :'template/footer' %>

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

@@ -1,4 +1,4 @@
-<%= erb :'user/template/header' %>
+<%= erb :'template/header' %>
 
 <% if defined? @error %>
   <p class="error"><%= @error %></p>
@@ -13,4 +13,4 @@
   </form>
 <% end %>
 
-<%= erb :'user/template/footer' %>
+<%= erb :'template/footer' %>

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

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

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

@@ -1,4 +1,4 @@
-<%= erb :'user/template/header' %>
+<%= erb :'template/header' %>
 
 <% if defined? @error %>
   <p class="error"><%= @error %></p>
@@ -12,4 +12,4 @@
   </form>
 <% end %>
 
-<%= erb :'user/template/footer' %>
+<%= erb :'template/footer' %>

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

@@ -1,4 +1,4 @@
-<%= erb :'user/template/header' %>
+<%= erb :'template/header' %>
 
 <% if defined? @error %>
   <p class="error"><%= @error %></p>
@@ -13,4 +13,4 @@
   </form>
 <% end %>
 
-<%= erb :'user/template/footer' %>
+<%= erb :'template/footer' %>

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

@@ -1,4 +1,4 @@
-<%= erb :'user/template/header' %>
+<%= erb :'template/header' %>
 
 <% if defined? @error %>
   <p class="error"><%= @error %></p>
@@ -14,4 +14,4 @@
   </form>
 <% end %>
 
-<%= erb :'user/template/footer' %>
+<%= erb :'template/footer' %>

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

@@ -1,4 +1,4 @@
-<%= erb :'user/template/header' %>
+<%= erb :'template/header' %>
 
 <% if defined? @error %>
   <p class="error"><%= @error %></p>
@@ -14,4 +14,4 @@
   </form>
 <% end %>
 
-<%= erb :'user/template/footer' %>
+<%= erb :'template/footer' %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gennaro
 version: !ruby/object:Gem::Version
-  version: 0.3.1.1
+  version: 0.3.1.2
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -63,14 +63,15 @@ files:
 - templates/authentication/Rakefile
 - templates/authentication/spec/spec.rb
 - templates/authentication/spec/user_spec.rb
+- templates/authentication/views/index.erb
+- templates/authentication/views/template/footer.erb
+- templates/authentication/views/template/header.erb
 - 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