daedal 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11c6ae3d232c10eb5d671406d9fe201d778c77dc
-  data.tar.gz: b59495f804fbc653fb9515c1fe6d0f29478d4a55
+  metadata.gz: 67944926b6a5ef6c6eb5165191a03f089e784c89
+  data.tar.gz: 0082ced2272905533bf4eae8912abb2bdb178ab6
 SHA512:
-  metadata.gz: 1886174417cd61ff5ffa31cd6807bb6eb1211f05f6237951ab39f7c09542edc744391bb70793caed483b92943a73b7b8bf4dd185f6a1d8cd97762f9bbe26a2f1
-  data.tar.gz: f2a586eefd70d05cbfcd925427ee691198d8bb2caab383ab66e641325a0ecb8d4378e2eb2200b0a4981b0efef057cac0f940b54c5a7b1f4b348f1348a5ef56f4
+  metadata.gz: f2a28d5bc4314a4827127eee9c300e14fefc2417c2fd25c7bd660d19f41a40bab560d051365c2449da4ee163a3c039e186ae5790b379022b13ad850a4128173e
+  data.tar.gz: 80b821a4d5050ec57b8806548e1e2768a93b0b4af8df6b9299f11ba228950080aec796c201bb660d93585523fdccea9130e66c2954a5353d615fd095a6514f00

data/Gemfile.lock

@@ -1,21 +1,20 @@
 PATH
   remote: .
   specs:
-    daedal (0.0.15)
+    daedal (0.0.16)
       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)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
     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)
@@ -23,9 +22,10 @@ GEM
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    descendants_tracker (0.0.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    equalizer (0.0.8)
+    equalizer (0.0.11)
     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.1)
     listen (2.4.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
@@ -77,13 +77,14 @@ GEM
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     thor (0.18.1)
+    thread_safe (0.3.5)
     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

@@ -92,6 +92,7 @@ bool_query.to_json # => "{\"bool\":{\"should\":[{\"match\":{\"lines\":{\"query\"
 Currently, the following queries have been implemented:
 * [bool query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-bool-query.html)
 * [constant score query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-constant-score-query.html)
+* [function score query](http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-function-score-query.html)
 * [dis max query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-dis-max-query.html)
 * [filtered query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-filtered-query.html)
 * [fuzzy query](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-fuzzy-query.html)

data/lib/daedal.rb

@@ -19,6 +19,7 @@ require 'daedal/attributes/filter'
 require 'daedal/attributes/field'
 require 'daedal/attributes/query_value'
 require 'daedal/attributes/boost'
+require 'daedal/attributes/score_function_array'
 
 # filters
 require 'daedal/filters/exists_filter'
@@ -47,5 +48,6 @@ require 'daedal/queries/query_string_query'
 require 'daedal/queries/term_query'
 require 'daedal/queries/terms_query'
 require 'daedal/queries/range_query'
+require 'daedal/queries/function_score_query'
 
 # facets

data/lib/daedal/attributes/score_function_array.rb

@@ -0,0 +1,24 @@
+module Daedal
+  module Attributes
+    """Custom coercer for the type attribute"""
+    class ScoreFunctionArray < Array
+      def <<(function)
+        raise Virtus::CoercionError.new(value, 'Daedal::Attributes::ScoreFunction') unless valid_score_function?(function)
+
+        super function
+      end
+
+      def unshift(function)
+        raise Virtus::CoercionError.new(f, 'Daedal::Attributes::ScoreFunctions') unless valid_score_function?(function)
+
+        super function
+      end
+
+
+      # Values should be an array of hashes with filter & weight
+      def valid_score_function?(score_function)
+        score_function[:filter].respond_to?(:hash) && score_function[:weight].respond_to?(:hash)
+      end
+    end
+  end
+end

data/lib/daedal/queries/function_score_query.rb

@@ -0,0 +1,37 @@
+module Daedal
+  module Queries
+    """Class for the function score query"""
+    class FunctionScoreQuery < Query
+
+      # required attributes
+      attribute :query,           Daedal::Attributes::Query
+      attribute :score_functions, Daedal::Attributes::ScoreFunctionArray
+
+      # non required attributes
+      attribute :boost,           Daedal::Attributes::Boost,           required: false
+      attribute :score_mode,      Daedal::Attributes::LowerCaseString, required: false
+      attribute :filter,          Daedal::Attributes::Filter,          required: false
+
+      def to_hash
+        {
+          function_score: {
+            query: build_query,
+            functions: score_functions.map { |f| { filter: f[:filter].to_hash, weight: f[:weight] } },
+            boost: boost || 1,
+            score_mode: score_mode || "multiply"
+          }
+        }
+      end
+
+      private
+
+      def build_query
+        if filter
+          { filtered: { query: query.to_hash, filter: filter.to_hash } }
+        else
+          query.to_hash
+        end
+      end
+    end
+  end
+end

data/lib/daedal/version.rb

@@ -1,3 +1,3 @@
 module Daedal
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end

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

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Daedal::Queries::FunctionScoreQuery do
+
+  let(:score_functions) do
+    [
+      filter: Daedal::Filters::TermFilter.new(field: :foo, term: :bar),
+      weight: 100
+    ]
+  end
+
+  let(:query) do
+    Daedal::Queries::MatchAllQuery.new
+  end
+
+  let(:filter) do
+    Daedal::Filters::TermFilter.new(field: :foo, term: :bar)
+  end
+
+  context 'without a query specified' do
+    it 'will raise an error' do
+      expect{ described_class.new(score_functions: score_functions) }.to raise_error
+    end
+  end
+
+  context 'without a boost specified' do
+    it 'will raise an error' do
+      expect{ described_class.new(query: query, score_functions: score_functions) }.to raise_error(Virtus::CoercionError)
+    end
+  end
+
+  context 'with valid arguments' do
+    it 'converts to a valid query with filter' do
+      valid_query =  described_class.new(query: query, score_functions: score_functions,
+                                         filter: filter, boost: 42, score_mode: 'sum')
+      expect(valid_query.to_hash[:function_score][:query][:filtered][:query]).to eq(query.to_hash)
+      expect(valid_query.to_hash[:function_score][:query][:filtered][:filter]).to eq(filter.to_hash)
+      expect(valid_query.to_hash[:function_score][:functions]).to eq(score_functions.map do |f|
+        { :filter => f[:filter].to_hash, :weight => f[:weight] }
+      end)
+      expect(valid_query.to_hash[:function_score][:boost]).to eq(42)
+      expect(valid_query.to_hash[:function_score][:score_mode]).to eq('sum')
+    end
+
+    it 'converts to a valid query without filter' do
+      valid_query =  described_class.new(query: query, score_functions: score_functions, boost: 42, score_mode: 'sum')
+      expect(valid_query.to_hash[:function_score][:query]).to eq(query.to_hash)
+      expect(valid_query.to_hash[:function_score][:functions]).to eq(score_functions.map do |f|
+        { :filter => f[:filter].to_hash, :weight => f[:weight] }
+      end)
+      expect(valid_query.to_hash[:function_score][:boost]).to eq(42)
+      expect(valid_query.to_hash[:function_score][:score_mode]).to eq('sum')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daedal
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Christopher Schuch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -52,6 +52,7 @@ files:
 - lib/daedal/attributes/query.rb
 - lib/daedal/attributes/query_array.rb
 - lib/daedal/attributes/query_value.rb
+- lib/daedal/attributes/score_function_array.rb
 - lib/daedal/attributes/score_mode.rb
 - lib/daedal/facets/facet.rb
 - lib/daedal/filters/and_filter.rb
@@ -69,6 +70,7 @@ files:
 - lib/daedal/queries/constant_score_query.rb
 - lib/daedal/queries/dis_max_query.rb
 - lib/daedal/queries/filtered_query.rb
+- lib/daedal/queries/function_score_query.rb
 - lib/daedal/queries/fuzzy_query.rb
 - lib/daedal/queries/match_all_query.rb
 - lib/daedal/queries/match_query.rb
@@ -96,6 +98,7 @@ files:
 - spec/unit/daedal/queries/constant_score_query_spec.rb
 - spec/unit/daedal/queries/dis_max_query_spec.rb
 - spec/unit/daedal/queries/filtered_query_spec.rb
+- spec/unit/daedal/queries/function_score_query_spec.rb
 - spec/unit/daedal/queries/fuzzy_query_spec.rb
 - spec/unit/daedal/queries/match_all_query_spec.rb
 - spec/unit/daedal/queries/match_query_spec.rb