scorn 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ada8f85a3f176d74bca5d1db932477f5d1e76fada2ffe0606d46a2b7424a4f
-  data.tar.gz: 6fbe21478d688875fd39cb9d3845781c0f1aae89259ad5c98c14ffbf754fae52
+  metadata.gz: 85cc3564b52b437e8e8f4310cfcede5d5696f627d5b0525acb78b8160edbe694
+  data.tar.gz: 29aae9d5ec45908f599c3e2cba875a0568d80cfa6c831393d1f45d0d0daa15de
 SHA512:
-  metadata.gz: 2edff84c7c87b61652f8c74d4bf89ef755f39470dc7ac3c883eeefba7c155481028c4d0995f795f729d88dbde2cae44b794291a5371e5490824ca165ca4021fa
-  data.tar.gz: abd609912fe210f3ae8f91a750c67448f7c08ea6116fdc21c72929037b6580a0b9db4595d1163aacb42d49acf537a05b9ecfc259984bb07db5871617eb223dcf
+  metadata.gz: c4fc2fc03aa541256700c41971be22617aba2025db4d7770bd5f8983a0b97f2c4f030ce67f89ef5a0823a2f126c1da73fe10fdd8d6e45e3e2bd11be6f838d24a
+  data.tar.gz: 4f142484e9ea9296f5d1da76cc5213ee85da9cb1862c4c37d7e376805c4961ec3490ea286fc3364e2ff80821ee09e54ea80fdbf10f28f39660fe0f221fc18c38

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # CHANGELOG.md
 
 
+## scorn 0.3.0 released 2021-01-11
+
+* Implement basic POST form data
+* Make HTTP response available via `#_response`
+
+
 ## scorn 0.2.0 released 2021-01-05
 
 * Don't pass the hostname is GET, it passes in Host:

data/README.md

@@ -4,7 +4,33 @@
 A stupid HTTP client library.
 
 ```ruby
-data = Scorn.get('https://example.com/data.json')
+r = Scorn.get('https://example.com/data.json')
+
+p r._response._c # => 200
+```
+
+```ruby
+r = Scorn.get('https://httpbin.org/get', json: true)
+
+p r._response._c # => 200
+p r['args'] # => {}
+p r['headers']['Host'] # => 'httpbin.org'
+p r['headers']['Accept'] # => 'application/json'
+p r['url'] # => 'https://httpbin.org/get'
+```
+
+```ruby
+r = Scorn.post(
+  'https://httpbin.org/post',
+  data: { source: 'src', target: 'tgt', n: -1 },
+  debug: $stderr)
+
+p r._response._c # => 200
+p r._response._sta # => 'OK'
+p r._response.code # => '200'
+
+p r.class # => Hash
+p r['form'] # => { 'n' => '-1', 'source' => 'src', 'target' => 'tgt' }
 ```
 
 

data/lib/scorn.rb

@@ -10,20 +10,18 @@ require 'net/http'
 
 module Scorn
 
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 
   class << self
 
     def get(uri, opts={})
 
-      res = Scorn::Client.new(opts).get(uri, opts)
-
-      s = res.body
+      Scorn::Client.new(opts).get(uri, opts)
+    end
 
-      st = s.strip
-      return (JSON.parse(st) rescue s) if st[0, 1] == '{' && st[-1, 1] == '}'
+    def post(uri, opts)
 
-      s
+      Scorn::Client.new(opts).post(uri, opts)
     end
   end
 
@@ -46,26 +44,76 @@ module Scorn
         OpenSSL::SSL::VERIFY_PEER
     end
 
-    def get(uri, opts)
+    def get(uri, opts={})
 
       u = uri.is_a?(String) ? URI(uri) : uri
 
-      request(u, make_get_req(u, opts))
+      res = request(u, make_get_req(u, opts))
+
+      opts[:res] ? res : read_response(res)
+    end
+
+    def post(uri, opts)
+
+      u = uri.is_a?(String) ? URI(uri) : uri
+
+      res = request(u, make_post_req(u, opts))
+
+      opts[:res] ? res : read_response(res)
     end
 
     protected
 
     def make_get_req(uri, opts)
 
+      accept =
+        opts[:accept] ||
+        (opts[:json] && 'application/json') ||
+        '*/*'
+
+      make_req(
+        :get, uri,
+        agent: opts[:user_agent] || user_agent,
+        accept: accept)
+    end
+
+    def make_post_req(uri, opts)
+
+      req = make_req(
+        :post, uri,
+        agent: opts[:user_agent] || user_agent,
+        type: opts[:content_type] || 'application/x-www-form-urlencoded')
+
+      data = opts[:data]
+      req.set_form_data(data) if data
+
+      req
+    end
+
+    def make_req(type, uri, headers)
+
       u = [ uri.path, uri.query ].compact.join('?')
       u = '/' if u.length < 1
 
-      req = Net::HTTP::Get.new(u)
+      req =
+        case type
+        when :get then Net::HTTP::Get.new(u)
+        when :post then Net::HTTP::Post.new(u)
+        else fail ArgumentError.new("HTTP #{type} not implemented")
+        end
       req.instance_eval { @header.clear }
       def req.set_header(k, v); @header[k] = [ v ]; end
 
-      req.set_header('User-Agent', user_agent)
-      req.set_header('Accept', '*/*')
+      headers.each do |k, v|
+        hk =
+          case k
+          when :accept then 'Accept'
+          when :agent then 'User-Agent'
+          when :type then 'Content-Type'
+          else k.to_s
+          end
+        req.set_header(hk, v)
+      end
 
       req
     end
@@ -81,10 +129,14 @@ module Scorn
       res = http.request(req)
 
       class << res
-        attr_accessor :_uri, :_elapsed, :_proxy
+        attr_accessor :_u, :_uri, :_request, :_c, :_sta, :_elapsed, :_proxy
         def _headers; each_header.inject({}) { |h, (k, v)| h[k] = v; h }; end
       end
-      res._uri = uri.to_s
+      res._u = uri.to_s
+      res._uri = uri
+      res._request = req
+      res._c = res.code.to_i
+      res._sta = WEBrick::HTTPStatus.reason_phrase(res.code) rescue ''
       res._elapsed = monow - t0
       #res._proxy = detail_proxy(http)
 
@@ -108,6 +160,23 @@ module Scorn
 
       http
     end
+
+    def read_response(res)
+
+      s = res.body
+      st = s.strip
+
+      r =
+        if st[0, 1] == '{' && st[-1, 1] == '}'
+          JSON.parse(st) rescue s
+        else
+          s
+        end
+      class << r; attr_accessor :_response; end
+      r._response = res
+
+      r
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorn
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec