dina 1.3.0.0 → 1.3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36ae9a46adaaf1a545511c102afbc5bada1c3ad4632273672253f9191e347459
-  data.tar.gz: 67c1631fad9d7ebb3469a063fc6b22e1d6c9d720a8abe6804ae35c7d4dd83848
+  metadata.gz: 38688424689df19ac817a13a5f0ef0a1d70ffc75e300f124adee33769faf0be3
+  data.tar.gz: 7e93423153af45f71614d6536fc79dcd7bdb19c1373c515a18927d6cecce08af
 SHA512:
-  metadata.gz: ba219ae94560f594838864568429f8c84e4bf86a8c4396a0fd142c8803a0aea03f0da864b7bb9b44f700234d1da7dfbf9b75e6033ad1690fb5b13e69785700b1
-  data.tar.gz: cd564fa3198356107742862c2cc7d45b4c32dace7c3684117ccb9e29d97e066bb0c6fb60dd5ca8aa388afe66c11203fa9d6558efc9f68ee82824536aa076ef4d
+  metadata.gz: 735f7adff9ef6397b5a4e474b1985c8818d948df5160fbc4f121c2b32b1c65c8d3029d3478a9011bb89921ab7f0719d562c32e79b47a6717b4464bdba295fb41
+  data.tar.gz: 6dfc825b17ef3f55cc98298816982de34d19c9fa41c3bf25d56d0b85f82e1714040968210d2f00e7e2e33a579ec8684f6987d9b4f2d30ab934be43b8dda238b1

data/lib/dina/authentication/authentication.rb

@@ -29,6 +29,7 @@ module Dina
     #    endpoint_url: "DINA API URL without terminating slash",
     #    authorization_url: "Keycloak authorization URL without terminating slash".
     #    realm: "provided by DINA admin in Keycloak"
+    #    verify_ssl: true
     # }
     #
     # @param options [Hash] the configuration options
@@ -51,6 +52,10 @@ module Dina
       Keycloak.auth_server_url = config.authorization_url
       Keycloak.realm = config.realm
 
+      if opts[:verify_ssl] && opts[:verify_ssl] == false
+        Dina::BaseModel.connection_options[:ssl] = { verify: false }
+      end
+
       if ::File.zero?(config.token_store_file)
         save_token(hash: empty_token)
       end

data/lib/dina/search/search_autocomplete.rb

@@ -4,11 +4,11 @@ require_rel 'search_connection'
 #TODO: requires testing, likely failing
 
 module Dina
-  class SearchAutocomplete < BaseModel
+  class SearchAutoComplete < BaseModel
 
     self.connection_class = SearchConnection
 
-    custom_endpoint :execute, on: :collection, request_method: :post
+    custom_endpoint :execute, on: :collection, request_method: :get
 
     def self.endpoint_path
       "search-api/search-ws/"

data/lib/dina/search/search_connection.rb

@@ -34,11 +34,12 @@ module Dina
     end
 
     def run(request_method, path, params: nil, headers: {}, body: nil)
-      #TODO: works for search class, but likely failing for autocomplete, count, and mapping
-      params = {
-        indexName: index_name(index: body[:index])
-      }
       path.slice!("/execute")
+      if params && params.has_key?(:index)
+        params.merge!(indexName: index_name(index: params[:index]))
+      elsif body && body.has_key?(:index)
+        params = { indexName: index_name(index: body[:index]) }
+      end
       payload = JSON.generate(body[:payload]) rescue ""
 
       response = faraday.run_request(request_method, path, body, headers) do |request|
@@ -48,7 +49,16 @@ module Dina
       end
 
       attributes = response.body.dup
-      response.body["meta"] = {}
+      meta = {}
+      if attributes.has_key?("hits")
+        #TODO: does not work with SearchAutoComplete because response is different from Search
+        meta["count"] = attributes["hits"]["total"]["value"] rescue 0
+      elsif attributes.has_key?("count")
+        meta["count"] = attributes["count"]
+      elsif attributes.has_key?("attributes")
+        meta = attributes
+      end
+      response.body["meta"] = meta
       response.body["errors"] = []
       response.body["data"] = attributes["hits"]["hits"].map{|d| d["_source"]["data"]} rescue []
       response

data/lib/dina/search/search_count.rb

@@ -1,8 +1,6 @@
 require_rel '../models/base_model'
 require_rel 'search_connection'
 
-#TODO: requires testing, likely failing
-
 module Dina
   class SearchCount < BaseModel
 

data/lib/dina/search/search_mapping.rb

@@ -1,8 +1,6 @@
 require_rel '../models/base_model'
 require_rel 'search_connection'
 
-#TODO: requires testing, likely failing
-
 module Dina
   class SearchMapping < BaseModel
 

data/lib/dina/version.rb

@@ -3,7 +3,7 @@ module Dina
 
     MAJOR = 1
     MINOR = 3
-    PATCH = 0
+    PATCH = 2
     BUILD = 0
 
     def self.version

data/lib/rest_client_request_patch.rb

@@ -0,0 +1,14 @@
+# Keycloak Client depends on RestClient & so verifying SSL must be accommodate here
+
+module RestClient
+  class Request
+    orig_initialize = instance_method(:initialize)
+  
+    define_method(:initialize) do |args|
+      if Dina.config.verify_ssl == false
+        args[:verify_ssl] = false
+        orig_initialize.bind(self).(args)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 1.3.0.0
+  version: 1.3.2.0
 platform: ruby
 authors:
 - David P. Shorthouse
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2023-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -211,6 +211,7 @@ files:
 - lib/dina/utils/multi_lingual_title.rb
 - lib/dina/utils/validator.rb
 - lib/dina/version.rb
+- lib/rest_client_request_patch.rb
 homepage: https://github.com/dshorthouse/dina
 licenses:
 - MIT