sinatra-authentication 0.1.1 → 0.2.0

data/Manifest

@@ -5,6 +5,8 @@ TODO
 lib/models/abstract_user.rb
 lib/models/datamapper_user.rb
 lib/models/dm_adapter.rb
+lib/models/mongomapper_user.rb
+lib/models/mm_adapter.rb
 lib/models/rufus_tokyo_user.rb
 lib/models/tc_adapter.rb
 lib/sinatra-authentication.rb

data/Rakefile

@@ -6,7 +6,7 @@ begin
   
   Jeweler::Tasks.new do |gemspec|
     gemspec.name           = 'sinatra-authentication'
-    gemspec.version        = '0.1.1'
+    gemspec.version        = '0.2.0'
     gemspec.description    = "Simple authentication plugin for sinatra."
     gemspec.summary        = "Simple authentication plugin for sinatra."
     gemspec.homepage       = "http://github.com/maxjustus/sinatra-authentication"
@@ -25,3 +25,12 @@ rescue LoadError
 end
 
 Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/mongomapper_test.rb']
+  t.verbose = true
+end
+

data/lib/models/abstract_user.rb

@@ -4,9 +4,12 @@ if Object.const_defined?("DataMapper")
   require 'dm-validations'
   require Pathname(__FILE__).dirname.expand_path + "datamapper_user.rb"
   require Pathname(__FILE__).dirname.expand_path + "dm_adapter.rb"
-elsif Object.const_defined?("Rufus") && Rufus.const_defined?("Tokyo")
+elsif Object.const_defined?("Rufus")
   require Pathname(__FILE__).dirname.expand_path + "rufus_tokyo_user.rb"
   require Pathname(__FILE__).dirname.expand_path + "tc_adapter.rb"
+elsif Object.const_defined?("MongoMapper")
+  require Pathname(__FILE__).dirname.expand_path + "mongomapper_user.rb"
+  require Pathname(__FILE__).dirname.expand_path + "mm_adapter.rb"
 end
 
 class User
@@ -14,8 +17,10 @@ class User
     include DmAdapter
   elsif Object.const_defined?("Rufus")
     include TcAdapter
+  elsif Object.const_defined?("MongoMapper")
+    include MmAdapter 
   else
-    throw "you need to require either 'dm-core' or 'rufus-tokyo' for sinatra-authentication to work"
+    throw "you need to require either 'dm-core', 'mongo_mapper', or 'rufus-tokyo' for sinatra-authentication to work"
   end
 
   def initialize(interfacing_class_instance)

data/lib/models/mm_adapter.rb

@@ -0,0 +1,53 @@
+module MmAdapter 
+  def self.included(base)
+    base.extend ClassMethods
+    base.class_eval { include MmAdapter::InstanceMethods }
+  end
+
+  module ClassMethods
+    def all
+      result = MmUser.all
+      result.collect {|instance| self.new instance}
+    end
+
+    def get(hash)
+      if user = MmUser.first(hash)
+        self.new user
+      else
+        nil
+      end
+    end
+
+    def set(attributes)
+      puts attributes.inspect
+      user = MmUser.new attributes
+      puts user.inspect
+      puts user.to_json
+      user.save
+      user
+    end
+
+    def set!(attributes)
+      user = MmUser.new attributes
+      user.save!
+      user
+    end
+
+    def delete(pk)
+      user = User.first(:id => pk)
+      user.destroy
+    end
+  end
+
+  module InstanceMethods
+    def update(attributes)
+      @instance.update_attributes attributes
+      @instance.save
+    end
+
+    def method_missing(meth, *args, &block)
+      #cool I just found out * on an array turns the array into a list of args for a function
+      @instance.send(meth, *args, &block)
+    end
+  end
+end

data/lib/models/mongomapper_user.rb

@@ -0,0 +1,41 @@
+class MmUser 
+  include MongoMapper::Document
+
+  key :email, String, :length => (5..40), :unique => true 
+  key :hashed_password, String
+  key :salt, String
+  key :created_at, DateTime
+  key :permission_level, Integer, :default => 1
+  if Sinatra.const_defined?('FacebookObject')
+    key :fb_uid, String
+  end
+
+  attr_accessor :password, :password_confirmation
+  #protected equievelant? :protected => true doesn't exist in dm 0.10.0
+  #protected :id, :salt
+  #doesn't behave correctly, I'm not even sure why I did this.
+
+  #validates_presence_of :password_confirmation, :unless => Proc.new { |t| t.hashed_password }
+  #validates_presence_of :password, :unless => Proc.new { |t| t.hashed_password }
+  #validates_is_confirmed :password
+
+  def password=(pass)
+    @password = pass
+    self.salt = User.random_string(10) if !self.salt
+    self.hashed_password = User.encrypt(@password, self.salt)
+  end
+
+  def admin?
+    self.permission_level == -1 || self.id == 1
+  end
+
+  def site_admin?
+    self.id == 1
+  end
+
+  protected
+
+  def method_missing(m, *args)
+    return false
+  end
+end

data/lib/models/rufus_tokyo_user.rb

@@ -36,9 +36,9 @@ class TcUser
   def self.query(&block)
     connection = TcUserTable.new
     result_set = connection.query(&block)
-    output = result_set.collect { |result_hash| TcUser.new(result_hash) }
+    result_set.collect! { |result_hash| TcUser.new(result_hash) }
     connection.close
-    output
+    result_set
   end
 
   def self.get(key)

data/lib/sinatra-authentication.rb

@@ -2,10 +2,6 @@ require 'sinatra/base'
 require 'pathname'
 require Pathname(__FILE__).dirname.expand_path + "models/abstract_user"
 
-module SinatraAuthentication
-  VERSION = "0.0.3"
-end
-
 module Sinatra
   module LilAuthentication
     def self.registered(app)
@@ -17,12 +13,10 @@ module Sinatra
       #loading the view from this path into a string and rendering it
       set :lil_authentication_view_path, Pathname(__FILE__).dirname.expand_path + "views/"
 
-      #TODO write captain sinatra developer man and inform him that the documentation
-      #concerning the writing of extensions is somewhat outdaded/incorrect.
-      #you do not need to to do self.get/self.post when writing an extension
-      #In fact, it doesn't work. You have to use the plain old sinatra DSL
-
       get '/users' do
+        login_required
+        redirect "/" unless current_user.admin?
+
         @users = User.all
         if @users != []
           haml get_view_as_string("index.haml"), :layout => use_layout?
@@ -52,18 +46,18 @@ module Sinatra
       end
 
       post '/login' do
-          if user = User.authenticate(params[:email], params[:password])
-            session[:user] = user.id
-            if session[:return_to]
-              redirect_url = session[:return_to]
-              session[:return_to] = false
-              redirect redirect_url
-            else
-              redirect '/'
-            end
+        if user = User.authenticate(params[:email], params[:password])
+          session[:user] = user.id
+          if session[:return_to]
+            redirect_url = session[:return_to]
+            session[:return_to] = false
+            redirect redirect_url
           else
-            redirect '/login'
+            redirect '/'
           end
+        else
+          redirect '/login'
+        end
       end
 
       get '/logout' do
@@ -212,19 +206,19 @@ module Sinatra
         logout_parameters = html_attributes
         # a tad janky?
         logout_parameters.delete(:rel)
-        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> "
         if Sinatra.const_defined?('FacebookObject')
           if fb[:user]
-            result += "<a href='javascript:FB.Connect.logoutAndRedirect(\"/logout\");' class='#{css_classes} sinatra-authentication-logout' #{logout_parameters}>logout</a>"
+            result += "<a href='javascript:FB.Connect.logoutAndRedirect(\"/logout\");' class='#{css_classes} sinatra-authentication-logout' #{logout_parameters}>Logout</a>"
           else
-            result += "<a href='/logout' class='#{css_classes} sinatra-authentication-logout' #{logout_parameters}>logout</a>"
+            result += "<a href='/logout' class='#{css_classes} sinatra-authentication-logout' #{logout_parameters}>Logout</a>"
           end
         else
-          result += "<a href='/logout' class='#{css_classes} sinatra-authentication-logout' #{logout_parameters}>logout</a>"
+          result += "<a href='/logout' class='#{css_classes} sinatra-authentication-logout' #{logout_parameters}>Logout</a>"
         end
       else
-        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>"
+        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

@@ -1,6 +1,6 @@
 #sinatra_authentication
   %h1
-    Editing
+    Edit
     - if @user.id == current_user.id
       account
     - else

data/lib/views/login.haml

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

data/lib/views/signup.haml

@@ -1,13 +1,17 @@
 #sinatra_authentication
   %h1 Signup
   %form{:action => "/signup", :method => "post"}
-    %input{ :id => "user_email", :name => "user[email]", :size => 30, :type => "text" }
-    email
-    %br
-    %input{ :id => "user_password", :name => "user[password]", :size => 30, :type => "password" }
-    password
-    %br
-    %input{ :id => "user_password_confirmation", :name => "user[password_confirmation]", :size => 30, :type => "password" }
-    confirm
-    %br
-    %input{ :value => "sign up", :type => "submit" }
+    %p
+      %label{:for => "user_email"} Email
+      %br
+      %input{ :id => "user_email", :name => "user[email]", :size => 30, :type => "text" }
+    %p
+      %label{:for => "user_password"} Password
+      %br
+      %input{ :id => "user_password", :name => "user[password]", :size => 30, :type => "password" }
+    %p
+      %label{:for => "user_password_confirmation"} Confirm Password
+      %br
+      %input{ :id => "user_password_confirmation", :name => "user[password_confirmation]", :size => 30, :type => "password" }
+    %p
+      %input{ :value => "Create account", :type => "submit" }

data/sinatra-authentication.gemspec

@@ -5,13 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-authentication}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Justus Spransy"]
-  s.date = %q{2009-12-05}
+  s.date = %q{2010-01-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",
@@ -21,6 +24,8 @@ Gem::Specification.new do |s|
      "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",
@@ -35,8 +40,10 @@ Gem::Specification.new do |s|
      "test/lib/dm_app.rb",
      "test/lib/dm_sinbook.rb",
      "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"
   ]
@@ -48,10 +55,12 @@ Gem::Specification.new do |s|
   s.test_files = [
     "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_app.rb",
      "test/datamapper_test.rb",
+     "test/mongomapper_test.rb",
      "test/rufus_tokyo_test.rb",
      "test/route_tests.rb"
   ]

data/test/lib/mm_app.rb

@@ -0,0 +1,24 @@
+require 'rubygems'
+require 'sinatra/base'
+require 'haml'
+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'])
+
+class TestApp < Sinatra::Base
+  use Rack::Session::Cookie, :secret => "heyhihello"
+
+  register Sinatra::LilAuthentication 
+
+  set :environment, 'development'
+  set :public, 'public'
+  set :views,  'views'
+
+  get '/' do
+    haml "= render_login_logout", :layout => :layout
+  end
+end

data/test/mongomapper_test.rb

@@ -0,0 +1,39 @@
+require 'lib/mm_app'
+require 'lib/helper'
+require 'test/unit'
+require 'rack/test'
+
+Test::Unit::TestCase.send :include, Rack::Test::Methods
+
+class SinatraAuthMongoMapperTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  def app
+    TestApp
+  end
+
+  def setup
+    post '/signup', TestHelper.gen_user
+    follow_redirect!
+    get '/logout'
+  end
+
+  def test_should_login
+    post '/login', {'email' => TestHelper.gen_user['user[email]'], 'password' => TestHelper.gen_user['user[password]']}
+    follow_redirect!
+
+    assert_equal 'http://example.org/', last_request.url
+    #assert cookie_jar['user']
+    assert last_request.env['rack.session'][:user]
+    assert last_response.ok?
+  end
+
+  def test_should_logout
+    post '/login', {'email' => TestHelper.gen_user['user[email]'], 'password' => TestHelper.gen_user['user[password]']}
+    get '/logout'
+    follow_redirect!
+
+    assert !last_request.env['rack.session'][:user]
+    assert_equal 'http://example.org/', last_request.url
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-authentication
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Max Justus Spransy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-05 00:00:00 -06:00
+date: 2010-01-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,8 +78,8 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- TODO
 files: 
 - .gitignore
 - History.txt
@@ -89,6 +89,8 @@ files:
 - 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
@@ -103,8 +105,10 @@ files:
 - test/lib/dm_app.rb
 - test/lib/dm_sinbook.rb
 - 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
 has_rdoc: true
@@ -138,9 +142,11 @@ summary: Simple authentication plugin for sinatra.
 test_files: 
 - 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_app.rb
 - test/datamapper_test.rb
+- test/mongomapper_test.rb
 - test/rufus_tokyo_test.rb
 - test/route_tests.rb