sinatra-authentication 0.2.4 → 0.3.0

data/Rakefile

@@ -6,7 +6,7 @@ begin
   
   Jeweler::Tasks.new do |gemspec|
     gemspec.name           = 'sinatra-authentication'
-    gemspec.version        = '0.2.3'
+    gemspec.version        = '0.3.0'
     gemspec.description    = "Simple authentication plugin for sinatra."
     gemspec.summary        = "Simple authentication plugin for sinatra."
     gemspec.homepage       = "http://github.com/maxjustus/sinatra-authentication"
@@ -18,6 +18,7 @@ begin
     gemspec.add_dependency "dm-timestamps"
     gemspec.add_dependency "rufus-tokyo"
     gemspec.add_dependency "sinbook"
+    gemspec.add_dependency "rack-flash"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/example/dm_extend_app.rb

@@ -0,0 +1,25 @@
+require 'rubygems'
+require 'sinatra'
+require 'haml'
+require 'dm-core'
+require 'rack-flash'
+require 'sinatra-authentication'
+
+class DmUser
+  property :name, String
+end
+
+DataMapper.setup(:default, "sqlite3://#{Dir.pwd}/test.db")
+DataMapper.auto_migrate!
+
+set :sinatra_authentication_view_path, Pathname(__FILE__).dirname.expand_path + "extend_views/"
+use Rack::Session::Cookie, :secret => "heyhihello"
+use Rack::Flash
+
+set :environment, 'development'
+set :public, 'public'
+set :views,  'views'
+
+get '/' do
+  haml "= render_login_logout", :layout => :layout
+end

data/example/dm_sinbook.rb

@@ -0,0 +1,55 @@
+require 'rubygems'
+require 'sinatra'
+require 'haml'
+require 'sinbook'
+require 'dm-core'
+require 'sinatra-authentication'
+
+facebook do
+  api_key 'aa2db1b96cb7b57f0c5b1d4d3d8f0a22'
+  secret '21d94ee63969ae3b3f833689838ca00f'
+  app_id 48652736613
+  url 'peoplewithjetpacks.com:4568/'
+  callback 'peoplewithjetpacks.com:4568/'
+end
+
+set :port, 4568
+
+DataMapper.setup(:default, "sqlite3://#{Dir.pwd}/test.db")
+DataMapper.auto_migrate!
+
+use Rack::Session::Cookie, :secret => "heyhihello"
+
+set :environment, 'development'
+set :public, 'public'
+set :views,  'views'
+
+get '/' do
+  haml :main
+end
+
+get '/test' do
+  login_required
+  'hihihi'
+end
+
+__END__
+
+@@ layout
+%html{:xmlns=>"http://www.w3.org/1999/xhtml", :'xmlns:fb'=>"http://www.facebook.com/2008/fbml"}
+  %head
+    %title Welcome to my Facebook Connect website!
+    %script{:type => 'text/javascript', :src => 'http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php/en_US'}
+  %body
+    = render_login_logout
+    = yield
+    :javascript
+      FB.init("#{fb.api_key}", "/receiver")
+
+@@ main
+- if fb[:user]
+  Hi,
+  %fb:profile-pic{:uid => fb[:user]}
+  %fb:name{:uid => fb[:user], :useyou => 'false', :firstnameonly => 'true'}
+  !
+

data/example/extend_views/edit.haml

@@ -0,0 +1,42 @@
+#sinatra_authentication
+  #sinatra_authentication_flash= flash[:notice]
+  %h1
+    Edit
+    - if @user.id == current_user.id
+      account
+    - else
+      - if @user.email
+        = @user.email
+      - elsif @user.fb_uid
+        <fb:name uid=#{@user.fb_uid} linked='false' />
+      - else
+        account
+  %form{:action => "/users/#{@user.id}/edit", :method => "post"}
+    .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
+      .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/example/extend_views/index.haml

@@ -0,0 +1,31 @@
+#sinatra_authentication
+  %h1.page_title Users
+  %table
+    %tr
+      %th
+      - if current_user.admin?
+        %th permission level
+    - @users.each do |user|
+      %tr
+        %td
+          - if user.email
+            = user.email
+          - elsif user.fb_uid
+            <fb:name uid=#{user.fb_uid} />
+          - else
+            "user #{user.id}"
+        - if current_user.admin?
+          %td= user.permission_level
+        %td
+          = user.name
+        %td
+          %a{:href => "/users/#{user.id}"} show
+        - if current_user.admin?
+          %td
+            %a{:href => "/users/#{user.id}/edit"} edit
+          %td
+            -# this doesn't work for tk
+            - if !user.site_admin?
+              %a{:href => "/users/#{user.id}/delete", :onclick => "return confirm('you sure?')"} delete
+            - else
+              site admin

data/example/extend_views/login.haml

@@ -0,0 +1,21 @@
+#sinatra_authentication
+  #sinatra_authentication_flash= flash[:notice]
+  %h1.page_title Login
+  %form{:action => "/login", :method => "post"}
+    .field
+      .label
+        %label{:for => "user_email'"} Email
+      %input{:id => "user_email", :name => "email", :size => 30, :type => "text"}
+    .field
+      .label
+        %label{:for => "user_password"} Password
+      %input{:id => "user_password", :name => "password", :size => 30, :type => "password"}
+    .buttons
+      %input{:value => "login", :type => "submit"}
+      %a{:href => "/signup", :class => 'sinatra_authentication_link'}
+        Signup
+    - if Sinatra.const_defined?('FacebookObject')
+      .third_party_signup
+        %h3.section_title One click login:
+        .login_link.facebook_login
+          = render_facebook_connect_link('Login using facebook', :size => 'large')

data/example/extend_views/show.haml

@@ -0,0 +1,9 @@
+#sinatra_authentication
+  %h1.page_title
+    - if @user.email
+      = @user.email
+    - elsif @user.fb_uid
+      <fb:name uid=#{@user.fb_uid} linked='false' />
+  - if current_user.admin?
+    %h2 permission level
+    = @user.permission_level

data/example/extend_views/signup.haml

@@ -0,0 +1,30 @@
+%h1 This view is overridden
+#sinatra_authentication
+  #sinatra_authentication_flash= flash[:notice]
+  %h1.page_title Signup
+  %form{:action => "/signup", :method => "post"}
+    .field
+      .label
+        %label{:for => "user_email"} Email
+      %input{ :id => "user_email", :name => "user[email]", :size => 30, :type => "text" }
+    .field
+      .label
+        %label{:for => "user_password"} Password
+      %input{ :id => "user_password", :name => "user[password]", :size => 30, :type => "password" }
+    .field
+      .label
+        %label{:for => "user_name"} Name
+      %input{ :id => "user_name", :name => "user[name]", :size => 30, :type => "text" }
+    .field
+      .label
+        %label{:for => "user_password_confirmation"} Confirm Password
+      %input{ :id => "user_password_confirmation", :name => "user[password_confirmation]", :size => 30, :type => "password" }
+    .buttons
+      %input{ :value => "Create account", :type => "submit" }
+      %a{:href => "/login", :class => 'sinatra_authentication_link'}
+        Login
+    - if Sinatra.const_defined?('FacebookObject')
+      .third_party_signup
+        %h3.section_title One click signup:
+        .login_link.facebook_login
+          = render_facebook_connect_link('Signup using facebook', :size => 'large')

data/example/mm_app.rb

@@ -0,0 +1,22 @@
+require 'rubygems'
+require 'sinatra/base'
+require 'haml'
+require 'mongo_mapper'
+require 'sinatra-authentication'
+
+logger = Logger.new($stdout)
+MongoMapper.connection = Mongo::Connection.new('db.mongohq.com', 27017, :logger => logger)
+MongoMapper.database = "fdbk"
+MongoMapper.database.authenticate(ENV['mongohq_user'], ENV['mongohq_pass'])
+
+class TestApp < Sinatra::Base
+  use Rack::Session::Cookie, :secret => "heyhihello"
+
+  set :environment, 'development'
+  set :public, 'public'
+  set :views,  'views'
+
+  get '/' do
+    haml "= render_login_logout", :layout => :layout
+  end
+end

data/example/tc_app.rb

@@ -0,0 +1,16 @@
+require 'rubygems'
+require 'sinatra'
+require 'haml'
+require 'rufus/tokyo'
+require 'sinatra-authentication'
+
+use Rack::Session::Cookie, :secret => "heyhihello"
+TcUserTable.cabinet_path = File.dirname(__FILE__)
+
+set :environment, 'development'
+set :public, 'public'
+set :views,  'views'
+
+get '/' do
+  haml "= render_login_logout", :layout => :layout
+end

data/example/tc_sinbook.rb

@@ -0,0 +1,62 @@
+require 'rubygems'
+require 'haml'
+require 'sinbook'
+require 'rufus/tokyo'
+require 'sinatra'
+require 'sinatra-authentication'
+
+use Rack::Session::Cookie, :secret => "heyhihello"
+TcUserTable.cabinet_path = File.dirname(__FILE__)
+
+facebook do
+  api_key 'aa2db1b96cb7b57f0c5b1d4d3d8f0a22'
+  secret '21d94ee63969ae3b3f833689838ca00f'
+  app_id 48652736613
+  url 'peoplewithjetpacks.com:4568/'
+  callback 'peoplewithjetpacks.com:4568/'
+end
+
+set :port, 4568
+
+get '/' do
+  haml :main
+end
+
+get '/test' do
+  login_required
+  'hihihi'
+end
+
+__END__
+
+@@ layout
+%html{:xmlns=>"http://www.w3.org/1999/xhtml", :'xmlns:fb'=>"http://www.facebook.com/2008/fbml"}
+  %head
+    %title Welcome to my Facebook Connect website!
+    %script{:type => 'text/javascript', :src => 'http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php/en_US'}
+    %script{:type => 'text/javascript', :src => 'http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js'}
+    :javascript
+      $(document).ready(function(){
+        /* test facebook crap works with ajax */
+        $('.sinatra-authentication-login').click(function(){
+          $.get($(this).attr('href'), {}, function(data){
+            $('#test_box').html(data);
+          });
+          return false;
+        });
+      });
+  %body
+    = render_login_logout
+    = yield
+    :javascript
+      FB.init("#{fb.api_key}", "/receiver")
+    #test_box
+
+@@ main
+- if fb[:user]
+  Hi,
+  %fb:profile-pic{:uid => fb[:user]}
+  %fb:name{:uid => fb[:user], :useyou => 'false', :firstnameonly => 'true'}
+  !
+  %br/
+

data/lib/models/dm_adapter.rb

@@ -31,15 +31,14 @@ module DmAdapter
     end
 
     def delete(pk)
-      user = User.first(:id => pk)
+      user = DmUser.first(:id => pk)
       user.destroy
     end
   end
 
   module InstanceMethods
     def update(attributes)
-      @instance.update_attributes attributes
-      @instance.save
+      @instance.update attributes
     end
 
     def method_missing(meth, *args, &block)

data/lib/sinatra-authentication.rb

@@ -11,7 +11,7 @@ module Sinatra
       #sinatra 9.1.1 doesn't have multiple view capability anywhere
       #so to get around I have to do it totally manually by
       #loading the view from this path into a string and rendering it
-      set :lil_authentication_view_path, Pathname(__FILE__).dirname.expand_path + "views/"
+      set :sinatra_authentication_view_path, Pathname(__FILE__).dirname.expand_path + "views/"
 
       get '/users' do
         login_required
@@ -48,6 +48,11 @@ module Sinatra
       post '/login' do
         if user = User.authenticate(params[:email], params[:password])
           session[:user] = user.id
+
+          if Rack.const_defined?('Flash')
+            flash[:notice] = "Login successful."
+          end
+
           if session[:return_to]
             redirect_url = session[:return_to]
             session[:return_to] = false
@@ -56,13 +61,18 @@ module Sinatra
             redirect '/'
           end
         else
+          if Rack.const_defined?('Flash')
+            flash[:notice] = "The email or password you entered is incorrect."
+          end
           redirect '/login'
         end
       end
 
       get '/logout' do
         session[:user] = nil
-        @message = "in case it weren't obvious, you've logged out"
+        if Rack.const_defined?('Flash')
+          flash[:notice] = "Logout successful."
+        end
         redirect '/'
       end
 
@@ -72,19 +82,23 @@ module Sinatra
 
       post '/signup' do
         @user = User.set(params[:user])
-        if @user
+        if @user && @user.id
           session[:user] = @user.id
+          if Rack.const_defined?('Flash')
+            flash[:notice] = "Account created."
+          end
           redirect '/'
         else
-          session[:flash] = "failure!"
-          redirect '/'
+          if Rack.const_defined?('Flash')
+            flash[:notice] = 'There were some problems creating your account. Please be sure you\'ve entered all your information correctly.'
+          end
+          redirect '/signup'
         end
       end
 
       get '/users/:id/edit' do
         login_required
         redirect "/users" unless current_user.admin? || current_user.id.to_s == params[:id]
-
         @user = User.get(:id => params[:id])
         haml get_view_as_string("edit.haml"), :layout => use_layout?
       end
@@ -101,9 +115,14 @@ module Sinatra
         end
 
         if user.update(user_attributes)
+          if Rack.const_defined?('Flash')
+            flash[:notice] = 'Account updated.'
+          end
           redirect '/'
         else
-          session[:notice] = 'whoops, looks like there were some problems with your updates'
+          if Rack.const_defined?('Flash')
+            flash[:notice] = 'Whoops, looks like there were some problems with your updates.'
+          end
           redirect "/users/#{user.id}/edit"
         end
       end
@@ -113,9 +132,13 @@ module Sinatra
         redirect "/users" unless current_user.admin? || current_user.id.to_s == params[:id]
 
         if User.delete(params[:id])
-          session[:flash] = "way to go, you deleted a user"
+          if Rack.const_defined?('Flash')
+            flash[:notice] = "User deleted."
+          end
         else
-          session[:flash] = "deletion failed, for whatever reason"
+          if Rack.const_defined?('Flash')
+            flash[:notice] = "Deletion failed."
+          end
         end
         redirect '/'
       end
@@ -185,7 +208,7 @@ module Sinatra
 
     #BECAUSE sinatra 9.1.1 can't load views from different paths properly
     def get_view_as_string(filename)
-      view = options.lil_authentication_view_path + filename
+      view = options.sinatra_authentication_view_path + filename
       data = ""
       f = File.open(view, "r")
       f.each_line do |line|

data/lib/views/edit.haml

@@ -1,4 +1,6 @@
 #sinatra_authentication
+  - if Rack.const_defined?('Flash')
+    #sinatra_authentication_flash= flash[:notice]
   %h1
     Edit
     - if @user.id == current_user.id

data/lib/views/login.haml

@@ -1,4 +1,6 @@
 #sinatra_authentication
+  - if Rack.const_defined?('Flash')
+    #sinatra_authentication_flash= flash[:notice]
   %h1.page_title Login
   %form{:action => "/login", :method => "post"}
     .field

data/lib/views/signup.haml

@@ -1,4 +1,6 @@
 #sinatra_authentication
+  - if Rack.const_defined?('Flash')
+    #sinatra_authentication_flash= flash[:notice]
   %h1.page_title Signup
   %form{:action => "/signup", :method => "post"}
     .field

data/readme.markdown

@@ -2,23 +2,31 @@
 
 ## INSTALLATION:
 
-in your sinatra app simply require either "dm-core", "rufus-tokyo" or "mongo_mapper", "digest/sha1" and then "sinatra-authentication" and turn on session storage
+in your sinatra app simply require either "dm-core", "rufus-tokyo" or "mongo_mapper", "digest/sha1", 'rack-flash' (if you want flash messages) and then "sinatra-authentication" and turn on session storage
 with a super secret key, like so:
 
     require "dm-core"
     require "digest/sha1"
+    require 'rack-flash'
     require "sinatra-authentication"
 
     use Rack::Session::Cookie, :secret => 'A1 sauce 1s so good you should use 1t on a11 yr st34ksssss'
+    #if you want flash messages
+    use Rack::Flash
 
   If you're using rufus-tokyo, you also need to set the database path for Users. like so:
 
     require "rufus_tokyo"
     require "digest/sha1"
+    require 'rack-flash'
     require "sinatra-authentication"
+
+    #Setting the database path for Users
     TcUserTable.cabinet_path = File.dirname(__FILE__) + 'folder/where/you/wanna/store/your/database'
 
     use Rack::Session::Cookie, :secret => 'A1 sauce 1s so good you should use 1t on a11 yr st34ksssss'
+    #if you want flash messages
+    use Rack::Flash
 
 ## DEFAULT ROUTES:
 
@@ -37,6 +45,20 @@ If you fetch any of the user pages using ajax, they will automatically render wi
 * get      '/reciever'
 * get      '/connect'
 
+## FLASH MESSAGES
+
+Flash messages are implemented using rack-flash. To set them up add this to your code:
+
+    require 'rack-flash'
+
+    #be sure and do this after after 'use Rack:Session:Cookie...'
+    use Rack::Flash
+
+And then sinatra-authentication related flash messages will be made available through flash[:notice]
+
+    -# somewhere in a haml view:
+    = flash[:notice]
+
 ## HELPER METHODS:
 
 This plugin provides the following helper methods for your sinatra app:
@@ -141,3 +163,53 @@ If they aren't already logged in to the app through the normal login form,
 it creates a new user in the database without an email address or password.
 They can later add this data by going to "/users/#{current_user.id}/edit",
 which will allow them to log in using their email address and password, OR their facebook account.
+
+## OVERRIDING DEFAULT VIEWS
+
+Right now if you're going to override sinatra-authentication's views, you have to override all of them.
+This is something I hope to change in a future release.
+
+To override the default view path do something like this:
+
+    set :sinatra_authentication_view_path, Pathname(__FILE__).dirname.expand_path + "my_views/"
+
+And then the views you'll need to define are:
+
+* show.haml
+* index.haml
+* signup.haml
+* login.haml
+* edit.haml
+
+The signup and edit form fields are named so they pass a hash called 'user' to the server:
+
+   %input{:name => "user[email]", :size => 30, :type => "text", :value => @user.email}
+   %input{:name => "user[password]", :size => 30, :type => "password"}
+   %input{:name => "user[password_confirmation]", :size => 30, :type => "password"}
+
+   %select{:name => "user[permission_level]"}
+     %option{:value => -1, :selected => @user.admin?}
+       Admin
+     %option{:value => 1, :selected => @user.permission_level == 1}
+       Authenticated user
+
+The login form fields just pass a field called email and a field called password:
+
+    %input{:name => "email", :size => 30, :type => "text"}
+    %input{:name => "password", :size => 30, :type => "password"}
+
+To add methods or properties to the User class, you have to access the underlying database user class, like so:
+
+    class DmUser
+      property :name, String
+      property :has_dog, Boolean, :default => false
+    end
+
+The database user classes are named as follows:
+
+* for Datamapper:
+  > DmUser
+* for Rufus Tokyo:
+  > TcUser
+* for Mongomapper:
+  > MmUser

data/sinatra-authentication.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-authentication}
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Justus Spransy"]
-  s.date = %q{2010-01-14}
+  s.date = %q{2010-04-17}
   s.description = %q{Simple authentication plugin for sinatra.}
   s.email = %q{maxjustus@gmail.com}
   s.extra_rdoc_files = [
@@ -21,6 +21,16 @@ Gem::Specification.new do |s|
      "Manifest",
      "Rakefile",
      "TODO",
+     "example/dm_extend_app.rb",
+     "example/dm_sinbook.rb",
+     "example/extend_views/edit.haml",
+     "example/extend_views/index.haml",
+     "example/extend_views/login.haml",
+     "example/extend_views/show.haml",
+     "example/extend_views/signup.haml",
+     "example/mm_app.rb",
+     "example/tc_app.rb",
+     "example/tc_sinbook.rb",
      "lib/models/abstract_user.rb",
      "lib/models/datamapper_user.rb",
      "lib/models/dm_adapter.rb",
@@ -38,7 +48,13 @@ Gem::Specification.new do |s|
      "sinatra-authentication.gemspec",
      "test/datamapper_test.rb",
      "test/lib/dm_app.rb",
+     "test/lib/dm_extend_app.rb",
      "test/lib/dm_sinbook.rb",
+     "test/lib/extend_views/edit.haml",
+     "test/lib/extend_views/index.haml",
+     "test/lib/extend_views/login.haml",
+     "test/lib/extend_views/show.haml",
+     "test/lib/extend_views/signup.haml",
      "test/lib/helper.rb",
      "test/lib/mm_app.rb",
      "test/lib/tc_app.rb",
@@ -58,6 +74,7 @@ Gem::Specification.new do |s|
      "test/lib/mm_app.rb",
      "test/lib/tc_sinbook.rb",
      "test/lib/helper.rb",
+     "test/lib/dm_extend_app.rb",
      "test/lib/dm_app.rb",
      "test/datamapper_test.rb",
      "test/mongomapper_test.rb",
@@ -76,6 +93,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<dm-timestamps>, [">= 0"])
       s.add_runtime_dependency(%q<rufus-tokyo>, [">= 0"])
       s.add_runtime_dependency(%q<sinbook>, [">= 0"])
+      s.add_runtime_dependency(%q<rack-flash>, [">= 0"])
     else
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<dm-core>, [">= 0"])
@@ -83,6 +101,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<dm-timestamps>, [">= 0"])
       s.add_dependency(%q<rufus-tokyo>, [">= 0"])
       s.add_dependency(%q<sinbook>, [">= 0"])
+      s.add_dependency(%q<rack-flash>, [">= 0"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0"])
@@ -91,6 +110,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<dm-timestamps>, [">= 0"])
     s.add_dependency(%q<rufus-tokyo>, [">= 0"])
     s.add_dependency(%q<sinbook>, [">= 0"])
+    s.add_dependency(%q<rack-flash>, [">= 0"])
   end
 end
 

data/test/lib/dm_app.rb

@@ -2,12 +2,14 @@ require 'rubygems'
 require 'sinatra'
 require 'haml'
 require 'dm-core'
+require 'rack-flash'
 require File.join(File.dirname(__FILE__), '../../lib/sinatra-authentication')
 
 DataMapper.setup(:default, "sqlite3://#{Dir.pwd}/test.db")
 DataMapper.auto_migrate!
 
 use Rack::Session::Cookie, :secret => "heyhihello"
+use Rack::Flash
 
 set :environment, 'development'
 set :public, 'public'

data/test/lib/dm_extend_app.rb

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'sinatra'
+require 'haml'
+require 'dm-core'
+require 'rack-flash'
+require File.join(File.dirname(__FILE__), '../../lib/sinatra-authentication')
+
+
+class DmUser
+  property :name, String
+end
+
+DataMapper.setup(:default, "sqlite3://#{Dir.pwd}/test.db")
+DataMapper.auto_migrate!
+
+set :lil_authentication_view_path, Pathname(__FILE__).dirname.expand_path + "extend_views/"
+use Rack::Session::Cookie, :secret => "heyhihello"
+use Rack::Flash
+
+set :environment, 'development'
+set :public, 'public'
+set :views,  'views'
+
+get '/' do
+  haml "= render_login_logout", :layout => :layout
+end

data/test/lib/extend_views/edit.haml

@@ -0,0 +1,42 @@
+#sinatra_authentication
+  #sinatra_authentication_flash= session[:flash]
+  %h1
+    Edit
+    - if @user.id == current_user.id
+      account
+    - else
+      - if @user.email
+        = @user.email
+      - elsif @user.fb_uid
+        <fb:name uid=#{@user.fb_uid} linked='false' />
+      - else
+        account
+  %form{:action => "/users/#{@user.id}/edit", :method => "post"}
+    .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
+      .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/test/lib/extend_views/index.haml

@@ -0,0 +1,31 @@
+#sinatra_authentication
+  %h1.page_title Users
+  %table
+    %tr
+      %th
+      - if current_user.admin?
+        %th permission level
+    - @users.each do |user|
+      %tr
+        %td
+          - if user.email
+            = user.email
+          - elsif user.fb_uid
+            <fb:name uid=#{user.fb_uid} />
+          - else
+            "user #{user.id}"
+        - if current_user.admin?
+          %td= user.permission_level
+        %td
+          = user.name
+        %td
+          %a{:href => "/users/#{user.id}"} show
+        - if current_user.admin?
+          %td
+            %a{:href => "/users/#{user.id}/edit"} edit
+          %td
+            -# this doesn't work for tk
+            - if !user.site_admin?
+              %a{:href => "/users/#{user.id}/delete", :onclick => "return confirm('you sure?')"} delete
+            - else
+              site admin

data/test/lib/extend_views/login.haml

@@ -0,0 +1,21 @@
+#sinatra_authentication
+  #sinatra_authentication_flash= session[:flash]
+  %h1.page_title Login
+  %form{:action => "/login", :method => "post"}
+    .field
+      .label
+        %label{:for => "user_email'"} Email
+      %input{:id => "user_email", :name => "email", :size => 30, :type => "text"}
+    .field
+      .label
+        %label{:for => "user_password"} Password
+      %input{:id => "user_password", :name => "password", :size => 30, :type => "password"}
+    .buttons
+      %input{:value => "login", :type => "submit"}
+      %a{:href => "/signup", :class => 'sinatra_authentication_link'}
+        Signup
+    - if Sinatra.const_defined?('FacebookObject')
+      .third_party_signup
+        %h3.section_title One click login:
+        .login_link.facebook_login
+          = render_facebook_connect_link('Login using facebook', :size => 'large')

data/test/lib/extend_views/show.haml

@@ -0,0 +1,9 @@
+#sinatra_authentication
+  %h1.page_title
+    - if @user.email
+      = @user.email
+    - elsif @user.fb_uid
+      <fb:name uid=#{@user.fb_uid} linked='false' />
+  - if current_user.admin?
+    %h2 permission level
+    = @user.permission_level

data/test/lib/extend_views/signup.haml

@@ -0,0 +1,29 @@
+#sinatra_authentication
+  #sinatra_authentication_flash= session[:flash]
+  %h1.page_title Signup
+  %form{:action => "/signup", :method => "post"}
+    .field
+      .label
+        %label{:for => "user_email"} Email
+      %input{ :id => "user_email", :name => "user[email]", :size => 30, :type => "text" }
+    .field
+      .label
+        %label{:for => "user_password"} Password
+      %input{ :id => "user_password", :name => "user[password]", :size => 30, :type => "password" }
+    .field
+      .label
+        %label{:for => "user_name"} Name
+      %input{ :id => "user_name", :name => "user[name]", :size => 30, :type => "text" }
+    .field
+      .label
+        %label{:for => "user_password_confirmation"} Confirm Password
+      %input{ :id => "user_password_confirmation", :name => "user[password_confirmation]", :size => 30, :type => "password" }
+    .buttons
+      %input{ :value => "Create account", :type => "submit" }
+      %a{:href => "/login", :class => 'sinatra_authentication_link'}
+        Login
+    - if Sinatra.const_defined?('FacebookObject')
+      .third_party_signup
+        %h3.section_title One click signup:
+        .login_link.facebook_login
+          = render_facebook_connect_link('Signup using facebook', :size => 'large')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-authentication
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Max Justus Spransy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 -06:00
+date: 2010-04-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-flash
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Simple authentication plugin for sinatra.
 email: maxjustus@gmail.com
 executables: []
@@ -86,6 +96,16 @@ files:
 - Manifest
 - Rakefile
 - TODO
+- example/dm_extend_app.rb
+- example/dm_sinbook.rb
+- example/extend_views/edit.haml
+- example/extend_views/index.haml
+- example/extend_views/login.haml
+- example/extend_views/show.haml
+- example/extend_views/signup.haml
+- example/mm_app.rb
+- example/tc_app.rb
+- example/tc_sinbook.rb
 - lib/models/abstract_user.rb
 - lib/models/datamapper_user.rb
 - lib/models/dm_adapter.rb
@@ -103,7 +123,13 @@ files:
 - sinatra-authentication.gemspec
 - test/datamapper_test.rb
 - test/lib/dm_app.rb
+- test/lib/dm_extend_app.rb
 - test/lib/dm_sinbook.rb
+- test/lib/extend_views/edit.haml
+- test/lib/extend_views/index.haml
+- test/lib/extend_views/login.haml
+- test/lib/extend_views/show.haml
+- test/lib/extend_views/signup.haml
 - test/lib/helper.rb
 - test/lib/mm_app.rb
 - test/lib/tc_app.rb
@@ -145,6 +171,7 @@ test_files:
 - test/lib/mm_app.rb
 - test/lib/tc_sinbook.rb
 - test/lib/helper.rb
+- test/lib/dm_extend_app.rb
 - test/lib/dm_app.rb
 - test/datamapper_test.rb
 - test/mongomapper_test.rb