arelastic 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70bfaded4af81b93d4ab0548c586a128a790a794
-  data.tar.gz: cadf4637b3c585aa297ded7ada84535c8455911f
+  metadata.gz: 9f049b77b8f52b63644138ab4d5adcbca584a209
+  data.tar.gz: 246926042e07742f621cd306b10f2d15b816d8e8
 SHA512:
-  metadata.gz: 336c9c1902878d897cfb09d2ca0fdcdbe5e02c6241e6c15de160a3727868160f5102f9ef3f00d174e3df43c26477e26e705bd07a021cbdc746173d8171cf8a51
-  data.tar.gz: ef592219177802e984bc79c0cc3378e2aaa230fa089503ea616f3bbb69677530c2a9200f0175bffbe483ce5ce0ec0286969001f1fc8e5eee921acf3162a3389c
+  metadata.gz: a088d3db6655275b52bb0c3df4ed0b941b4c55bef1f9e21cfb3bb1d8e211c3fd982c8d0247865f802fb42ebd85fe6877eeaa2fb652828baa678e316a7dfc98b1
+  data.tar.gz: b705c8dac162171e1313661396836893a3e5fe96f5ddd1b19c067aa7aba79f2483f175c10324548f34bb1f90fc1f9797b21818fccaf44004dc9b091580fad625

data/lib/arelastic/facets/facet.rb

@@ -1,6 +1,16 @@
 module Arelastic
   module Facets
     class Facet < Arelastic::Nodes::Node
+      attr_reader :name
+
+      def initialize name
+        @name = name
+      end
+
+      def as_elastic
+        { name => as_elastic_facet }
+      end
+
       def nested path
         Facets::Nested.new path, self
       end

data/lib/arelastic/facets/histogram.rb

@@ -1,17 +1,16 @@
 module Arelastic
   module Facets
     class Histogram < Arelastic::Facets::Facet
-      attr_accessor :name, :options
+      attr_accessor :options
+
       def initialize name, options
-        @name = name
+        super name
         @options = options
       end
 
-      def as_elastic
+      def as_elastic_facet
         {
-          name => {
-            "histogram" => options
-          }
+          "histogram" => options
         }
       end
     end

data/lib/arelastic/facets/nested.rb

@@ -1,8 +1,16 @@
 module Arelastic
   module Facets
-    class Nested < Struct.new :path, :facet
-      def as_elastic
-        facet.as_elastic.merge("nested" => path)
+    class Nested < Arelastic::Facets::Facet
+      attr_reader :path, :facet
+
+      def initialize path, facet
+        super facet.name
+        @path = path
+        @facet = facet
+      end
+
+      def as_elastic_facet
+        facet.as_elastic_facet.merge("nested" => path)
       end
     end
   end

data/lib/arelastic/facets/terms.rb

@@ -1,20 +1,19 @@
 module Arelastic
   module Facets
     class Terms < Arelastic::Facets::Facet
-      attr_accessor :name, :field, :options
+      attr_accessor :field, :options
+
       def initialize name, field, options = {}
-        @name = name
+        super name
         @field = field
         @options = options
       end
 
-      def as_elastic
+      def as_elastic_facet
         params = {"field" => field}.update(options)
 
         {
-          name => {
-            "terms" => params
-          }
+          "terms" => params
         }
       end
     end

data/lib/arelastic/filters/filter.rb

@@ -18,4 +18,4 @@ module Arelastic
       end
     end
   end
-end
+end

data/lib/arelastic/nodes/node.rb

@@ -13,10 +13,6 @@ module Arelastic
         end
       end
 
-      def as_elastic
-        {}
-      end
-
       def ==(other)
         as_elastic == other.as_elastic
       end

data/test/arelastic/facets/facet_test.rb

@@ -2,9 +2,14 @@ require 'helper'
 
 class Arelastic::Facets::FacetTest < MiniTest::Unit::TestCase
   def test_nested
-    facet = Arelastic::Facets::Facet.new
+    facet = Class.new(Arelastic::Facets::Facet) do
+      def as_elastic_facet
+        {}
+      end
+    end.new 'name'
+
     expected = {
-      "nested" => "links"
+      "name" => {"nested" => "links"}
     }
 
     nested = facet.nested "links"
@@ -19,9 +24,9 @@ class Arelastic::Facets::FacetTest < MiniTest::Unit::TestCase
         "terms" => {
           "field" => "links.name",
           "size"  => 10,
-        }
-      },
-      "nested" => "links"
+        },
+        "nested" => "links"
+      }
     }
 
     nested = facet.nested "links"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com