tweakphoeus 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9cdc0cacc3d2f0689e958d15ec999d95a87b4ea
-  data.tar.gz: bb6e1c45b16dc0972e77e1f145a45698a99a4e98
+  metadata.gz: ea8b67191906a4405d2a281b65bebe605b75b47a
+  data.tar.gz: f00524b1660e48dd48367f273fb59daba447cc73
 SHA512:
-  metadata.gz: f15a18722d99609541692e9d067e20092317b41d57b41a7393a156125cf6a28399ea701d2141db6305efa94f4536c71055d4f9cafab1d88ab7bfe1c3c5b25e57
-  data.tar.gz: a0be461a8f38f4da5178d769d9f9e0e401a82dee0b2d861f4f1364b9dbd7cc2cc7357f2b51a51f82f14ee0313c8df70feb09b05ddce27749247a83b5b2538271
+  metadata.gz: c92ea3ec329f44879363f3411f4953f8b70a5492938b42b07ebbdaa4d82a551ab8aff5b5d951106933c0402dc151bfef4c83092d15118dc92c59e49f7f807ac4
+  data.tar.gz: 22c40a0112be9ebc97f62f3a57d712e4760c448260447cf69f9be491db08b7a4b9eb82eab11f35b96416f4cf40a20f30bdabaedc995b3ee32862be8aeed4a327

data/.gitignore

@@ -7,4 +7,8 @@
 /pkg/
 /spec/reports/
 /tmp/
-.gem
+*.gem
+
+#*
+*#
+.#*

data/CHANGELOG.md

@@ -0,0 +1 @@
+-- v0.1.0 - First stable version: Typhoeus dependency version updated

data/lib/tweakphoeus/version.rb

@@ -1,3 +1,3 @@
 module Tweakphoeus
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/tweakphoeus.rb

@@ -9,18 +9,18 @@ module Tweakphoeus
       @cookie_jar = {}
     end
 
-    def get url, body: nil, headers: nil, redirect: true
-      inject_cookies url, headers
-      response = Typhoeus.get url, body: body, headers: headers
-      obtain_cookies response
+    def get(url, body: nil, headers: nil, redirect: true)
+      inject_cookies(url, headers)
+      response = Typhoeus.get(url, body: body, headers: headers)
+      obtain_cookies(response)
       response = get(redirect_url(response), body: body, headers: headers) if redirect && has_redirect?(response)
       response
     end
 
-    def post url, body: nil, headers: nil, redirect: false
-      inject_cookies url, headers
-      response = Typhoeus.get url, body: body, headers: headers
-      obtain_cookies response
+    def post(url, body: nil, headers: nil, redirect: false)
+      inject_cookies(url, headers)
+      response = Typhoeus.post(url, body: body, headers: headers)
+      obtain_cookies(response)
       response = post(redirect_url(response), body: body, headers: headers) if redirect && has_redirect?(response)
       response
     end
@@ -32,6 +32,7 @@ module Tweakphoeus
     def add_cookies host, key, value
       domain = get_domain host
       @cookie_jar[domain] = [] if @cookie_jar[domain].nil?
+      @cookie_jar[domain] = @cookie_jar[domain].reject{|hash| hash.first[0]==key}
       @cookie_jar[domain] << {key => value}
     end
 
@@ -49,8 +50,8 @@ module Tweakphoeus
       end
 
       set_cookies_field.each do |cookie|
-        key, value = cookie.match(/^([^=]+)=([^;]+)/).to_a[1..-1]
-        domain = cookie.match(/domain=([^;]+)/)
+        key, value = cookie.match(/^([^=]+)=([^;].+)/).to_a[1..-1]
+        domain = cookie.match(/Domain=([^;]+)/)
 
         if domain.nil?
           domain = get_domain response.request.url
@@ -58,24 +59,31 @@ module Tweakphoeus
           domain = domain[1]
         end
 
-        @cookie_jar[domain] = [] if @cookie_jar[domain].nil?
-        @cookie_jar[domain] << {key => value}
+        if value != "\"\""
+          @cookie_jar[domain] = [] if @cookie_jar[domain].nil?
+          @cookie_jar[domain] = @cookie_jar[domain].reject{|hash| hash.first[0]==key}
+          @cookie_jar[domain] << {key => value}
+        end
       end
     end
 
     def inject_cookies url, headers
       domain = get_domain url
-      domain = domain.gsub("www.","")
       headers = {} if headers.nil?
       cookies = []
 
       while domain.split(".").count > 1
-        cookies << @cookie_jar[domain] if @cookie_jar[domain]
-        cookies << @cookie_jar["." + domain] if @cookie_jar["." + domain]
+        if @cookie_jar[domain]
+          @cookie_jar[domain].each do |cookie|
+            if !cookie.in?(cookies.map{|k,v| k})
+              cookies << cookie
+            end
+          end
+        end
         domain = domain.split(".")[1..-1].join(".")
       end
 
-      headers["Set-Cookie"] = cookies.flatten
+      headers["Cookie"] = cookies.map{|hash| hash.map{|k,v| k + "=" + v}}.flatten.join('; ')
     end
 
     def has_redirect? response
@@ -85,5 +93,9 @@ module Tweakphoeus
     def redirect_url response
       response.headers["Location"]
     end
+
+    def purge_bad_cookies cookies
+      cookies.reject{|e| e.first.last=="\"\""}
+    end
   end
 end

data/tweakphoeus.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Typhoeus on steroids.}
   spec.description   = %q{Typhoeus wrapper with new pretty things: cookie handler for example.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/basestylo/Tweakphoeus/"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
@@ -27,8 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'typhoeus', "~> 0.8.0"
-
+  spec.add_dependency 'typhoeus', "~> 1.0.1"
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0", "> 3.0.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tweakphoeus
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - David Martin Garcia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +82,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -92,7 +93,7 @@ files:
 - lib/tweakphoeus.rb
 - lib/tweakphoeus/version.rb
 - tweakphoeus.gemspec
-homepage: ''
+homepage: https://github.com/basestylo/Tweakphoeus/
 licenses:
 - MIT
 metadata:
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Typhoeus on steroids.