ip21 1.0.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f638df374799c3d306c2dc305384e7c796b64a31c75e5a9e8320e73eb27db0d7
-  data.tar.gz: 2c73764f135c65782921cee24dcf03cd5a778431b0c8313e7bcfa264376006eb
+  metadata.gz: f13b47dc34afa9911dcce75e646e47a44a3e71a79c84277125c81f5e5baffa90
+  data.tar.gz: 84d5b491d39178b042563c06b3130f7020744a8b96bf1fb2aeb22e41fbe9e575
 SHA512:
-  metadata.gz: 6c845f6d07f705b6dfa5e6dad7ab86cfcb6aedfe903af71a7e07b55b05c81b7b5bd7adf14b42827b26dd967267b53f9d1b6a3501390842d6e33f82a0e486df69
-  data.tar.gz: 83ea282fef5124401e7b2ab4eccfd8d052de345e559ff2b5012e9fd06e5638a673c8d928b2d4b16fac8bd23f5b771de4924fe55ed570a6a8b1bba2202871ac3c
+  metadata.gz: bae814543504c17f3f8c3f43c6cff6d9029a989e2258a91cb1d99feef2af69e91462c81cf23943a50fe4da31d51d0d8907ac2fe9b8859cabf31c7c1b0effe942
+  data.tar.gz: 2ee1aed4ed3327df97d9f40cbe3bb04c382c8e4606d3edb0fd541239facd9d8a7a468860611427e63ba82d5b1b536310c763f20dcc39d24405196eaec21b6ae4

data/ip21.gemspec

@@ -5,15 +5,16 @@ Gem::Specification.new do |s|
   s.summary     = 'Aspentech IP21 Adapter for Ruby'
   s.description = 'Aspentech IP21 Adapter for executing queries using SQLPlus' \
                   ' REST API'
-  s.version     = '1.0.1'
+  s.version     = '1.3.0'
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.author      = 'Rhuan Barreto'
   s.email       = 'rhuan@rhuan.com.br'
   s.homepage    = 'http://rubygems.org/gems/ip21'
   s.platform    = Gem::Platform::RUBY
   s.license     = 'MIT'
-  s.add_dependency 'activesupport', '~>6.0.1'
-  s.add_dependency 'rubyntlm', '~>0.6'
+  s.add_dependency 'activesupport', '~> 6.1.0'
+  s.add_dependency 'rubyntlm', '~>0.6.3'
+  s.add_dependency 'httpi', '~>2.4'
   s.files = Dir.glob('{docs,bin,lib,spec,templates,benchmarks}/**/*') +
             ['LICENSE', 'README.md', '.yardopts', __FILE__]
   s.require_path = 'lib'

data/lib/ip21.rb

@@ -118,15 +118,13 @@ class IP21
   # @param [String] type The request type to be passed to rest_address function
   # @param [String] body The request body
   def rest_request(type, body)
-    require 'net/http'
-    require 'ntlm/http'
-    uri = URI(rest_address(type))
-    http = Net::HTTP.new(uri.host)
-    request = Net::HTTP::Post.new(uri)
+    require 'httpi'
+    HTTPI.log = @debug
+    request = HTTPI::Request.new(rest_address(type))
     request.body = body
-    request.ntlm_auth(@account, @domain, @password)
-    response = http.request(request)
-    debug_info(uri, request.body, response) if @debug
+    request.auth.ntlm(@account, @password, @domain)
+    response = HTTPI.post(request)
+    debug_info(request.url, request.body, response) if @debug
     response
   end
 
@@ -147,13 +145,13 @@ class IP21
   #
   # @return [Hash] Response or error from the API
   def parse_rest(response)
-    if response.code == '200'
+    if response.code == 200
       require 'json'
       JSON.parse(response.body)
     else
       {
         status: response.code,
-        message: "Error on IP21: #{response.message}"
+        message: "Error on IP21: #{response.body}"
       }
     end
   end
@@ -183,16 +181,30 @@ class IP21
     }.to_query
   end
 
-  def history_query_body(tag, start_time, end_time, opts)
+  def history_query_body(tags, start_time, end_time, opts)
     opts[:limit] ||= 1000
     opts[:outsiders] ||= 0
     opts[:history_format] ||= 0
     opts[:retrieval_type] ||= 0
-    '<Q appId="20" f="D" allQuotes="1"><Tag>' + "<N><![CDATA[#{tag}]]></N>" \
-      "<D><![CDATA[#{@ip21_address}]]></D>" + "<HF>#{opts[:history_format]}</HF>" \
-      "<St>#{start_time}</St>" + "<Et>#{end_time}</Et>" \
-      "<RT>#{opts[:retrieval_type]}</RT>" + "<X>#{opts[:limit]}</X>" \
-      "<O>#{opts[:outsiders]}</O>" + '</Tag></Q>'
+    body = if tags.is_a?(String)
+             tag_request(tags, start_time, end_time, opts)
+           else
+             tags.map { |tag| tag_request(tag, start_time, end_time, opts) }.join
+           end
+    '<Q appId="20" f="D" allQuotes="1">' + body + '</Q>'
+  end
+
+  def tag_request(tag, start_time, end_time, opts)
+    '<Tag>' \
+      "<N><![CDATA[#{tag}]]></N>" \
+      "<D><![CDATA[#{@ip21_address}]]></D>" \
+      "<HF>#{opts[:history_format]}</HF>" \
+      "<St>#{start_time}</St>" \
+      "<Et>#{end_time}</Et>" \
+      "<RT>#{opts[:retrieval_type]}</RT>" \
+      "<X>#{opts[:limit]}</X>" \
+      "<O>#{opts[:outsiders]}</O>" \
+    '</Tag>'
   end
 
   def select?(query)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ip21
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Rhuan Barreto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: rubyntlm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: httpi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 description: Aspentech IP21 Adapter for executing queries using SQLPlus REST API
 email: rhuan@rhuan.com.br
 executables: []