arelastic 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8edf892187c4bc1b1dfd20957cb7f906a174e477
-  data.tar.gz: f70671331e9a01954dae642a81b43536c17566aa
+  metadata.gz: 7ed83fdd7af7f94209a516bc4438b0eabdf384cd
+  data.tar.gz: 899e033e443cfd575043fe6d937f18c15cc63ef5
 SHA512:
-  metadata.gz: 5d3950ddc9d39032578070a19a24df1674fe1f6ca52ae94e5d04d421aa8b86f71b75f233e32f1382a6cb14069830b1e135da5665e7e9a6a12ef8681c5b6e0e3d
-  data.tar.gz: 3e0fee651967a41f0de510d2d5fdcde18d5aa33a058f59d781dca74fc9981e10a01cdc27e07a7045331b0b652366dab1b11612b29351f208eb4476eaff4e5f7f
+  metadata.gz: dd9786cc2bc4e10fe3c783cd807845321c35632a40d0a696f6a0f7fbb479e96410228c3fc004b4be8dca68b29225d7d333947f2baa13e94b2123622d029cb654
+  data.tar.gz: 836bce0d0430f3338ac5ff4ab02b72c135770648ed0da4d2e8e338ef334bbaeddaa575d9617e99282b4463b92de07dd74c89b830d0642760ea91a409744ac729

data/README.md

@@ -0,0 +1 @@
+[![Travis](https://secure.travis-ci.org/matthuhiggins/arelastic.png?rvm=1.9.3)](http://travis-ci.org/matthuhiggins/arelastic) [![Code Climate](https://codeclimate.com/github/matthuhiggins/arelastic/badges/gpa.svg)](https://codeclimate.com/github/matthuhiggins/arelastic)

data/lib/arelastic/builders/aggregation.rb

@@ -7,12 +7,12 @@ module Arelastic
         end
       end
 
-      def terms field, options = {}
-        Arelastic::Facets::Terms.new name, field, options
+      def terms options = {}
+        Arelastic::Aggregations::Terms.new name, options
       end
 
       def histogram options
-        Arelastic::Facets::Histogram.new name, options
+        Arelastic::Aggregations::Histogram.new name, options
       end
     end
   end

data/lib/arelastic/builders/search.rb

@@ -14,10 +14,6 @@ module Arelastic
           Arelastic::Builders::Aggregation
         end
 
-        def facet
-          Arelastic::Builders::Facet
-        end
-
         def query
           Arelastic::Builders::Query
         end

data/lib/arelastic/builders.rb

@@ -1,6 +1,5 @@
 require 'arelastic/builders/aggregation'
 require 'arelastic/builders/filter'
-require 'arelastic/builders/facet'
 require 'arelastic/builders/mapping'
 require 'arelastic/builders/query'
 require 'arelastic/builders/search'

data/lib/arelastic/nodes/node.rb

@@ -14,7 +14,7 @@ module Arelastic
       end
 
       def ==(other)
-        as_elastic == other.as_elastic
+        other.is_a?(Arelastic::Nodes::Node) && as_elastic == other.as_elastic
       end
     end
   end

data/lib/arelastic/searches.rb

@@ -1,7 +1,6 @@
 require 'arelastic/searches/search'
 
 require 'arelastic/searches/aggregations'
-require 'arelastic/searches/facets'
 require 'arelastic/searches/filter'
 require 'arelastic/searches/from'
 require 'arelastic/searches/query'

data/lib/arelastic.rb

@@ -1,7 +1,6 @@
 require 'arelastic/arities'
 require 'arelastic/nodes'
 require 'arelastic/aggregations'
-require 'arelastic/facets'
 require 'arelastic/filters'
 require 'arelastic/mappings'
 require 'arelastic/queries'

data/test/arelastic/builders/aggregation_test.rb

@@ -2,8 +2,8 @@ require 'helper'
 
 class Arelastic::Builders::AggregationTest < Minitest::Test
   def test_terms
-    expected = {"name" => {"terms" => {"field" => "term"}}}
-    actual = Arelastic::Builders::Aggregation['name'].terms('term').as_elastic
+    expected = {"name" => {"terms" => {"field" => "color"}}}
+    actual = Arelastic::Builders::Aggregation['name'].terms('field' => 'color').as_elastic
 
     assert_equal expected, actual
   end

data/test/arelastic/builders/search_test.rb

@@ -13,10 +13,6 @@ class Arelastic::Builders::SearchTest < Minitest::Test
     assert_equal Arelastic::Builders::Aggregation, Arelastic::Builders::Search.aggregation
   end
 
-  def test_facet
-    assert_equal Arelastic::Builders::Facet, Arelastic::Builders::Search.facet
-  end
-
   def test_filter
     assert_equal Arelastic::Builders::Query, Arelastic::Builders::Search.query
   end

data/test/arelastic/nodes/node_test.rb

@@ -14,5 +14,6 @@ class Arelastic::Nodes::NodeTest < Minitest::Test
 
     assert_equal node.new('foo'), node.new('foo')
     refute_equal node.new('foo'), node.new('bar')
+    refute_equal node.new('foo'), 'wut'
   end
 end

metadata

@@ -1,28 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 files:
-- README.rdoc
+- README.md
 - lib/arelastic.rb
 - lib/arelastic/aggregations.rb
 - lib/arelastic/aggregations/aggregation.rb
 - lib/arelastic/aggregations/date_histogram.rb
 - lib/arelastic/aggregations/filter.rb
+- lib/arelastic/aggregations/histogram.rb
 - lib/arelastic/aggregations/min.rb
 - lib/arelastic/aggregations/nested.rb
 - lib/arelastic/aggregations/terms.rb
@@ -32,19 +33,11 @@ files:
 - lib/arelastic/arities/unary.rb
 - lib/arelastic/builders.rb
 - lib/arelastic/builders/aggregation.rb
-- lib/arelastic/builders/facet.rb
 - lib/arelastic/builders/filter.rb
 - lib/arelastic/builders/mapping.rb
 - lib/arelastic/builders/query.rb
 - lib/arelastic/builders/search.rb
 - lib/arelastic/builders/sort.rb
-- lib/arelastic/facets.rb
-- lib/arelastic/facets/date_histogram.rb
-- lib/arelastic/facets/facet.rb
-- lib/arelastic/facets/histogram.rb
-- lib/arelastic/facets/nested.rb
-- lib/arelastic/facets/range.rb
-- lib/arelastic/facets/terms.rb
 - lib/arelastic/filters.rb
 - lib/arelastic/filters/and.rb
 - lib/arelastic/filters/exists.rb
@@ -92,7 +85,6 @@ files:
 - lib/arelastic/queries/wildcard.rb
 - lib/arelastic/searches.rb
 - lib/arelastic/searches/aggregations.rb
-- lib/arelastic/searches/facets.rb
 - lib/arelastic/searches/filter.rb
 - lib/arelastic/searches/from.rb
 - lib/arelastic/searches/query.rb
@@ -112,16 +104,11 @@ files:
 - test/arelastic/arities/polyadic_test.rb
 - test/arelastic/arities/unary_test.rb
 - test/arelastic/builders/aggregation_test.rb
-- test/arelastic/builders/facet_test.rb
 - test/arelastic/builders/filter_test.rb
 - test/arelastic/builders/mapping_test.rb
 - test/arelastic/builders/query_test.rb
 - test/arelastic/builders/search_test.rb
 - test/arelastic/builders/sort_test.rb
-- test/arelastic/facets/date_histogram_test.rb
-- test/arelastic/facets/facet_test.rb
-- test/arelastic/facets/histogram_test.rb
-- 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

data/README.rdoc

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

data/lib/arelastic/builders/facet.rb

@@ -1,19 +0,0 @@
-module Arelastic
-  module Builders
-    class Facet < Struct.new :name
-      class << self
-        def [](name)
-          new(name)
-        end
-      end
-
-      def terms field, options = {}
-        Arelastic::Facets::Terms.new name, field, options
-      end
-
-      def histogram options
-        Arelastic::Facets::Histogram.new name, options
-      end
-    end
-  end
-end

data/lib/arelastic/facets/date_histogram.rb

@@ -1,18 +0,0 @@
-module Arelastic
-  module Facets
-    class DateHistogram < Arelastic::Facets::Facet
-      attr_accessor :options
-
-      def initialize name, options
-        super name
-        @options = options
-      end
-
-      def as_elastic_facet
-        {
-          "date_histogram" => options
-        }
-      end
-    end
-  end
-end

data/lib/arelastic/facets/facet.rb

@@ -1,19 +0,0 @@
-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
-    end
-  end
-end

data/lib/arelastic/facets/histogram.rb

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

data/lib/arelastic/facets/nested.rb

@@ -1,17 +0,0 @@
-module Arelastic
-  module Facets
-    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
-end

data/lib/arelastic/facets/terms.rb

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

data/lib/arelastic/facets.rb

@@ -1,7 +0,0 @@
-require 'arelastic/facets/facet'
-
-require 'arelastic/facets/date_histogram'
-require 'arelastic/facets/histogram'
-require 'arelastic/facets/range'
-require 'arelastic/facets/terms'
-require 'arelastic/facets/nested'

data/lib/arelastic/searches/facets.rb

@@ -1,14 +0,0 @@
-module Arelastic
-  module Searches
-    class Facets < Arelastic::Searches::Search
-      attr_accessor :grouping
-      def initialize facets
-        @grouping = Arelastic::Nodes::HashGroup.new facets
-      end
-
-      def as_elastic
-        { "facets" => convert_to_elastic(grouping) }
-      end
-    end
-  end
-end

data/test/arelastic/builders/facet_test.rb

@@ -1,9 +0,0 @@
-require 'helper'
-
-class Arelastic::Builders::FacetTest < Minitest::Test
-  def test_terms
-    expected = {"name" => {"terms" => {"field" => "term"}}}
-    actual = Arelastic::Builders::Facet['name'].terms('term').as_elastic
-    assert_equal expected, actual
-  end
-end

data/test/arelastic/facets/date_histogram_test.rb

@@ -1,17 +0,0 @@
-require 'helper'
-
-class Arelastic::Facets::DateHistogramTest < Minitest::Test
-  def test_as_elastic
-    facet = Arelastic::Facets::DateHistogram.new('histo', "field" => "field_name", "interval" => "day")
-    expected = {
-      "histo" => {
-        "date_histogram" => {
-          "field" => "field_name",
-          "interval" => "day"
-        }
-      }
-    }
-
-    assert_equal expected, facet.as_elastic
-  end
-end

data/test/arelastic/facets/facet_test.rb

@@ -1,36 +0,0 @@
-require 'helper'
-
-class Arelastic::Facets::FacetTest < Minitest::Test
-  def test_nested
-    facet = Class.new(Arelastic::Facets::Facet) do
-      def as_elastic_facet
-        {}
-      end
-    end.new 'name'
-
-    expected = {
-      "name" => {"nested" => "links"}
-    }
-
-    nested = facet.nested "links"
-
-    assert_equal expected, nested.as_elastic
-  end
-
-  def test_nested_terms
-    facet = Arelastic::Facets::Terms.new('foo', 'links.name', "size" => 10)
-    expected = {
-      "foo" => {
-        "terms" => {
-          "field" => "links.name",
-          "size"  => 10,
-        },
-        "nested" => "links"
-      }
-    }
-
-    nested = facet.nested "links"
-
-    assert_equal expected, nested.as_elastic
-  end
-end

data/test/arelastic/facets/histogram_test.rb

@@ -1,17 +0,0 @@
-require 'helper'
-
-class Arelastic::Facets::HistogramTest < Minitest::Test
-  def test_as_elastic
-    facet = Arelastic::Facets::Histogram.new('histo', "field" => "field_name", "interval" => 100)
-    expected = {
-      "histo" => {
-        "histogram" => {
-          "field" => "field_name",
-          "interval" => 100
-        }
-      }
-    }
-
-    assert_equal expected, facet.as_elastic
-  end
-end

data/test/arelastic/facets/terms_test.rb

@@ -1,17 +0,0 @@
-require 'helper'
-
-class Arelastic::Facets::TermsTest < Minitest::Test
-  def test_as_elastic
-    facet = Arelastic::Facets::Terms.new('foo', 'tags', "size" => 10)
-    expected = {
-      "foo" => {
-        "terms" => {
-          "field" => "tags",
-          "size"  => 10,
-        }
-      }
-    }
-
-    assert_equal expected, facet.as_elastic
-  end
-end