sinatra-authentication-oran 0.0.1.1 → 0.0.1.2

data/lib/models/abstract_user.rb

@@ -44,8 +44,8 @@ class User
     @instance.id
   end
 
-  def self.authenticate(email, pass)
-    current_user = get(:email => email)
+  def self.authenticate(name, pass)
+    current_user = get(:name => name)
     return nil if current_user.nil?
     return current_user if User.encrypt(pass, current_user.salt) == current_user.hashed_password
     nil

data/lib/views/login.slim

@@ -1,4 +1,3 @@
-- # -*- coding:utf-8 -*-
 #sinatra_authentication
   - if Rack.const_defined?('Flash') && flash[:notice]
     #sinatra_authentication_flash= flash[:notice]
@@ -7,13 +6,13 @@
   h1.page_title Login
   form action="/login" method="post"
     .field
-      .label name
+      .label
         label for="user_name"
-      input id="user_name" name="email" size="30" type="text"
+      input id="user_name" name="name" size="30" type="text"
     .field
       .label
-        label for="user_password"pass 
-      input id="user_password" name="password" size="30"type="password"
+        label for="user_password"
+      input id="user_password" name="password" size="30" type="password"
     .buttons
       input value="Login" type="submit"
       a href="/signup" class='sinatra_authentication_link'

data/lib/views/signup.slim

@@ -7,20 +7,20 @@
   h1.page_title Sign Up
   form action="/signup" method="post"
     .field
-      .label name
-        label for="user_name"
+      .label
+        label for="user_name" name
       input  id="user_name" name="user[name]" size="30"type="text"  value=(params[:name])
     .field
-      .label mail
-        label for="user_email"
+      .label
+        label for="user_email" email
       input  id="user_email" name="user[email]" size="30"type="text"  value=(params[:email])
     .field
-      .label password
-        label for="user_password"
+      .label
+        label for="user_password" password
       input  id="user_password" name="user[password]" size="30" type="password" 
     .field
-      .label password again
-        label for="user_password_confirmation"
+      .label
+        label for="user_password_confirmation" password again
       input  id="user_password_confirmation" name="user[password_confirmation]" size="30" type="password" 
     .buttons
       input  value="Sign up" type="submit" 

data/sinatra-authentication-oran.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sinatra-authentication-oran"
-  s.version = "0.0.1.1"
+  s.version = "0.0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["oranzhang"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-authentication-oran
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &22094484 !ruby/object:Gem::Requirement
+  requirement: &22577628 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22094484
+  version_requirements: *22577628
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &22094112 !ruby/object:Gem::Requirement
+  requirement: &22577184 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22094112
+  version_requirements: *22577184
 - !ruby/object:Gem::Dependency
   name: dm-migrations
-  requirement: &22093728 !ruby/object:Gem::Requirement
+  requirement: &22576812 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22093728
+  version_requirements: *22576812
 - !ruby/object:Gem::Dependency
   name: dm-validations
-  requirement: &22093248 !ruby/object:Gem::Requirement
+  requirement: &22576464 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22093248
+  version_requirements: *22576464
 - !ruby/object:Gem::Dependency
   name: dm-timestamps
-  requirement: &22092792 !ruby/object:Gem::Requirement
+  requirement: &22576092 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22092792
+  version_requirements: *22576092
 - !ruby/object:Gem::Dependency
   name: rufus-tokyo
-  requirement: &22092444 !ruby/object:Gem::Requirement
+  requirement: &22524648 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22092444
+  version_requirements: *22524648
 - !ruby/object:Gem::Dependency
   name: sinbook
-  requirement: &22092108 !ruby/object:Gem::Requirement
+  requirement: &22524336 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22092108
+  version_requirements: *22524336
 - !ruby/object:Gem::Dependency
   name: rack-flash3
-  requirement: &22091748 !ruby/object:Gem::Requirement
+  requirement: &22524000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22091748
+  version_requirements: *22524000
 description: Simple authentication plugin for sinatra.
 email: 423794590@qq.com
 executables: []