warden 0.8.1 → 0.9.0

data/spec/warden/{serializers/session_spec.rb → session_serializer_spec.rb}

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
-describe Warden::Serializers::Session do
+describe Warden::SessionSerializer do
   before(:each) do
     @env = env_with_params
     @env['rack.session'] ||= {}
-    @session = Warden::Serializers::Session.new(@env)
+    @session = Warden::SessionSerializer.new(@env)
   end
 
   it "should store data for the default scope" do

data/spec/warden/strategies/base_spec.rb

@@ -43,7 +43,19 @@ describe Warden::Strategies::Base do
     strategy._run!
     strategy.user.should == "foo"
   end
-  
+
+  it "should be performed after run" do
+    RAS.add(:foobar) do
+      def authenticate!; end
+    end
+    strategy = RAS[:foobar].new(env_with_params)
+    strategy.should_not be_performed
+    strategy._run!
+    strategy.should be_performed
+    strategy.clear!
+    strategy.should_not be_performed
+  end
+
   it "should set the scope" do
     RAS.add(:foobar) do
       def authenticate!

data/warden.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{warden}
-  s.version = "0.8.1"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]
-  s.date = %q{2010-01-08}
+  s.date = %q{2010-01-21}
   s.email = %q{has.sox@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -24,17 +24,13 @@ Gem::Specification.new do |s|
      "TODO.textile",
      "lib/warden.rb",
      "lib/warden/config.rb",
-     "lib/warden/declarable.rb",
      "lib/warden/errors.rb",
      "lib/warden/hooks.rb",
      "lib/warden/manager.rb",
      "lib/warden/manager_deprecation.rb",
      "lib/warden/mixins/common.rb",
      "lib/warden/proxy.rb",
-     "lib/warden/serializers.rb",
-     "lib/warden/serializers/base.rb",
-     "lib/warden/serializers/cookie.rb",
-     "lib/warden/serializers/session.rb",
+     "lib/warden/session_serializer.rb",
      "lib/warden/strategies.rb",
      "lib/warden/strategies/base.rb",
      "lib/warden/version.rb",
@@ -52,9 +48,7 @@ Gem::Specification.new do |s|
      "spec/warden/hooks_spec.rb",
      "spec/warden/manager_spec.rb",
      "spec/warden/proxy_spec.rb",
-     "spec/warden/serializers/cookie_spec.rb",
-     "spec/warden/serializers/session_spec.rb",
-     "spec/warden/serializers_spec.rb",
+     "spec/warden/session_serializer_spec.rb",
      "spec/warden/strategies/base_spec.rb",
      "spec/warden/strategies_spec.rb",
      "spec/warden_spec.rb",
@@ -79,9 +73,7 @@ Gem::Specification.new do |s|
      "spec/warden/hooks_spec.rb",
      "spec/warden/manager_spec.rb",
      "spec/warden/proxy_spec.rb",
-     "spec/warden/serializers/cookie_spec.rb",
-     "spec/warden/serializers/session_spec.rb",
-     "spec/warden/serializers_spec.rb",
+     "spec/warden/session_serializer_spec.rb",
      "spec/warden/strategies/base_spec.rb",
      "spec/warden/strategies_spec.rb",
      "spec/warden_spec.rb"
@@ -93,11 +85,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 1.0.0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.0.0"])
     else
       s.add_dependency(%q<rack>, [">= 1.0.0"])
+      s.add_dependency(%q<rspec>, [">= 1.0.0"])
     end
   else
     s.add_dependency(%q<rack>, [">= 1.0.0"])
+    s.add_dependency(%q<rspec>, [">= 1.0.0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: warden
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 +01:00
+date: 2010-01-21 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
 description: 
 email: has.sox@gmail.com
 executables: []
@@ -40,17 +50,13 @@ files:
 - TODO.textile
 - lib/warden.rb
 - lib/warden/config.rb
-- lib/warden/declarable.rb
 - lib/warden/errors.rb
 - lib/warden/hooks.rb
 - lib/warden/manager.rb
 - lib/warden/manager_deprecation.rb
 - lib/warden/mixins/common.rb
 - lib/warden/proxy.rb
-- lib/warden/serializers.rb
-- lib/warden/serializers/base.rb
-- lib/warden/serializers/cookie.rb
-- lib/warden/serializers/session.rb
+- lib/warden/session_serializer.rb
 - lib/warden/strategies.rb
 - lib/warden/strategies/base.rb
 - lib/warden/version.rb
@@ -68,9 +74,7 @@ files:
 - spec/warden/hooks_spec.rb
 - spec/warden/manager_spec.rb
 - spec/warden/proxy_spec.rb
-- spec/warden/serializers/cookie_spec.rb
-- spec/warden/serializers/session_spec.rb
-- spec/warden/serializers_spec.rb
+- spec/warden/session_serializer_spec.rb
 - spec/warden/strategies/base_spec.rb
 - spec/warden/strategies_spec.rb
 - spec/warden_spec.rb
@@ -116,9 +120,7 @@ test_files:
 - spec/warden/hooks_spec.rb
 - spec/warden/manager_spec.rb
 - spec/warden/proxy_spec.rb
-- spec/warden/serializers/cookie_spec.rb
-- spec/warden/serializers/session_spec.rb
-- spec/warden/serializers_spec.rb
+- spec/warden/session_serializer_spec.rb
 - spec/warden/strategies/base_spec.rb
 - spec/warden/strategies_spec.rb
 - spec/warden_spec.rb

data/lib/warden/declarable.rb

@@ -1,43 +0,0 @@
-# encoding: utf-8
-module Warden
-  module Declarable
-    
-    # Add a declaration and store it in a hash.
-    def add(label, declaration = nil, &block)
-      base = self.const_get(:Base)
-
-      declaration ||= Class.new(base)
-      declaration.class_eval(&block) if block_given?
-
-      check_validity!(label, declaration)
-      raise "#{label.inspect} is not a #{base}" unless declaration.ancestors.include?(base)
-
-      _declarations[label] = declaration
-    end
-
-    # Update a previously given declaration.
-    def update(label, &block)
-      declaration = _declarations[label]
-      raise "Unknown declaration #{label.inspect}" unless declaration
-      add(label, declaration, &block)
-    end
-
-    # Provides access to declarations by label
-    # :api: public
-    def [](label)
-      _declarations[label]
-    end
-
-    # Clears all declared.
-    # :api: public
-    def clear!
-      _declarations.clear
-    end
-
-    # :api: private
-    def _declarations
-      @declarations ||= {}
-    end
-    
-  end # Declarable
-end # Warden

data/lib/warden/serializers.rb

@@ -1,20 +0,0 @@
-# encoding: utf-8
-require 'warden/declarable'
-
-module Warden
-  module Serializers
-    extend Warden::Declarable
-    
-    class << self
-      def check_validity!(label, serializer)
-        [:fetch, :store, :stored?, :delete].each do |method|
-          next if serializer.method_defined?(method)
-          raise NoMethodError, "#{method} is not declared in the #{label.inspect} serializer"
-        end
-      end
-      
-      alias :_serializers :_declarations
-    end # << self
-
-  end # Serializers
-end # Warden

data/lib/warden/serializers/base.rb

@@ -1,38 +0,0 @@
-# encoding: utf-8
-module Warden
-  module Serializers
-    # A serializer is a place where you put the logic to serializing and deserializing an user. All serializers
-    # inherits from Warden::Serializers::Base.
-    #
-    # The Warden::Serializers.add method is a simple way to provide custom serializers. In order to do so,
-    # you _must_ declare @store@, @fetch@, @delete@ and @stored?@ methods.
-    # 
-    # The parameters for Warden::Serializers.add method is: 
-    #   <label: Symbol> The label is the name given to a serializer. Use the label to refer to the serializer when authenticating
-    #   <serializer: Class|nil> The optional serializer argument if set _must_ be a class that inherits from Warden::Serializers::Base
-    #   <block> The block acts as a convinient way to declare your serializer.  Inside is the class definition of a serializer.
-    #
-    # Check Session and Cookie serializers for more information.
-    #
-    class Base
-      attr_accessor :env
-      include ::Warden::Mixins::Common
-
-      def initialize(env)
-        @env = env
-      end
-
-      def key_for(scope)
-        "warden.user.#{scope}.key"
-      end
-
-      def serialize(user)
-        user
-      end
-
-      def deserialize(key)
-        key
-      end
-    end # Base
-  end # Serializers
-end # Warden

data/lib/warden/serializers/cookie.rb

@@ -1,34 +0,0 @@
-# encoding: utf-8
-module Warden
-  module Serializers
-    # A cookie serializer provided by Warden. You need to implement the serialize and deserialize
-    # methods in order to use it.
-    class Cookie < Base
-      def store(user, scope)
-        response.set_cookie key_for(scope), default_options(user)
-      end
-
-      def fetch(scope)
-        key = request.cookies[key_for(scope)]
-        return nil unless key
-        user = deserialize(key)
-        delete(scope) unless user
-        user
-      end
-
-      def stored?(scope)
-        !!request.cookies[key_for(scope)]
-      end
-
-      def delete(scope, user=nil)
-        response.delete_cookie(key_for(scope))
-      end
-
-      def default_options(user)
-        { :value => serialize(user), :expires => (Time.now + 7 * 24 * 3600), :path => "/" }
-      end
-    end # Cookie
-
-    Serializers.add(:cookie, Cookie)
-  end # Serializers
-end # Warden

data/lib/warden/serializers/session.rb

@@ -1,30 +0,0 @@
-# encoding: utf-8
-module Warden
-  module Serializers
-    # A session serializer provided by Warden. You need to implement the serialize and deserialize
-    # methods in order to use it.
-    class Session < Base
-      def store(user, scope)
-        session[key_for(scope)] = serialize(user)
-      end
-
-      def fetch(scope)
-        key = session[key_for(scope)]
-        return nil unless key
-        user = deserialize(key)
-        delete(scope) unless user
-        user
-      end
-
-      def stored?(scope)
-        !!session[key_for(scope)]
-      end
-
-      def delete(scope, user=nil)
-        session.delete(key_for(scope))
-      end
-    end # Session
-
-    Serializers.add(:session, Session)
-  end # Serializers
-end # Warden

data/spec/warden/serializers/cookie_spec.rb

@@ -1,60 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe Warden::Serializers::Cookie do
-  before(:each) do
-    @env = env_with_params
-    @cookie = Warden::Serializers::Cookie.new(@env)
-  end
-
-  def set_cookie!
-    @env['HTTP_COOKIE'] = @cookie.response.headers['Set-Cookie']
-  end
-
-  def read_cookie
-    cookie = @cookie.response.headers['Set-Cookie']
-    cookie = cookie.first if cookie.is_a?(Array)
-    cookie.split(";").first
-  end
-
-  it "should store data for the default scope" do
-    @cookie.store("user", :default)
-    read_cookie.should == "warden.user.default.key=user"
-  end
-
-  it "should check if a data is stored or not" do
-    @cookie.should_not be_stored(:default)
-    @cookie.store("user", :default)
-    set_cookie!
-    @cookie.should be_stored(:default)
-  end
-
-  it "should load an user from store" do
-    @cookie.fetch(:default).should be_nil
-    @cookie.store("user", :default)
-    set_cookie!
-    @cookie.fetch(:default).should == "user"
-  end
-
-  it "should store data based on the scope" do
-    @cookie.store("user", :default)
-    set_cookie!
-    @cookie.fetch(:default).should == "user"
-    @cookie.fetch(:another).should be_nil
-  end
-
-  it "should delete data from store" do
-    @cookie.store("user", :default)
-    set_cookie!
-    @cookie.fetch(:default).should == "user"
-    @cookie.delete(:default)
-    read_cookie.should == "warden.user.default.key="
-  end
-
-  it "should delete information from store if user cannot be retrieved" do
-    @cookie.store("user", :default)
-    set_cookie!
-    @cookie.instance_eval "def deserialize(key); nil; end" 
-    @cookie.fetch(:default)
-    read_cookie.should == "warden.user.default.key="
-  end
-end

data/spec/warden/serializers_spec.rb

@@ -1,102 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Warden::Serializers do
-  it "should let me add a serializer via a block" do
-    Warden::Serializers.add(:serializer1) do
-      def fetch; end
-      def store; end
-      def stored?; end
-      def delete; end
-    end
-    Warden::Serializers[:serializer1].ancestors.should include(Warden::Serializers::Base)
-  end
-  
-  it "should raise an error if I add a serializer via a block, that does not have an autheniticate! method" do
-    lambda do
-      Warden::Serializers.add(:serializer2) do
-      end
-    end.should raise_error
-  end
-  
-  it "should allow me to get access to a particular serializer" do
-    Warden::Serializers.add(:serializer3) do
-      def fetch; end
-      def store; end
-      def stored?; end
-      def delete; end
-    end
-    serializer = Warden::Serializers[:serializer3]
-    serializer.should_not be_nil
-    serializer.ancestors.should include(Warden::Serializers::Base)
-  end
-  
-  it "should allow me to add a serializer with the required methods" do
-    class MySerializer < Warden::Serializers::Base
-      def fetch; end
-      def store; end
-      def stored?; end
-      def delete; end
-    end
-    lambda do
-      Warden::Serializers.add(:serializer4, MySerializer)
-    end.should_not raise_error
-  end
-  
-  it "should not allow a serializer that does not have any required method" do
-    class MyOtherSerializer
-    end
-    lambda do
-      Warden::Serializers.add(:serializer5, MyOtherSerializer)
-    end.should raise_error
-  end
-
-  it "should allow me to change a class when providing a block and class" do
-    class MySerializer < Warden::Serializers::Base
-    end
-
-    Warden::Serializers.add(:foo, MySerializer) do
-      def fetch; end
-      def store; end
-      def stored?; end
-      def delete; end
-    end
-
-    Warden::Serializers[:foo].ancestors.should include(MySerializer)
-  end
-
-  it "should allow me to update a previously given serializer" do
-    class MySerializer < Warden::Serializers::Base
-      def fetch; end
-      def store; end
-      def stored?; end
-      def delete; end
-    end
-
-    Warden::Serializers.add(:serializer6, MySerializer)
-
-    new_module = Module.new
-    Warden::Serializers.update(:serializer6) do
-      include new_module
-    end
-
-    Warden::Serializers[:serializer6].ancestors.should include(new_module)
-  end
-
-  it "should allow me to clear the Serializers" do
-    old_serializers = Warden::Serializers._serializers.dup
-
-    begin
-      Warden::Serializers.add(:foobar) do
-        def fetch; end
-        def store; end
-        def stored?; end
-        def delete; end
-      end
-      Warden::Serializers[:foobar].should_not be_nil
-      Warden::Serializers.clear!
-      Warden::Serializers[:foobar].should be_nil
-    else
-      Warden::Serializers._serializers.replace(old_serializers)
-    end
-  end
-end