Refactored cookies class after @dblock notice. Write and read method.

Author: Łukasz Śliwa

lib/grape/cookies.rb

@@ -2,15 +2,23 @@ module Grape
   class Cookies
 
       def initialize
-        @send = true
         @cookies = {}
         @send_cookies = {}
       end
 
-      def without_send
-        @send = false
-        yield self if block_given?
-        @send = true
+      def read(request)
+        request.cookies.each do |name, value|
+          @cookies[name.to_sym] = value
+        end
+      end
+
+      def write(header)
+        @cookies.select { |key, value|
+            @send_cookies[key.to_sym] == true
+        }.each { |name, value|
+          Rack::Utils.set_cookie_header!(
+            header, name, value.instance_of?(Hash) ? value : { :value => value })
+        }
       end
 
       def [](name)
@@ -19,17 +27,11 @@ def [](name)
 
       def []=(name, value)
         @cookies[name.to_sym] = value
-        @send_cookies[name.to_sym] = true if @send
+        @send_cookies[name.to_sym] = true
       end
 
-      def each(opt = nil, &block)
-        if opt == :to_send
-          @cookies.select { |key, value|
-            @send_cookies[key.to_sym] == true
-          }.each(&block)
-        else
-          @cookies.each(&block)
-        end
+      def each(&block)
+        @cookies.each(&block)
       end
 
       def delete(name)

lib/grape/endpoint.rb

@@ -138,13 +138,13 @@ def call(env)
       @header = {}
       @request = Rack::Request.new(@env)
 
-      get_cookies
+      cookies.read(@request)
 
       run_filters self.class.options[:befores]
       response_text = instance_eval &self.class.block
       run_filters self.class.options[:afters]
 
-      set_cookies
+      cookies.write(header)
 
       [status, header, [body || response_text]]
     end
@@ -156,20 +156,5 @@ def run_filters(filters)
         instance_eval &filter
       end
     end
-
-    def get_cookies
-      cookies.without_send do |c|
-        @request.cookies.each do |name, value|
-          c[name] = value
-        end
-      end
-    end
-
-    def set_cookies
-      cookies.each(:to_send) do |name, value|
-        Rack::Utils.set_cookie_header!(
-            header, name, value.instance_of?(Hash) ? value : { :value => value })
-      end
-    end
   end
 end