eac_rest 0.1.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fd1d42c30c2b2eb6a4ba354738b91b1571e2d6d5a3d49e2b735e3908f0c37e3
-  data.tar.gz: 35d67e9b184559ff489a80309fd7e8cd9c8de38d01b58924244a50c18d8acff8
+  metadata.gz: 67ceadfe92a9a6ec7b1916876411ac574b3638d8aa093bc58e55a90653e2a747
+  data.tar.gz: 7d418c2dca5f0504224baef19fcbe63eef741c44fd9e95ff7b1d6dce5be21ec5
 SHA512:
-  metadata.gz: c49a47e1b7aacb386e5d16184fffd6dc2b8218e1778f5b258ed8bfd1fe109be9ea3f9eb37fec09f9063e60964dfb1ce8c0e36a4e219026540038946352fd99b1
-  data.tar.gz: 680621128f7ea7b6323088bf2a917c30f16ac39f1387e8fd15fc9e5f7da37998184bb1f02156a2da6ba9c6b97a6b1f4e4fb9c6340b51e411da586ea4cb91321f
+  metadata.gz: 4ff384bfe7467ba2fd449058ea40775d283b43bb2a507de97b2dba01fb7db84e87d3ee4c27e6a904e95650c9f6f69160cbe4f2797c6499dfcc4651834f54c742
+  data.tar.gz: cbb27118906ba9d5ba1fe0a7c27c9c7354731d0eea45d0f6ea9d45729a80a653d579ad8bb61df598230e7fa7b26865c36b6307d7fdf111ff9fbc58f62081403e

data/lib/eac_rest/api.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'curb'
+require 'eac_rest/request'
 require 'eac_ruby_utils/core_ext'
 
 module EacRest
@@ -13,20 +13,25 @@ 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
 
     def request_json(service_url_suffix, headers = {}, &body_data_proc)
-      request(service_url_suffix, headers.merge('Accept' => 'application/json'), &body_data_proc)
+      request(service_url_suffix, headers.merge('Accept' => 'application/json')) do |body_data|
+        r = ::JSON.parse(body_data)
+        r = body_data_proc.call(r) if body_data_proc
+        r
+      end
     end
 
     def build_service_url(suffix)
       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/entity.rb

@@ -5,6 +5,12 @@ require 'eac_ruby_utils/core_ext'
 module EacRest
   class Entity
     enable_simple_cache
-    common_constructor :instance, :data
+    common_constructor :api, :data
+
+    class << self
+      def from_array_data(api, array_data, *args)
+        array_data.map { |item_data| new(api, item_data, *args) }
+      end
+    end
   end
 end

data/lib/eac_rest/request.rb

@@ -1,18 +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
@@ -21,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.1.0'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rest
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-18 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: A REST helper for Ruby.