daedal 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49b9a5ec5d8154e612f0a8e368b4a3ede833288a
-  data.tar.gz: 8df178f9d7d355ea309c260ac47f5ddb762df2f5
+  metadata.gz: 4c4bde7051a2f331ec26642e3ffc6b517bec4ffc
+  data.tar.gz: 834a366bd9a23949f0db2a878c71450fc83ed09e
 SHA512:
-  metadata.gz: a2393948c2748df8ff9adbf435ce79c910837eddefdef9fa80db35314136005af27e90d90de71be9da3a716cb4b26039c6822929de3a343c0c3a289ef17d13b5
-  data.tar.gz: 6a1950ca0d71446b5c5238b30c54f4f39e37a54bb362affb21bfe879d49e0708da7f38b0f306d8755212286c6529b06ee7a4c9681e7a6fd6f145d6fc021b2eed
+  metadata.gz: d7e1c3d7af4517105b94b3182e205f1de57b50c5e9ac9e1cfbbb8dd65463ac37ecef64bb0c092246aa608c63a41e86a110be4da5e4d5987c10cb976bbee63997
+  data.tar.gz: 5d3c1e527051b559fd0eec04254c8f68ee596cbb3515805630e035153c51c6b2a084bcbaa94b5aff1bfaf36f60790d88674617e0848fed0f29d8737d08952577

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    daedal (0.0.12)
+    daedal (0.0.14)
       virtus (>= 1.0.0)
 
 GEM
@@ -77,7 +77,7 @@ GEM
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     thor (0.18.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     timers (1.1.0)
     tins (0.13.1)
     virtus (1.0.2)

data/README.md

@@ -104,13 +104,13 @@ Currently, the following queries have been implemented:
 * [nested query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-nested-query.html)
 * [prefix query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-prefix-query.html)
 * [query string query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html)
+* [range query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-range-query.html)
+* [term query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-term-query.html)
+* [terms query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-terms-query.html)
 
 On deck:
 * [function score query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-function-score-query.html)
-* [range query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-range-query.html)
 * [regexp query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-regexp-query.html)
-* [term query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-term-query.html)
-* [terms query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-terms-query.html)
 * [wildcard query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-wildcard-query.html)
 
 Queries I'm not planning on implementing at all, since they're deprecated:

data/lib/daedal.rb

@@ -45,5 +45,6 @@ require 'daedal/queries/fuzzy_query'
 require 'daedal/queries/query_string_query'
 require 'daedal/queries/term_query'
 require 'daedal/queries/terms_query'
+require 'daedal/queries/range_query'
 
 # facets

data/lib/daedal/queries/range_query.rb

@@ -0,0 +1,33 @@
+module Daedal
+  module Queries
+    "" "Class for range query" ""
+    class RangeQuery < Query
+
+      # required attributes
+      attribute :field, Daedal::Attributes::Field
+
+      # non required attributes, but at least one must be given
+      MINIMUM_ATTRIBUTES = [:gte, :gt, :lte, :lt].sort
+      MINIMUM_ATTRIBUTES.each { |a| attribute a, Daedal::Attributes::QueryValue, required: false }
+
+      #non required attributes
+      attribute :boost, Daedal::Attributes::Boost, required: false
+
+      def initialize(options={})
+        super options
+
+        # ensure at least one of the minimum attributes is provided
+        raise "Must give at least one of the following: #{MINIMUM_ATTRIBUTES.join(', ')}" unless (attributes.reject { |k,v| v.nil? }.keys & MINIMUM_ATTRIBUTES).length > 0
+
+      end
+
+      def to_hash
+        inner_result = attributes.select { |k,v| MINIMUM_ATTRIBUTES.include?(k) && !v.nil? }
+        inner_result.merge(boost: boost) if boost
+        
+        {range: {field => inner_result} }
+
+      end
+    end
+  end
+end

data/lib/daedal/version.rb

@@ -1,3 +1,3 @@
 module Daedal
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

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

@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+describe Daedal::Queries::RangeQuery do
+
+  subject do
+    Daedal::Queries::RangeQuery
+  end
+
+  let(:field) { :foo }
+  let(:boost) { 1.0 }
+
+  minimum_attributes = [:lt, :lte, :gt, :gte].sort
+  minimum_attributes.each { |a| let(a) { rand(0..100) } }
+
+  context 'without a field specified' do
+    it 'will raise an error' do
+      expect { subject.new(lt: 42) }.to raise_error(Virtus::CoercionError)
+    end
+  end
+
+  context 'with field specified only (without minimum attribute or boost)' do
+    it 'will raise an error' do
+      expect { subject.new(field: field) }.to raise_error(RuntimeError)
+    end
+  end
+
+  context 'with field and boost specified (without minimum attribute)' do
+    it 'will raise an error' do
+      expect { subject.new(field: field, boost: boost) }.to raise_error(RuntimeError)
+    end
+  end
+
+  context 'with field and one minimum attribute' do
+    minimum_attributes.each do |a|
+      let(:params) { { field: field, a => self.send(a) } }
+      it "will populate the field attribute appropriately" do
+        expect(subject.new(params).field).to eq field
+      end
+      it "will populate the #{a} attribute appropriately" do
+        expect(subject.new(params).send(a)).to eq params[a]
+      end
+    end
+  end
+
+  shared_examples "range query with minimum attributes" do |attrs|
+    let(:attr_hash)  { attrs.each_with_object({}) { |a, h| h.merge!(a => self.send(a)) } }
+    context "with minimum attributes #{attrs.inspect}" do
+      context 'with field and one or more minimum attribute' do
+        let(:params)     { { field: field }.merge(attr_hash) }
+        let(:query)      { subject.new(params) }
+        let(:hash_query) { { range: { field => attr_hash } } }
+        it "will not raise an error when only #{attrs.join(', ')} is specified" do
+          expect { query }.to_not raise_error
+        end
+        it "will have the correct hash representation when only #{attrs.join(', ')} is specified" do
+          expect(query.to_hash).to eq hash_query
+        end
+
+        it "will have the correct json representation when only #{attrs.join(', ')} is specified" do
+          expect(query.to_json).to eq hash_query.to_json
+        end
+      end
+
+      context 'with field, boost and one or more minimum attribute' do
+        let(:params)     { { field: field, boost: boost }.merge(attr_hash) }
+        let(:query)      { subject.new(params) }
+        let(:hash_query) { { range: { field => attr_hash } } }
+        it "will not raise an error when only #{attrs.join(', ')} is specified" do
+          expect { query }.to_not raise_error
+        end
+        it "will have the correct hash representation when only #{attrs.join(', ')} is specified" do
+          expect(query.to_hash).to eq hash_query
+        end
+
+        it "will have the correct json representation when only #{attrs.join(', ')} is specified" do
+          expect(query.to_json).to eq hash_query.to_json
+        end
+      end
+    end
+  end
+
+  (1..minimum_attributes.length).to_a.each do |slice|
+    minimum_attributes.combination(slice).each do |attrs|
+      it_behaves_like "range query with minimum attributes", attrs
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daedal
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Christopher Schuch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -76,6 +76,7 @@ files:
 - lib/daedal/queries/prefix_query.rb
 - lib/daedal/queries/query.rb
 - lib/daedal/queries/query_string_query.rb
+- lib/daedal/queries/range_query.rb
 - lib/daedal/queries/term_query.rb
 - lib/daedal/queries/terms_query.rb
 - lib/daedal/version.rb
@@ -100,6 +101,7 @@ files:
 - spec/unit/daedal/queries/nested_query_spec.rb
 - spec/unit/daedal/queries/prefix_query_spec.rb
 - spec/unit/daedal/queries/query_string_spec.rb
+- spec/unit/daedal/queries/range_query_spec.rb
 - spec/unit/daedal/queries/term_query_spec.rb
 - spec/unit/daedal/queries/terms_query_spec.rb
 homepage: https://github.com/cschuch/daedal