arelastic 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ceb8425c2ce46af3710cc15cb83790e2969b99e
-  data.tar.gz: 5080a642884136bb0e155e52402b5be358bf9797
+  metadata.gz: 0d00eda71df4112d4692e221660b7899ab6d558a
+  data.tar.gz: f4131059d4b6a9e5718fb75b7e9fb6a35d7971ed
 SHA512:
-  metadata.gz: f6bfc5f1b46adde62c89080bb10bb8121ffef428aeb531118c031d986d882af6fcc498cd5feff9f424a29fb0ece6c29cb7809fd58bed8d8b520943efc00d57bb
-  data.tar.gz: 06a292844f4acc59eb8d11a6db636544a81cbbb97068afe36e7cdfaba3ef41431ca76319f1327d7397278fb4ac074cf7509fd4c2be9f863e930386ab8c97ec6a
+  metadata.gz: 75cbb39ad6a33f5e5f89ff6b8085184a86dc9a86a58a52a9c71d4a16d304279941c56ce63dee00d98fe1e0580e031024d5f908073e7b55c40e61df567babf098
+  data.tar.gz: d05d03b04f7920652de4cc3bff7141b06d6c9eb352511a37d7b9233ba4ccd3df60aeff8eb6736f6bfc4a8d39efce5700d7617e656f9bf79a5bf8943c4893f411

data/lib/arelastic/queries/multi_match.rb

@@ -1,10 +1,10 @@
 module Arelastic
   module Queries
     class MultiMatch < Query
-      attr_accessor :query, :fields, :options
+      attr_accessor :fields, :query, :options
       def initialize(fields, query, options = {})
-        @query = query
         @fields = fields
+        @query = query
         @options = options
       end
 

data/lib/arelastic/queries/simple_query_string.rb

@@ -0,0 +1,21 @@
+module Arelastic
+  module Queries
+    class SimpleQueryString < Query
+      attr_accessor :fields, :query, :options
+      def initialize(fields, query, options = {})
+        @fields = fields
+        @query = query
+        @options = options
+      end
+
+      def as_elastic
+        {
+          "simple_query_string" => {
+            "fields"  => convert_to_elastic(fields),
+            "query"   => convert_to_elastic(query)
+          }.merge(options)
+        }
+      end
+    end
+  end
+end

data/lib/arelastic/queries.rb

@@ -10,6 +10,7 @@ require 'arelastic/queries/multi_match'
 require 'arelastic/queries/nested'
 require 'arelastic/queries/prefix'
 require 'arelastic/queries/query_string'
+require 'arelastic/queries/simple_query_string'
 require 'arelastic/queries/terms'
 require 'arelastic/queries/term'
 require 'arelastic/queries/wildcard'

data/test/arelastic/queries/multi_match_test.rb

@@ -2,13 +2,11 @@ require 'helper'
 
 class Arelastic::Queries::MultiMatchTest < Minitest::Test
   def test_as_elastic
-    query = "bar"
-    fields = ["field_1", "field_2"]
-    multi_match = Arelastic::Queries::MultiMatch.new(fields, query)
+    multi_match = Arelastic::Queries::MultiMatch.new(["color", "name"], "bar")
     expected = {
       "multi_match" => {
         "query" => "bar",
-        "fields" => ["field_1", "field_2"]
+        "fields" => ["color", "name"]
       }
     }
     assert_equal expected, multi_match.as_elastic

data/test/arelastic/queries/simple_query_string_test.rb

@@ -0,0 +1,26 @@
+require 'helper'
+
+class Arelastic::Queries::SimpleQueryStringTest < Minitest::Test
+  def test_as_elastic
+    simple_query_string = Arelastic::Queries::SimpleQueryString.new(["color", "name"], "bar")
+    expected = {
+      "simple_query_string" => {
+        "fields" => ["color", "name"],
+        "query" => "bar"
+      }
+    }
+    assert_equal expected, simple_query_string.as_elastic
+  end
+
+  def test_as_elastic_with_options
+    simple_query_string = Arelastic::Queries::SimpleQueryString.new(["color", "name"], "bar", "flags" => "OR")
+    expected = {
+      "simple_query_string" => {
+        "fields" => ["color", "name"],
+        "query" => "bar",
+        "flags" => "OR"
+      }
+    }
+    assert_equal expected, simple_query_string.as_elastic
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -82,6 +82,7 @@ files:
 - lib/arelastic/queries/prefix.rb
 - lib/arelastic/queries/query.rb
 - lib/arelastic/queries/query_string.rb
+- lib/arelastic/queries/simple_query_string.rb
 - lib/arelastic/queries/term.rb
 - lib/arelastic/queries/terms.rb
 - lib/arelastic/queries/wildcard.rb
@@ -133,6 +134,7 @@ files:
 - test/arelastic/queries/multi_match_test.rb
 - test/arelastic/queries/query_string_test.rb
 - test/arelastic/queries/query_test.rb
+- test/arelastic/queries/simple_query_string_test.rb
 - test/arelastic/queries/wildcard_test.rb
 - test/arelastic/searches/aggregations_test.rb
 - test/arelastic/searches/sort_test.rb