sinatra-authentication 0.3.1 → 0.3.2

data/Rakefile

@@ -6,7 +6,7 @@ begin
   
   Jeweler::Tasks.new do |gemspec|
     gemspec.name           = 'sinatra-authentication'
-    gemspec.version        = '0.3.1'
+    gemspec.version        = '0.3.2'
     gemspec.description    = "Simple authentication plugin for sinatra."
     gemspec.summary        = "Simple authentication plugin for sinatra."
     gemspec.homepage       = "http://github.com/maxjustus/sinatra-authentication"
@@ -14,6 +14,7 @@ begin
     gemspec.email          = "maxjustus@gmail.com"
     gemspec.add_dependency "sinatra"
     gemspec.add_dependency "dm-core"
+    gemspec.add_dependency "dm-migrations"
     gemspec.add_dependency "dm-validations"
     gemspec.add_dependency "dm-timestamps"
     gemspec.add_dependency "rufus-tokyo"

data/example/dm_extend_app.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'sinatra'
 require 'haml'
 require 'dm-core'
+require 'dm-migrations'
 require 'rack-flash'
 require 'sinatra-authentication'
 

data/example/dm_sinbook.rb

@@ -3,6 +3,7 @@ require 'sinatra'
 require 'haml'
 require 'sinbook'
 require 'dm-core'
+require 'dm-migrations'
 require 'sinatra-authentication'
 
 facebook do

data/lib/models/datamapper_user.rb

@@ -16,9 +16,9 @@ class DmUser
   #protected :id, :salt
   #doesn't behave correctly, I'm not even sure why I did this.
 
-  validates_present :password_confirmation, :unless => Proc.new { |t| t.hashed_password }
-  validates_present :password, :unless => Proc.new { |t| t.hashed_password }
-  validates_is_confirmed :password
+  validates_presence_of :password_confirmation, :unless => Proc.new { |t| t.hashed_password }
+  validates_presence_of :password, :unless => Proc.new { |t| t.hashed_password }
+  validates_confirmation_of :password
 
   def password=(pass)
     @password = pass

data/readme.markdown

@@ -6,6 +6,8 @@ in your sinatra app simply require either "dm-core", "rufus-tokyo" or "mongo_map
 with a super secret key, like so:
 
     require "dm-core"
+    #for using auto_migrate!
+    require "dm-migrations"
     require "digest/sha1"
     require 'rack-flash'
     require "sinatra-authentication"
@@ -183,16 +185,17 @@ And then the views you'll need to define are:
 
 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"}
+    %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
-  #if you add attributes to the User class and pass them in the user hash your new attributes will be set along with the others.
+    %select{:name => "user[permission_level]"}
+      %option{:value => -1, :selected => @user.admin?}
+        Admin
+      %option{:value => 1, :selected => @user.permission_level == 1}
+        Authenticated user
+
+if you add attributes to the User class and pass them in the user hash your new attributes will be set along with the others.
 
 The login form fields just pass a field called email and a field called password:
 
@@ -206,7 +209,7 @@ To add methods or properties to the User class, you have to access the underlyin
       property :has_dog, Boolean, :default => false
     end
 
-And then to access/update your newly defined attributes you the User class:
+And then to access/update your newly defined attributes you use the User class:
 
     current_user.name
     current_user.has_dog

data/sinatra-authentication.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-authentication}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Justus Spransy"]
-  s.date = %q{2010-04-18}
+  s.date = %q{2010-06-14}
   s.description = %q{Simple authentication plugin for sinatra.}
   s.email = %q{maxjustus@gmail.com}
   s.extra_rdoc_files = [
@@ -66,7 +66,7 @@ Gem::Specification.new do |s|
   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.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Simple authentication plugin for sinatra.}
   s.test_files = [
     "test/lib/dm_sinbook.rb",
@@ -86,9 +86,10 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
       s.add_runtime_dependency(%q<dm-core>, [">= 0"])
+      s.add_runtime_dependency(%q<dm-migrations>, [">= 0"])
       s.add_runtime_dependency(%q<dm-validations>, [">= 0"])
       s.add_runtime_dependency(%q<dm-timestamps>, [">= 0"])
       s.add_runtime_dependency(%q<rufus-tokyo>, [">= 0"])
@@ -97,6 +98,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<dm-core>, [">= 0"])
+      s.add_dependency(%q<dm-migrations>, [">= 0"])
       s.add_dependency(%q<dm-validations>, [">= 0"])
       s.add_dependency(%q<dm-timestamps>, [">= 0"])
       s.add_dependency(%q<rufus-tokyo>, [">= 0"])
@@ -106,6 +108,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<sinatra>, [">= 0"])
     s.add_dependency(%q<dm-core>, [">= 0"])
+    s.add_dependency(%q<dm-migrations>, [">= 0"])
     s.add_dependency(%q<dm-validations>, [">= 0"])
     s.add_dependency(%q<dm-timestamps>, [">= 0"])
     s.add_dependency(%q<rufus-tokyo>, [">= 0"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-authentication
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Max Justus Spransy
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-18 00:00:00 -05:00
+date: 2010-06-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,74 +36,100 @@ dependencies:
   name: dm-core
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: dm-validations
+  name: dm-migrations
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: dm-timestamps
+  name: dm-validations
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rufus-tokyo
+  name: dm-timestamps
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: sinbook
+  name: rufus-tokyo
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rack-flash
+  name: sinbook
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rack-flash
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
 description: Simple authentication plugin for sinatra.
 email: maxjustus@gmail.com
 executables: []
@@ -166,23 +195,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple authentication plugin for sinatra.