active_session 0.1.0 → 0.2.0

data/lib/active_session.rb

@@ -1,117 +1,7 @@
 require "active_model"
-require "active_support/core_ext"
-require "active_session/attribute_methods"
+require "authencitity_validator"
 require "active_session/errors"
 
 module ActiveSession
-  # Adds a simple session mechanism for a given model.
-  #
-  # <tt>authenticates :user</tt> adds <tt>user</tt> and
-  # <tt>user=(new_user)</tt> methods.
-  #
-  # Options are:
-  # * <tt>:class_name</tt> - Specifies the class name of the
-  #   association. Use it only if that name can't be inferred from the
-  #   name. So <tt>authenticates :user</tt> will by default be linked
-  #   to the User class, but if the real class name is Admin, you'll
-  #   have to specify it using this option.
-  # * <tt>:foreign_key</tt> - Specifies the foreign key of the
-  #   association. Use it only if the key can't be inferred from the
-  #   name. So <tt>authenticates :user</tt> will by default add
-  #   <tt>user_id</tt> and <tt>user_id=(new_user_id)</tt> methods.
-  # * <tt>:primary_key</tt> - Specifies the primary key of the
-  #   association. Use it only if the key is different than <tt>id</tt>.
-  # * <tt>:finder_method</tt> - Specifies the finder_method for the
-  #   association. Uses <tt>find_for_authentication</tt> method by
-  #   default.
-  # * <tt>:persists</tt> - Specifies if the session model is
-  #   persistable in the store. If set to <tt>true</tt> (default)
-  #   <tt>foreign_key</tt> will be used to store session. So
-  #   <tt>authenticates :user</tt> will by default store the session
-  #   using <tt>:user_id</tt> key in the store, and use
-  #   <tt>user_id</tt> method to fetch the stored value. You can
-  #   change it to <tt>:email</tt> if you want to use <tt>:email</tt>
-  #   key and <tt>email</tt> method to store the session. You can also
-  #   turn the persistence off by passing <tt>false</tt>. Adds
-  #   <tt>save</tt>, <tt>destroy</tt>, <tt>persisted?</tt> and a class
-  #   method <tt>find</tt> when turned on. When turned off adds only
-  #   <tt>persisted?</tt> method that returns false to comply with
-  #   <tt>ActiveModel::Lint</tt>.
 
-  def authenticates(name, options = {})
-    options.assert_valid_keys(:class_name, :foreign_key, :primary_key, :finder_method, :persists)
-
-    klass         = options.fetch(:class_name, name.to_s.classify)
-    foreign_key   = options.fetch(:foreign_key, "#{name}_id").to_sym
-    primary_key   = options.fetch(:primary_key, "id").to_sym
-    finder_method = options.fetch(:finder_method, "find_for_authentication").to_sym
-    persists      = options.fetch(:persists, foreign_key)
-
-    extend ActiveModel::Naming
-    include ActiveModel::AttributeMethods
-    include ActiveModel::Conversion
-    include ActiveModel::MassAssignmentSecurity
-    include ActiveModel::Validations
-
-    include AttributeMethods
-
-    attribute_method_suffix "", "="
-
-    validates name, :presence => true
-
-    class_eval <<-END, __FILE__, __LINE__ + 1
-      def #{name}
-        return @#{name} if defined?(@#{name})
-        @#{name} = #{klass}.#{finder_method}(:#{primary_key} => #{foreign_key})
-      end
-
-      def #{name}=(model)
-        raise ActiveSession::AssociationTypeMismatch, "#{klass} expected, got \#{model.class}" unless model.nil? or model.is_a?(#{klass})
-        self.#{foreign_key} = model.try(:#{primary_key})
-      end
-
-      def #{foreign_key}
-        @attributes[:#{foreign_key}]
-      end
-
-      def #{foreign_key}=(model_id)
-        remove_instance_variable("@#{name}") if instance_variable_defined?("@#{name}")
-        @attributes[:#{foreign_key}] = model_id
-      end
-    END
-
-    persists(persists == true ? foreign_key : persists)
-  end
-
-  private
-
-  def persists(key)
-    if key
-      instance_eval <<-END, __FILE__, __LINE__ + 1
-        def find(store)
-          new(store, :#{key} => store[:#{key}])
-        end
-      END
-
-      class_eval <<-END, __FILE__, __LINE__ + 1
-        def persisted?
-          @store[:#{key}].present? and @store[:#{key}] == #{key}
-        end
-
-        def destroy
-          persisted? && @store.delete(:#{key}) && true
-        end
-
-        def save
-          valid? && (@store[:#{key}] = #{key}) && true
-        end
-      END
-    else
-      class_eval <<-END, __FILE__, __LINE__ + 1
-        def persisted?
-          false
-        end
-      END
-    end
-  end
 end

data/lib/active_session/{attribute_methods.rb → base.rb}

@@ -1,5 +1,13 @@
 module ActiveSession
-  module AttributeMethods
+  class Base
+    extend ActiveModel::Naming
+    include ActiveModel::AttributeMethods
+    include ActiveModel::Conversion
+    include ActiveModel::MassAssignmentSecurity
+    include ActiveModel::Validations
+
+    attribute_method_suffix "", "="
+
     def initialize(store, attributes = nil, options = {})
       @store = store
       @attributes = {}
@@ -7,10 +15,6 @@ module ActiveSession
       yield self if block_given?
     end
 
-    def attributes
-      @attributes
-    end
-
     def attributes=(attributes)
       assign_attributes(attributes)
     end
@@ -33,6 +37,10 @@ module ActiveSession
       end
     end
 
+    def persisted?
+      false
+    end
+
     private
 
     def attribute(attribute)

data/lib/active_session/errors.rb

@@ -6,8 +6,4 @@ module ActiveSession
   class UnknownAttributeError < NoMethodError
     include ActiveSessionError
   end
-
-  class AssociationTypeMismatch < StandardError
-    include ActiveSessionError
-  end
 end

data/lib/active_session/version.rb

@@ -1,3 +1,3 @@
 module ActiveSession
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/authenticity_validator.rb

@@ -0,0 +1,7 @@
+class AuthenticityValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    authenticating_record = options[:of] ? record.send(options[:of]) : record
+    authentic = authenticating_record ? authenticating_record.authenticate(value) : true
+    record.errors.add(attribute, :invalid) unless authentic
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_session
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-19 00:00:00.000000000Z
+date: 2011-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &11440600 !ruby/object:Gem::Requirement
+  requirement: &19050140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *11440600
+  version_requirements: *19050140
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &11440080 !ruby/object:Gem::Requirement
+  requirement: &19049640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *11440080
+  version_requirements: *19049640
 description: ActiveModel session
 email:
 - qoobaa@gmail.com
@@ -49,13 +49,11 @@ files:
 - Rakefile
 - active_session.gemspec
 - lib/active_session.rb
-- lib/active_session/attribute_methods.rb
+- lib/active_session/base.rb
 - lib/active_session/errors.rb
 - lib/active_session/version.rb
+- lib/authenticity_validator.rb
 - test/helper.rb
-- test/models/user.rb
-- test/models/user_session.rb
-- test/user_session_test.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -76,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ActiveModel session

data/test/models/user.rb

@@ -1,11 +0,0 @@
-class User
-  attr_reader :id
-
-  def self.find_for_authentication(conditions)
-    new(conditions[:id]) if conditions[:id].to_i > 0
-  end
-
-  def initialize(id)
-    @id = id
-  end
-end

data/test/models/user_session.rb

@@ -1,4 +0,0 @@
-class UserSession
-  extend ActiveSession
-  authenticates :user
-end

data/test/user_session_test.rb

@@ -1,126 +0,0 @@
-require "helper"
-
-require "models/user"
-require "models/user_session"
-
-describe UserSession do
-  include ActiveModel::Lint::Tests
-
-  before do
-    @store = {}
-    @model = UserSession.new(@store)
-  end
-
-  describe "valid?" do
-
-    it "returns false if new record" do
-      session = UserSession.new(@store)
-      assert_equal false, session.valid?
-    end
-
-    it "returns true with existing user_id" do
-      session = UserSession.new(@store, :user_id => 1)
-      assert_equal true, session.valid?
-    end
-
-    it "returns false with non-existing user_id" do
-      session = UserSession.new(@store, :user_id => "non-existing")
-      assert_equal false, session.valid?
-    end
-
-    it "returns true with existing user" do
-      session = UserSession.new(@store, :user => User.new(1))
-      assert_equal true, session.valid?
-    end
-
-    it "returns false when user is nil" do
-      session = UserSession.new(@store, :user => nil)
-      assert_equal false, session.valid?
-    end
-
-  end
-
-  describe "save" do
-
-    it "returns true with existing user_id" do
-      session = UserSession.new(@store, :user_id => 5)
-      assert_equal true, session.save
-      assert_equal 5, @store[:user_id]
-    end
-
-    it "returns false with non-existing user" do
-      @store[:user_id] = "666"
-      session = UserSession.new(@store, :user => nil)
-      assert_equal false, session.save
-      assert_equal "666", @store[:user_id]
-    end
-
-  end
-
-  describe "persisted?" do
-
-    it "returns true with existing user and user_id in store" do
-      @store[:user_id] = 1
-      session = UserSession.new(@store, :user_id => 1)
-      assert_equal true, session.persisted?
-    end
-
-    it "returns false without user_id" do
-      @store[:user_id] = "666"
-      session = UserSession.new(@store)
-      assert_equal false, session.persisted?
-    end
-
-    it "returns false with existing user and different user_id in store" do
-      @store[:user_id] = "666"
-      session = UserSession.new(@store, :user_id => 1)
-      assert_equal false, session.persisted?
-    end
-
-  end
-
-  describe "destroy" do
-
-    it "returns true when persisted with existing user" do
-      @store[:user_id] = 1
-      session = UserSession.new(@store, :user_id => 1)
-      assert_equal true, session.destroy
-      assert_nil @store[:user_id]
-    end
-
-    it "returns false when not persisted" do
-      @store[:user_id] = "666"
-      session = UserSession.new(@store, :user_id => 1)
-      assert_equal false, session.destroy
-      assert_equal "666", @store[:user_id]
-    end
-
-  end
-
-  describe "user" do
-
-    it "returns user with given user_id" do
-      session = UserSession.new(@store)
-      assert_nil session.user
-      session.user_id = 1
-      assert_equal 1, session.user.id
-    end
-
-  end
-
-  describe "user=" do
-
-    it "works properly with nil" do
-      session = UserSession.new(@store, :user => User.new(1))
-      session.user = nil
-      assert_nil session.user
-      assert_nil session.user_id
-    end
-
-    it "raises exception when non-user class given" do
-      session = UserSession.new(@store, :user_id => 1)
-      assert_raises(ActiveSession::AssociationTypeMismatch) { session.user = "zomg" }
-    end
-
-  end
-end