wikk_webbrowser 0.9.6 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b68922378ce9c4777c7810d94449ec8c4cdd738d9480b80430aa9f8829cd0d97
-  data.tar.gz: 33654b9c6d202036b39895c2b41facba850bfcee44e211866cca373a45443c8f
+  metadata.gz: 97d467b1c73719e5792766843f0022dfc1e3b66aa6f80d5627cce822c295a6a2
+  data.tar.gz: 8c7bbc76ec4290ed8277beb7a624f9c9a4b4db95ac362a4c22d29790608f093d
 SHA512:
-  metadata.gz: a3ed4f35c54b8d96baddfe7e21afc0fdf674706daf36aa5a97a0da5717a3fb513a1bbda23c7840765b9891d314a3ff26601847272b8c146b34bf196c7c9f0534
-  data.tar.gz: 9bafdc4f3fd1b77d92b749b5970e224811a631a3f1fc8c9f48cbf59b07a884f8a12d9431620ef331bd8afc0e99d4cbb6a109f09c315f1e5722eb4a2ae569b680
+  metadata.gz: b6dde99ae5e31f08eefc8a06abb4cb55e7778af435523199a03e50d5bdc62bbdcb249c1a7e9e5c54aa91c13c86e2cf1ac668ab1ef0478dd9df42d71863b6ac26
+  data.tar.gz: 92575280201954924c2aa9eb1da7ab424939ba3a204ea6046dc7ca6a21620f1b637750dd086eb24a332aa7e4910dc589e9afa786d464ffde3f11b7dce121ffb4

data/History.txt

@@ -1,3 +1,15 @@
+robertburrowes	Tue Sep 20 11:54:06 2022 +1200
+	Fix broken post, when we should be converting 'data' into json, but weren't
+robertburrowes	Mon Jun 13 17:53:47 2022 +1200
+	use bash
+robertburrowes	Mon Jun 13 13:46:47 2022 +1200
+	scripts should be bash
+robertburrowes	Mon Jun 13 12:22:50 2022 +1200
+	comment
+robertburrowes	Sun May 15 10:06:52 2022 +1200
+	Push tags too
+robertburrowes	Mon May 9 17:02:06 2022 +1200
+	Duplicated Put, changing all Puts to Patch
 robertburrowes	Mon Sep 20 12:14:31 2021 +1200
 	Add aliases for put,post,get and delete
 robertburrowes	Mon Sep 20 12:14:09 2021 +1200

data/lib/wikk_webbrowser.rb

@@ -1,4 +1,5 @@
-module WIKK # :nodoc:
+# Stay in our own namespace
+module WIKK
   require 'net/http'
   require 'net/https'
   require 'uri'
@@ -13,7 +14,7 @@ module WIKK # :nodoc:
   #    response = get_page(query: ,'/')
   #  end
   class WebBrowser
-    VERSION = '0.9.6'
+    VERSION = '0.9.8'
 
     class Error < RuntimeError # :nodoc:
       attr_accessor :web_return_code
@@ -241,14 +242,14 @@ module WIKK # :nodoc:
 
       if data.nil?
         req.body = ''
-      elsif data.instance_of?(Hash)
-        if content_type =~ /application\/octet-stream/
-          req.set_form_data(data, '&')
-        else
-          req.set_form_data.to_j
-        end
-      else
-        req.body = data # If json as a string or raw string
+      elsif data.instance_of?(String)
+        req.body = data # If we are given a String, just use it as is
+      elsif content_type =~ /application\/json/
+        req.body = data.to_j # Encode data as json. It wasn't already a String.
+      elsif content_type =~ /application\/octet-stream/ && (data.instance_of?(Hash) || data.instance_of?(Array))
+        req.set_form_data(data, '&') # Should handle Array as multiple entries with the same key, and Hash
+      else # Assuming data can become a string that makes sense to the other end
+        req.body = data.to_s # raw string
       end
 
       @response = @session.request(req)
@@ -387,6 +388,67 @@ module WIKK # :nodoc:
 
     alias put put_req
 
+    # send a PATCH query to the server and return the response.
+    # @param query [String] URL, less the 'http://host/'  part
+    # @param authorization [String] If present, add Authorization header, using this string
+    # @param content_type [String] Posted content type
+    # @param data [String] Text to add to body of post to the web server
+    # @param extra_headers [Hash] Add these to standard headers
+    # @param extra_cookies [Hash] Add these to standard cookies
+    # @return [String] The Net::HTTPResponse.body text response from the web server
+    def patch_req(query:, authorization: nil, content_type: '"application/octet-stream"', data: nil, extra_headers: {}, extra_cookies: {})
+      url = URI.parse("#{@use_ssl ? 'https' : 'http'}://#{@host}/#{query}")
+      req = Net::HTTP::Patch.new(url.path)
+
+      header = { 'HOST' => @host }
+      header['Accept'] = '*/*'
+      header['Accept-Encoding'] = 'gzip, deflate, br'
+      header['Accept-Language'] = 'en-US,en;q=0.5'
+      header['Connection'] = 'keep-alive'
+      header['User-Agent'] = 'Mozilla/5.0'
+      header['Content-Type'] = content_type
+      add_cookies(extra_cookies)
+      header['Cookie'] = cookies_to_s if @cookies.length > 0
+      header['DNT'] = '1'
+      header['Authorization'] = authorization if authorization != nil
+
+      extra_headers.each do |k, v|
+        header[k] = v
+      end
+      req.initialize_http_header( header )
+
+      if data.nil?
+        req.body = ''
+      elsif data.instance_of?(Hash)
+        if content_type =~ /application\/octet-stream/
+          req.set_form_data(data, '&')
+        else
+          req.set_form_data.to_j
+        end
+      else
+        req.body = data # If json as a string or raw string
+      end
+
+      @response = @session.request(req)
+      save_cookies(@response)
+
+      if @response.code.to_i >= 300
+        if @response.code.to_i == 302
+          # ignore the redirects.
+          # puts "302"
+          # @response.each {|key, val| printf "%s = %s\n", key, val }  #Location seems to have cgi params removed. End up with .../cginame?&
+          # puts "Redirect of Post to #{@response['location']}" #Location seems to have cgi params removed. End up with .../cginame?&
+          return
+        end
+
+        raise Error.new(web_return_code: @response.code, message: "#{@response.code} #{@response.message} #{query} #{data} #{@response.body}")
+      end
+
+      return @response.body
+    end
+
+    alias patch patch_req
+
     # Extract form field values from the html body.
     # @param body [String] The html response body
     # @return [Hash] Keys are the field names, values are the field values

data/version

@@ -1,2 +1,2 @@
 PROJECT="wikk_webbrowser"
-VERSION="0.9.6"
+VERSION="0.9.8"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wikk_webbrowser
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.8
 platform: ruby
 authors:
 - Rob Burrowes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2022-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -70,14 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '3.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '3.25'
 description: |-
   Wrapper around ruby http and https libraries.
 
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Wrapper around ruby http and https libraries