active_model-session 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1e361dbb8d00204306b1d22e7088e9d2b84a299
-  data.tar.gz: ef97b68bef1105728de9deff30ccf85d06165ad0
+  metadata.gz: fb37c5a803683c66784ff7c578a9fe27f9a5acb0
+  data.tar.gz: bba585ddd3c4291d080970340d98d0a065b19614
 SHA512:
-  metadata.gz: d05d6039043638a7055e502e3390dfd594a056d2beb04bbf376d41ffd2dace3df7efea8807ccb585fc97dc7ece3ab56e47e1a3cb5cafdc06bc5e88fa163757ac
-  data.tar.gz: abd058d56c08cd8dbe4e7a577020f43073eaf9e5f6fe154acb36fa31cfa7dd0fac5f2dfa7ce5e72ac2c5bbf5bf5933d1fdd327ecbba32bb654fed883c2fac2a4
+  metadata.gz: a9d55f68eeca4e52360500aa64d522d55bab96ce624701f73938769d77b179550eaa19dbbe09591f22b9eb286fbd5cd85ccad671b7a7477ba14ac48537ac9cf2
+  data.tar.gz: 96e740e67dc4da347a10ce1516b48708686ea1468309aa73f01bce4aa969b8ad2db87201c943853436603288d6c11232f89fd702b5e9f0b3eec119a814a3dcaa

data/README.md

@@ -1,6 +1,7 @@
 # ActiveModel::Session
 
-A simple session model implemented on top of `ActiveModel::Model`.
+`ActiveModel::Session` is a lightweight session model implemented 
+on top of `ActiveModel::Model`.
 
 ## Installation
 

data/lib/active_model/session.rb

@@ -5,20 +5,25 @@ module ActiveModel
   class Session
     include Model
 
-    attr_accessor :email, :password
-    attr_writer :user
+    attr_accessor :password, :user
+    attr_reader :email
 
-    validates :email, presence: true
-    validate :authenticity, if: -> { email.present? }
+    validates :email, presence: true, if: -> { user.blank? }
+    validate :existence, if: -> { email.present? }
+    validate :authenticity, if: -> { user.present? }
     delegate :id, :authenticate, to: :user, prefix: true, allow_nil: true
 
-    def user
-      return @user if defined?(@user)
+    def email=(email)
+      @email = email
       @user = User.find_by(email: email)
     end
 
     private
 
+    def existence
+      errors.add(:email, :invalid) if user.blank?
+    end
+
     def authenticity
       errors.add(:password, :invalid) unless user_authenticate(password)
     end

data/lib/active_model/session/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   class Session
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/test/session_with_user_model_test.rb

@@ -47,7 +47,7 @@ class SessionWithUserModelTest < Test::Unit::TestCase
   def test_is_invalid_when_user_does_not_exist
     @session.email = "non-existing@example.com"
     assert @session.invalid?
-    assert @session.errors[:password].present?
+    assert @session.errors[:email].present?
   end
 
   def test_is_invalid_with_incorrect_password

data/test/session_without_user_model_test.rb

@@ -6,7 +6,7 @@ class SessionWithoutUserModelTest < Test::Unit::TestCase
   end
 
   def test_is_invalid_when_user_model_is_nil
-    session = ActiveModel::Session.new(user: nil, email: "alice@example.com", password: "secret")
+    session = ActiveModel::Session.new(user: nil, password: "secret")
     assert session.invalid?
   end
 
@@ -15,7 +15,7 @@ class SessionWithoutUserModelTest < Test::Unit::TestCase
     def user.authenticate(password)
       password == "secret"
     end
-    session = ActiveModel::Session.new(user: user, email: "alice@example.com", password: "wrongsecret")
+    session = ActiveModel::Session.new(user: user, password: "wrongsecret")
     assert session.invalid?
   end
 
@@ -24,7 +24,7 @@ class SessionWithoutUserModelTest < Test::Unit::TestCase
     def user.authenticate(password)
       password == "secret"
     end
-    session = ActiveModel::Session.new(user: user, email: "alice@example.com", password: "secret")
+    session = ActiveModel::Session.new(user: user, password: "secret")
     assert session.valid?
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: active_model-session
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Kuba Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple session model implemented on top of ActiveModel::Model
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -80,17 +80,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Simple session model implemented on top of ActiveModel::Model