sinatra-authentication 0.3.2 → 0.4.0

data/sinatra-authentication.gemspec

@@ -1,85 +1,111 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-authentication}
-  s.version = "0.3.2"
+  s.version = "0.4.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-06-14}
+  s.date = %q{2010-12-13}
   s.description = %q{Simple authentication plugin for sinatra.}
   s.email = %q{maxjustus@gmail.com}
   s.extra_rdoc_files = [
     "TODO"
   ]
   s.files = [
-    ".gitignore",
-     "History.txt",
-     "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",
-     "lib/models/mm_adapter.rb",
-     "lib/models/mongomapper_user.rb",
-     "lib/models/rufus_tokyo_user.rb",
-     "lib/models/tc_adapter.rb",
-     "lib/sinatra-authentication.rb",
-     "lib/views/edit.haml",
-     "lib/views/index.haml",
-     "lib/views/login.haml",
-     "lib/views/show.haml",
-     "lib/views/signup.haml",
-     "readme.markdown",
-     "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",
-     "test/lib/tc_sinbook.rb",
-     "test/mongomapper_test.rb",
-     "test/route_tests.rb",
-     "test/rufus_tokyo_test.rb"
+    "History.txt",
+    "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",
+    "lib/models/mm_adapter.rb",
+    "lib/models/mongoid_adapter.rb",
+    "lib/models/mongoid_user.rb",
+    "lib/models/mongomapper_user.rb",
+    "lib/models/rufus_tokyo_user.rb",
+    "lib/models/sequel_adapter.rb",
+    "lib/models/sequel_user.rb",
+    "lib/models/tc_adapter.rb",
+    "lib/sinatra-authentication.rb",
+    "lib/sinatra-authentication/models.rb",
+    "lib/views/edit.haml",
+    "lib/views/index.haml",
+    "lib/views/login.haml",
+    "lib/views/show.haml",
+    "lib/views/signup.haml",
+    "readme.markdown",
+    "sinatra-authentication-0.3.2.gem",
+    "sinatra-authentication.gemspec",
+    "spec/run_all_specs.rb",
+    "spec/unit/dm_model_spec.rb",
+    "spec/unit/mm_model_spec.rb",
+    "spec/unit/mongoid_model_spec.rb",
+    "spec/unit/sequel_model_spec.rb",
+    "spec/unit/tc_model_spec.rb",
+    "spec/unit/user_specs.rb",
+    "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/mongoid_app.rb",
+    "test/lib/sequel_app.rb",
+    "test/lib/tc_app.rb",
+    "test/lib/tc_sinbook.rb",
+    "test/mongoid_test.rb",
+    "test/mongomapper_test.rb",
+    "test/route_tests.rb",
+    "test/rufus_tokyo_test.rb",
+    "test/sequel_test.rb"
   ]
   s.homepage = %q{http://github.com/maxjustus/sinatra-authentication}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Simple authentication plugin for sinatra.}
   s.test_files = [
+    "spec/run_all_specs.rb",
+    "spec/unit/dm_model_spec.rb",
+    "spec/unit/mm_model_spec.rb",
+    "spec/unit/mongoid_model_spec.rb",
+    "spec/unit/sequel_model_spec.rb",
+    "spec/unit/tc_model_spec.rb",
+    "spec/unit/user_specs.rb",
+    "test/datamapper_test.rb",
+    "test/lib/dm_app.rb",
+    "test/lib/dm_extend_app.rb",
     "test/lib/dm_sinbook.rb",
-     "test/lib/tc_app.rb",
-     "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",
-     "test/rufus_tokyo_test.rb",
-     "test/route_tests.rb"
+    "test/lib/helper.rb",
+    "test/lib/mm_app.rb",
+    "test/lib/mongoid_app.rb",
+    "test/lib/sequel_app.rb",
+    "test/lib/tc_app.rb",
+    "test/lib/tc_sinbook.rb",
+    "test/mongoid_test.rb",
+    "test/mongomapper_test.rb",
+    "test/route_tests.rb",
+    "test/rufus_tokyo_test.rb",
+    "test/sequel_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/run_all_specs.rb

@@ -0,0 +1,8 @@
+#!/bin/ruby
+
+specs = ['sequel_model', 'dm_model', 'mm_model', 'tc_model', 'mongoid_model']
+specs.each do |spec|
+  spec_path = File.dirname(__FILE__) + "/unit/#{spec}_spec.rb"
+  @output = %x[rspec #{spec_path}]
+  puts @output
+end

data/spec/unit/dm_model_spec.rb

@@ -0,0 +1,3 @@
+require File.join(File.dirname(__FILE__), '../../test/lib/dm_app')
+require File.join(File.dirname(__FILE__), '../../test/lib/helper')
+require File.join(File.dirname(__FILE__), 'user_specs')

data/spec/unit/mm_model_spec.rb

@@ -0,0 +1,3 @@
+require File.join(File.dirname(__FILE__), '../../test/lib/mm_app')
+require File.join(File.dirname(__FILE__), '../../test/lib/helper')
+require File.join(File.dirname(__FILE__), 'user_specs')

data/spec/unit/mongoid_model_spec.rb

@@ -0,0 +1,3 @@
+require File.join(File.dirname(__FILE__), '../../test/lib/mongoid_app')
+require File.join(File.dirname(__FILE__), '../../test/lib/helper')
+require File.join(File.dirname(__FILE__), 'user_specs')

data/spec/unit/sequel_model_spec.rb

@@ -0,0 +1,10 @@
+require File.join(File.dirname(__FILE__), '../../test/lib/sequel_app')
+require File.join(File.dirname(__FILE__), '../../test/lib/helper')
+require File.join(File.dirname(__FILE__), 'user_specs')
+
+describe User do
+  describe '#get' do
+    it 'Should pass arguments to the underlying ORM' do
+    end
+  end
+end

data/spec/unit/tc_model_spec.rb

@@ -0,0 +1,3 @@
+require File.join(File.dirname(__FILE__), '../../test/lib/tc_app')
+require File.join(File.dirname(__FILE__), '../../test/lib/helper')
+require File.join(File.dirname(__FILE__), 'user_specs')

data/spec/unit/user_specs.rb

@@ -0,0 +1,119 @@
+describe User do
+  before :each do
+    User.all.each do |u|
+      User.delete(u.id)
+    end
+
+    @user = User.set(TestHelper.gen_user_for_model)
+  end
+
+  describe 'instance' do
+    describe '#update' do
+      before :each do
+        @user.update(:password => 'password', :password_confirmation => 'password')
+      end
+
+      it 'Returns an instance if User' do
+        @user.class.should == User
+      end
+
+      it 'Should return true on success' do
+        @user.update(:email => 'max@max.com', :password => 'hi', :password_confirmation => 'hi').should == true
+        @user.update(:email => 'max@max.com').should == true
+      end
+
+      it 'Does not allow duplicate email addresses on update' do
+        @user_two = User.set(:email => 'steve@steve.com', :password => 'hi', :password_confirmation => 'hi')
+        @user.update(:email => 'steve@steve.com').should == false
+        #@user.class.should == User
+      end
+
+      it 'Should say saved is false when invalid' do
+        @user.update(:password => 'paz')
+        @user.saved.should == false
+      end
+    end
+
+    describe '#errors' do
+      it 'Returns a string of errors' do
+        @user.update(:password => 'paz')
+        @user.errors.class.should == String && @user.errors.length.should > 0
+      end
+    end
+
+    describe '#valid' do
+      it 'Should return false when invalid' do
+        @user.update(:password => 'hi')
+        @user.valid.should == false
+      end
+
+      it 'Should validate format of email' do
+        @user.update(:email => 'meeewewe!!')
+        @user.valid.should == false
+      end
+
+      it 'Should return true when valid' do
+        @user.valid.should == true
+      end
+    end
+  end
+
+  describe '#all' do
+    it 'Should return an array of instances of User' do
+      User.all[0].class.should == User
+    end
+
+    it 'Should return users in descending order of creation time' do
+      @newest_user = User.set(:email => 'hey@hi.com', :password => 'hihihi', :password_confirmation => 'hihihi', :created_at => Time.now + 1)
+      User.all[0].email.should == @newest_user.email
+    end
+
+    #it 'Should accept a page argument in a hash and limit results to 20 by default' do
+    #  40.times do |n|
+    #    @newest_user = User.set(:email => "#{n}hey@hi.com", :password => 'hihihi', :password_confirmation => 'hihihi', :created_at => Time.now + n)
+    #  end
+    #  users = User.all(:page => 0)
+    #  users[0].email.should == @newest_user.email
+    #  users.size.should == 20
+    #  User.all(:page => 1)[0].email.should == "19hey@hi.com"
+    #end
+  end
+
+  describe '#set' do
+    it 'Returns an instance if User' do
+      @user.class.should == User
+    end
+
+    it 'Timestamps user with Time' do
+      @user.created_at.class.should == Time
+    end
+
+    it 'Should set first user in database as site admin' do
+      @user.site_admin.should == true
+    end
+
+    #it 'Should say saved is true' do
+    #  @user.saved.should == true
+    #end
+  end
+
+  describe '#set!' do
+    before :each do
+      @user = User.set!({:password => 'hi'})
+    end
+
+    it 'Returns an instance if User' do
+      @user.class.should == User
+    end
+
+    #it 'Should say saved is true' do
+    #  @user.saved.should == true
+    #end
+  end
+
+  describe '#delete' do
+    it 'Returns a boolean' do
+      User.delete(@user.id).should == true
+    end
+  end
+end

data/test/lib/dm_app.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'sinatra'
 require 'haml'
 require 'dm-core'
+require 'dm-migrations'
 require 'rack-flash'
 require File.join(File.dirname(__FILE__), '../../lib/sinatra-authentication')
 

data/test/lib/dm_extend_app.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'sinatra'
 require 'haml'
 require 'dm-core'
+require 'dm-migrations'
 require 'rack-flash'
 require File.join(File.dirname(__FILE__), '../../lib/sinatra-authentication')
 

data/test/lib/extend_views/edit.haml

@@ -16,6 +16,10 @@
       .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_email"} Name
+      %input{ :id => "user_email", :name => "user[name]", :size => 30, :type => "text", :value => @user.name }
     .field
       .label
         %label{:for => "user_password"} New password

data/test/lib/extend_views/signup.haml

@@ -6,14 +6,14 @@
       .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"} Password
+      %input{ :id => "user_password", :name => "user[password]", :size => 30, :type => "password" }
     .field
       .label
         %label{:for => "user_password_confirmation"} Confirm Password

data/test/lib/helper.rb

@@ -2,6 +2,10 @@ class TestHelper
   def self.gen_user
     {'user[email]' => 'yodawg@gmail.com', 'user[password]' => 'password', 'user[password_confirmation]' => 'password'}
   end
+
+  def self.gen_user_for_model
+    {:email => 'yodawg@gmail.com', :password => 'password', :password_confirmation => 'password'}
+  end
 end
 
 def app

data/test/lib/mm_app.rb

@@ -1,24 +1,25 @@
 require 'rubygems'
-require 'sinatra/base'
+require 'sinatra'
 require 'haml'
+require 'rack-flash'
 require 'mongo_mapper'
-require File.join(File.dirname(__FILE__), '../../lib/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'])
+#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'])
+
+require File.join(File.dirname(__FILE__), '../../lib/sinatra-authentication')
 
-class TestApp < Sinatra::Base
-  use Rack::Session::Cookie, :secret => "heyhihello"
+MongoMapper.database = "sinatraauthtest"
 
-  register Sinatra::LilAuthentication 
+use Rack::Session::Cookie, :secret => "heyhihello"
+use Rack::Flash
 
-  set :environment, 'development'
-  set :public, 'public'
-  set :views,  'views'
+set :environment, 'development'
+set :public, 'public'
+set :views,  'views'
 
-  get '/' do
-    haml "= render_login_logout", :layout => :layout
-  end
+get '/' do
+  haml "= render_login_logout", :layout => :layout
 end

data/test/lib/mongoid_app.rb

@@ -0,0 +1,29 @@
+require 'rubygems'
+require 'sinatra'
+require 'haml'
+require 'rack-flash'
+require 'mongoid'
+
+#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'])
+
+require File.join(File.dirname(__FILE__), '../../lib/sinatra-authentication')
+
+Mongoid.configure do |config|
+  name = "sinatraauth_test"
+  host = "localhost"
+  config.master = Mongo::Connection.new.db(name)
+end
+
+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