elasticquerybuilder 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b04560361a0f7240549b8803c1b3bc611f18ed6eddbdabd83a4f8e7c72a61438
-  data.tar.gz: c8cf3274aba46e51720430b4af10ed42d4d8c0d6bbe3218831781b1320c8ab7b
+  metadata.gz: ced73c82a31289251a18b233d55a2368fc975e97425d6d7b64ffe177e943dd40
+  data.tar.gz: 2c824aca2bf7afa316cd7eb8b3b59144013e8a8faab0ff32bf7a60fa3fa8c7c8
 SHA512:
-  metadata.gz: f0cf96c3b0036b32ceb0d9c97a2d8d808f019a4794271faef0f171aca85eb9bd1e416b6e259fb23b4efd5e18cbe8da8d0745f8987a48cee348e2e6dd0823b1b2
-  data.tar.gz: 0ca2a8eef82e9dda91b3dcfa2955fbf9f295e638f2387f2751d9501fc24139ee7dd1d80c4b07738591e8f510a71a5a190921250caa84e5c118384e7574431898
+  metadata.gz: f25d3d51c86afd77c1e9f45fa631c7d5d5973c91437423f2ed8835f8ae555600a9b44a060ef56a1ad5e5b1bfe7d733f87773adfa23bb0abf8ab9b5be9b627397
+  data.tar.gz: 791a543fa6b589e539ba584c3abd3fffb9e567b4487d0936c8eed2f755955d10df137c8c738061b5490065bec19da2cfbc4558ecb17e8c64dc54bc5a09ccaa69

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elasticquerybuilder (0.0.1)
+    elasticquerybuilder (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/elasticquerybuilder.rb

@@ -1,137 +1,42 @@
 require 'elasticquerybuilder/version'
+require 'elasticquerybuilder/modals'
 
 module ElasticQueryBuilder
+  # main class that generates elastic criteria
   class Engine
     attr_reader :criteria
     def initialize
       @criteria = { query: {} }
-      @keyword = ''
+      @modal = ''
     end
 
     # opts = [{field,value,operation},{field,value,operation}]
     def must
-      @keyword = 'must'
+      @modal = ElasticQueryBuilder::Modals.must
       self
     end
 
+    # used for matching strings
     def term(opts)
-      term = {}
-      prev = @keyword.to_sym
-      if @criteria[:query].include? :bool
-        @criteria[:query][:bool][prev] = [] unless @criteria[:query][:bool].include? prev
-        bool_query = true
-      else
-        bool_query = false
-        @criteria[:query] = []
-      end
-      opts.each do |option, _value|
-        val = option[:value]
-        term[option[:field]] = val
-      end
-      if bool_query
-        @criteria[:query][:bool][prev].push(term: term)
-      else
-        if opts.count > 1
-          @criteria[:query].push(term: term)
-        else
-          @criteria[:query] = { term: {} }
-          @criteria[:query][:term] = term
-        end
-      end
-      self
+      setup_query('term', opts)
     end
 
-    def terms(opts)
-      term = {}
-      prev = @keyword.to_sym
-      if @criteria[:query].include? :bool
-        @criteria[:query][:bool][prev] = [] unless @criteria[:query][:bool].include? prev
-        bool_query = true
-      else
-        bool_query = false
-        @criteria[:query] = []
-      end
-      opts.each do |option, _value|
-        val = handle_operation('in', option[:value])
-        term[option[:field]] = val
-      end
-      if bool_query
-        @criteria[:query][:bool][prev].push(terms: term)
-      else
-        if opts.count > 1
-          @criteria[:query].push(terms: term)
-        else
-          @criteria[:query] = { terms: {} }
-          @criteria[:query][:terms] = term
-        end
-      end
-      self
+    # used for matching a value within an array
+    def terms(opts, default_operator = 'in')
+      setup_query('terms', opts, default_operator)
     end
 
-    def wildcard(opts)
-      wildcard = {}
-      prev = @keyword.to_sym
-      if @criteria[:query].include? :bool
-        @criteria[:query][:bool][prev] = [] unless @criteria[:query][:bool].include? prev
-        bool_query = true
-      else
-        bool_query = false
-        @criteria[:query] = []
-      end
-      opts.each do |option, _value|
-        val = if !option.include? :operation
-                option[:value]
-              else
-                handle_operation(option[:operation], option[:value])
-              end
-        wildcard[option[:field]] = val
-      end
-      if bool_query
-        @criteria[:query][:bool][prev].push(wildcard: wildcard)
-      else
-        if opts.count > 1
-          @criteria[:query].push(wildcard: wildcard)
-        else
-          @criteria[:query] = { wildcard: {} }
-          @criteria[:query][:wildcard] = wildcard
-        end
-      end
-      self
+    # used for wildcards. supports whole wildcard, left and right matching
+    def wildcard(opts, default_operator = 'wildcard')
+      setup_query('wildcard', opts, default_operator)
     end
 
-    def match_on_single_field(opts)
-      match = {}
-      prev = @keyword.to_sym
-      if @criteria[:query].include? :bool
-        @criteria[:query][:bool][prev] = [] unless @criteria[:query][:bool].include? prev
-        bool_query = true
-      else
-        bool_query = false
-        @criteria[:query] = []
-      end
-      opts.each do |option, _value|
-        val = if !option.include? :operation
-                option[:value]
-              else
-                handle_operation(option[:operation], option[:value])
-              end
-        match[option[:field]] = val
-      end
-      if bool_query
-        @criteria[:query][:bool][prev].push(match: match)
-      else
-        if opts.count > 1
-          @criteria[:query].push(match: match)
-        else
-          @criteria[:query] = { match: {} }
-          @criteria[:query][:match] = match
-        end
-      end
-      self
+    def single_match(opts)
+      setup_query('match', opts)
     end
 
     def should
-      @keyword = 'should'
+      @modal = ElasticQueryBuilder::Modals.should
       self
     end
 
@@ -140,21 +45,59 @@ module ElasticQueryBuilder
       self
     end
 
-    # TODO: single wildcard or match not in bool clause
-    # commit when should and must combination working
-    # provide to_searchkick method which allows a formatted criteria to be sent through a relevant model
-    # push version 0.05 to rubygems
-
     private
 
       def handle_operation(operation, value)
         case operation
-        when 'eq' then ''
+        when 'eq' then value
         when 'in' then value.split(',').map(&:to_i)
         when 'wildcard-left' then '*' + value
         when 'wildcard-right' then value + '*'
         when 'wildcard' then '*' + value + '*'
         end
       end
+
+      def populate_data(opts, default_operator)
+        data = {}
+        opts.each do |option, _value|
+          val = if !option.include? :operation
+                  handle_operation(default_operator, option[:value])
+                else
+                  handle_operation(option[:operation], option[:value])
+                end
+          data[option[:field]] = val
+        end
+        data
+      end
+
+      def setup_query(key, opts, default_operator = 'eq')
+        prev = @modal.to_sym
+        formulate_query_structure(prev, key, opts, default_operator)
+        self
+      end
+
+      def formulate_query_structure(prev, key, opts, default_operator)
+        if @criteria[:query].include? :bool
+          @criteria[:query][:bool][prev] = [] unless @criteria[:query][:bool].include? prev
+          bool_query = true
+        else
+          bool_query = false
+          @criteria[:query] = []
+        end
+        after_formulate_query_structure(prev, bool_query, key, opts, default_operator)
+      end
+
+      def after_formulate_query_structure(prev, bool_query, key, opts, default_operator)
+        data = populate_data(opts, default_operator)
+        if bool_query
+          @criteria[:query][:bool][prev].push(key.to_sym => data)
+        elsif opts.count > 1
+          @criteria[:query].push(key.to_sym => data)
+        else
+          @criteria[:query] = { key.to_sym => {} }
+          @criteria[:query][key.to_sym] = data
+        end
+        bool_query
+      end
   end
 end

data/lib/elasticquerybuilder/modals.rb

@@ -0,0 +1,14 @@
+require 'elasticquerybuilder/version'
+
+module ElasticQueryBuilder
+  # main class that generates elastic criteria
+  class Modals
+    def self.must
+      'must'
+    end
+
+    def self.should
+      'should'
+    end
+  end
+end

data/lib/elasticquerybuilder/version.rb

@@ -1,3 +1,3 @@
 module ElasticQueryBuilder
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticquerybuilder
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Comms365
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,8 +71,11 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- elasticquerybuilder-0.0.1.gem
+- elasticquerybuilder-0.1.5.gem
 - elasticquerybuilder.gemspec
 - lib/elasticquerybuilder.rb
+- lib/elasticquerybuilder/modals.rb
 - lib/elasticquerybuilder/version.rb
 homepage: https://github.com/comms365/elasticquerybuilder/
 licenses: