eac_rest 0.2.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52eedfe432cca2d5b561def4ff250065c6f602038820919c3e4588d3f402e74d
-  data.tar.gz: 8b286a003e28931db39b589f01d56d4e2b4d08be7bac7c9cdb45ee7da3f2883c
+  metadata.gz: 275b7cb77a0cf2c309381dcd4759579584b53663a05fd1844e8bf7fb40430066
+  data.tar.gz: 50fde4de859dcdcb38af6b8d3c808e6b2dc0ab328079f6faae8c39cc296b2021
 SHA512:
-  metadata.gz: 66f581076f08aa0d44eff44dc7c274c7fcac6079b1b0461afa2a9706a052c9d9445088ac9074f2f58db4f5d5db754d6f0d078693f1b6aa54ce14b3d0a8daf2e5
-  data.tar.gz: 2d87555094fcdfd930573fce8711fc3e38380ae63235a30743f283cabddcb0ec85f0938e468c889f9d5b431c1dec7330e89533412188b3243d6ecea8a574d25e
+  metadata.gz: b4402b89378a23d574ee3137d379c94af5e541ee70d7a9cec55235722231eb51c1380f9a5a1d2ec22745b3133b5ee1b32136bc479332e588bc10210fab4ff4c8
+  data.tar.gz: 8679dc9886b157040d7f05da6849b304c123c1fc0e97ec33be35f39e0fefd03eda5629a73691003c0773b9b7a067da396c4cd38632918ea0955fb31b261f0b6f

data/lib/eac_rest/api.rb

@@ -13,8 +13,8 @@ module EacRest
     def request(service_url_suffix, headers = {}, &body_data_proc)
       r = ::EacRest::Request.new(build_service_url(service_url_suffix),
                                  body_data_proc)
-      headers.each { |name, value| r.header(name, value) }
-      r.autenticate(username, password) if username.present?
+      headers.each { |name, value| r = r.header(name, value) }
+      r = r.autenticate(username, password) if username.present?
       r
     end
 
@@ -30,7 +30,8 @@ module EacRest
       s = ::Addressable::URI.parse(suffix)
       r = ::Addressable::URI.parse(root_url)
       r.path += s.path
-      r.query_values = r.query_values.if_present({}).merge(s.query_values.if_present({}))
+      r.query_values = r.query_values(::Array).if_present([]) +
+                       s.query_values(::Array).if_present([])
       r.to_s
     end
   end

data/lib/eac_rest/request.rb

@@ -1,19 +1,31 @@
 # frozen_string_literal: true
 
+require 'curb'
 require 'eac_rest/response'
 require 'eac_ruby_utils/core_ext'
 require 'ostruct'
 
 module EacRest
   class Request
+    COMMON_MODIFIERS = %w[auth body_data verb].freeze
+    HASH_MODIFIERS = %w[header].freeze
+    MODIFIERS = COMMON_MODIFIERS + HASH_MODIFIERS.map(&:pluralize)
+
+    enable_immutable
+    immutable_accessor(*COMMON_MODIFIERS, type: :common)
+    immutable_accessor(*HASH_MODIFIERS, type: :hash)
+
+    enable_listable
+    lists.add_symbol :verb, :get, :delete, :options, :post, :put
+
     common_constructor :url, :body_data_proc, default: [nil]
 
     def autenticate(username, password)
-      self.auth = ::OpenStruct.new(username: username, password: password)
+      auth(::OpenStruct.new(username: username, password: password))
     end
 
-    def header(name, value)
-      headers[name.to_s] = value
+    def immutable_constructor_args
+      [url, body_data_proc]
     end
 
     def response
@@ -22,21 +34,41 @@ module EacRest
 
     private
 
-    attr_accessor :auth
-
     def build_curl
       r = ::Curl::Easy.new(url)
+      MODIFIERS.each { |suffix| send("build_curl_#{suffix}", r) }
+      r
+    end
+
+    def build_curl_auth(curl)
       auth.if_present do |a|
-        r.http_auth_types = :basic
-        r.username = a.username
-        r.password = a.password
+        curl.http_auth_types = :basic
+        curl.username = a.username
+        curl.password = a.password
       end
-      r.headers.merge!(headers)
-      r
     end
 
-    def headers
-      @headers ||= {}
+    def build_curl_body_data(curl)
+      www_form_body_data_encoded.if_present { |v| curl.post_body = v }
+    end
+
+    def build_curl_headers(curl)
+      curl.headers.merge!(headers)
+    end
+
+    def build_curl_verb(curl)
+      curl.set(
+        :customrequest,
+        verb.if_present(VERB_GET) { |v| self.class.lists.verb.value_validate!(v) }.to_s.upcase
+      )
+    end
+
+    def www_form_body_data_encoded
+      body_data.if_present do |v|
+        v = v.map { |k, vv| [k, vv] } if v.is_a?(::Hash)
+        v = URI.encode_www_form(v) if v.is_a?(::Array)
+        v.to_s
+      end
     end
   end
 end

data/lib/eac_rest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRest
-  VERSION = '0.2.0'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rest
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-28 00:00:00.000000000 Z
+date: 2021-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
 description: 
 email: 
 executables: []
@@ -74,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A REST helper for Ruby.