sinatra-authentication 0.2.0 → 0.2.1

data/Rakefile

@@ -6,7 +6,7 @@ begin
   
   Jeweler::Tasks.new do |gemspec|
     gemspec.name           = 'sinatra-authentication'
-    gemspec.version        = '0.2.0'
+    gemspec.version        = '0.2.1'
     gemspec.description    = "Simple authentication plugin for sinatra."
     gemspec.summary        = "Simple authentication plugin for sinatra."
     gemspec.homepage       = "http://github.com/maxjustus/sinatra-authentication"

data/lib/views/edit.haml

@@ -11,26 +11,31 @@
       - else
         account
   %form{:action => "/users/#{@user.id}/edit", :method => "post"}
-    %input{ :id => "user_email", :name => "user[email]", :size => 30, :type => "text", :value => @user.email }
-    email
-    %br
-    %input{ :id => "user_password", :name => "user[password]", :size => 30, :type => "password" }
-    new password
-    %br
-    %input{ :id => "user_password_confirmation", :name => "user[password_confirmation]", :size => 30, :type => "password" }
-    confirm
+    .field
+      .label
+        %label{:for => "user_email"} Email
+      %input{ :id => "user_email", :name => "user[email]", :size => 30, :type => "text", :value => @user.email }
+    .field
+      .label
+        %label{:for => "user_password"} New password
+      %input{ :id => "user_password", :name => "user[password]", :size => 30, :type => "password" }
+    .field
+      .label
+        %label{:for => "user_password_confirmation"} Confirm
+      %input{ :id => "user_password_confirmation", :name => "user[password_confirmation]", :size => 30, :type => "password" }
     -# don't render permission field if admin and editing yourself so you don't shoot yourself in the foot
     - if current_user.admin? && current_user.id != @user.id
-      %br
-      %select{ :id => "permission_level", :name => "user[permission_level]" }
-        %option{:value => -1, :selected => @user.admin?}
-          admin
-        %option{:value => 1, :selected => @user.permission_level == 1}
-          authenticated user
-      permission level
-    %br
-    %input{ :value => "update", :type => "submit" }
-    - if Sinatra.const_defined?('FacebookObject')
-      - unless @user.fb_uid
-        |
-        = render_facebook_connect_link('Link account with facebook')
+      .field
+        .label
+          %label{:for => 'permission_level'}  Permission level
+        %select{ :id => "permission_level", :name => "user[permission_level]" }
+          %option{:value => -1, :selected => @user.admin?}
+            Admin
+          %option{:value => 1, :selected => @user.permission_level == 1}
+            Authenticated user
+    .buttons
+      %input{ :value => "Update", :type => "submit" }
+      - if Sinatra.const_defined?('FacebookObject')
+        - unless @user.fb_uid
+          |
+          = render_facebook_connect_link('Link account with Facebook')

data/lib/views/login.haml

@@ -1,18 +1,18 @@
 #sinatra_authentication
   %h1 Login
   %form{:action => "/login", :method => "post"}
-    %p
-      %label{:for => "user_email'"} Email
-      %br
+    .field
+      .label
+        %label{:for => "user_email'"} Email
       %input{:id => "user_email", :name => "email", :size => 30, :type => "text"}
-    %p
-      %label{:for => "user_password"} Password
-      %br
+    .field
+      .label
+        %label{:for => "user_password"} Password
       %input{:id => "user_password", :name => "password", :size => 30, :type => "password"}
-    %p
+    .buttons
       %input{:value => "login", :type => "submit"}
-      %a{:href => "/signup"}
+      %a{:href => "/signup", :class => 'sinatra_authentication_link'}
         Signup
-    %br
-    - if Sinatra.const_defined?('FacebookObject')
-      = render_facebook_connect_link
+      .facebook_login
+        - if Sinatra.const_defined?('FacebookObject')
+          = render_facebook_connect_link

data/lib/views/signup.haml

@@ -1,17 +1,19 @@
 #sinatra_authentication
   %h1 Signup
   %form{:action => "/signup", :method => "post"}
-    %p
-      %label{:for => "user_email"} Email
-      %br
+    .field
+      .label
+        %label{:for => "user_email"} Email
       %input{ :id => "user_email", :name => "user[email]", :size => 30, :type => "text" }
-    %p
-      %label{:for => "user_password"} Password
-      %br
+    .field
+      .label
+        %label{:for => "user_password"} Password
       %input{ :id => "user_password", :name => "user[password]", :size => 30, :type => "password" }
-    %p
-      %label{:for => "user_password_confirmation"} Confirm Password
-      %br
+    .field
+      .label
+        %label{:for => "user_password_confirmation"} Confirm Password
       %input{ :id => "user_password_confirmation", :name => "user[password_confirmation]", :size => 30, :type => "password" }
-    %p
+    .buttons
       %input{ :value => "Create account", :type => "submit" }
+      %a{:href => "/login", :class => 'sinatra_authentication_link'}
+        Login

data/readme.markdown

@@ -2,7 +2,7 @@
 
 ## INSTALLATION:
 
-in your sinatra app simply require either "dm-core" or "rufus-tokyo" and then "sinatra-authentication" and turn on session storage
+in your sinatra app simply require either "dm-core", "rufus-tokyo" or "mongo_mapper" and then "sinatra-authentication" and turn on session storage
 with a super secret key, like so:
 
     require "dm-core"

data/sinatra-authentication.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-authentication}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Justus Spransy"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-authentication
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Max Justus Spransy