arelastic 0.2.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6cf678c64069a5d89e411132f83ac62f3d009dab
+  data.tar.gz: 27fd293a467d708af530101687f79d75d8866941
+SHA512:
+  metadata.gz: e94367a5bbbf4b119cb32a6db103899f17c162062ebe5cc9ce89d5557d4bec0e9cac6f22fb077b6fbc4a51f0ecb26f510f8c37361d47961da7dff538ef97868a
+  data.tar.gz: e60d85515dac401c2fdb45ceb4d71875873f5404209d0bbd611c09427f745e99390eec4f4b0fb1511c2e7dddfcc69dcbd18578359d0b24718705b3f37de14879

data/lib/arelastic/builders/mapping.rb

@@ -0,0 +1,16 @@
+module Arelastic
+  module Builders
+    class Mapping < Struct.new :field
+      class << self
+        def [](field)
+          new(field)
+        end
+      end
+
+      def multi_field(options)
+        Arelastic::Mappings::MultiField.new field, options
+      end
+
+    end
+  end
+end

data/lib/arelastic/builders/sort.rb

@@ -7,12 +7,12 @@ module Arelastic
         end
       end
 
-      def asc
-        
+      def asc(options = nil)
+        Arelastic::Sorts::Sort.new(field => 'asc', options)
       end
 
-      def desc
-        
+      def desc(options = nil)
+        Arelastic::Sorts::Sort.new(field => 'asc', options)
       end
     end
   end

data/lib/arelastic/builders.rb

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

data/lib/arelastic/mappings/type.rb

@@ -1,13 +1,23 @@
 module Arelastic
   module Mappings
     class Type < Arelastic::Nodes::Node
-      def self.for_type(type)
+      class << self
+        attr_reader :type
+        def for_type(type)
+          @type = type
+        end
+      end
+
+      attr_reader :field, :options
+      def initialize(field, options = {})
+        @field = field
+        @options = options
       end
 
       def as_elastic
-        {
-          "type" => type_name
-        }
+        params = {'type' => self.class.type}.update(options)
+
+        { field => params }
       end
     end
   end

data/lib/arelastic/mappings/types/multi_field.rb

@@ -1,14 +1,20 @@
 module Arelastic
   module Mappings
     class MultiField < Arelastic::Mappings::Type
-      for_type 'multi_field'
+      attr_reader :field, :field_mappings
+      def initialize(field, field_mappings)
+        @field = field
+        @field_mappings = field_mappings
+      end
+
+      def as_elastic
+        {
+          field => {
+            'type'    => 'multi_field',
+            'fields'  => field_mappings
+          }
+        }
+      end
     end
   end
-end
-#   "name" : {
-#     "type" : "multi_field",
-#     "fields" : {
-#         "name" : {"type" : "string", "index" : "analyzed"},
-#         "untouched" : {"type" : "string", "index" : "not_analyzed"}
-#     }
-# }
+end

data/lib/arelastic/mappings/types/string.rb

@@ -1,6 +1,7 @@
 module Arelastic
   module Mappings
     class String < Arelastic::Mappings::Type
+      for_type 'string'
     end
   end
 end

data/lib/arelastic/searches/sort.rb

@@ -1,7 +1,14 @@
 module Arelastic
   module Searches
     class Sort < Arelastic::Searches::Search
-      unary 'sort'
+      attr_reader :sorts
+      def initialize sorts
+        @sorts = sorts
+      end
+
+      def as_elastic
+        {'sort' => sorts.map { |sort| convert_to_elastic(sort) }}
+      end
     end
   end
 end

data/lib/arelastic/sorts/sort.rb

@@ -0,0 +1,53 @@
+module Arelastic
+  module Sorts
+    class Sort < Arelastic::Nodes::Node
+      attr_reader :field, :options
+
+      # Sort.new('price').as_elastic
+      #  => 'price'
+      #
+      # Sort.new('price' => 'asc').as_elastic
+      #  => {'price' => 'asc'}
+      #
+      # Sort.new('price', 'order' => 'asc').as_elastic
+      #  => {'price' => {'order', 'asc'}}
+      #
+      # Sort.new({'price' => 'asc'}, {'missing' => '_last'}).as_elastic
+      #  => {'price' => {'order' => 'asc', 'missing' => '_last'}}
+      #
+      def initialize(field, extra_options = nil)
+        if field.is_a?(Hash)
+          @field, @options = field.first.to_a
+          if extra_options
+            @options = (@options.is_a?(Hash) ? @options : {'order' => @options}).update(extra_options)
+          end
+        else
+          @field = field
+          @options = extra_options
+        end
+      end
+
+      def reverse
+        reverse_order = ordering == 'desc' ? 'asc' : 'desc'
+
+        if options.is_a?(Hash)
+          Arelastic::Sorts::Sort.new(field, options.merge('order' => reverse_order))
+        else
+          Arelastic::Sorts::Sort.new(field => reverse_order)
+        end
+      end
+
+      def ordering
+        (options.is_a?(Hash) ? options['order'] : options).to_s
+      end
+
+      def as_elastic
+        if options
+          {field => options}
+        else
+          field
+        end
+      end
+    end
+  end
+end

data/lib/arelastic/sorts.rb

@@ -0,0 +1 @@
+require 'arelastic/sorts/sort'

data/lib/arelastic.rb

@@ -5,5 +5,6 @@ require 'arelastic/filters'
 require 'arelastic/mappings'
 require 'arelastic/queries'
 require 'arelastic/searches'
+require 'arelastic/sorts'
 
 require 'arelastic/builders'

data/test/arelastic/arities/binary_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Arities::BinaryTest < MiniTest::Spec
+class Arelastic::Arities::BinaryTest < MiniTest::Unit::TestCase
   def test_binary
     node = Class.new(Arelastic::Nodes::Node) do
       binary 'suffix'

data/test/arelastic/arities/polyadic_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Arities::PolyadicTest < MiniTest::Spec
+class Arelastic::Arities::PolyadicTest < MiniTest::Unit::TestCase
   def test_polyadic
     expr = Struct.new(:as_elastic)
     node = Class.new(Arelastic::Nodes::Node) do

data/test/arelastic/arities/unary_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Arities::UnaryTest < MiniTest::Spec
+class Arelastic::Arities::UnaryTest < MiniTest::Unit::TestCase
   def test_unary
     node = Class.new(Arelastic::Nodes::Node) do
       unary 'unicorn'

data/test/arelastic/builders/filter_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Builders::FilterTest < MiniTest::Spec
+class Arelastic::Builders::FilterTest < MiniTest::Unit::TestCase
   def test_ids
     expected = {"ids" => {"values"=>["5", "6"]}}
     assert_equal expected, Arelastic::Builders::Filter.ids('5', '6').as_elastic

data/test/arelastic/builders/mapping_test.rb

@@ -0,0 +1,4 @@
+require 'helper'
+
+class Arelastic::Builders::MappingTest < MiniTest::Unit::TestCase
+end

data/test/arelastic/builders/query_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Builders::QueryTest < MiniTest::Spec
+class Arelastic::Builders::QueryTest < MiniTest::Unit::TestCase
   def test_constant_score
     query = Arelastic::Builders::Query.constant_score({"foo" => "bar"})
     expected = {"query" => {"constant_score" => {"foo" => "bar"}}}

data/test/arelastic/builders/search_test.rb

@@ -1,4 +1,4 @@
 require 'helper'
 
-class Arelastic::Builders::SearchTest < MiniTest::Spec
+class Arelastic::Builders::SearchTest < MiniTest::Unit::TestCase
 end

data/test/arelastic/builders/sort_test.rb

@@ -1,5 +1,5 @@
 require 'helper'
 
-class Arelastic::Builders::SortTest < MiniTest::Spec
+class Arelastic::Builders::SortTest < MiniTest::Unit::TestCase
   
 end

data/test/arelastic/facets/histogram_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Facets::TermsTest < MiniTest::Spec
+class Arelastic::Facets::TermsTest < MiniTest::Unit::TestCase
   def test_as_elastic
     facet = Arelastic::Facets::Histogram.new('histo', "field" => "field_name", "interval" => 100)
     expected = {

data/test/arelastic/facets/terms_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Facets::TermsTest < MiniTest::Spec
+class Arelastic::Facets::TermsTest < MiniTest::Unit::TestCase
   def test_as_elastic
     facet = Arelastic::Facets::Terms.new('foo', 'tags', "size" => 10)
     expected = {

data/test/arelastic/filters/exists_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::ExistsTest < MiniTest::Spec
+class Arelastic::Filters::ExistsTest < MiniTest::Unit::TestCase
   def test_as_elastic
     expected = {"exists" => { "field" => "color" }}
 

data/test/arelastic/filters/filter_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::FilterTest < MiniTest::Spec
+class Arelastic::FilterTest < MiniTest::Unit::TestCase
   def test_or
     filter = Arelastic::Filters::Filter.new
 

data/test/arelastic/filters/geo_distance_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::GeoDistanceTest < MiniTest::Spec
+class Arelastic::Filters::GeoDistanceTest < MiniTest::Unit::TestCase
   def test_as_elastic
     expected = {
       "geo_distance" => {

data/test/arelastic/filters/has_child_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::HasChildTest < MiniTest::Spec
+class Arelastic::Filters::HasChildTest < MiniTest::Unit::TestCase
   def test_as_elastic
     expected = {"has_child" => {"type" => "comment", "query" => {"query_string" => "lol"}}}
 

data/test/arelastic/filters/ids_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::IdsTest < MiniTest::Spec
+class Arelastic::Filters::IdsTest < MiniTest::Unit::TestCase
   def test_as_elastic
     expected = {"ids" => {"values" => ["foo", "bar"]}}
 

data/test/arelastic/filters/match_all_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::MatchAllTest < MiniTest::Spec
+class Arelastic::Filters::MatchAllTest < MiniTest::Unit::TestCase
   def test_as_elastic
     match_all = Arelastic::Queries::MatchAll.new
     expected = {"match_all" => {}}

data/test/arelastic/filters/missing_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::MissingTest < MiniTest::Spec
+class Arelastic::Filters::MissingTest < MiniTest::Unit::TestCase
   def test_as_elastic
     expected = {"missing" => { "field" => "color" }}
 

data/test/arelastic/filters/not_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::NotTest < MiniTest::Spec
+class Arelastic::Filters::NotTest < MiniTest::Unit::TestCase
   def test_as_elastic
     expected = {"not" => { "foo" => "bar" }}
 

data/test/arelastic/filters/query_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Filters::QueryTest < MiniTest::Spec
+class Arelastic::Filters::QueryTest < MiniTest::Unit::TestCase
   def test_as_elastic
     expected = {"query" => { "match" => {"message" => "this is a test"} }}
 

data/test/arelastic/mappings/types/binary_test.rb

@@ -0,0 +1,10 @@
+require 'helper'
+
+class Arelastic::Mappings::BinaryTest < MiniTest::Unit::TestCase
+  def test_as_elastic
+    type = Arelastic::Mappings::Binary.new('message', 'index' => 'analyzed')
+    expected = {'message' => {'type' => 'binary', 'index' => 'analyzed'}}
+
+    assert_equal expected, type.as_elastic
+  end
+end

data/test/arelastic/mappings/types/multi_field_test.rb

@@ -0,0 +1,18 @@
+require 'helper'
+
+class Arelastic::Mappings::MultiFieldTest < MiniTest::Unit::TestCase
+  def test_as_elastic
+    type = Arelastic::Mappings::MultiField.new('message', 'message' => {'type' => 'string', 'index' => 'analyzed'}, 'untouched' => {'type' => 'string', 'index' => 'not_analyzed'})
+    expected = {
+      'message' => {
+        'type'    => 'multi_field',
+        'fields'  => {
+          'message'   => {'type' => 'string', 'index' => 'analyzed'},
+          'untouched' => {'type' => 'string', 'index' => 'not_analyzed'}
+        }
+      }
+    }
+
+    assert_equal expected, type.as_elastic
+  end
+end

data/test/arelastic/mappings/types/string_test.rb

@@ -0,0 +1,10 @@
+require 'helper'
+
+class Arelastic::Mappings::StringTest < MiniTest::Unit::TestCase
+  def test_as_elastic
+    type = Arelastic::Mappings::String.new('message', 'index' => 'analyzed')
+    expected = {'message' => {'type' => 'string', 'index' => 'analyzed'}}
+
+    assert_equal expected, type.as_elastic
+  end
+end

data/test/arelastic/nodes/node_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Nodes::NodeTest < MiniTest::Spec
+class Arelastic::Nodes::NodeTest < MiniTest::Unit::TestCase
   def test_equality
     node = Class.new(Arelastic::Nodes::Node) do
       def initialize(value)

data/test/arelastic/queries/filtered_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Queries::FilteredTest < MiniTest::Spec
+class Arelastic::Queries::FilteredTest < MiniTest::Unit::TestCase
   def test_as_elastic
     filtered = Arelastic::Queries::Filtered.new({"query_string" => "bar"}, {"term" => "baz"})
     expected = {"filtered" => {"query" => {"query_string" => "bar"}, "filter" => {"term" => "baz"}}}

data/test/arelastic/queries/match_all_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Queries::MatchAllTest < MiniTest::Spec
+class Arelastic::Queries::MatchAllTest < MiniTest::Unit::TestCase
   def test_as_elastic
     match_all = Arelastic::Queries::MatchAll.new
     expected = {"match_all" => {}}

data/test/arelastic/queries/query_string_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Queries::QueryStringTest < MiniTest::Spec
+class Arelastic::Queries::QueryStringTest < MiniTest::Unit::TestCase
   def test_as_elastic
     query_string = Arelastic::Queries::QueryString.new('foo')
     expected = {"query_string" => {"query" => "foo"}}

data/test/arelastic/queries/query_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Queries::QueryTest < MiniTest::Spec
+class Arelastic::Queries::QueryTest < MiniTest::Unit::TestCase
   def test_as_elastic
   end
 end

data/test/arelastic/searches/sort_test.rb

@@ -0,0 +1,13 @@
+require 'helper'
+
+class Arelastic::Searches::SortTest < MiniTest::Spec
+  def test_as_elastic
+    sort = Arelastic::Searches::Sort.new [
+      Arelastic::Sorts::Sort.new('price'),
+      {'name' => 'asc'}
+    ]
+    expected = {'sort' => ['price', {'name' => 'asc'}]}
+
+    assert_equal expected, sort.as_elastic
+  end
+end

data/test/arelastic/sorts/sort_test.rb

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -24,6 +23,7 @@ files:
 - lib/arelastic/arities.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
@@ -82,11 +82,15 @@ files:
 - lib/arelastic/searches/size.rb
 - lib/arelastic/searches/sort.rb
 - lib/arelastic/searches.rb
+- lib/arelastic/sorts/asc.rb
+- lib/arelastic/sorts/sort.rb
+- lib/arelastic/sorts.rb
 - lib/arelastic.rb
 - test/arelastic/arities/binary_test.rb
 - test/arelastic/arities/polyadic_test.rb
 - test/arelastic/arities/unary_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
@@ -102,36 +106,40 @@ files:
 - test/arelastic/filters/missing_test.rb
 - test/arelastic/filters/not_test.rb
 - test/arelastic/filters/query_test.rb
+- test/arelastic/mappings/types/binary_test.rb
+- test/arelastic/mappings/types/multi_field_test.rb
+- test/arelastic/mappings/types/string_test.rb
 - test/arelastic/nodes/node_test.rb
 - test/arelastic/queries/filtered_test.rb
 - test/arelastic/queries/match_all_test.rb
 - test/arelastic/queries/query_string_test.rb
 - test/arelastic/queries/query_test.rb
+- test/arelastic/searches/sort_test.rb
+- test/arelastic/sorts/sort_test.rb
 - test/helper.rb
 - README.rdoc
 homepage: http://github.com/matthuhiggins/arelastic
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.11
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Elastic Search query builder
 test_files: []