mack 0.4.0.1 → 0.4.1

data/CHANGELOG

@@ -1,3 +1,13 @@
+===0.4.1
+* Improved testing support.
+* Added ability to do 'session' based tests.
+* Added assert_difference method.
+* Added ability to set/remove cookies before requests are made.
+* gem: mack_ruby_core_extensions 0.1.4
+
+===0.4.0.1
+* gem: cachetastic 1.4.2
+
 ===0.4.0
 * Added Distributed Routes!
 * gem: mack_ruby_core_extensions 0.1.3

data/lib/mack.rb

@@ -12,6 +12,7 @@ module Mack
     # This method needs to be defined as part of the Rack framework. As is noted for the Mack::Runner
     # class, this is where the center of the Mack framework lies.
     def call(env)
+      # pp env
       begin
         setup(env) do
           begin
@@ -22,6 +23,7 @@ module Mack
             else
               # let's handle a normal request:
               c = "#{route[:controller].to_s.camelcase}Controller".constantize.new(self.request, self.response, self.cookies)
+              self.response.controller = c
               self.response.write(c.run)
             end
           rescue Mack::Errors::ResourceNotFound, Mack::Errors::UndefinedRoute => e
@@ -85,7 +87,7 @@ module Mack
           sess_id = create_new_session
         end
       end
-      
+
       yield
       
       Cachetastic::Caches::MackSessionCache.set(sess_id, self.request.session)
@@ -97,6 +99,7 @@ module Mack
       sess = Mack::Session.new(id)
       self.request.session = sess
       Cachetastic::Caches::MackSessionCache.set(id, sess)
+      id
     end
     
     def try_to_find_resource(env, path_info, exception)

data/lib/sea_level/response.rb

@@ -2,5 +2,12 @@ module Mack
   # Right now Mack::Response is just a wrapper around Rack::Response.
   # Down the line this may be used to spice up the response.
   class Response < Rack::Response
+    
+    attr_accessor :controller
+    
+    def assigns(key)
+      self.controller.instance_variable_get("@#{key}")
+    end
+    
   end
 end

data/lib/test_extensions/test_assertions.rb

@@ -33,6 +33,7 @@ module Mack
     # Asserts that the specified cookie has been set to the specified value.
     def assert_cookie(name, value)
       assert cookies[name.to_s]
+      assert_equal value, cookies[name.to_s]
     end
     
     # Asserts that there is no cookie set for the specified cookie
@@ -40,6 +41,13 @@ module Mack
       assert !cookies[name.to_s]
     end
     
+    def assert_difference(object, method = nil, difference = 1)
+      start_count = object.send(method)
+      yield
+      object.reload if object.respond_to? :reload
+      assert_equal start_count + difference, object.send(method)
+    end
+    
   end # TestAssertions
   
 end # Mack

data/lib/test_extensions/test_helpers.rb

@@ -15,30 +15,35 @@ module Mack
         yield
       end
     end
+    
+    # Retrieves an instance variable from the controller from a request.
+    def assigns(key)
+      $mack_app.instance_variable_get("@app").instance_variable_get("@response").instance_variable_get("@controller").instance_variable_get("@#{key}")
+    end
 
     # Performs a 'get' request for the specified uri.
     def get(uri, options = {})
-      build_response(request.get(uri, options))
+      build_response(request.get(uri, build_request_options(options)))
     end
     
     # Performs a 'put' request for the specified uri.
     def put(uri, options = {})
-      build_response(request.put(uri, :input => options.to_params))
+      build_response(request.put(uri, build_request_options({:input => options.to_params})))
     end
     
     # Performs a 'post' request for the specified uri.
     def post(uri, options = {})
-      build_response(request.post(uri, :input => options.to_params))
+      build_response(request.post(uri, build_request_options({:input => options.to_params})))
     end
     
     # Performs a 'delete' request for the specified uri.
     def delete(uri, options = {})
-      build_response(request.delete(uri, options))
+      build_response(request.delete(uri, build_request_options(options)))
     end
     
     # Returns a Rack::MockRequest. If there isn't one, a new one is created.
     def request
-      @request ||= Rack::MockRequest.new(Rack::Recursive.new(Mack::Runner.new))
+      @request ||= Rack::MockRequest.new(mack_app)
     end
     
     # Returns the last Rack::MockResponse that got generated by a call.
@@ -56,27 +61,78 @@ module Mack
       Cachetastic::Caches::MackSessionCache.get(cookies[app_config.mack.session_id])
     end
     
+    # Used to create a 'session' around a block of code. This is great of 'integration' tests.
+    def in_session
+      @in_session = true
+      clear_session
+      yield
+      clear_session
+      @in_session = false
+    end
+    
+    # Clears all the sessions.
+    def clear_session
+      Cachetastic::Caches::MackSessionCache.expire_all
+    end
+    
     # Returns a Hash of cookies from the response.
     def cookies
-      cooks = {}
-      responses.each do |res|
-        res.original_headers["Set-Cookie"].each do |ck|
-          spt = ck.split("=")
-          cooks[spt.first] = spt.last
-        end
-      end
-      cooks
+      test_cookies
+    end
+    
+    # Sets a cookie to be used for the next request
+    def set_cookie(name, value)
+      test_cookies[name] = value
+    end
+    
+    # Removes a cookie.
+    def remove_cookie(name)
+      test_cookies.delete(name)
     end
     
     private
+    def test_cookies
+      @test_cookies = {} if @test_cookies.nil?
+      @test_cookies
+    end
+    
+    def mack_app
+      if $mack_app.nil?
+        $mack_app = Rack::Recursive.new(Mack::Runner.new)
+      end
+      $mack_app
+    end
+    
+    def build_request_options(options)
+      {"HTTP_COOKIE" => test_cookies.join("%s=%s", "; ")}.merge(options)
+    end
+    
     def build_response(res)
       @responses = [res]
+      strip_cookies_from_response(res)
       until res.successful?
+        [res].flatten.each do |r|
+          strip_cookies_from_response(r)
+        end
         res = request.get(res["Location"])
         @responses << res
       end
     end
     
+    def strip_cookies_from_response(res)
+      unless res.original_headers["Set-Cookie"].nil?
+        res.original_headers["Set-Cookie"].each do |ck|
+          spt = ck.split("=")
+          name = spt.first
+          value = spt.last
+          if name == app_config.mack.session_id
+            value = nil unless @in_session
+          end
+          set_cookie(name, value)
+        end
+      end
+    end
+    
   end # TestHelpers
   
 end # Mack

data/tasks/gem_helper.rb

@@ -10,7 +10,7 @@ class GemHelper # :nodoc:
     self.project = "magrathea"
     self.package = "mack"
     self.gem_name = "mack"
-    self.version = "0.4.0.1"
+    self.version = "0.4.1"
   end
   
   def gem_name_with_version

data/tasks/gem_tasks.rake

@@ -47,7 +47,7 @@ namespace :gem do
         s.rdoc_options << '--title' << 'Mack' << '--main' << 'README' << '--line-numbers' << "--inline-source"
         
         s.add_dependency("rack", "0.3.0")
-        s.add_dependency("mack_ruby_core_extensions", "0.1.3")
+        s.add_dependency("mack_ruby_core_extensions", "0.1.4")
         s.add_dependency("application_configuration", "1.2.1")
         s.add_dependency("cachetastic", "1.4.2")
         s.add_dependency("log4r", "1.0.5")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack
 version: !ruby/object:Gem::Version 
-  version: 0.4.0.1
+  version: 0.4.1
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-26 00:00:00 -04:00
+date: 2008-03-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.3
+        version: 0.1.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: application_configuration