arelastic 0.0.1 → 0.0.3

data/README.rdoc

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

data/lib/arelastic/builders/filter.rb

@@ -9,6 +9,10 @@ module Arelastic
         def ids *ids
           Arelastic::Filters::Ids.new ids.flatten
         end
+
+        def not expr
+          Arelastic::Filters::Not.new expr
+        end
       end
 
       def eq other
@@ -16,10 +20,10 @@ module Arelastic
       end
 
       def not_eq other
-        self.not eq(other)
+        self.class.not eq(other)
       end
 
-      def in other
+      def in other, options = {}
         case other
         when Range
           if other.exclude_end?
@@ -28,12 +32,12 @@ module Arelastic
             range 'gte' => other.begin, 'lte' => other.end
           end
         else
-          Arelastic::Filters::Terms.new field, other
+          Arelastic::Filters::Terms.new field, other, options
         end
       end
 
-      def not_in other
-        self.not self.in(other)
+      def not_in other, options = {}
+        self.class.not self.in(other, options)
       end
 
       def prefix other
@@ -64,8 +68,8 @@ module Arelastic
         range 'lt' => other
       end
 
-      def not other
-        Arelastic::Filters::Not.new other
+      def distance location, distance, options = {}
+        Arelastic::Filters::GeoDistance.new(field, location, distance, options)
       end
 
       private

data/lib/arelastic/filters.rb

@@ -2,6 +2,7 @@ require 'arelastic/filters/filter'
 
 require 'arelastic/filters/and'
 require 'arelastic/filters/exists'
+require 'arelastic/filters/geo_distance'
 require 'arelastic/filters/ids'
 require 'arelastic/filters/limit'
 require 'arelastic/filters/missing'

data/lib/arelastic/filters/geo_distance.rb

@@ -0,0 +1,19 @@
+module Arelastic
+  module Filters
+    class GeoDistance < Arelastic::Filters::Filter
+      attr_accessor :field, :location, :distance, :options
+      def initialize(field, location, distance, options = {})
+        @field = field
+        @location = location
+        @distance = distance
+        @options = options
+      end
+
+      def as_elastic
+        params = { field => location, "distance" => distance }.update(options)
+
+        { "geo_distance" => params }
+      end
+    end
+  end
+end

data/lib/arelastic/filters/terms.rb

@@ -1,7 +1,18 @@
 module Arelastic
   module Filters
     class Terms < Arelastic::Filters::Filter
-      binary 'terms'
+      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
     end
   end
 end

data/test/arelastic/builders/filter_test.rb

@@ -17,10 +17,15 @@ class Arelastic::Builders::FilterTest < MiniTest::Spec
   end
 
   def test_in
-    expected = {"terms" => {"color"=>["blue"]}}
+    expected = {"terms" => {"color" => ["blue"]}}
     assert_equal expected, builder.in(['blue']).as_elastic
   end
 
+  def test_in_with_options
+    expected = {"terms" => {"color" => ["blue"], "execution" => "bool"}}
+    assert_equal expected, builder.in(['blue'], "execution" => "bool").as_elastic
+  end
+
   def test_in_with_range
     expected = {"range" => {"color" => {"gte"=>1, "lte"=>3}}}
     assert_equal expected, builder.in(1..3).as_elastic
@@ -40,7 +45,7 @@ class Arelastic::Builders::FilterTest < MiniTest::Spec
   end
 
   def test_exists
-    expected = {"exists" => {"field"=>"color"}}
+    expected = {"exists" => {"field" => "color"}}
     assert_equal expected, builder.exists.as_elastic
   end
 
@@ -49,6 +54,14 @@ class Arelastic::Builders::FilterTest < MiniTest::Spec
     assert_equal expected, builder.lt(5).as_elastic
   end
 
+  def test_distance
+    expected = {"geo_distance" => {"distance" => "10km", "color" => [10, 11]}}
+    assert_equal expected, builder.distance([10, 11], '10km').as_elastic
+
+    expected = {"geo_distance" => {"distance" => "10km", "color" => [10, 11], "distance_type" => "plane"}}
+    assert_equal expected, builder.distance([10, 11], '10km', 'distance_type' => 'plane').as_elastic
+  end
+
   private
     def builder
       @builder ||= Arelastic::Builders::Filter['color']

data/test/arelastic/filters/geo_distance_test.rb

@@ -0,0 +1,14 @@
+require 'helper'
+
+class Arelastic::Filters::GeoDistanceTest < MiniTest::Spec
+  def test_as_elastic
+    expected = {
+      "geo_distance" => {
+        "pin.location" => [40, -70],
+        "distance" => "12km"
+      }
+    }
+
+    assert_equal expected, Arelastic::Filters::GeoDistance.new('pin.location', [40, -70], '12km').as_elastic
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -36,6 +36,7 @@ files:
 - lib/arelastic/filters/and.rb
 - lib/arelastic/filters/exists.rb
 - lib/arelastic/filters/filter.rb
+- lib/arelastic/filters/geo_distance.rb
 - lib/arelastic/filters/ids.rb
 - lib/arelastic/filters/limit.rb
 - lib/arelastic/filters/missing.rb
@@ -79,6 +80,7 @@ files:
 - test/arelastic/facets/terms_test.rb
 - test/arelastic/filters/exists_test.rb
 - test/arelastic/filters/filter_test.rb
+- test/arelastic/filters/geo_distance_test.rb
 - test/arelastic/filters/ids_test.rb
 - test/arelastic/filters/missing_test.rb
 - test/arelastic/filters/not_test.rb