co-elastic-query 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f01c74301eadb7c79db3db995ad7bf4992273e2
-  data.tar.gz: a070f73ec86e785ee80e6b125bf9ca9e202bc985
+  metadata.gz: 9b151553366a3789ac06d80546f5eea887afc35f
+  data.tar.gz: 7d45f4eefb2c5052b666d69e5683861b3989df18
 SHA512:
-  metadata.gz: 0a4bb9fa597922f7e6981d5c26b5719983f9741a33e04cef497b1f0af61e2c563b630a5f85cebcef44d167b15913ddd498bfdd47968b3438fe94fd4f4979324d
-  data.tar.gz: 6fa9d4f3046b73b528564d9d848d3a5255d7f7d2e516b75c0af588c2aec342a71c4f9bb83c8cceb86399593e4cdd7cb7425401fed7d7950a0a75e6887e4acf25
+  metadata.gz: 6106ba041466def4f08aceffeca77a29294c32d5530e606fd0ac86837ac2397ead9150da20fb8ade3f341d42db31ff78525090e047e1a063a1c48a876cd7dd2b
+  data.tar.gz: c8b0e70ad054708d36af51b780096775b421e888a270392d684ce6e85fa803d9c36c341550392cd71d0ae1381533e5846cf94e21bb65f00ab40a6ef76efbc792

data/lib/co-elastic-query.rb

@@ -315,9 +315,11 @@ class Elastic
     SCORE = ['_score'.freeze]
     INDEX = (ENV['ELASTIC_INDEX'] || 'default').freeze
 
-    def initialize(klass, opts = {})
-        @klass = klass
-        @filter = klass.design_document
+    def initialize(klass = nil, **opts)
+        if klass
+            @klass = klass
+            @filter = klass.design_document
+        end
         @index = opts[:index] || INDEX
         @use_couch_type = opts[:use_couch_type] || false
     end
@@ -338,7 +340,11 @@ class Elastic
         # currently logged in user is an admin of the group). nils are removed
         # from the list.
         result = Elastic.search(query)
-        records = Array(@klass.find_by_id(result[HITS][HITS].map {|entry| entry[ID]}))
+        records = if @klass
+            Array(@klass.find_by_id(result[HITS][HITS].map {|entry| entry[ID]}))
+        else
+            Array(result[HITS][HITS].map { |entry| ::CouchbaseOrm.try_load(entry[ID]) }).compact
+        end
         results = block_given? ? (records.map {|record| yield record}).compact : records
 
         # Ensure the total is accurate
@@ -377,10 +383,12 @@ class Elastic
 
         filters = opt[:filters] || []
 
-        if @use_couch_type
-            filters.unshift({term: {'doc.type' => @filter}})
-        else
-            filters.unshift({type: {value: @filter}})
+        if @filter
+            if @use_couch_type
+                filters.unshift({term: {'doc.type' => @filter}})
+            else
+                filters.unshift({type: {value: @filter}})
+            end
         end
 
         {

data/lib/co-elastic-query/version.rb

@@ -1,3 +1,3 @@
 module CoElasticQuery
-    VERSION = "3.0.3"
+    VERSION = "3.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: co-elastic-query
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Stephen von Takach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler