faraday-cookie_jar 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e74bcd96edbb8febdcf5fcb77962a0b6788cf70b
-  data.tar.gz: 9e80c3d1b786f56731c0e5039b527127f6ed0188
+  metadata.gz: 23be36b8be03b487d50d756a69c6f3e6996a1e2f
+  data.tar.gz: 80be5d729297d81d752dce3c0ff65c11e6d04911
 SHA512:
-  metadata.gz: 473024fe42546791d025736424cfc30719a91b2c58c7dd476447a5f74c8731b902d7a7cd821e75b4e3a7df65a950068aa2a35d3a93e11055f57562d07c32bc96
-  data.tar.gz: da403cfcea63dc498b883359fb7c5b61fed35374a59c592ee0ddb41c0f775e6a263df7f9f613aef1f61a34636301fb8d5327b1f9d5d4c54be5804f53a0b8fbc7
+  metadata.gz: eedf7cd419797c390d238fab7a48b198a37855653d17af0283a56f020f92587f3a31b3ebc93ab4f3769979a2b1e308d17e3c7cd88c170e9b24d7f4ea426f8e6e
+  data.tar.gz: 05c368592c7eea598722a17fb9b3cfb88d4d11f7c38d91c4c7c48d022fb06eb43e7a244ea0b51a5b1731bc419e99cfc95dd502fd92245c509bb9f6c619b5a748

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 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

data/faraday-cookie_jar.gemspec

@@ -18,7 +18,7 @@ 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 "faraday", ">= 0.7.4", "< 0.9.0"
   spec.add_dependency "http-cookie", "~> 1.0.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/faraday/cookie_jar.rb

@@ -11,7 +11,12 @@ module Faraday
     def call(env)
       cookies = @jar.cookies(env[:url])
       unless cookies.empty?
-        env[:request_headers]["Cookie"] = HTTP::Cookie.cookie_value(cookies)
+        cookie_value = HTTP::Cookie.cookie_value(cookies)
+        if env[:request_headers]["Cookie"]
+          env[:request_headers]["Cookie"] = cookie_value + ';' + env[:request_headers]["Cookie"]
+        else
+          env[:request_headers]["Cookie"] = cookie_value
+        end
       end
 
       @app.call(env).on_complete do |res|
@@ -27,4 +32,4 @@ end
 
 if Faraday.respond_to? :register_middleware
   Faraday.register_middleware :cookie_jar => lambda { Faraday::CookieJar }
-end
+end

data/lib/faraday/cookie_jar/version.rb

@@ -1,5 +1,5 @@
 module Faraday
   module CookieJarVersion
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/spec/faraday-cookie_jar/cookie_jar_spec.rb

@@ -24,5 +24,16 @@ describe Faraday::CookieJar do
     sleep 2
     conn.get('/dump').body.should_not == 'foo=bar'
   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
+
+    response.body.should == '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,111 +1,117 @@
 --- !ruby/object:Gem::Specification
 name: faraday-cookie_jar
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tatsuhiko Miyagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: http-cookie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sham_rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Cookie jar middleware for Faraday
@@ -115,7 +121,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -138,17 +144,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Manages client-side cookie jar for Faraday HTTP client