rack_utm 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba7edca42f7dfe760ef7d3cbec3a2dff3470bed49ed85609ccb860c5ea909c59
-  data.tar.gz: e62dcaa1a79651094e1f32f33acc68cff317054883a1944393e5505be935c9d7
+  metadata.gz: e27a764ad976f7d849ac310124d9db540812313b5e533c045e369db64544bc5b
+  data.tar.gz: 81bbb07552cf211f3c716eb53ff8624dd2b32bd896a0f91f69e5998ddebb296a
 SHA512:
-  metadata.gz: ed216746f975a866b4f3f4fb2e2aa0d5cf34752d566965380839a4afefa056f859931ffcd39665bad908eb04deebcd35721ac332408b961cc70daf68e474dca6
-  data.tar.gz: 9c4286498c85360615b6a28a6692ab531aaa72884cd6341b3399ce6c5569d812ada48c697a6c5984290355bf990cac75e84342486f874e82a0abe8376c2c9a38
+  metadata.gz: 00da548a4f1dead8986f151586850a7968b808656453932c1bb0f69500caea61418526b6a19cf65017bcd06ffb571cce976ffbd5e63919d53a2c9104796c1a20
+  data.tar.gz: 24f949e0a61dbbfe84c0f4b9f341a6acf49566b7c4328eea4470b278fd6b6e96afdaec5425b87549c0880511c904249b78404e3da4eff952ba3f2f4865838e58

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack_utm (0.1.0)
+    rack_utm (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/rack_utm/version.rb

@@ -1,3 +1,3 @@
 module RackUtm
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/rack_utm.rb

@@ -22,8 +22,11 @@ module Rack
       set_env(env)
 
       status, headers, body = app.call(env)
-
-      set_cookies(headers)
+      if set_cookies?
+        set_cookies(headers)
+      else
+        delete_cookies(headers)
+      end
 
       [status, headers, body]
     end
@@ -40,6 +43,10 @@ module Rack
                 :req,
                 :optional_parameters
 
+    def all_parameter_names
+      required_parameters.concat(optional_parameters)
+    end
+
     def params
       req.params
     end
@@ -54,20 +61,20 @@ module Rack
 
     def set_params_for_env?
       return false unless !required_param_values.compact.empty?
-      return false unless required_param_values != required_cookie_values
 
       true
     end
 
-    def set_env_values
-      return newer_parameters if set_params_for_env?
-      return cookies if set_cookies_for_env?
+    def values
+      values = []
+      values = cookies if set_cookies_for_env?
+      values = newer_parameters if set_params_for_env? && allow_overwrite
 
-      []
+      values
     end
 
     def set_env(env)
-      set_env_values.each { |key, value| env["#{key}"] = value }
+      values.each { |key, value| env["#{key}"] = value }
     end
 
     def required_param_values
@@ -88,7 +95,7 @@ module Rack
     end
 
     def set_cookies?
-      return false unless required_param_values.all?
+      return false unless values.values_at(*required_parameters).all?
       required_param_values != required_cookie_values
     end
 
@@ -101,10 +108,22 @@ module Rack
         )
     end
 
-    def set_cookies(headers)
-      return unless set_cookies?
+    def delete_cookies(headers)
+      cookies.each_key do |key|
+        cookie =
+          {
+            value: nil,
+            expires: expires,
+            domain: cookie_domain,
+            path: cookie_path
+          }
+
+        Rack::Utils.set_cookie_header!(headers, key, cookie)
+      end
+    end
 
-      newer_parameters.each do |key, value|
+    def set_cookies(headers)
+      values.each do |key, value|
         cookie =
           {
             value: value,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack_utm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ihatov08
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler