arelastic 0.0.3 → 0.0.4

data/README.rdoc

@@ -1,2 +1,2 @@
-= Foreigner
+= Arelastic
 {<img src="https://secure.travis-ci.org/matthuhiggins/arelastic.png?rvm=1.9.3" />}[http://travis-ci.org/matthuhiggins/arelastic]

data/lib/arelastic/arities/binary.rb

@@ -9,21 +9,20 @@ module Arelastic
           attr_reader :predicate
         end
 
-        attr_reader :field, :value
+        attr_reader :field, :value, :options
       end
 
       module Methods
-        def initialize field, value
+        def initialize field, value, options = {}
           @field = field
           @value = value
+          @options = options
         end
 
         def as_elastic
-          {
-            self.class.predicate => {
-              field => convert_to_elastic(value)
-            }
-          }
+          params = {field => convert_to_elastic(value)}.update(options)
+
+          { self.class.predicate => params }
         end
       end
     end

data/lib/arelastic/builders/query.rb

@@ -5,6 +5,7 @@ module Arelastic
         def [](field)
           new(field)
         end
+
         def constant_score(filter_or_query)
           query Arelastic::Queries::ConstantScore.new(filter_or_query)
         end
@@ -17,6 +18,10 @@ module Arelastic
           query Arelastic::Queries::MatchAll.new
         end
 
+        def multi_match other, fields
+          # Arelastic::Queries::MultiMatch.new other, fields
+        end
+
         private
           def query value
             Arelastic::Searches::Query.new value
@@ -34,6 +39,10 @@ module Arelastic
       def terms other
         Arelastic::Queries::Terms.new name, other
       end
+
+      def match other
+        Arelastic::Queries::Match.new name, other
+      end
     end
   end
 end

data/lib/arelastic/builders/sort.rb

@@ -10,6 +10,10 @@ module Arelastic
       def asc
         
       end
+
+      def desc
+        
+      end
     end
   end
 end

data/lib/arelastic/filters/terms.rb

@@ -1,18 +1,7 @@
 module Arelastic
   module Filters
     class Terms < Arelastic::Filters::Filter
-      attr_accessor :field, :terms, :options
-      def initialize(field, terms, options = {})
-        @field = field
-        @terms = terms
-        @options = options
-      end
-
-      def as_elastic
-        params = {field => terms}.update(options)
-
-        { "terms" => params }
-      end
+      binary 'terms'
     end
   end
 end

data/lib/arelastic/queries.rb

@@ -3,7 +3,9 @@ require 'arelastic/queries/query'
 require 'arelastic/queries/constant_score'
 require 'arelastic/queries/field'
 require 'arelastic/queries/filtered'
+require 'arelastic/queries/match'
 require 'arelastic/queries/match_all'
+require 'arelastic/queries/multi_match'
 require 'arelastic/queries/prefix'
 require 'arelastic/queries/query_string'
 require 'arelastic/queries/terms'

data/lib/arelastic/queries/match.rb

@@ -0,0 +1,7 @@
+module Arelastic
+  module Queries
+    class Match < Arelastic::Queries::Query
+      binary 'match'
+    end
+  end
+end

data/lib/arelastic/queries/multi_match.rb

@@ -0,0 +1,6 @@
+module Arelastic
+  module Queries
+    class MultiMatch
+    end
+  end
+end

data/test/arelastic/arities/binary_test.rb

@@ -8,5 +8,8 @@ class Arelastic::Arities::BinaryTest < MiniTest::Spec
 
     expected = {'suffix' => {'phone' => '666'}}
     assert_equal expected, node.new('phone', '666').as_elastic
+
+    expected = {'suffix' => {'phone' => '666', '_cache' => false}}
+    assert_equal expected, node.new('phone', '666', '_cache' => false).as_elastic
   end
 end

data/test/arelastic/builders/query_test.rb

@@ -22,6 +22,10 @@ class Arelastic::Builders::QueryTest < MiniTest::Spec
     assert_equal expected, query.as_elastic
   end
 
+  def test_multi_match
+    Arelastic::Builders::Query.multi_match 'blue', ['color', 'description']
+  end
+
   def test_field
     query = Arelastic::Builders::Query['user'].field 'kimchy'
     expected = { "field" => { "user" => "kimchy" } }
@@ -36,10 +40,17 @@ class Arelastic::Builders::QueryTest < MiniTest::Spec
     assert_equal expected, query.as_elastic
   end
 
-  def test_term
+  def test_terms
     query = Arelastic::Builders::Query['tags'].terms ['blue', 'pill']
     expected = {"terms" => { "tags" => ["blue", "pill"] }}
     
     assert_equal expected, query.as_elastic
   end
+
+  def test_match
+    query = Arelastic::Builders::Query['message'].match "hello"
+    expected = {"match" => { "message" => "hello" }}
+    
+    assert_equal expected, query.as_elastic
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -53,7 +53,9 @@ files:
 - lib/arelastic/queries/constant_score.rb
 - lib/arelastic/queries/field.rb
 - lib/arelastic/queries/filtered.rb
+- lib/arelastic/queries/match.rb
 - lib/arelastic/queries/match_all.rb
+- lib/arelastic/queries/multi_match.rb
 - lib/arelastic/queries/prefix.rb
 - lib/arelastic/queries/query.rb
 - lib/arelastic/queries/query_string.rb