elastic_search_framework 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e38cb0d02951b7d4b3d76e1eefdd6f6f1aece78b8155d745c8faff954e0708f
-  data.tar.gz: ffb17d5fdd74a9cb9098ecebba7073b993b405573ae61ac661cbb2c2b2006075
+  metadata.gz: 39a2a5f0c0573e1ce1ea95fe0206a05a2228bf2fb9e1a99f04e61f6fd64ced47
+  data.tar.gz: 1ccf3eec2961929a4c042585131f2dffa16ddddac011536ee71b1d08582b33a3
 SHA512:
-  metadata.gz: 0f73d01a913e2e858466675bf774e36d41dc87c4060e2bc97f34b0efeadb0fe06d8f43ab0c87a20dccd48248f524d9dc5f6a4e693ed45af83e3f2882e50014e9
-  data.tar.gz: 12128e76fa8ffaac2177722fe95250e9a520334460da0a3643839b01908a535c238f1a503cb2ff3408760435bf392668bcb557a08bc2d54d23f5d4976e296a98
+  metadata.gz: 63890595521aa8816cef97190b39491d8f7f62d890e293f5311b354c9101f016dc9da630208cb6b8e0d90cf9e026b86a5e5f6390c787b02dc6c7ba03183be064
+  data.tar.gz: a5429fd019a6cf5b6ad3606c44dc42380f49c4f07f6dec35b5abbeb2676e1095a15b681e2f92915dbd01c386acb24e9217a63a64a700657c2d0d8348232e4f8e

data/lib/elastic_search_framework/query.rb

@@ -23,7 +23,7 @@ module ElasticSearchFramework
     end
 
     def contains?(value)
-      condition(expression: ':', value: value)
+      condition(expression: ':', value: "*#{value}*")
       self
     end
 
@@ -91,11 +91,11 @@ module ElasticSearchFramework
           when :field
             @expression_string += ' ' + p[:value].to_s
           when :condition
-            @expression_string += p[:expression].to_s + format_value(p[:value])
+            @expression_string += p[:expression].to_s + p[:value].to_s
           when :exists
             @expression_string += ' _exists_:' + p[:field].to_s
           when :not_eq
-            @expression_string += ' NOT (' + p[:field].to_s + ':' + format_value(p[:value]) + ')'
+            @expression_string += ' NOT (' + p[:field].to_s + ':' + p[:value].to_s + ')'
           when :and
             @expression_string += ' AND'
           when :or
@@ -111,14 +111,5 @@ module ElasticSearchFramework
     def condition(expression:, value:)
       @parts << { type: :condition, expression: expression, value: value }
     end
-
-    def format_value(value)
-      result = value.to_s
-      if value.is_a?(String)
-        result = '"' + value + '"'
-      end
-      result
-    end
-
   end
 end

data/lib/elastic_search_framework/version.rb

@@ -1,3 +1,3 @@
 module ElasticSearchFramework
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/query_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe ElasticSearchFramework::Query do
 
   subject do
@@ -7,7 +9,7 @@ RSpec.describe ElasticSearchFramework::Query do
   describe '#build' do
     it 'should build the expected query string' do
       subject.name.eq('fred').and.age.gt(18).and.gender.not_eq('male')
-      expect(subject.build).to eq 'name:"fred" AND age:>18 AND NOT (gender:"male")'
+      expect(subject.build).to eq 'name:fred AND age:>18 AND NOT (gender:male)'
     end
   end
 
@@ -70,13 +72,21 @@ RSpec.describe ElasticSearchFramework::Query do
       results = ExampleIndex.query.number.gt_eq(15).execute
       expect(results.length).to eq 2
 
+      results = ExampleIndex.query.number.lt(15).execute
+      expect(results.length).to eq 2
+
+      results = ExampleIndex.query.number.lt_eq(15).execute
+      expect(results.length).to eq 3
+
       results = ExampleIndex.query.name.not_eq('john').execute
       expect(results.length).to eq 3
+
+      results = ExampleIndex.query.name.contains?('oh').execute
+      expect(results.length).to eq 1
     end
 
     after do
       ExampleIndex.delete
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_search_framework
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler