dina 1.3.0.0 → 1.3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36ae9a46adaaf1a545511c102afbc5bada1c3ad4632273672253f9191e347459
-  data.tar.gz: 67c1631fad9d7ebb3469a063fc6b22e1d6c9d720a8abe6804ae35c7d4dd83848
+  metadata.gz: 3d466686f44b5d2e0850a05283bef73ccf71bb25da366a1d80aec8945d6e0fd2
+  data.tar.gz: b250f06e97f384449790007f2f4b6588fa634186b7853e4a67508fa049e2ab0d
 SHA512:
-  metadata.gz: ba219ae94560f594838864568429f8c84e4bf86a8c4396a0fd142c8803a0aea03f0da864b7bb9b44f700234d1da7dfbf9b75e6033ad1690fb5b13e69785700b1
-  data.tar.gz: cd564fa3198356107742862c2cc7d45b4c32dace7c3684117ccb9e29d97e066bb0c6fb60dd5ca8aa388afe66c11203fa9d6558efc9f68ee82824536aa076ef4d
+  metadata.gz: e3e4afce48d934ddb4b3ed5f1d4b0fd6c474f38cdb2ef7e7259611a02910f66cd7561d71cb85b858692d0a87e71efa5e5a0b7d005e2ba311a7b76da3f705fcfb
+  data.tar.gz: 7546f5bb55aeb366aed09ed9107a1e6fc26bb2aa7fa7ada784d4d73c2ecb92940803ee97dde61290b10b4313f582ceede57b311840c8d081ac01ebc152366595

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 = 1
     BUILD = 0
 
     def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 1.3.0.0
+  version: 1.3.1.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-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client