simple-http 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b513811215ed8543923236fd40336bd3989771cc85f7da2a2d6ecfff869c7bd4
-  data.tar.gz: 0a0718c191e4102a8a06162e92d295dcd519aaeb22fbb4997ee45a8b3a4e7a26
+  metadata.gz: af4c48df122f1e2d75e2646e7175e8356b3d29ed29090b7b2d50e5b045ac4c67
+  data.tar.gz: 377058a3745909a67b4cf51307fcc87743bf5e054e681541e72b668473a07933
 SHA512:
-  metadata.gz: 2b304ffa55e45fdcc8c5c68b52d379dae57d38d07404c817a04de80409c0e161c75c6c94dff0cdbad81506ffee3e61e0569b33d1e20fd8fba77880e420694650
-  data.tar.gz: 429e91c1b979b1750cf4896b2ebf2a13cf072bb4e0418268573615273dd1a5785ef5eb6f9927851d55531eb41703d748d57fe9a8c59533c750e463147d486848
+  metadata.gz: 3bb65d9e2a2fe14e197fcab613fe587523fb932cd1f45b2648d2a160defe25762490223d66a338d342095abb83fafc3c564a6d3bd525c0dc5033728dad33dde8
+  data.tar.gz: 910e7c3e08cd98361067e79082496b972cb24e0b3bc64365807d058119696e23758a3ac2e166ebdbe1dd678c8a0c4b10dcfaeeaf1c5b105cb7613fe8dd6765da

data/lib/simple/http.rb

@@ -3,6 +3,7 @@
 # License::   Distributes under the terms  of the Modified BSD License, see LICENSE.BSD for details.
 
 # rubocop:disable Metrics/ClassLength
+# rubocop:disable Metrics/AbcSize
 
 require "json"
 require "expectation"
@@ -20,6 +21,8 @@ require_relative "http/request"
 require_relative "http/response"
 require_relative "http/checked_response"
 
+Simple::HTTP.extend Simple::HTTP::Helpers
+
 #
 # A very simple, Net::HTTP-based HTTP client.
 #

data/lib/simple/http/errors.rb

@@ -36,7 +36,7 @@ class Simple::HTTP::StatusError < Simple::HTTP::Error
                   when 400..499 then ::Simple::HTTP::Status4XXError
                   when 500..599 then ::Simple::HTTP::Status5XXError
                   else ::Simple::HTTP::StatusError
-    end
+                  end
 
     Kernel.raise error_klass.new(response)
   end

data/lib/simple/http/helpers.rb

@@ -1,24 +1,22 @@
 module Simple::HTTP::Helpers
-  module BuildURL
-    def build_url(base, *args)
-      option_args, string_args = args.partition { |arg| arg.is_a?(Hash) }
-      options = option_args.inject({}) { |hsh, option| hsh.update option }
+  def build_url(base, *args)
+    option_args, string_args = args.partition { |arg| arg.is_a?(Hash) }
+    options = option_args.inject({}) { |hsh, option| hsh.update option }
 
-      url = File.join([base] + string_args)
+    url = File.join([base] + string_args)
 
-      query = build_query(options)
-      url += url.index("?") ? "&#{query}" : "?#{query}" if query
+    query = build_query(options)
+    url += url.index("?") ? "&#{query}" : "?#{query}" if query
 
-      url
-    end
+    url
+  end
 
-    private
+  private
 
-    def build_query(params)
-      params = params.reject { |_k, v| v.blank? }
-      return nil if params.blank?
+  def build_query(params)
+    params = params.reject { |_k, v| v.blank? }
+    return nil if params.blank?
 
-      params.map { |k, value| "#{k}=#{escape(value.to_s)}" }.join("&")
-    end
+    params.map { |k, value| "#{k}=#{CGI.escape(value.to_s)}" }.join("&")
   end
 end

data/lib/simple/http/response.rb

@@ -71,22 +71,44 @@ class Simple::HTTP::Response
     return parsed_content if into.nil?
 
     if parsed_content.is_a?(Array)
-      parsed_content.map { |entry| into.new entry }
+      parsed_content.map { |entry| convert_into(entry, into: into) }
     else
-      into.new parsed_content
+      convert_into(parsed_content, into: into)
     end
   end
 
   private
 
+  def convert_into(rec, into:)
+    case into
+    when :struct
+      to_struct(rec)
+    else
+      into.new rec
+    end
+  end
+
+  def to_struct(hsh)
+    keys = hsh.keys
+    values = hsh.values_at(*keys)
+
+    @to_structs ||= {}
+    struct = (@to_structs[keys] ||= Struct.new(*keys.map(&:to_sym)))
+    struct.new(*values)
+  end
+
   def parsed_content
     return @parsed_content if defined? @parsed_content
 
-    @parsed_content = case media_type
-                      when "application/json"
-                        body.empty? ? nil : JSON.parse(body)
-                      else
-                        body
+    @parsed_content = parse_content
+  end
+
+  def parse_content
+    case media_type
+    when "application/json"
+      body.empty? ? nil : JSON.parse(body)
+    else
+      body
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple-http
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2019-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expectation