arelastic 0.2.0 → 0.2.1

data/lib/arelastic.rb

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

data/lib/arelastic/builders/filter.rb

@@ -48,18 +48,10 @@ module Arelastic
         Arelastic::Filters::Exists.new field
       end
 
-      def present
-        exists.and(not_eq(''))       
-      end
-
       def missing(options = {})
         Arelastic::Filters::Missing.new field, options
       end
 
-      def blank
-        missing.or(eq(''))
-      end
-
       def gteq other
         range 'gte' => other
       end

data/lib/arelastic/filters/query.rb

@@ -1,7 +1,14 @@
 module Arelastic
   module Filters
     class Query < Arelastic::Filters::Filter
-      unary 'query'
+      attr_reader :expr
+      def initialize(expr)
+        @expr = expr.is_a?(String) ? {'query_string' => expr} : expr
+      end
+
+      def as_elastic
+        {'query' => convert_to_elastic(expr)}
+      end
     end
   end
 end

data/lib/arelastic/mappings.rb

@@ -0,0 +1,9 @@
+require 'arelastic/mappings/type'
+
+require 'arelastic/mappings/types/binary'
+require 'arelastic/mappings/types/boolean'
+require 'arelastic/mappings/types/date'
+require 'arelastic/mappings/types/multi_field'
+require 'arelastic/mappings/types/number'
+require 'arelastic/mappings/types/object'
+require 'arelastic/mappings/types/string'

data/lib/arelastic/mappings/type.rb

@@ -0,0 +1,14 @@
+module Arelastic
+  module Mappings
+    class Type < Arelastic::Nodes::Node
+      def self.for_type(type)
+      end
+
+      def as_elastic
+        {
+          "type" => type_name
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Arelastic
+  module Mappings
+    class Binary < Arelastic::Mappings::Type
+      for_type 'binary'
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Arelastic
+  module Mappings
+    class Boolean < Arelastic::Mappings::Type
+      for_type 'boolean'
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Arelastic
+  module Mappings
+    class Date < Arelastic::Mappings::Type
+      for_type 'date'
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Arelastic
+  module Mappings
+    class MultiField < Arelastic::Mappings::Type
+      for_type 'multi_field'
+    end
+  end
+end
+#   "name" : {
+#     "type" : "multi_field",
+#     "fields" : {
+#         "name" : {"type" : "string", "index" : "analyzed"},
+#         "untouched" : {"type" : "string", "index" : "not_analyzed"}
+#     }
+# }

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

@@ -0,0 +1,8 @@
+module Arelastic
+  module Mappings
+    class Number < Arelastic::Mappings::Type
+      def initialize(type, options = {})
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Arelastic
+  module Mappings
+    class Object < Arelastic::Mappings::Type
+      for_type 'object'
+    end
+  end
+end
+# {
+#     "tweet" : {
+#         "properties" : {
+#             "person" : {
+#                 "type" : "object",
+#                 "properties" : {
+#                     "name" : {
+#                         "properties" : {
+#                             "first_name" : {"type" : "string"},
+#                             "last_name" : {"type" : "string"}
+#                         }
+#                     },
+#                     "sid" : {"type" : "string", "index" : "not_analyzed"}
+#                 }
+#             }
+#             "message" : {"type" : "string"}
+#         }
+#     }
+# }

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

@@ -0,0 +1,6 @@
+module Arelastic
+  module Mappings
+    class String < Arelastic::Mappings::Type
+    end
+  end
+end

data/test/arelastic/builders/filter_test.rb

@@ -6,6 +6,11 @@ class Arelastic::Builders::FilterTest < MiniTest::Spec
     assert_equal expected, Arelastic::Builders::Filter.ids('5', '6').as_elastic
   end
 
+  def test_not
+    expected = {"not" => {"terms" => {"color" => "blue"}}}
+    assert_equal expected, Arelastic::Builders::Filter.not({"terms" => {"color" => "blue"}}).as_elastic    
+  end
+
   def test_eq
     expected = {"term"=>{"color"=>"blue"}}
     assert_equal expected, builder.eq('blue').as_elastic
@@ -49,22 +54,11 @@ class Arelastic::Builders::FilterTest < MiniTest::Spec
     assert_equal expected, builder.exists.as_elastic
   end
 
-  def test_present
-    expected = {"and" => [{"exists" => {"field"=>"color"}}, {"not" => {"term"=>{"color"=>""}}}]}
-    assert_equal expected, builder.present.as_elastic
-  end
-
   def test_missing
     expected = {"missing" => {"field" => "color"}}
     assert_equal expected, builder.missing.as_elastic
   end
 
-  def test_blank
-    expected = {"or" => [{"missing" => {"field"=>"color"}}, {"term" => {"color"=>""}}]}
-    assert_equal expected, builder.blank.as_elastic
-  end
-  
-
   def test_range
     expected = {"range" => {"color" => {"lt" => 5}}}
     assert_equal expected, builder.lt(5).as_elastic

data/test/arelastic/filters/query_test.rb

@@ -6,4 +6,10 @@ class Arelastic::Filters::QueryTest < MiniTest::Spec
 
     assert_equal expected, Arelastic::Filters::Query.new(Arelastic::Queries::Match.new('message', 'this is a test')).as_elastic
   end
+
+  def test_with_string
+    expected = {"query" => { "query_string" => "blue dog"}}
+
+    assert_equal expected, Arelastic::Filters::Query.new("blue dog").as_elastic
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -50,6 +50,15 @@ files:
 - lib/arelastic/filters/term.rb
 - lib/arelastic/filters/terms.rb
 - lib/arelastic/filters.rb
+- lib/arelastic/mappings/type.rb
+- lib/arelastic/mappings/types/binary.rb
+- lib/arelastic/mappings/types/boolean.rb
+- lib/arelastic/mappings/types/date.rb
+- lib/arelastic/mappings/types/multi_field.rb
+- lib/arelastic/mappings/types/number.rb
+- lib/arelastic/mappings/types/object.rb
+- lib/arelastic/mappings/types/string.rb
+- lib/arelastic/mappings.rb
 - lib/arelastic/nodes/hash_group.rb
 - lib/arelastic/nodes/node.rb
 - lib/arelastic/nodes.rb
@@ -108,17 +117,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
-required_rubygems_version: !ruby/object:Gem::Requirement
   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