daedal 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTEzNTlhZTlmYjZkY2U0ZGY3YzhhZmNiYjdjZjljOThmM2U2MGI4Mg==
+    NTNjNjRlYjhmYTA1MzVlNmM4OTRiNGEwM2Q0OTI5YzIwOGI3MzFhZQ==
   data.tar.gz: !binary |-
-    NTRkNGMyYjc1ZTRmYzQyZTM0ZTUzMDg4N2Y2NzI2YWYzNzQ1YzljNA==
+    ZjViZDYxOWY4Mjg4ZTlmZDIxMmMxMWU0MmVlYzIyMDNhNjdlZGYwYw==
 SHA512:
   metadata.gz: !binary |-
-    ZTk5MjRmMWYyMjcyZjEzYWIyM2M4MGViYTVkYTFhNDI5NjM5OWNiMzg3MmU3
-    MTZhOTg3NzAxZWUyMTAyYTM2NzFkMWViMmY1NmU2MDE1NTdhZGM4Njg2MmVi
-    NDQyOGRlNjdkMjdjYTk0ZjVmMzBkMzI0ZDRiN2UxNzU5YTUyZjg=
+    Y2M2MTRhNTk3ZmNkMmRlZjUwNjI3Zjg1NTc0Zjc0ZDY4ODVjOWNhMDUwN2Q0
+    MDYyYjRjYTI0MTNlOTIyZDRkZTQ2M2IwOTBkMDEyNzY5NWMwMGIyNjBlNTRj
+    ZTg5MjU0MDZiZmQ1ZjdmNGMxOThkZDkyNTNkZGFhOTRlNjMzYWM=
   data.tar.gz: !binary |-
-    MzA5MzBiNmU5ZWY3YTQ2YTIwMzU4ZGNlZWU0NmQ1NzA1ZTZmOTc5OTllZDZh
-    ZDI3MzBiNTdjNzY2YTQ1YWNkOTEyMmM0N2Q0Yzk4YTc5M2U5YWNhMzM5MjU5
-    MzhkNjk0MWEyOTkxZDgzNGIzOThjYzI0ZWJkNjU3Y2Q3NDM5YWQ=
+    Y2E4MmFjYWQ1ZGI5MzMyMzcwYmQ2NTY5NGYzZTM5MDczODc3ZWExMDdjNjQ4
+    ZGEyZTlmODQxMWU0YTQ3NTFhYjJhZjMyYTkyZjNjNWYxZjYzZGI2NGI0NGQ5
+    ZWE1NWRkZDc4ZTliYWZiYWNiYjI2ODFhZDU0Mjc5NzdmYjQ3ODA=

data/lib/daedal/filters/nested_filter.rb

@@ -0,0 +1,23 @@
+module Daedal
+  module Filters
+    """Class for the nested filter"""
+    class NestedFilter < Filter
+  
+      # required attributes
+      attribute :path,        Daedal::Attributes::Field
+      attribute :filter,      Daedal::Attributes::Filter
+  
+      # non required attributes
+      attribute :cache,       Boolean,                        required: false
+      attribute :name,        Symbol,                         required: false
+  
+      def to_hash
+        result = {nested: {path: path, filter: filter.to_hash}}
+        options = {_name: name, _cache: cache}.select { |k,v| !v.nil? }
+        result[:nested].merge! options
+
+        result
+      end
+    end
+  end
+end

data/lib/daedal/version.rb

@@ -1,3 +1,3 @@
 module Daedal
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/unit/daedal/filters/nested_filter_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe Daedal::Filters::NestedFilter do
+
+  subject do
+    Daedal::Filters::NestedFilter
+  end
+
+  let(:term_filter) do
+    Daedal::Filters::TermFilter.new field: 'foo', term: 'bar'
+  end
+
+  context 'with no path specified' do
+    it 'will raise an error' do
+      expect{subject.new(filter: term_filter)}.to raise_error(Virtus::CoercionError)
+    end
+  end
+
+  context 'with no filter specified' do
+    it 'will raise an error' do
+      expect{subject.new(path: '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(Virtus::CoercionError)
+    end
+  end
+
+  context 'with a filter and a path specified' do
+    let(:filter) do
+      subject.new filter: term_filter, path: :foo
+    end
+    let(:hash_filter) do
+      {nested: {path: :foo, filter: term_filter.to_hash}}
+    end
+
+    it 'will create a nested filter with the appropriate fields' do
+      expect(filter.filter).to eq term_filter
+      expect(filter.path).to eq :foo
+    end
+
+    it 'will have the correct hash representation' do
+      expect(filter.to_hash).to eq hash_filter
+    end
+
+    it 'will have the correct json representation' do
+      expect(filter.to_json).to eq hash_filter.to_json
+    end
+  end
+
+  context 'with cache set to true' do
+    let(:filter) do
+      subject.new filter: term_filter, path: :foo, cache: true
+    end
+    it 'will set _cache to true' do
+      expect(filter.cache).to eq true
+      expect(filter.to_hash[:nested][:_cache]).to eq true
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daedal
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Christopher Schuch
@@ -58,6 +58,7 @@ files:
 - lib/daedal/filters/bool_filter.rb
 - lib/daedal/filters/filter.rb
 - lib/daedal/filters/geo_distance_filter.rb
+- lib/daedal/filters/nested_filter.rb
 - lib/daedal/filters/or_filter.rb
 - lib/daedal/filters/range_filter.rb
 - lib/daedal/filters/term_filter.rb
@@ -79,6 +80,7 @@ files:
 - spec/unit/daedal/filters/and_filter_spec.rb
 - spec/unit/daedal/filters/bool_filter_spec.rb
 - spec/unit/daedal/filters/geo_distance_filter_spec.rb
+- spec/unit/daedal/filters/nested_filter_spec.rb
 - spec/unit/daedal/filters/or_filter_spec.rb
 - spec/unit/daedal/filters/range_filter_spec.rb
 - spec/unit/daedal/filters/term_filter_spec.rb