sinatra-security 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/sinatra/security/login_field.rb

@@ -0,0 +1,16 @@
+module Sinatra
+  module Security
+    module LoginField
+      def self.attr_name(attr_name = nil)
+        @attr_name = attr_name if attr_name
+        @attr_name
+      end
+      attr_name(:email)
+      
+      def self.included(user)
+        user.attribute LoginField.attr_name
+        user.index     LoginField.attr_name
+      end
+    end
+  end
+end

data/lib/sinatra/security/user.rb

@@ -2,11 +2,12 @@ module Sinatra
   module Security
     module User
       def self.included(user)
-        user.send :include, Validations
+        user.send :include, LoginField
         user.send :include, Password
+        user.send :include, Validations
 
         user.extend Identification 
       end
     end
   end
-end
+end

data/lib/sinatra/security/validations.rb

@@ -2,7 +2,18 @@ module Sinatra
   module Security
     module Validations
       EMAIL_FORMAT = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
-
+      
+      def validate
+        # TODO : email requirement should only be done if
+        # LoginField.attr_name == :email maybe
+        # then just let users expilicity declare there own 
+        # validation rules
+        assert_login_using_email :email
+        assert_password :password
+        
+        super
+      end
+      
     protected
       def assert_login_using_email(att, error = [att, :not_email])
         if assert_present att

data/lib/sinatra/security.rb

@@ -13,6 +13,7 @@ module Sinatra
     autoload :Validations,    'sinatra/security/validations'
     autoload :Password,       'sinatra/security/password'
     autoload :Identification, 'sinatra/security/identification'
+    autoload :LoginField,     'sinatra/security/login_field'
 
     def self.registered(app)
       app.helpers Helpers
@@ -29,4 +30,4 @@ module Sinatra
   end
 
   register Security
-end
+end

data/sinatra-security.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-security}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/sinatra/security.rb",
      "lib/sinatra/security/helpers.rb",
      "lib/sinatra/security/identification.rb",
+     "lib/sinatra/security/login_field.rb",
      "lib/sinatra/security/password.rb",
      "lib/sinatra/security/user.rb",
      "lib/sinatra/security/validations.rb",

data/test/helper.rb

@@ -23,32 +23,36 @@ class Test::Unit::TestCase
 end
 
 # Test Fixtures appear here
-class User
-  attr :id
-  attr_accessor :email, :password
+module TestFixtures
+  class User
+    attr :id
+    attr_accessor :email, :password, :password_confirmation
 
-  def initialize(id = nil)
-    @id = id
-  end
-
-  def errors
-    @errors ||= []
-  end
+    def initialize(id = nil)
+      @id = id
+    end
 
-protected
-  def assert(value, error)
-    value or errors.push(error) && false
-  end
+    def errors
+      @errors ||= []
+    end
+  
+    def validate
+      # placed here so included validate method has a super to call 
+    end
+  protected
+    def assert(value, error)
+      value or errors.push(error) && false
+    end
 
-  def assert_present(att, error = [att, :not_present])
-    assert(!send(att).to_s.empty?, error)
-  end
+    def assert_present(att, error = [att, :not_present])
+      assert(!send(att).to_s.empty?, error)
+    end
 
-  def assert_format(att, format, error = [att, :format])
-    if assert_present(att, error)
-      assert(send(att).to_s.match(format), error)
+    def assert_format(att, format, error = [att, :format])
+      if assert_present(att, error)
+        assert(send(att).to_s.match(format), error)
+      end
     end
-  end
 
+  end
 end
-

data/test/test_sinatra_security_helpers.rb

@@ -5,6 +5,8 @@ class ExecutionContext < Struct.new(:session, :request)
   end
 end
 
+include TestFixtures
+
 class TestSinatraSecurityHelpers < Test::Unit::TestCase
   setup do
     @context = ExecutionContext.new({})

data/test/test_validations.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class UserWithEmailValidation < User
+class UserWithEmailValidation < TestFixtures::User
   include Sinatra::Security::Validations
  
   def initialize
@@ -19,9 +19,8 @@ class UserWithEmailValidation < User
   end
 end
 
-class UserWithPasswordValidation < User
+class UserWithPasswordValidation < TestFixtures::User
   include Sinatra::Security::Validations
-  attr_accessor :password_confirmation
 
   def initialize
     super
@@ -38,6 +37,14 @@ class UserWithPasswordValidation < User
   end
 end
 
+class UserDefaultValidation < TestFixtures::User
+  include Sinatra::Security::Validations
+
+  def errors
+    @errors ||= []
+  end
+end
+
 class TestValidations < Test::Unit::TestCase
   context "without an email" do
     should "require the email to be present" do
@@ -156,4 +163,51 @@ class TestValidations < Test::Unit::TestCase
       end
     end
   end
+
+  context "the default validations" do
+    setup do
+      @user = UserDefaultValidation.new
+      @user.stubs(:new?).returns(true)
+    end
+
+    should "assert presence of email" do
+      @user.validate
+
+      assert @user.errors.include?([:email, :not_present])
+    end
+
+    should "assert the email is an email" do
+      @user.email = '_foobar_'
+      @user.validate
+
+      assert @user.errors.include?([:email, :not_email])
+    end
+
+    should "assert the email is unique" do
+      @user.email = 'foo@bar.com'
+      @user.expects(:assert_unique).with(:email).returns(false)
+      @user.validate
+    end
+
+    should "assert the password is there" do
+      @user.password = ''
+      @user.validate
+      assert @user.errors.include?([:password, :not_present])
+    end
+
+    should "assert the password is confirmed" do
+      @user.password = 'aoeu'
+      @user.validate
+      assert @user.errors.include?([:password, :not_confirmed])
+    end
+
+    context "when the user is existing" do
+      should "not require a password" do
+        @user.stubs(:new?).returns(false)
+        @user.validate
+
+        assert ! @user.errors.include?([:password, :not_presen])
+      end
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Cyril David
@@ -40,6 +40,7 @@ files:
 - lib/sinatra/security.rb
 - lib/sinatra/security/helpers.rb
 - lib/sinatra/security/identification.rb
+- lib/sinatra/security/login_field.rb
 - lib/sinatra/security/password.rb
 - lib/sinatra/security/user.rb
 - lib/sinatra/security/validations.rb