rails-reverse-proxy 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1b94bbe6eeeeccc58ec4feead43ef9087adad7e
-  data.tar.gz: c868d4034d08f11c0440fdb0622ac6956010b85f
+  metadata.gz: c3efd82dcfd11cfa021b4871b3e1f0aa33a8a509
+  data.tar.gz: 0eadd74a5b7effad66d73df02c694322e4011cc6
 SHA512:
-  metadata.gz: 3aefba37ef43c29762fa578b005675086972f86cf9d1bde8bff44f3c76819ef77c59baae6fd685954310e8f8f8bf1be50eaf6c0bc3c6ba9f31bcc73977b5c2bb
-  data.tar.gz: 0163b7b4c729933fb53e12b3403d28216fae4ec77ba7fe1270a641413c7ee98b5231d2b1d9ccdf095724cfea9a1ea30101b2e6f26946d8af7023836f39746deb
+  metadata.gz: 535ea09b49f805d311b6c492772ab8ea07c9395971ffd2ad726353d22f98befcb2f5c3fd16b7df347d4f87011b6930b5cc8e7a485fa9bce61c46021964f5f381
+  data.tar.gz: 727eb02da9067525e02f56bcaa179982ee53d413e723b066ed99688f3e6e145c9a68786ffc0e2718d23aee64269df618170d25be180fc8dfa7496f76a396d531

data/Gemfile

@@ -4,7 +4,6 @@ gem 'rails'
 gem 'rack'
 gem 'rack-proxy'
 gem 'addressable'
-gem 'cookiejar', '~> 0.3.2'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -39,7 +39,6 @@ GEM
     addressable (2.3.8)
     arel (6.0.0)
     builder (3.2.2)
-    cookiejar (0.3.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.1.5)
@@ -149,7 +148,6 @@ PLATFORMS
 DEPENDENCIES
   addressable
   bundler (~> 1.0)
-  cookiejar (~> 0.3.2)
   jeweler (~> 2.0.1)
   rack
   rack-proxy
@@ -157,3 +155,6 @@ DEPENDENCIES
   rdoc (~> 3.12)
   shoulda
   simplecov
+
+BUNDLED WITH
+   1.10.6

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.5.0

data/lib/reverse_proxy/client.rb

@@ -1,6 +1,5 @@
 require 'rack'
 require 'rack-proxy'
-require 'cookiejar'
 
 module ReverseProxy
   class Client
@@ -92,11 +91,8 @@ module ReverseProxy
         set_cookies_hash = {}
 
         set_cookie_headers.each do |set_cookie_header|
-          set_cookie_hash = CookieJar::CookieValidation.parse_set_cookie(set_cookie_header)
-          set_cookie_hash[:value] = CGI.unescape(set_cookie_hash[:value])
-
-          name = set_cookie_hash.delete(:name)
-
+          set_cookie_hash = parse_cookie(set_cookie_header)
+          name = set_cookie_hash[:name]
           set_cookies_hash[name] = set_cookie_hash
         end
 
@@ -140,5 +136,40 @@ module ReverseProxy
     def reconstruct_header_name(name)
       name.sub(/^HTTP_/, "").gsub("_", "-")
     end
+
+    COOKIE_PARAM_PATTERN = /\A([^(),\/<>@;:\\\"\[\]?={}\s]+)(?:=([^;]*))?\Z/
+    COOKIE_SPLIT_PATTERN = /;\s*/
+
+    def parse_cookie(cookie_str)
+      params = cookie_str.split(COOKIE_SPLIT_PATTERN)
+      info = params.shift.match(COOKIE_PARAM_PATTERN)
+      return {} unless info
+
+      cookie = {
+        name: info[1],
+        value: CGI.unescape(info[2]),
+      }
+
+      params.each do |param|
+        result = param.match(COOKIE_PARAM_PATTERN)
+        next unless result
+
+        key = result[1].downcase.to_sym
+        value = result[2]
+        case key
+        when :expires
+          begin
+            cookie[:expires] = Time.parse(value)
+          rescue ArgumentError
+          end
+        when *[:httponly, :secure]
+          cookie[key] = true
+        else
+          cookie[key] = value
+        end
+      end
+
+      cookie
+    end
   end
 end

data/rails-reverse-proxy.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rails-reverse-proxy 0.4.2 ruby lib
+# stub: rails-reverse-proxy 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rails-reverse-proxy"
-  s.version = "0.4.2"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["James Hu"]
-  s.date = "2015-08-11"
+  s.date = "2015-08-28"
   s.description = "Reverse proxy for Ruby on Rails"
   s.email = "hello@james.hu"
   s.extra_rdoc_files = [
@@ -46,7 +46,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<rack-proxy>, [">= 0"])
       s.add_runtime_dependency(%q<addressable>, [">= 0"])
-      s.add_runtime_dependency(%q<cookiejar>, ["~> 0.3.2"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -57,7 +56,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<rack-proxy>, [">= 0"])
       s.add_dependency(%q<addressable>, [">= 0"])
-      s.add_dependency(%q<cookiejar>, ["~> 0.3.2"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -69,7 +67,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<rack-proxy>, [">= 0"])
     s.add_dependency(%q<addressable>, [">= 0"])
-    s.add_dependency(%q<cookiejar>, ["~> 0.3.2"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-reverse-proxy
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - James Hu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cookiejar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement