elasticquerybuilder 0.0.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ae2d23e5c3212e4f375a1ca277f81de55a2fc60cb766090d986610659683561
-  data.tar.gz: f34f8c97cb587d2ee3c20fc4837d11b503f991ece3799ae98ac9e9cbec5f6c19
+  metadata.gz: b04560361a0f7240549b8803c1b3bc611f18ed6eddbdabd83a4f8e7c72a61438
+  data.tar.gz: c8cf3274aba46e51720430b4af10ed42d4d8c0d6bbe3218831781b1320c8ab7b
 SHA512:
-  metadata.gz: 7bff78ac052e96a7b5740ecb69adb4ef9c5e570808ead6dd4fd29cf4aa3d42f32126ba67c59cb83923c819ffed147b573ad78e774ccbeeac4c2d52ddf6069959
-  data.tar.gz: e5c6c1a48f88c8ee874bfdeca48a1f772db9f1218087bb57c3db74e8dde3c1269a6dbae253d81a7edddac6fc32a85f7fe5c8da1b1ac93458d2bb1441cb60a43b
+  metadata.gz: f0cf96c3b0036b32ceb0d9c97a2d8d808f019a4794271faef0f171aca85eb9bd1e416b6e259fb23b4efd5e18cbe8da8d0745f8987a48cee348e2e6dd0823b1b2
+  data.tar.gz: 0ca2a8eef82e9dda91b3dcfa2955fbf9f295e638f2387f2751d9501fc24139ee7dd1d80c4b07738591e8f510a71a5a190921250caa84e5c118384e7574431898

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in elasticquerybuilder.gemspec
 gemspec

data/Gemfile.lock

@@ -0,0 +1,35 @@
+PATH
+  remote: .
+  specs:
+    elasticquerybuilder (0.0.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.3)
+    rake (10.4.2)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.16)
+  elasticquerybuilder!
+  rake (~> 10.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.16.5

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/elasticquerybuilder.gemspec

@@ -1,18 +1,17 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "elasticquerybuilder/version"
+require 'elasticquerybuilder/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "elasticquerybuilder"
+  spec.name          = 'elasticquerybuilder'
   spec.version       = ElasticQueryBuilder::VERSION
-  spec.authors       = ["Comms365"]
-  spec.email         = ["ben.hassan@comms365.com"]
+  spec.authors       = ['Comms365']
+  spec.email         = ['ben.hassan@comms365.com']
 
-  spec.summary       = %q{Query Criteria Builder For Elasticsearch}
-  spec.description   = %q{Allows for an easier way to construct Elasticsearch queries. Tries to minimise the verbosity.}
-  spec.homepage      = "https://github.com/comms365/elasticquerybuilder/"
-  spec.license       = "MIT"
+  spec.summary       = 'Query Criteria Builder For Elasticsearch'
+  spec.description   = 'Allows for an easier way to construct Elasticsearch queries. Tries to minimise the verbosity.'
+  spec.homepage      = 'https://github.com/comms365/elasticquerybuilder/'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -25,14 +24,14 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/elasticquerybuilder.rb

@@ -1,5 +1,160 @@
-require "elasticquerybuilder/version"
+require 'elasticquerybuilder/version'
 
 module ElasticQueryBuilder
-  # Your code goes here...
+  class Engine
+    attr_reader :criteria
+    def initialize
+      @criteria = { query: {} }
+      @keyword = ''
+    end
+
+    # opts = [{field,value,operation},{field,value,operation}]
+    def must
+      @keyword = 'must'
+      self
+    end
+
+    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
+    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
+    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
+    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
+    end
+
+    def should
+      @keyword = 'should'
+      self
+    end
+
+    def bool
+      @criteria[:query] = { bool: {} }
+      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 'in' then value.split(',').map(&:to_i)
+        when 'wildcard-left' then '*' + value
+        when 'wildcard-right' then value + '*'
+        when 'wildcard' then '*' + value + '*'
+        end
+      end
+  end
 end

data/lib/elasticquerybuilder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticquerybuilder
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.5
 platform: ruby
 authors:
 - Comms365
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,6 +65,7 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile