co-elastic-query 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bd337a7275ec8cec28308fad9de92bf3a0c6564
-  data.tar.gz: 457927186441945763961a96ec56ecaf563e3be7
+  metadata.gz: c6201d8ff96b8b7a0f832da3f041ce68d1e7c13e
+  data.tar.gz: 301ecffff574afe0c610b239d504a25d54e9d0e7
 SHA512:
-  metadata.gz: 848c7bcfce64a91f66a998461773148d74a7e3850de9ab553546aced805bdca7805b105f65a1138d65206cd2c645b8cb5ef9811c0cd09fb66fe25a1c907528f5
-  data.tar.gz: d7aa50ade0d46c16978b56611f53b1d6eb57df3ce34f46b97b96a08fb8200a0d1d80d6cde2e88fe2dffcc3c140efb88220ae8dbbb42ae98f23b2d82920793976
+  metadata.gz: 036bc57e784220cddae897e99ef50834508c24fccf6c1a215d392a3a90fa23971cbe89e6204a740f2042529de9df025452a4b59881c7d1136d6258779ecad60a
+  data.tar.gz: c42ef837af6e2deceba86a782fcd8ac1c075032f55b5e1854f9bd3ed5fefacf4ac8c29e0cf71bbde12de9ace5e273f6642608035a75e914a720f23a3b1b120df

data/lib/co-elastic-query.rb

@@ -40,6 +40,15 @@ class Elastic
             @orFilter.merge!(filters)
         end
 
+        # Applys the query to child objects
+        def has_child(name)
+            @hasChild = name
+        end
+
+        def has_parent(name)
+            @hasParent = name
+        end
+
         def range(filter)
             @rangeFilter ||= []
             @rangeFilter << filter
@@ -123,16 +132,68 @@ class Elastic
 
             if @search.present?
                 # Break the terms up purely on whitespace
-                {
-                    query: {
-                        query_string: {
-                            query: '*' + @search.scan(/\S+/).join('* *') + '*'
-                        }
-                    },
-                    filters: fieldfilters,
-                    offset: @offset,
-                    limit: @limit
-                }
+                query_obj = nil
+
+                # update search string
+                @search << '*'
+
+                if @hasChild || @hasParent
+                    should = [{
+                            simple_query_string: {
+                                query: @search
+                            }
+                        }]
+
+                    if @hasChild
+                        should << {
+                                has_child: {
+                                    type: @hasChild,
+                                    query: {
+                                        simple_query_string: {
+                                            query: @search
+                                        }
+                                    }
+                                }
+                            }
+                    end
+
+                    if @hasParent
+                        should << {
+                                has_parent: {
+                                    parent_type: @hasParent,
+                                    query: {
+                                        simple_query_string: {
+                                            query: @search
+                                        }
+                                    }
+                                }
+                            }
+                    end
+
+                    query_obj = {
+                        query: {
+                            bool: {
+                                should: should
+                            }
+                        },
+                        filters: fieldfilters,
+                        offset: @offset,
+                        limit: @limit
+                    }
+                else
+                    query_obj = {
+                        query: {
+                            simple_query_string: {
+                                query: @search
+                            }
+                        },
+                        filters: fieldfilters,
+                        offset: @offset,
+                        limit: @limit
+                    }
+                end
+
+                query_obj
             else
                 {
                     sort: @sort || [{created_at: 'desc'}],
@@ -208,7 +269,7 @@ class Elastic
         queries.unshift(opt[:query])
 
         filters = opt[:filters] || []
-        filters.unshift({term: {type: @filter}})
+        filters.unshift({type: {value: @filter}})
 
         query = {
             index: @index,

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

@@ -1,3 +1,3 @@
 module CoElasticQuery
-    VERSION = "0.0.3"
+    VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: co-elastic-query
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Stephen von Takach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Elasticsearch query generator