maxjustus-sinatra-authentication 0.0.1 → 0.0.2

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('sinatra-authentication', '0.0.1') do |p|
+Echoe.new('sinatra-authentication', '0.0.2') do |p|
   p.description    = "Simple authentication plugin for sinatra."
   p.url            = "http://github.com/maxjustus/sinatra-authentication"
   p.author         = "Max Justus Spransy"

data/lib/models/user.rb

@@ -8,7 +8,7 @@ class User
   property :hashed_password, String
   property :salt, String, :protected => true, :nullable => false
   property :created_at, DateTime
-  property :permission_level, Integer, :default => -1
+  property :permission_level, Integer, :default => 1
 
   validates_present :password_confirmation, :unless => Proc.new { |t| t.hashed_password }
   validates_present :password, :unless => Proc.new { |t| t.hashed_password }
@@ -28,7 +28,7 @@ class User
   end
 
   def admin?
-    self.permission_level == -1
+    self.permission_level == -1 || self.id == 1
   end
   protected
 

data/lib/sinatra-authentication.rb

@@ -123,8 +123,6 @@ module Sinatra
         redirect '/'
       end
     end
-
-
   end
 
   module Helpers
@@ -139,8 +137,6 @@ module Sinatra
     end
 
     def current_user
-      # TODO
-      # considering returning a user like object with a permission method if not logged in
       if session[:user]
         User.first(:id => session[:user])
       else
@@ -179,11 +175,11 @@ module Sinatra
         logout_parameters = html_attributes
         # a tad janky?
         logout_parameters.delete(:rel)
-        result += "<a href='/logout' class='#{css_classes} sinatra-authentication-logout' #{logout_parameters}>logout</a> "
-        result += "<a href='/users/#{current_user.id}/edit' class='#{css_classes} sinatra-authentication-edit' #{parameters}>edit account</a>"
+        result += "<a href='/users/#{current_user.id}/edit' class='#{css_classes} sinatra-authentication-edit' #{parameters}>edit account</a> "
+        result += "<a href='/logout' class='#{css_classes} sinatra-authentication-logout' #{logout_parameters}>logout</a>"
       else
-        result += "<a href='/login' class='#{css_classes} sinatra-authentication-login' #{parameters}>login</a> "
-        result += "<a href='/signup' class='#{css_classes} sinatra-authentication-signup' #{parameters}>signup</a>"
+        result += "<a href='/signup' class='#{css_classes} sinatra-authentication-signup' #{parameters}>signup</a> "
+        result += "<a href='/login' class='#{css_classes} sinatra-authentication-login' #{parameters}>login</a>"
       end
 
       result += "</div>"

data/lib/views/edit.haml

@@ -12,9 +12,9 @@
     - if current_user.admin? && current_user.id != @user.id
       %br
       %select{ :id => "permission_level", :name => "user[permission_level]" }
-        %option{:value => -1}
+        %option{:value => -1, :selected => @user.admin?}
           admin
-        %option{:value => 1}
+        %option{:value => 1, :selected => @user.permission_level == 1}
           authenticated user
       permission level
     %br

data/lib/views/index.haml

@@ -16,4 +16,7 @@
           %td
             %a{:href => "/users/#{user.id}/edit"} edit
           %td
-            %a{:href => "/users/#{user.id}/delete", :onclick => "return confirm('you sure?')"} delete
+            - if user.id != 1
+              %a{:href => "/users/#{user.id}/delete", :onclick => "return confirm('you sure?')"} delete
+            - else
+              site admin

data/sinatra-authentication.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-authentication}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Justus Spransy"]
-  s.date = %q{2009-04-21}
+  s.date = %q{2009-04-22}
   s.description = %q{Simple authentication plugin for sinatra.}
   s.email = %q{maxjustus@gmail.com}
   s.extra_rdoc_files = ["lib/models/user.rb", "lib/views/signup.haml", "lib/views/edit.haml", "lib/views/login.haml", "lib/views/index.haml", "lib/views/show.haml", "lib/sinatra-authentication.rb", "TODO"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maxjustus-sinatra-authentication
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Max Justus Spransy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-21 00:00:00 -07:00
+date: 2009-04-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency