sapoci-connect 0.1.10 → 0.1.11

data/bin/sapoci-search

@@ -56,7 +56,7 @@ begin
 
   # Setup
   conn = Faraday.new(uri.to_s, :ssl => {:verify => true}) do |builder| 
-    builder.response :follow_redirects, :cookies => :all, :limit => 5
+    builder.response :follow_redirects, :cookies => :all, :limit => 10 
     builder.response :background_search
     builder.use Faraday::Response::Logger if options.debug
     builder.adapter  Faraday.default_adapter

data/lib/sapoci/connect/middleware/follow_redirects.rb

@@ -1,5 +1,6 @@
 require 'faraday'
 require 'set'
+require 'webrick'
 
 module SAPOCI
   module Connect
@@ -62,13 +63,13 @@ module SAPOCI
         #           standards_compliant - A Boolean indicating whether to respect
         #                                 the HTTP spec when following 302
         #                                 (default: false)
-        #          cookie - Use either an array of strings
-        #                  (e.g. ['cookie1', 'cookie2']) to choose kept cookies
-        #                  or :all to keep all cookies.
         def initialize(app, options = {})
           super(app)
           @options = options
 
+          @options[:cookies] = :all
+          @cookies = []
+
           @replay_request_codes = Set.new [307]
           @replay_request_codes << 302 if standards_compliant?
         end
@@ -99,10 +100,11 @@ module SAPOCI
 
         def update_env(env, request_body, response)
           location = response['location']
-          raise RedirectWithoutLocation, response if location.blank?
+          raise RedirectWithoutLocation, response if location.to_s.size == 0
           env[:url] += location
-          if @options[:cookies] && captured_cookies = keep_cookies(env)
-            env[:request_headers]['Cookie'] = captured_cookies
+          
+          if @options[:cookies] && cookie_string = collect_cookies(env)
+            env[:request_headers]['Cookie'] = cookie_string
           end
 
           if transform_into_get?(response)
@@ -126,22 +128,16 @@ module SAPOCI
           @options.fetch(:limit, FOLLOW_LIMIT)
         end
 
-        def keep_cookies(env)
-          cookies = @options.fetch(:cookies, [])
-          response_cookies = env[:response_headers]['Set-Cookie'] #[:cookies]
-          cookies == :all ? response_cookies : selected_request_cookies(response_cookies)
-        end
-
-        def selected_request_cookies(cookies)
-          selected_cookies(cookies)[0...-1]
-        end
-
-        def selected_cookies(cookies)
-          "".tap do |cookie_string|
-            @options[:cookies].each do |cookie|
-              string = /#{cookie}=?[^;]*/.match(cookies)[0] + ';'
-              cookie_string << string
-            end
+        def collect_cookies(env)
+          if response_cookies = env[:response_headers]['Set-Cookie']
+            @cookies = WEBrick::Cookie.parse_set_cookies(response_cookies)
+            @cookies.inject([]) do |result, cookie|
+              # TODO only send back cookies where path is nil or 
+              # path matches according to env[:url]
+              result << cookie.name + "=" + cookie.value
+            end.uniq.join(";")
+          else
+            nil
           end
         end
 

metadata

@@ -1,145 +1,150 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sapoci-connect
-version: !ruby/object:Gem::Version
-  version: 0.1.10
+version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 11
+  version: 0.1.11
 platform: ruby
-authors:
+authors: 
 - Oliver Eilhard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-03 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.4
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 8
+        - 4
         version: 0.8.4
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2'
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rack
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 4
+        - 1
+        version: 1.4.1
     - - <
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: sapoci
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.8
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sapoci
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 1
+        - 8
         version: 0.1.8
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rdoc
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.2
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
+        version: "2.5"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: sinatra
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  type: :development
+  version_requirements: *id007
 description: HTTP client library for working with SAP OCI compliant servers.
-email:
+email: 
 - oliver.eilhard@gmail.com
-executables:
+executables: 
 - sapoci-search
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - CHANGELOG.md
 - LICENSE
 - README.md
-files:
+files: 
 - bin/sapoci-search
 - lib/sapoci/connect.rb
 - lib/sapoci/connect/middleware/background_search.rb
@@ -149,27 +154,38 @@ files:
 - README.md
 homepage: http://github.com/meplato/sapoci-connect
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: HTTP client library for working with SAP OCI compliant servers.
 test_files: []
+