active_session 0.0.3 → 0.0.4

data/lib/active_session/attribute_methods.rb

@@ -0,0 +1,46 @@
+module ActiveSession
+  module AttributeMethods
+    def initialize(store, attributes = nil, options = {})
+      @store = store
+      @attributes = {}
+      assign_attributes(attributes, options) if attributes
+      yield self if block_given?
+    end
+
+    def attributes
+      @attributes
+    end
+
+    def attributes=(attributes)
+      assign_attributes(attributes)
+    end
+
+    def assign_attributes(new_attributes, options = {})
+      return unless new_attributes
+
+      attributes = new_attributes.stringify_keys
+
+      unless options[:without_protection]
+        attributes = sanitize_for_mass_assignment(attributes, options.fetch(:as, :default))
+      end
+
+      attributes.each do |key, value|
+        if respond_to?("#{key}=")
+          send("#{key}=", value)
+        else
+          raise ActiveSession::UnknownAttributeError, "unknown attribute: #{key}"
+        end
+      end
+    end
+
+    private
+
+    def attribute(attribute)
+      @attributes[attribute.to_sym]
+    end
+
+    def attribute=(attribute, value)
+      @attributes[attribute.to_sym] = value
+    end
+  end
+end

data/lib/active_session/errors.rb

@@ -10,8 +10,4 @@ module ActiveSession
   class AssociationTypeMismatch < StandardError
     include ActiveSessionError
   end
-
-  class StoreValueNotDefined < StandardError
-    include ActiveSessionError
-  end
 end

data/lib/active_session/version.rb

@@ -1,3 +1,3 @@
 module ActiveSession
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/active_session.rb

@@ -1,115 +1,58 @@
 require "active_model"
-require "active_support/concern"
 require "active_support/core_ext"
+require "active_session/attribute_methods"
 require "active_session/errors"
 
 module ActiveSession
-  extend ActiveSupport::Concern
+  def authenticates(name, options = {})
+    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
 
-  included do
     extend ActiveModel::Naming
     include ActiveModel::AttributeMethods
     include ActiveModel::Conversion
     include ActiveModel::MassAssignmentSecurity
     include ActiveModel::Validations
 
-    attribute_method_suffix "", "="
-    attr_reader :attributes
-
-    cattr_accessor :store_key
-    self.store_key = :id
-  end
-
-  module ClassMethods
-    def clear_store(store)
-      store.delete(store_key)
-    end
-
-    def belongs_to(name, options = {})
-      klass = options.fetch(:class_name, name.to_s.classify)
-      foreign_key = options.fetch(:foreign_key, "#{name}_id")
-
-      class_eval <<-END, __FILE__, __LINE__ + 1
-        def #{name}
-          return @#{name} if defined?(@#{name})
-          @#{name} = #{klass}.find(#{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(:id)
-        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
-    end
-  end
-
-  module InstanceMethods
-    def initialize(store, attributes = nil, options = {})
-      @store = store
-      @attributes = {}
-      assign_attributes(attributes, options) if attributes
-      yield self if block_given?
-    end
+    include AttributeMethods
 
-    def attributes=(attributes)
-      assign_attributes(attributes)
-    end
-
-    def assign_attributes(new_attributes, options = {})
-      return unless new_attributes
+    attribute_method_suffix "", "="
 
-      attributes = new_attributes.stringify_keys
+    validates name, :presence => true
 
-      unless options[:without_protection]
-        attributes = sanitize_for_mass_assignment(attributes, options.fetch(:as, :default))
+    class_eval <<-END, __FILE__, __LINE__ + 1
+      def #{name}
+        return @#{name} if defined?(@#{name})
+        @#{name} = #{klass}.#{finder_method}(:#{primary_key} => #{foreign_key})
       end
 
-      attributes.each do |key, value|
-        if respond_to?("#{key}=")
-          send("#{key}=", value)
-        else
-          raise ActiveSession::UnknownAttributeError, "unknown attribute: #{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
-    end
-
-    def persisted?
-      @store[self.class.store_key].present? and @store[self.class.store_key] == store_value
-    end
-
-    def destroy
-      persisted? && self.class.clear_store(@store) && true
-    end
-
-    def store_value
-      raise ActiveSession::StoreValueNotDefined, "you have to override store_value method to return something useful (usually user_id)"
-    end
 
-    def save
-      valid? && serialize && true
-    end
+      def #{foreign_key}
+        @attributes[:#{foreign_key}]
+      end
 
-    private
+      def #{foreign_key}=(model_id)
+        remove_instance_variable("@#{name}") if instance_variable_defined?("@#{name}")
+        @attributes[:#{foreign_key}] = model_id
+      end
 
-    def attribute(attribute)
-      @attributes[attribute.to_sym]
-    end
+      def persisted?
+        @store[:#{foreign_key}].present? and @store[:#{foreign_key}] == #{foreign_key}
+      end
 
-    def attribute=(attribute, value)
-      @attributes[attribute.to_sym] = value
-    end
+      def destroy
+        persisted? && @store.delete(:#{foreign_key}) && true
+      end
 
-    def serialize
-      @store[self.class.store_key] = store_value
-    end
+      def save
+        valid? && (@store[:#{foreign_key}] = #{foreign_key}) && true
+      end
+    END
   end
 end

data/test/models/user.rb

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

data/test/models/user_session.rb

@@ -1,10 +1,4 @@
 class UserSession
-  include ActiveSession
-
-  belongs_to :user
-
-  validates :user, :presence => true
-
-  self.store_key = :user_id
-  alias_method :store_value, :user_id
+  extend ActiveSession
+  authenticates :user
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_session
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-10-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &13989540 !ruby/object:Gem::Requirement
+  requirement: &16721260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *13989540
+  version_requirements: *16721260
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &13972600 !ruby/object:Gem::Requirement
+  requirement: &16720720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *13972600
+  version_requirements: *16720720
 description: ActiveModel session
 email:
 - qoobaa@gmail.com
@@ -49,11 +49,10 @@ files:
 - Rakefile
 - active_session.gemspec
 - lib/active_session.rb
+- lib/active_session/attribute_methods.rb
 - lib/active_session/errors.rb
 - lib/active_session/version.rb
-- test/basic_session_test.rb
 - test/helper.rb
-- test/models/basic_session.rb
 - test/models/user.rb
 - test/models/user_session.rb
 - test/user_session_test.rb

data/test/basic_session_test.rb

@@ -1,12 +0,0 @@
-require "helper"
-
-require "models/basic_session"
-
-describe BasicSession do
-  include ActiveModel::Lint::Tests
-
-  before do
-    @store = {}
-    @model = BasicSession.new(@store)
-  end
-end

data/test/models/basic_session.rb

@@ -1,3 +0,0 @@
-class BasicSession
-  include ActiveSession
-end