arelastic 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9423c0576c44867372fc88a1ca44407425d06e15
-  data.tar.gz: aa0065aea8b9ba21ff8cdf1a757f1117a1a53f23
+  metadata.gz: 11298654c38fbd7bd96231464189148b4949e182
+  data.tar.gz: 171eb4e3b6122b231c5e5d3944970ada55080fc8
 SHA512:
-  metadata.gz: b5818ba5af9d8e1df98f26288ad4a36e5872f2ce1dc057224bd18643df27832935ec69fe8702aaa90077dc5a99b88d6fce8693b8345b58fa652faa997538ab71
-  data.tar.gz: 5d0fd2581a854c34602319803c50b3a13f87b66d9e7ef524f8acb5676d75f5370cd37d18ddc3070c8db6db831b353e71112ef76f4e0ffaa7ce9b31fe7c4246fb
+  metadata.gz: 7cd3171f03da4ce5bc59972f0614448e93b65925bd29129076c390d273dd5ee5c68a284ee90ba5874e83f170c5b34c309ebac701184e20710f778a023709b018
+  data.tar.gz: 3d777f0dbcf20b748f912b59580a3c85704a6b1a8958c248591d6f992ad84d82e83a596b85aadfb123c8152bc2775b0a762e4d2fd42289c690abf40ac21d4e30

data/lib/arelastic/builders/sort.rb

@@ -8,11 +8,11 @@ module Arelastic
       end
 
       def asc(options = nil)
-        Arelastic::Sorts::Sort.new({field => 'asc'}, options)
+        Arelastic::Sorts::Field.new({field => 'asc'}, options)
       end
 
       def desc(options = nil)
-        Arelastic::Sorts::Sort.new({field => 'desc'}, options)
+        Arelastic::Sorts::Field.new({field => 'desc'}, options)
       end
     end
   end

data/lib/arelastic/sorts.rb

@@ -1 +1,2 @@
-require 'arelastic/sorts/sort'
+require 'arelastic/sorts/field'
+require 'arelastic/sorts/geo_distance'

data/lib/arelastic/sorts/{sort.rb → field.rb}

@@ -1,18 +1,18 @@
 module Arelastic
   module Sorts
-    class Sort < Arelastic::Nodes::Node
+    class Field < Arelastic::Nodes::Node
       attr_reader :field, :options
 
-      # Sort.new('price').as_elastic
+      # Field.new('price').as_elastic
       #  => 'price'
       #
-      # Sort.new('price' => 'asc').as_elastic
+      # Field.new('price' => 'asc').as_elastic
       #  => {'price' => 'asc'}
       #
-      # Sort.new('price', 'order' => 'asc').as_elastic
+      # Field.new('price', 'order' => 'asc').as_elastic
       #  => {'price' => {'order', 'asc'}}
       #
-      # Sort.new({'price' => 'asc'}, {'missing' => '_last'}).as_elastic
+      # Field.new({'price' => 'asc'}, {'missing' => '_last'}).as_elastic
       #  => {'price' => {'order' => 'asc', 'missing' => '_last'}}
       #
       def initialize(field, extra_options = nil)
@@ -31,9 +31,9 @@ module Arelastic
         reverse_order = ordering == 'desc' ? 'asc' : 'desc'
 
         if options.is_a?(Hash)
-          Arelastic::Sorts::Sort.new(field, options.merge('order' => reverse_order))
+          Arelastic::Sorts::Field.new(field, options.merge('order' => reverse_order))
         else
-          Arelastic::Sorts::Sort.new(field => reverse_order)
+          Arelastic::Sorts::Field.new(field => reverse_order)
         end
       end
 

data/lib/arelastic/sorts/geo_distance.rb

@@ -0,0 +1,23 @@
+module Arelastic
+  module Sorts
+    class GeoDistance < Arelastic::Nodes::Node
+      attr_accessor :field, :location, :options
+
+      # GeoDistance.new('coordinates', [-70, 40]).as_elastic
+      #  => {'_geo_distance' => {'coordinates' => [-70, 40]}}
+      #
+      # GeoDistance.new('coordinates', [-70, 40], 'distance_type' => 'plane').as_elastic
+      #  => {'_geo_distance' => {'coordinates' => [-70, 40], 'distance_type' => 'plane'}}
+      #
+      def initialize(field, location, options = {})
+        @field    = field
+        @location = location
+        @options  = options
+      end
+
+      def as_elastic
+        {'_geo_distance' => {field => location}.update(options)}
+      end
+    end
+  end
+end

data/test/arelastic/searches/sort_test.rb

@@ -3,7 +3,7 @@ require 'helper'
 class Arelastic::Searches::SortTest < MiniTest::Spec
   def test_as_elastic
     sort = Arelastic::Searches::Sort.new [
-      Arelastic::Sorts::Sort.new('price'),
+      Arelastic::Sorts::Field.new('price'),
       {'name' => 'asc'}
     ]
     expected = {'sort' => ['price', {'name' => 'asc'}]}

data/test/arelastic/sorts/field_test.rb

@@ -0,0 +1,47 @@
+require 'helper'
+
+class Arelastic::Sorts::FieldTest < MiniTest::Spec
+  def test_as_elastic
+    assert_equal(
+      'price',
+      Arelastic::Sorts::Field.new('price').as_elastic,
+    )
+
+    assert_equal(
+      {'price' => 'asc'},
+      Arelastic::Sorts::Field.new('price' => 'asc').as_elastic
+    )
+
+    assert_equal(
+      {'price' => {'order' => 'asc'}},
+      Arelastic::Sorts::Field.new('price', 'order' => 'asc').as_elastic
+    )
+
+    assert_equal(
+      {'price' => {'order' => 'asc', 'missing' => '_last'}},
+      Arelastic::Sorts::Field.new({'price' => 'asc'}, {'missing' => '_last'}).as_elastic
+    )
+  end
+
+  def test_reverse
+    assert_equal(
+      {'price' => 'desc'},
+      Arelastic::Sorts::Field.new('price').reverse.as_elastic,
+    )
+
+    assert_equal(
+      {'price' => 'desc'},
+      Arelastic::Sorts::Field.new('price' => 'asc').reverse.as_elastic
+    )
+
+    assert_equal(
+      {'price' => 'asc'},
+      Arelastic::Sorts::Field.new('price' => 'desc').reverse.as_elastic
+    )
+
+    assert_equal(
+      {'price' => {'order' => 'asc', 'missing' => '_last'}},
+      Arelastic::Sorts::Field.new({'price' => 'desc'}, {'missing' => '_last'}).reverse.as_elastic
+    )
+  end
+end

data/test/arelastic/sorts/geo_distance_test.rb

@@ -0,0 +1,17 @@
+require 'helper'
+
+class Arelastic::Sorts::GeoDistanceTest < MiniTest::Spec
+  def test_as_elastic
+    assert_equal(
+      {"_geo_distance" => {"coordinates" => [-70, 40]}},
+      Arelastic::Sorts::GeoDistance.new('coordinates', [-70, 40]).as_elastic,
+    )
+  end
+
+  def test_as_elastic_with_options
+    assert_equal(
+      {"_geo_distance" => {"coordinates" => [-70, 40], "distance_type" => "plane"}},
+      Arelastic::Sorts::GeoDistance.new('coordinates', [-70, 40], 'distance_type' => 'plane').as_elastic,
+    )
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -97,8 +97,8 @@ files:
 - lib/arelastic/searches/sort.rb
 - lib/arelastic/searches/terms.rb
 - lib/arelastic/sorts.rb
-- lib/arelastic/sorts/asc.rb
-- lib/arelastic/sorts/sort.rb
+- lib/arelastic/sorts/field.rb
+- lib/arelastic/sorts/geo_distance.rb
 - test/arelastic/aggregations/aggregation_test.rb
 - test/arelastic/aggregations/date_histogram_test.rb
 - test/arelastic/aggregations/filter_test.rb
@@ -140,7 +140,8 @@ files:
 - test/arelastic/queries/wildcard_test.rb
 - test/arelastic/searches/aggregations_test.rb
 - test/arelastic/searches/sort_test.rb
-- test/arelastic/sorts/sort_test.rb
+- test/arelastic/sorts/field_test.rb
+- test/arelastic/sorts/geo_distance_test.rb
 - test/helper.rb
 homepage: http://github.com/matthuhiggins/arelastic
 licenses:

data/test/arelastic/sorts/sort_test.rb

@@ -1,47 +0,0 @@
-require 'helper'
-
-class Arelastic::Sorts::SortTest < MiniTest::Spec
-  def test_as_elastic
-    assert_equal(
-      'price',
-      Arelastic::Sorts::Sort.new('price').as_elastic,
-    )
-
-    assert_equal(
-      {'price' => 'asc'},
-      Arelastic::Sorts::Sort.new('price' => 'asc').as_elastic
-    )
-
-    assert_equal(
-      {'price' => {'order' => 'asc'}},
-      Arelastic::Sorts::Sort.new('price', 'order' => 'asc').as_elastic
-    )
-
-    assert_equal(
-      {'price' => {'order' => 'asc', 'missing' => '_last'}},
-      Arelastic::Sorts::Sort.new({'price' => 'asc'}, {'missing' => '_last'}).as_elastic
-    )
-  end
-
-  def test_reverse
-    assert_equal(
-      {'price' => 'desc'},
-      Arelastic::Sorts::Sort.new('price').reverse.as_elastic,
-    )
-
-    assert_equal(
-      {'price' => 'desc'},
-      Arelastic::Sorts::Sort.new('price' => 'asc').reverse.as_elastic
-    )
-
-    assert_equal(
-      {'price' => 'asc'},
-      Arelastic::Sorts::Sort.new('price' => 'desc').reverse.as_elastic
-    )
-
-    assert_equal(
-      {'price' => {'order' => 'asc', 'missing' => '_last'}},
-      Arelastic::Sorts::Sort.new({'price' => 'desc'}, {'missing' => '_last'}).reverse.as_elastic
-    )
-  end
-end