daedal 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWY3ZDMyOWU5OTNhZWEzNDViNGYwZjkxZDQ1Y2E3MTczODM4MzlmYQ==
+    ZGMxMGUzOWUzOTllYzcyZmVmNTViYmMxOWFiYzBiNTc1ODA4MDY0Yg==
   data.tar.gz: !binary |-
-    ZDY2ZTFjYmRmNDAzMjRiYjgyYjI4NGNkZTc2Mzg2NTYzZGI3NzNmZQ==
+    ZTMzZDNhMTI3ZWY3ZDg2YzAxYmUzZGQwM2JkZDYwNTQwNWEyYzdiMQ==
 SHA512:
   metadata.gz: !binary |-
-    MzQ4YjZiMjFjNGFjOWZlZDQ0YjlmMjZmZWFiMWZkYjBkNTFkOGNkOWNkMmI4
-    ZGQ2YjE4NzkyN2E2NjA4ZjFkOTAzN2JkNGU1NzVmOTMyMjE4YTA3Nzc2YmVm
-    YWYyYTlmMjRhNTc1OTlmOTI0YzJkZjNkNzgwNmU2YzEwNzFjMGU=
+    MDAzODBjM2E0M2Y5NDVkNzllNWQzY2ZhZTVmNWExOGQ1MzJlZjE1ZDVkYTZi
+    ZDk5MzI3NGRlMzU4NjRiNWM4Y2ZlNmRjYTdhYzMxNjM2NzViMGYwZWMyNzVi
+    ODc0YjBhNmVlNzljZDc5MDFjNzYxNTYzZDhlYzU3ODk4NWEwYjQ=
   data.tar.gz: !binary |-
-    NGZmY2I4NjYyZGU4NjFhOTY2MmM2NDRkZGZjNjU5MzcyMjU4NGQ4ZGNjYmJk
-    ODNiYTg1YzNhMDI4N2Y5NDE0ZDZlMjBiZWIzNThhNTRmNDU4YzVmMWNjYzU1
-    MTFjYmI0NTgwNzE2MGY5ZDdjODM0ODNiMmIwZmJmOWYwYzZlYjc=
+    MmI3ZTM4OTlmMDFjZmY2YTk4ZTQ2MWU3ZDRlODUyZTA2NjVmZTI0NDFhNjJh
+    YzZlOWRhYWM2ZGVmZmZhNDBkMTc2ZWNkODdlY2Q1NTdmMDRhNGIzYjVjZjA4
+    NzRiZDMyODZhNTVmYzc2MTJmYmRjZjJjNDYzYWRmMzAwOTQyNzc=

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    daedal (0.0.5)
+    daedal (0.0.10)
       virtus (>= 1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    axiom-types (0.0.5)
-      descendants_tracker (~> 0.0.1)
-      ice_nine (~> 0.9)
-    backports (3.3.5)
+    atomic (1.1.16)
+    axiom-types (0.1.0)
+      descendants_tracker (~> 0.0.3)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.1.3)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     coderay (1.1.0)
-    coercible (0.2.0)
-      backports (~> 3.0, >= 3.1.0)
+    coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     coveralls (0.7.0)
       multi_json (~> 1.3)
@@ -25,7 +25,7 @@ GEM
       thor
     descendants_tracker (0.0.3)
     diff-lcs (1.2.5)
-    equalizer (0.0.8)
+    equalizer (0.0.9)
     ffi (1.9.3)
     formatador (0.2.4)
     fuubar (1.2.1)
@@ -41,7 +41,7 @@ GEM
     guard-rspec (4.2.0)
       guard (>= 2.1.1)
       rspec (>= 2.14, < 4.0)
-    ice_nine (0.10.0)
+    ice_nine (0.11.0)
     listen (2.4.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
@@ -77,13 +77,15 @@ GEM
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
     timers (1.1.0)
     tins (0.13.1)
-    virtus (1.0.0)
-      axiom-types (~> 0.0.5)
-      coercible (~> 0.2)
-      descendants_tracker (~> 0.0.1)
-      equalizer (~> 0.0.7)
+    virtus (1.0.2)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0.3)
+      equalizer (~> 0.0.9)
 
 PLATFORMS
   ruby

data/README.md

@@ -136,8 +136,6 @@ Currently, the following filters have been implemented:
 * [range filter](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-range-filter.html)
 * [term filter](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-term-filter.html)
 * [terms filter](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-terms-filter.html)
-
-On deck:
 * [nested filter](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-nested-filter.html)
 
 ### Type checking and attribute coercion

data/lib/daedal/attributes/match_type.rb

@@ -2,7 +2,7 @@ module Daedal
   module Attributes
     """Custom coercer for the type attribute"""
     class MatchType < Virtus::Attribute
-      ALLOWED_MATCH_TYPES = [:phrase, :phrase_prefix]
+      ALLOWED_MATCH_TYPES = [:phrase, :phrase_prefix, :best_fields, :most_fields, :cross_fields]
       def coerce(value)
         unless value.nil?
           value = value.to_sym

data/lib/daedal/queries/fuzzy_query.rb

@@ -11,10 +11,12 @@ module Daedal
       attribute :boost,           Daedal::Attributes::Boost,      required: false
       attribute :min_similarity,  Daedal::Attributes::QueryValue, required: false
       attribute :prefix_length,   Integer,                        required: false
+      attribute :max_expansions,  Integer,                        required: false
+      attribute :fuzziness,       Daedal::Attributes::QueryValue, required: false
   
       def to_hash
         result = {fuzzy: {field => {value: query}}}
-        options = {boost: boost, min_similarity: min_similarity, prefix_length: prefix_length}.select {|k,v| !v.nil?}
+        options = {boost: boost, min_similarity: min_similarity, prefix_length: prefix_length, max_expansions: max_expansions, fuzziness: fuzziness}.select {|k,v| !v.nil?}
         result[:fuzzy][field].merge!(options)
 
         result

data/lib/daedal/queries/match_query.rb

@@ -14,13 +14,16 @@ module Daedal
       attribute :type,                  Daedal::Attributes::MatchType,  required: false
       attribute :analyzer,              Symbol,                         required: false
       attribute :boost,                 Daedal::Attributes::Boost,      required: false
-      attribute :fuzziness,             Float,                          required: false
+      attribute :fuzziness,             Daedal::Attributes::QueryValue, required: false
       attribute :slop,                  Integer,                        required: false
+      attribute :max_expansions,        Integer,                        required: false
+      attribute :prefix_length,         Integer,                        required: false
+      attribute :lenient,               Boolean,                        required: false
   
       def to_hash
   
         result = {match: {field => {query: query}}}
-        options = {minimum_should_match: minimum_should_match, cutoff_frequency: cutoff_frequency, type: type, analyzer: analyzer, boost: boost, fuzziness: fuzziness, operator: operator, slop: slop}
+        options = {minimum_should_match: minimum_should_match, cutoff_frequency: cutoff_frequency, type: type, analyzer: analyzer, boost: boost, fuzziness: fuzziness, operator: operator, slop: slop, max_expansions: max_expansions, prefix_length: prefix_length, lenient: lenient}
         result[:match][field].merge! options.select {|k,v| !v.nil?}
   
         result

data/lib/daedal/queries/multi_match_query.rb

@@ -16,7 +16,9 @@ module Daedal
       attribute :type,                  Daedal::Attributes::MatchType,  required: false
       attribute :analyzer,              Symbol,                         required: false
       attribute :boost,                 Daedal::Attributes::Boost,      required: false
-      attribute :fuzziness,             Float,                          required: false
+      attribute :fuzziness,             Daedal::Attributes::QueryValue, required: false
+      attribute :prefix_length,         Integer,                        required: false
+      attribute :max_expansions,        Integer,                        required: false
   
       # Fields cannot be an empty array... should eventually refactor this kind of thing out of initialize
       def initialize(options={})
@@ -29,7 +31,7 @@ module Daedal
   
       def to_hash
         result = {multi_match: {query: query, fields: fields}}
-        options = {minimum_should_match: minimum_should_match, cutoff_frequency: cutoff_frequency, type: type, analyzer: analyzer, boost: boost, fuzziness: fuzziness, operator: operator}
+        options = {minimum_should_match: minimum_should_match, cutoff_frequency: cutoff_frequency, type: type, analyzer: analyzer, boost: boost, fuzziness: fuzziness, operator: operator, prefix_length: prefix_length, max_expansions: max_expansions}
   
         result[:multi_match].merge!(options.select { |k,v| !v.nil? })
   

data/lib/daedal/version.rb

@@ -1,3 +1,3 @@
 module Daedal
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/spec/unit/daedal/queries/fuzzy_query_spec.rb

@@ -86,4 +86,46 @@ describe Daedal::Queries::FuzzyQuery do
       expect(query.to_json).to eq hash_query.to_json
     end
   end
+
+  context 'with a fuzziness of 0.5 specified' do
+    let(:query) do
+      subject.new(query: :bar, field: :foo, fuzziness: 0.5)
+    end
+
+    before do
+      hash_query[:fuzzy][:foo][:fuzziness] = 0.5
+    end
+
+    it 'will set the fuzziness' do
+      expect(query.fuzziness).to eq 0.5
+    end
+
+    it 'will have the correct hash representation' do
+      expect(query.to_hash).to eq hash_query
+    end
+
+    it 'will have the correct json representation' do
+      expect(query.to_json).to eq hash_query.to_json
+    end
+  end
+
+  context 'with an invalid fuzziness specified' do
+    it 'will raise an error' do
+      expect {subject.new(query: :bar, field: :foo, fuzziness: {})}.to raise_error(Virtus::CoercionError)
+    end
+  end
+
+  context 'with max_expansions specified' do
+    context 'when given an int' do
+      before { hash_query[:fuzzy][:foo][:max_expansions] = 2 }
+      it 'will use the max_expansions' do
+        expect(subject.new(query: :bar, field: :foo, max_expansions: 2).to_hash).to eq hash_query
+      end
+    end
+    context 'with invalid input' do
+      it 'will raise an error' do
+        expect {subject.new(query: :bar, field: :foo, max_expansions: {})}.to raise_error(Virtus::CoercionError)
+      end
+    end
+  end
 end

data/spec/unit/daedal/queries/match_query_spec.rb

@@ -251,7 +251,7 @@ describe Daedal::Queries::MatchQuery do
       base_query[:match][:foo][:fuzziness] = 0.5
     end
 
-    it 'will set the phrase type to :phrase' do
+    it 'will set fuzziness correctly' do
       expect(match_query.fuzziness).to eq 0.5
     end
 
@@ -264,9 +264,60 @@ describe Daedal::Queries::MatchQuery do
     end
   end
 
-  context 'with a non float or integer fuzziness specified' do
+  context 'with an invalid fuzziness specified' do
     it 'will raise an error' do
-      expect {subject.new(field: :foo, query: :bar, fuzziness: 'foo')}.to raise_error(Virtus::CoercionError)
+      expect {subject.new(field: :foo, query: :bar, fuzziness: {})}.to raise_error(Virtus::CoercionError)
+    end
+  end
+
+  context 'with a lenient specified' do
+    let(:query) do
+      subject.new field: :foo, query: :bar, lenient: true
+    end
+    
+    before do
+      base_query[:match][:foo][:lenient] = true
+    end
+    it 'will set the lenient correctly' do
+      expect(query.lenient).to eq true
+    end
+    it 'will have the correct hash and json representations' do
+      expect(query.to_hash).to eq base_query
+      expect(query.to_json).to eq base_query.to_json
+    end
+  end
+
+  context 'with a max_expansions specified' do
+    let(:query) do
+      subject.new field: :foo, query: :bar, max_expansions: 1
+    end
+    
+    before do
+      base_query[:match][:foo][:max_expansions] = 1
+    end
+    it 'will set the max_expansions correctly' do
+      expect(query.max_expansions).to eq 1
+    end
+    it 'will have the correct hash and json representations' do
+      expect(query.to_hash).to eq base_query
+      expect(query.to_json).to eq base_query.to_json
+    end
+  end
+
+  context 'with a prefix_length specified' do
+    let(:query) do
+      subject.new field: :foo, query: :bar, prefix_length: 1
+    end
+    
+    before do
+      base_query[:match][:foo][:prefix_length] = 1
+    end
+    it 'will set the prefix_length correctly' do
+      expect(query.prefix_length).to eq 1
+    end
+    it 'will have the correct hash and json representations' do
+      expect(query.to_hash).to eq base_query
+      expect(query.to_json).to eq base_query.to_json
     end
   end
 end

data/spec/unit/daedal/queries/multi_match_query_spec.rb

@@ -125,7 +125,7 @@ describe Daedal::Queries::MultiMatchQuery do
       base_query[:multi_match][:minimum_should_match] = 2
     end
 
-    it 'will set the phrase type to :phrase' do
+    it 'will set the minimum_should_match' do
       expect(query.minimum_should_match).to eq 2
     end
 
@@ -153,7 +153,7 @@ describe Daedal::Queries::MultiMatchQuery do
       base_query[:multi_match][:cutoff_frequency] = 0.5
     end
 
-    it 'will set the phrase type to :phrase' do
+    it 'will set the cutoff_frequency' do
       expect(query.cutoff_frequency).to eq 0.5
     end
 
@@ -181,7 +181,7 @@ describe Daedal::Queries::MultiMatchQuery do
       base_query[:multi_match][:analyzer] = :foo
     end
 
-    it 'will set the phrase type to :phrase' do
+    it 'will set the analyzer' do
       expect(query.analyzer).to eq :foo
     end
 
@@ -203,7 +203,7 @@ describe Daedal::Queries::MultiMatchQuery do
       base_query[:multi_match][:boost] = 2.0
     end
 
-    it 'will set the phrase type to :phrase' do
+    it 'will set the boost' do
       expect(query.boost).to eq 2.0
     end
 
@@ -231,7 +231,7 @@ describe Daedal::Queries::MultiMatchQuery do
       base_query[:multi_match][:fuzziness] = 0.5
     end
 
-    it 'will set the phrase type to :phrase' do
+    it 'will set the fuzziness' do
       expect(query.fuzziness).to eq 0.5
     end
 
@@ -244,9 +244,38 @@ describe Daedal::Queries::MultiMatchQuery do
     end
   end
 
-  context 'with a non float or integer fuzziness specified' do
+  context 'with an invalid fuzziness specified' do
     it 'will raise an error' do
-      expect {subject.new(query: term, fields: fields, fuzziness: 'foo')}.to raise_error(Virtus::CoercionError)
+      expect {subject.new(query: term, fields: fields, fuzziness: {})}.to raise_error(Virtus::CoercionError)
+    end
+  end
+
+  context 'with prefix_length specified' do
+    context 'when given an int' do
+      before { base_query[:multi_match][:prefix_length] = 2 }
+      it 'will use the prefix_length' do
+        expect(subject.new(query: term, fields: fields, prefix_length: 2).to_hash).to eq base_query
+      end
+    end
+    context 'with invalid input' do
+      it 'will raise an error' do
+        expect {subject.new(query: term, fields: fields, prefix_length: {})}.to raise_error(Virtus::CoercionError)
+      end
     end
   end
+
+  context 'with max_expansions specified' do
+    context 'when given an int' do
+      before { base_query[:multi_match][:max_expansions] = 2 }
+      it 'will use the max_expansions' do
+        expect(subject.new(query: term, fields: fields, max_expansions: 2).to_hash).to eq base_query
+      end
+    end
+    context 'with invalid input' do
+      it 'will raise an error' do
+        expect {subject.new(query: term, fields: fields, max_expansions: {})}.to raise_error(Virtus::CoercionError)
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daedal
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Christopher Schuch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus