daedal 0.0.3 → 0.0.4

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

@@ -37,19 +37,19 @@ describe Daedal::Queries::FilteredQuery do
       expect(query.filter.to_hash).to eq base_filter.to_hash
     end
     it 'will have the correct hash representation' do
-      expect(query.to_hash).to eq({filtered: {query: {match_all: {}}, filter: {}}})
+      expect(query.to_hash).to eq({filtered: {query: {match_all: {}}, filter: nil}})
     end
   end
 
   context 'with an invalid query specified' do
     it 'will raise an error' do
-      expect{subject.new(query: :foo)}.to raise_error
+      expect{subject.new(query: :foo)}.to raise_error(Virtus::CoercionError)
     end
   end
 
   context 'with an invalid filter specified' do
     it 'will raise an error' do
-      expect{subject.new(filter: :foo)}.to raise_error
+      expect{subject.new(filter: :foo)}.to raise_error(Virtus::CoercionError)
     end
   end
 

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

@@ -13,13 +13,13 @@ describe Daedal::Queries::MatchQuery do
 
   context 'without a field or term given' do
     it 'will raise an error' do
-      expect {subject.new}.to raise_error
+      expect {subject.new}.to raise_error(Virtus::CoercionError)
     end
   end
 
   context 'without a term given' do
     it 'will raise an error' do
-      expect {subject.new(field: :foo)}.to raise_error
+      expect {subject.new(field: :foo)}.to raise_error(Virtus::CoercionError)
     end
   end
 
@@ -77,7 +77,7 @@ describe Daedal::Queries::MatchQuery do
 
   context 'with a non-valid operator specified' do
     it 'will raise an error' do
-      expect {subject.new(field: :foo, query: :bar, operator: :foo)}.to raise_error
+      expect {subject.new(field: :foo, query: :bar, operator: :foo)}.to raise_error(Virtus::CoercionError)
     end
   end
 
@@ -105,7 +105,7 @@ describe Daedal::Queries::MatchQuery do
 
   context 'with a non-valid type specified' do
     it 'will raise an error' do
-      expect {subject.new(field: :foo, query: :bar, type: :foo)}.to raise_error
+      expect {subject.new(field: :foo, query: :bar, type: :foo)}.to raise_error(Virtus::CoercionError)
     end
   end
 
@@ -133,7 +133,7 @@ describe Daedal::Queries::MatchQuery do
 
   context 'with a non-integer minimum should match specified' do
     it 'will raise an error' do
-      expect {subject.new(field: :foo, query: :bar, minimum_should_match: 'foo')}.to raise_error
+      expect {subject.new(field: :foo, query: :bar, minimum_should_match: 'foo')}.to raise_error(Virtus::CoercionError)
     end
   end
 
@@ -161,7 +161,7 @@ describe Daedal::Queries::MatchQuery do
 
   context 'with a non-float cutoff frequency specified' do
     it 'will raise an error' do
-      expect {subject.new(field: :foo, query: :bar, cutoff_frequency: 'foo')}.to raise_error
+      expect {subject.new(field: :foo, query: :bar, cutoff_frequency: 'foo')}.to raise_error(Virtus::CoercionError)
     end
   end
 
@@ -211,7 +211,35 @@ describe Daedal::Queries::MatchQuery do
 
   context 'with a non integer boost specified' do
     it 'will raise an error' do
-      expect {subject.new(field: :foo, query: :bar, boost: 'foo')}.to raise_error
+      expect {subject.new(field: :foo, query: :bar, boost: 'foo')}.to raise_error(Virtus::CoercionError)
+    end
+  end
+
+  context 'with a slop of 2 specified' do
+    let(:match_query) do
+      subject.new(field: :foo, query: :bar, slop: 2)
+    end
+
+    before do
+      base_query[:match][:foo][:slop] = 2
+    end
+
+    it 'will set the phrase type to :phrase' do
+      expect(match_query.slop).to eq 2
+    end
+
+    it 'will have the correct hash representation' do
+      expect(match_query.to_hash).to eq base_query
+    end
+
+    it 'will have the correct json representation' do
+      expect(match_query.to_json).to eq base_query.to_json
+    end
+  end
+
+  context 'with a non integer slop specified' do
+    it 'will raise an error' do
+      expect {subject.new(field: :foo, query: :bar, slop: 'foo')}.to raise_error(Virtus::CoercionError)
     end
   end
 
@@ -239,7 +267,7 @@ describe Daedal::Queries::MatchQuery do
 
   context 'with a non float or integer fuzziness specified' do
     it 'will raise an error' do
-      expect {subject.new(field: :foo, query: :bar, fuzziness: 'foo')}.to raise_error
+      expect {subject.new(field: :foo, query: :bar, fuzziness: 'foo')}.to raise_error(Virtus::CoercionError)
     end
   end
 end

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

@@ -21,13 +21,13 @@ describe Daedal::Queries::MultiMatchQuery do
 
   context 'without a field or term given' do
     it 'will raise an error' do
-      expect {subject.new}.to raise_error
+      expect {subject.new}.to raise_error(Virtus::CoercionError)
     end
   end
 
   context 'without fields given' do
     it 'will raise an error' do
-      expect {subject.new(query: term)}.to raise_error
+      expect {subject.new(query: term)}.to raise_error(RuntimeError)
     end
   end
 
@@ -85,7 +85,7 @@ describe Daedal::Queries::MultiMatchQuery do
 
   context 'with a non-valid operator specified' do
     it 'will raise an error' do
-      expect {subject.new(query: term, fields: fields, operator: :foo)}.to raise_error
+      expect {subject.new(query: term, fields: fields, operator: :foo)}.to raise_error(Virtus::CoercionError)
     end
   end
 
@@ -113,7 +113,7 @@ describe Daedal::Queries::MultiMatchQuery do
 
   context 'with a non-valid type specified' do
     it 'will raise an error' do
-      expect {subject.new(query: term, fields: fields, type: :foo)}.to raise_error
+      expect {subject.new(query: term, fields: fields, type: :foo)}.to raise_error(Virtus::CoercionError)
     end
   end
 
@@ -141,7 +141,7 @@ describe Daedal::Queries::MultiMatchQuery do
 
   context 'with a non-integer minimum should match specified' do
     it 'will raise an error' do
-      expect {subject.new(query: term, fields: fields, minimum_should_match: 'foo')}.to raise_error
+      expect {subject.new(query: term, fields: fields, minimum_should_match: 'foo')}.to raise_error(Virtus::CoercionError)
     end
   end
 
@@ -169,7 +169,7 @@ describe Daedal::Queries::MultiMatchQuery do
 
   context 'with a non-float cutoff frequency specified' do
     it 'will raise an error' do
-      expect {subject.new(query: term, fields: fields, cutoff_frequency: 'foo')}.to raise_error
+      expect {subject.new(query: term, fields: fields, cutoff_frequency: 'foo')}.to raise_error(Virtus::CoercionError)
     end
   end
 
@@ -219,7 +219,7 @@ describe Daedal::Queries::MultiMatchQuery do
 
   context 'with a non integer boost specified' do
     it 'will raise an error' do
-      expect {subject.new(query: term, fields: fields, boost: 'foo')}.to raise_error
+      expect {subject.new(query: term, fields: fields, boost: 'foo')}.to raise_error(Virtus::CoercionError)
     end
   end
 
@@ -247,7 +247,7 @@ describe Daedal::Queries::MultiMatchQuery do
 
   context 'with a non float or integer fuzziness specified' do
     it 'will raise an error' do
-      expect {subject.new(query: term, fields: fields, fuzziness: 'foo')}.to raise_error
+      expect {subject.new(query: term, fields: fields, fuzziness: 'foo')}.to raise_error(Virtus::CoercionError)
     end
   end
 end

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

@@ -14,19 +14,19 @@ describe Daedal::Queries::NestedQuery do
 
   context 'with no path specified' do
     it 'will raise an error' do
-      expect{subject.new(query: match_all_query)}.to raise_error
+      expect{subject.new(query: match_all_query)}.to raise_error(Virtus::CoercionError)
     end
   end
 
   context 'with no query specified' do
     it 'will raise an error' do
-      expect{subject.new(path: 'foo')}.to raise_error
+      expect{subject.new(path: 'foo')}.to raise_error(Virtus::CoercionError)
     end
   end
 
   context 'with an invalid query specified' do
     it 'will raise an error' do
-      expect{subject.new(query: :foo)}.to raise_error
+      expect{subject.new(query: :foo)}.to raise_error(Virtus::CoercionError)
     end
   end
 
@@ -76,7 +76,7 @@ describe Daedal::Queries::NestedQuery do
 
   context 'with an invalid score_mode specified' do
     it 'will raise an error' do
-      expect{subject.new(query: match_all_query, path: :foo, score_mode: 'foo')}.to raise_error
+      expect{subject.new(query: match_all_query, path: :foo, score_mode: 'foo')}.to raise_error(Virtus::CoercionError)
     end
   end
 end

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

@@ -0,0 +1,85 @@
+require 'spec_helper'
+require 'daedal/queries'
+
+describe Daedal::Queries::PrefixQuery do
+
+  subject do
+    Daedal::Queries::PrefixQuery
+  end
+
+  context 'with no field or term specified' do
+    it 'will raise an error' do
+      expect {subject.new}.to raise_error(Virtus::CoercionError)
+    end
+  end
+
+  context 'with no field specified' do
+    it 'will raise an error' do
+      expect {subject.new(query: :foo)}.to raise_error(Virtus::CoercionError)
+    end
+  end
+
+  context 'with no term specified' do
+    it 'will raise an error' do
+      expect {subject.new(field: :foo)}.to raise_error(Virtus::CoercionError)
+    end
+  end
+
+  context 'with a field and a term specified' do
+    let(:query) do
+      subject.new(field: :foo, query: :bar)
+    end
+    let(:hash_query) do
+      {prefix: {foo: 'bar'}}
+    end
+
+    it 'will create a prefix query with the correct values' do
+      expect(query.field).to eq :foo
+      expect(query.query).to eq 'bar'
+    end
+
+    it 'will have the correct hash and json representation' do
+      expect(query.to_hash).to eq hash_query
+      expect(query.to_json).to eq hash_query.to_json
+    end
+  end
+
+  context 'with a field and an upper cased term specified' do
+    let(:query) do
+      subject.new(field: :foo, query: 'Bar')
+    end
+    let(:hash_query) do
+      {prefix: {foo: 'bar'}}
+    end
+
+    it 'will create a prefix query and downcase the term' do
+      expect(query.field).to eq :foo
+      expect(query.query).to eq 'bar'
+    end
+
+    it 'will have the correct hash and json representations' do
+      expect(query.to_hash).to eq hash_query
+      expect(query.to_json).to eq hash_query.to_json
+    end
+  end
+
+  context 'with a boost specified' do
+    let(:query) do
+      subject.new(field: :foo, query: :bar, boost: 5.0)
+    end
+    let(:hash_query) do
+      {prefix: {foo: 'bar', boost: 5.0}}
+    end
+
+    it 'will create a prefix query with the correct values' do
+      expect(query.field).to eq :foo
+      expect(query.query).to eq 'bar'
+      expect(query.boost).to eq 5.0
+    end
+
+    it 'will have the correct hash and json representation' do
+      expect(query.to_hash).to eq hash_query
+      expect(query.to_json).to eq hash_query.to_json
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daedal
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Christopher Schuch
@@ -14,14 +14,14 @@ dependencies:
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: Classes for easier ElasticSearch query creation
@@ -40,12 +40,20 @@ files:
 - daedal.gemspec
 - lib/daedal.rb
 - lib/daedal/attributes.rb
+- lib/daedal/attributes/distance_unit.rb
+- lib/daedal/attributes/filter.rb
+- lib/daedal/attributes/filter_array.rb
+- lib/daedal/attributes/lower_case_string.rb
 - lib/daedal/attributes/match_type.rb
 - lib/daedal/attributes/operator.rb
+- lib/daedal/attributes/query.rb
 - lib/daedal/attributes/query_array.rb
 - lib/daedal/attributes/score_mode.rb
 - lib/daedal/filters.rb
+- lib/daedal/filters/and_filter.rb
 - lib/daedal/filters/base_filter.rb
+- lib/daedal/filters/geo_distance_filter.rb
+- lib/daedal/filters/range_filter.rb
 - lib/daedal/filters/term_filter.rb
 - lib/daedal/filters/terms_filter.rb
 - lib/daedal/queries.rb
@@ -58,7 +66,12 @@ files:
 - lib/daedal/queries/match_query.rb
 - lib/daedal/queries/multi_match_query.rb
 - lib/daedal/queries/nested_query.rb
+- lib/daedal/queries/prefix_query.rb
+- lib/daedal/version.rb
 - spec/spec_helper.rb
+- spec/unit/daedal/filters/and_filter_spec.rb
+- spec/unit/daedal/filters/geo_distance_filter_spec.rb
+- spec/unit/daedal/filters/range_filter_spec.rb
 - spec/unit/daedal/filters/term_filter_spec.rb
 - spec/unit/daedal/filters/terms_filter_spec.rb
 - spec/unit/daedal/queries/bool_query_spec.rb
@@ -69,6 +82,7 @@ files:
 - spec/unit/daedal/queries/match_query_spec.rb
 - spec/unit/daedal/queries/multi_match_query_spec.rb
 - spec/unit/daedal/queries/nested_query_spec.rb
+- spec/unit/daedal/queries/prefix_query_spec.rb
 homepage: https://github.com/cschuch/daedal
 licenses:
 - MIT