faraday-cookie_jar 0.0.2 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 6518c4004a5c37f4781930223b709a9331c28f09d78926a99caf6d6d2d7a7231
+  data.tar.gz: e07f34c4acfd740cad6668390a22b5a02fcae9ce70b15d7498b66a11ab1425ea
+SHA512:
+  metadata.gz: 6397a74a2f902fbcaaffa2637aa14950f228d9154a6fc0fcdcdd6a843f39b285dec03cb2ab479d348b92ffe50c36bf101261725c0ed196f22425aa6eeec336f4
+  data.tar.gz: 5f81657bcc13538f3686041e90f77571a38f66a4d8893f630422bbd3d0c90c838673277ccd575bb371f1e0c5b0a4f14e82ca4ca0afdb448492241720121a5377

data/CHANGELOG.md

@@ -1,8 +1,31 @@
+## 0.0.7  Tue Sep  1 20:25:00 PDT 2020
+
+- Avoid loading Faraday by assuming Faraday registry API (chesterbr)
+- To support change above, require Faraday 0.8 as a minimum (chesterbr)
+
+## 0.0.6  Tue Jan 21 16:34:35 PST 2014
+
+- Support Faraday 0.9 registry API (cameron-martin)
+- Support specifying CookieJar in configuration (cameron-martin)
+
+## 0.0.5  Mon Jan 20 21:53:13 PST 2014
+
+- Lock faraday dependency to < 0.9.0 for now
+- Ability to add extra cookies in addition to the ones in Cookie Jar (nanjingboy)
+
+## 0.0.4  Mon Aug 12 23:11:46 PDT 2013
+
+- Fix a crash when there's no valid response header #3
+
+## 0.0.3  Sun Apr 21 08:14:32 CST 2013
+
+- Switch to http-cookie gem (knu) #2
+
 ## 0.0.2
 
 - Repackaging
-- Typo in README
+- Typo in README (tmaesaka) #1
 
 ## 0.0.1
 
-- Initial release
+- Initial release

data/README.md

@@ -4,7 +4,7 @@ Faraday middleware to manage client-side cookies
 
 ## Description
 
-This gem is a piece of Faraday middleware that adds client-side Cookies management, using [cookiejar gem](https://github.com/dwaite/cookiejar).
+This gem is a piece of Faraday middleware that adds client-side Cookies management, using [http-cookie gem](https://github.com/sparklemotion/http-cookie).
 
 ## Installation
 
@@ -27,6 +27,7 @@ require 'faraday-cookie_jar'
 
 conn = Faraday.new(:url => "http://example.com") do |builder|
   builder.use :cookie_jar
+  builder.adapter Faraday.default_adapter
 end
 
 conn.get "/foo"  # gets cookie

data/Rakefile

@@ -1 +1,5 @@
 require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/faraday-cookie_jar.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", ">= 0.7.4"
-  spec.add_dependency "cookiejar"
+  spec.add_dependency "faraday", ">= 0.8.0"
+  spec.add_dependency "http-cookie", "~> 1.0.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.2"
   spec.add_development_dependency "sinatra"
   spec.add_development_dependency "sham_rack"
 end

data/lib/faraday/cookie_jar.rb

@@ -1,26 +1,37 @@
 require "faraday"
-require "cookiejar"
+require "http/cookie_jar"
 
 module Faraday
   class CookieJar < Faraday::Middleware
     def initialize(app, options = {})
       super(app)
-      @jar = ::CookieJar::Jar.new
+      @jar = options[:jar] || HTTP::CookieJar.new
     end
 
     def call(env)
-      cookie = @jar.get_cookie_header(env[:url])
-      unless cookie.empty?
-        env[:request_headers]["Cookie"] = cookie
+      cookies = @jar.cookies(env[:url])
+      unless cookies.empty?
+        cookie_value = HTTP::Cookie.cookie_value(cookies)
+        if env[:request_headers]["Cookie"]
+          unless env[:request_headers]["Cookie"] == cookie_value
+            env[:request_headers]["Cookie"] = cookie_value + ';' + env[:request_headers]["Cookie"]
+          end
+        else
+          env[:request_headers]["Cookie"] = cookie_value
+        end
       end
 
       @app.call(env).on_complete do |res|
-        @jar.set_cookies_from_headers(env[:url], res[:response_headers])
+        if res[:response_headers]
+          if set_cookie = res[:response_headers]["Set-Cookie"]
+            @jar.parse(set_cookie, env[:url])
+          end
+        end
       end
     end
   end
 end
 
-if Faraday.respond_to? :register_middleware
-  Faraday.register_middleware :cookie_jar => lambda { Faraday::CookieJar }
+if Faraday::Middleware.respond_to? :register_middleware
+  Faraday::Middleware.register_middleware :cookie_jar => Faraday::CookieJar
 end

data/lib/faraday/cookie_jar/version.rb

@@ -1,5 +1,5 @@
 module Faraday
   module CookieJarVersion
-    VERSION = "0.0.2"
+    VERSION = "0.0.7"
   end
 end

data/spec/faraday-cookie_jar/cookie_jar_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Faraday::CookieJar do
   let(:conn) { Faraday.new(:url => 'http://faraday.example.com') }
+  let(:cookie_jar) { HTTP::CookieJar.new }
 
   before do
     conn.use :cookie_jar
@@ -10,19 +11,43 @@ describe Faraday::CookieJar do
 
   it 'get default cookie' do
     conn.get('/default')
-    conn.get('/dump').body.should == 'foo=bar'
+    expect(conn.get('/dump').body).to eq('foo=bar')
   end
 
   it 'does not send cookies to wrong path' do
     conn.get('/path')
-    conn.get('/dump').body.should_not == 'foo=bar'
+    expect(conn.get('/dump').body).to_not eq('foo=bar')
   end
 
   it 'expires cookie' do
     conn.get('/expires')
-    conn.get('/dump').body.should == 'foo=bar'
+    expect(conn.get('/dump').body).to eq('foo=bar')
     sleep 2
-    conn.get('/dump').body.should_not == 'foo=bar'
+    expect(conn.get('/dump').body).to_not eq('foo=bar')
+  end
+
+  it 'fills an injected cookie jar' do
+
+    conn_with_jar = Faraday.new(:url => 'http://faraday.example.com') do |conn|
+      conn.use :cookie_jar, jar: cookie_jar
+      conn.adapter :net_http # for sham_rock
+    end
+
+    conn_with_jar.get('/default')
+
+    expect(cookie_jar.empty?).to be false
+
+  end
+
+  it 'multiple cookies' do
+    conn.get('/default')
+
+    response = conn.send('get') do |request|
+      request.url '/multiple_cookies'
+      request.headers.merge!({:Cookie => 'language=english'})
+    end
+
+    expect(response.body).to eq('foo=bar;language=english')
   end
 end
 

data/spec/support/fake_app.rb

@@ -16,4 +16,8 @@ class FakeApp < Sinatra::Application
   get '/expires' do
     response.set_cookie "foo", :value => "bar", :expires => Time.now + 1
   end
+
+  get '/multiple_cookies' do
+    "foo=#{request.cookies['foo']};language=#{request.cookies['language']}"
+  end
 end

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: faraday-cookie_jar
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Tatsuhiko Miyagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: cookiejar
+  name: http-cookie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sham_rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Cookie jar middleware for Faraday
@@ -130,7 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -146,27 +131,25 @@ files:
 homepage: https://github.com/miyagawa/faraday-cookie_jar
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Manages client-side cookie jar for Faraday HTTP client
 test_files:
 - spec/faraday-cookie_jar/cookie_jar_spec.rb