sinatra-session-auth 0.1.0 → 0.1.1

data/.gitignore

@@ -1 +1,2 @@
 pkg/
+webrat.log

data/Rakefile

@@ -1,5 +1,8 @@
 require 'rubygems'
 require 'rake'
+require "rake/testtask"
+
+task :default => ["test"]
 
 begin
   require 'jeweler'
@@ -16,3 +19,8 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
+end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/sinatra/session_auth.rb

@@ -3,17 +3,17 @@ require 'digest/sha1'
 
 module Sinatra
   module SessionAuth
-    module EncryptionHelpers
+    module ModelHelpers
       def self.included(klass)
-        klass.send(:include, InstanceMethods)
-        klass.send(:extend,  ClassMethods   )
+        klass.send :include, InstanceMethods
+        klass.send :extend,  ClassMethods
       end 
 
       module InstanceMethods
         def password=(pass)
           @password = pass
-          self.salt = User.random_string(10) unless self.salt
-          self.hashed_password = User.encrypt(@password, self.salt)
+          self.salt = self.class.random_string(10) unless self.salt
+          self.hashed_password = self.class.encrypt(@password, self.salt)
         end
       end
 
@@ -45,10 +45,7 @@ module Sinatra
       end
 
       def authorize!
-        unless authorized?
-          flash[:notice] = 'You must be logged in to view this page.'
-          redirect '/login'
-        end
+        redirect '/protected/login' unless authorized?
       end
 
       def logout!
@@ -58,41 +55,6 @@ module Sinatra
 
     def self.registered(app)
       app.helpers SessionAuth::Helpers
-      app.set :views, "/views"
-      app.get '/login' do
-        erb :login
-      end
-
-      app.post '/login' do
-        if session[:user] = User.authenticate(params[:user])
-          flash[:notice] = "Login succesful"
-          redirect '/'
-        else
-          flash[:notice] = "Login failed - Try again"
-          redirect '/login'
-        end
-      end
-
-      app.get '/logout' do
-        logout!
-        flash[:notice] = "Logged out"
-        redirect '/'
-      end
-      
-      app.get "/signup" do
-        erb :signup
-      end
-
-      app.post "/signup" do
-        if user = User.create(params[:user])
-          session[:user] = user
-          flash[:notice] = "Your account was succesfully created"
-          redirect '/'
-         else
-           flash[:notice] = "Signup failed - Try again"
-           redirect '/signup'
-        end
-      end
     end
   end
 

data/sinatra-session-auth.gemspec

@@ -0,0 +1,52 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{sinatra-session-auth}
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Patrik Hedman"]
+  s.date = %q{2009-11-25}
+  s.description = %q{sinatra-session-auth is an extension for Sinatra to add orm-agnostic session based user authorization}
+  s.email = %q{patrik@moresale.se}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION",
+     "lib/sinatra/session_auth.rb",
+     "sinatra-session-auth.gemspec",
+     "test/app/app.rb",
+     "test/app_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/polly/sinatra-session-auth}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{A orm-agnostic extension to add session based user authorization}
+  s.test_files = [
+    "test/app/app.rb",
+     "test/app_test.rb",
+     "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

data/test/app/app.rb

@@ -0,0 +1,79 @@
+$:.unshift File.join('..', 'lib', 'sinatra')
+
+require 'rubygems'
+require 'dm-core'
+require 'sinatra' 
+require 'rack-flash'
+require 'sinatra/session_auth'
+
+DataMapper.setup(:default, 'sqlite3::memory:')
+
+class User
+  include DataMapper::Resource
+  include Sinatra::SessionAuth::ModelHelpers 
+
+  property :id,              Serial
+  property :login,           String
+  property :salt,            String
+  property :hashed_password, String
+end
+
+User.auto_migrate!
+
+use Rack::Session::Cookie
+use Rack::Flash
+
+get "/" do
+  erb "<%= flash[:notice] %><br />Public"
+end
+
+get "/protected" do
+  flash[:notice] = 'You must be logged in to view this page.'
+  authorize!
+  erb "<%= flash[:notice] %><br />Protected"
+end
+
+get '/protected/login' do
+  '<form action="/protected/login" method="post">
+    <label for="login">Login</label><input id="login" type="text" size="30" name="user[login]"/>
+    <label for="password">Password</label><input id="password" type="password" size="30" name="user[password]"/>
+    <br/>
+    <input type="submit" value="Submit" name="submit"/>
+  </form>'
+end
+
+post '/protected/login' do
+  if session[:user] = User.authenticate(params[:user])
+    flash[:notice] = "Login succesful"
+    redirect '/'
+  else
+    flash[:notice] = "Login failed, try again"
+    redirect '/login'
+  end
+end
+
+get '/protected/signup' do
+  '<form action="/protected/signup" method="post">
+    <label for="login">Login</label><input id="login" type="text" size="30" name="user[login]"/>
+    <label for="password">Password</label><input id="password" type="password" size="30" name="user[password]"/>
+    <br/>
+    <input type="submit" value="Submit" name="submit"/>
+  </form>'
+end
+
+post '/protected/signup' do
+  if session[:user] = User.new(params[:user])
+    flash[:notice] = "Your account has been created"
+    redirect '/'
+  else
+    flash[:notice] = "Signup failed, try again"
+    redirect '/login'
+  end
+end
+
+get '/protected/logout' do
+  logout!
+  flash[:notice] = "Logged out"
+  redirect '/'
+end
+

data/test/app_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+class AppTest < Test::Unit::TestCase
+  
+  context "GET /" do
+    should "not require authentication" do
+      visit "/"
+      assert_contain "Public"
+    end
+  end
+  
+  context "GET /protected" do
+    should "require authentication" do
+      visit "/protected"
+      assert_equal "http://example.org/protected/login", last_request.url
+    end
+  end
+
+  context "A visitor" do
+    should "be able to signup for an account" do
+      visit "/protected/signup" 
+      fill_in "Login",    :with => "pmh"
+      fill_in "Password", :with => "1234"
+      click_button "Submit"
+      assert_contain "Your account has been created"
+    end
+
+    should "be able to login" do
+      user = User.create(:login => "pmh", :password => "1234")
+
+      visit "/protected/login"
+      fill_in "Login",    :with => "pmh"
+      fill_in "Password", :with => "1234"
+      click_button "Submit"
+      assert_contain "Login succesful"
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,43 @@
+ENV['RACK_ENV'] = "test"
+
+require 'app/app'
+require 'rack/test'
+require 'webrat'
+
+Sinatra::Application.set(
+  :environment => :test,
+  :run => false,
+  :raise_errors => true,
+  :logging => false
+)
+
+Webrat.configure do |config|
+  config.mode = :rack
+  config.application_port = 4567
+end
+
+module TestHelper
+
+  def app
+    # change to your app class if using the 'classy' style
+    # Sinatra::Application.new
+    Sinatra::Application.new
+  end
+
+  def body
+    last_response.body
+  end
+
+  def status
+    last_response.status
+  end
+
+  include Rack::Test::Methods
+  include Webrat::Methods
+  include Webrat::Matchers
+end
+
+require 'test/unit'
+require 'shoulda'
+
+Test::Unit::TestCase.send(:include, TestHelper)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-session-auth
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Patrik Hedman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 +01:00
+date: 2009-11-25 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,10 @@ files:
 - Rakefile
 - VERSION
 - lib/sinatra/session_auth.rb
+- sinatra-session-auth.gemspec
+- test/app/app.rb
+- test/app_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/polly/sinatra-session-auth
 licenses: []
@@ -57,5 +61,7 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A orm-agnostic extension to add session based user authorization
-test_files: []
-
+test_files: 
+- test/app/app.rb
+- test/app_test.rb
+- test/test_helper.rb