daedal 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27cd710adc4e066c10e7a70e93e7bcc021f39e97
-  data.tar.gz: adc66f8d210e1f33e56cc4d39dd9b9467a68546f
+  metadata.gz: 42810c58167abc4ba533fc0eafac07fcaba97116
+  data.tar.gz: 08005b8084eb8ebb7e61215016f6ca9be1f77805
 SHA512:
-  metadata.gz: 8b9509704bf2f5965b25dd09c8f6370bcca897bc62a7ffec635368b363f275261cba9b39ddb99dfedb54b4314cc33d71b44ca5e0fa4375c64c46be91a181ea5e
-  data.tar.gz: 4fb13110837bf95334b67fbc247f36ccff48a627948e40ea9a699632c3a68a4924aff8012a78744948e1d00dac46debf4f8af332bbb7c7f709aa3f30a6ffe646
+  metadata.gz: 32f890e3ba820bcb6a034628cd661e20eb2012a130b198ad897287d9b9f2233fdbf1c7e7b2c7c906f2c85a96b561d15b1cf5c9620711d9c6e205905826d13abc
+  data.tar.gz: b51239c437c8f164ca8b5bb0d6f48ffb0b8c401ea93e1b0278965be940f7225e5a17db84e01f2b63c00c337b4af95852ba4fe4686d1fdb422519607e7fde0cc6

data/.travis.yml

@@ -1,6 +1,10 @@
 language: ruby
 rvm:
     - 2.0.0
+    - 2.1.9
+    - 2.2.6
+    - 2.3.3
+    - 2.4.0
 notifications:
     email:
         - cas13091@gmail.com

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    daedal (0.0.17)
+    daedal (0.0.18)
       virtus (>= 1.0.0)
 
 GEM
@@ -41,7 +41,7 @@ GEM
     guard-rspec (4.2.0)
       guard (>= 2.1.1)
       rspec (>= 2.14, < 4.0)
-    ice_nine (0.11.1)
+    ice_nine (0.11.2)
     listen (2.4.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
@@ -77,14 +77,14 @@ GEM
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     thor (0.18.1)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
     timers (1.1.0)
     tins (0.13.1)
-    virtus (1.0.2)
+    virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
-      descendants_tracker (~> 0.0.3)
-      equalizer (~> 0.0.9)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
 
 PLATFORMS
   ruby
@@ -96,3 +96,6 @@ DEPENDENCIES
   guard
   guard-rspec
   rspec
+
+BUNDLED WITH
+   1.13.6

data/README.md

@@ -132,6 +132,7 @@ term_filter.to_json # => "{\"term\":{\"characters\":\"Pozzo\"}}"
 
 Currently, the following filters have been implemented:
 * [and filter](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-and-filter.html)
+* [not filter](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-not-filter.html)
 * [bool filter](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-bool-filter.html)
 * [geo distance filter](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-geo-distance-filter.html)
 * [geo distance range filter](http://www.elasticsearch.org/guide/en/elasticsearch/guide/current/geo-distance.html#geo-distance-range)
@@ -155,7 +156,7 @@ constant_score_query = {'constant_score' => {'boost' => 'foo', 'query' => {'matc
 
 would yield a server error, since the `boost` parameter must be a number.
 
-Daedal uses [Virtus](https://github.com/solnic/virtus) to perform data-type coercions. 
+Daedal uses [Virtus](https://github.com/solnic/virtus) to perform data-type coercions.
 Invalid query parameters are surfaced at runtime, making debugging much easier.
 The previous example in Daedal would raise an error:
 
@@ -192,7 +193,7 @@ Here are some guidelines:
 Example of a custom query:
 ``` ruby
 class PlayQuery < Daedal::Queries::Query
-  
+
   # define the parameters that you want in your query
   # if the field is optional, make sure to set required to false
   attribute :author, String
@@ -212,7 +213,7 @@ class PlayQuery < Daedal::Queries::Query
     full_query
   end
 
-  # define the to_hash method to convert for use in ElasticSearch 
+  # define the to_hash method to convert for use in ElasticSearch
   def to_hash
     construct_query.to_hash
   end

data/lib/daedal.rb

@@ -31,10 +31,12 @@ require 'daedal/filters/range_filter'
 require 'daedal/filters/geo_distance_filter'
 require 'daedal/filters/geo_distance_range_filter'
 require 'daedal/filters/and_filter'
+require 'daedal/filters/not_filter'
 require 'daedal/filters/or_filter'
 require 'daedal/filters/bool_filter'
 require 'daedal/filters/nested_filter'
 require 'daedal/filters/type_filter'
+require 'daedal/filters/regexp_filter'
 
 # queries
 require 'daedal/queries/match_all_query'
@@ -53,5 +55,5 @@ require 'daedal/queries/terms_query'
 require 'daedal/queries/range_query'
 require 'daedal/queries/function_score_query'
 require 'daedal/queries/simple_query_string_query'
-
+require 'daedal/queries/regexp_query'
 # facets

data/lib/daedal/attributes/query_value.rb

@@ -4,7 +4,7 @@ module Daedal
     a string, a symbol, a float, or an integer. If it's none
     of those, raises a coercion error."""
     class QueryValue < Virtus::Attribute
-      ALLOWED_QUERY_VALUE_CLASSES = [String, Symbol, Float, Fixnum, Boolean, TrueClass, FalseClass]
+      ALLOWED_QUERY_VALUE_CLASSES = [String, Symbol, Float, 0.class, Boolean, TrueClass, FalseClass]
       def coerce(q)
         if !required? and q.nil?
           return q

data/lib/daedal/filters/not_filter.rb

@@ -0,0 +1,13 @@
+module Daedal
+  module Filters
+    class NotFilter < Filter
+
+      # required attributes
+      attribute :filter, Daedal::Attributes::Filter
+
+      def to_hash
+        {:not => filter.to_hash}
+      end
+    end
+  end
+end

data/lib/daedal/filters/regexp_filter.rb

@@ -0,0 +1,32 @@
+module Daedal
+  module Filters
+    """Class for the regexp filter"""
+    class RegexpFilter < Filter
+
+      # required attributes
+      attribute :field,                     Daedal::Attributes::Field
+      attribute :query,                     Daedal::Attributes::LowerCaseString
+
+      # non required attributes
+      attribute :flags,                     Array[Daedal::Attributes::Flag], required: false
+
+      def to_hash
+        result = {regexp: {field => {value: query}}}
+        options = set_options
+        result[:regexp][field].merge!(options)
+
+        result
+      end
+
+      private
+
+      def set_options
+        { flags: parse_flags(flags) }.select {|k,v| !v.nil?}
+      end
+
+      def parse_flags(flags)
+        flags.map(&:to_s).join('|') unless flags.empty?
+      end
+    end
+  end
+end

data/lib/daedal/queries/regexp_query.rb

@@ -0,0 +1,38 @@
+module Daedal
+  module Queries
+    """Class for the regexp query"""
+    class RegexpQuery < Query
+
+      # required attributes
+      attribute :field,                     Daedal::Attributes::Field
+      attribute :query,                     Daedal::Attributes::LowerCaseString
+
+      # non required attributes
+      attribute :boost,                     Daedal::Attributes::Boost, required: false
+      attribute :flags,                     Array[Daedal::Attributes::Flag], required: false
+      attribute :max_determinized_states,   Integer, required: false
+
+      def to_hash
+        result = {regexp: {field => {value: query}}}
+        options = set_options
+        result[:regexp][field].merge!(options)
+
+        result
+      end
+
+      private
+
+      def set_options
+        {
+          boost: boost,
+          flags: parse_flags(flags),
+          max_determinized_states: max_determinized_states,
+        }.select {|k,v| !v.nil?}
+      end
+
+      def parse_flags(flags)
+        flags.map(&:to_s).join('|') unless flags.empty?
+      end
+    end
+  end
+end

data/lib/daedal/version.rb

@@ -1,3 +1,3 @@
 module Daedal
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end

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

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Daedal::Filters::NotFilter do
+
+  context 'without filter specified' do
+    it 'will raise an error' do
+      expect { described_class.new }.to raise_error(Virtus::CoercionError)
+    end
+  end
+
+  context 'with filter specified' do
+    subject { described_class.new(filter: term_filter) }
+
+    let(:term_filter) { Daedal::Filters::TermFilter.new(field: :foo, term: :bar) }
+    let(:hash_filter) { { :not => term_filter.to_hash } }
+
+    it 'will populate the field and term attributes appropriately' do
+      expect(subject.filter).to eq term_filter
+    end
+    it 'will have the correct hash representation' do
+      expect(subject.to_hash).to eq hash_filter
+    end
+    it 'will have the correct json representation' do
+      expect(subject.to_json).to eq hash_filter.to_json
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+require "spec_helper"
+
+describe Daedal::Filters::RegexpFilter do
+  subject { Daedal::Filters::RegexpFilter }
+
+  context "without a field" do
+    it { expect{subject.new(filter: :foo)}.to raise_error(Virtus::CoercionError) }
+  end
+
+  context "without a query" do
+    it { expect{subject.new(fied: :foo)}.to raise_error(Virtus::CoercionError) }
+  end
+
+  context "with a field and a query" do
+    let(:filter) { subject.new(field: :foo, query: :bar) }
+    let(:hash_filter) { {regexp: {foo: {value: 'bar'}}} }
+
+    it "will create a regexp query with the correct values" do
+      expect(filter.field).to eq :foo
+      expect(filter.query).to eq "bar"
+    end
+
+    it "will have the correct hash and json representations" do
+      expect(filter.to_hash).to eq hash_filter
+      expect(filter.to_json).to eq hash_filter.to_json
+    end
+  end
+
+  context "with a field and an upper cased query" do
+    let(:filter) { subject.new(field: :foo, query: "BAR") }
+    let(:hash_filter) { {regexp: {foo: {value: 'bar'}}} }
+
+    it "will create a regexp query with the correct values" do
+      expect(filter.field).to eq :foo
+      expect(filter.query).to eq "bar"
+    end
+
+    it "will have the correct hash and json representations" do
+      expect(filter.to_hash).to eq hash_filter
+      expect(filter.to_json).to eq hash_filter.to_json
+    end
+  end
+
+  context "with flags" do
+    let(:filter) { subject.new(field: :foo, query: :bar, flags: [:intersection, :complement]) }
+    let(:hash_filter) { {regexp: {foo: {value: 'bar', flags: "intersection|complement"}}} }
+
+    it { expect(filter.flags).to eq [:intersection, :complement] }
+
+    it "will have the correct hash and json representation" do
+      expect(filter.to_hash).to eq hash_filter
+      expect(filter.to_json).to eq hash_filter.to_json
+    end
+  end
+end

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

@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe Daedal::Queries::RegexpQuery do
+  subject { Daedal::Queries::RegexpQuery }
+
+  context "without a field" do
+    it { expect{subject.new(query: :foo)}.to raise_error(Virtus::CoercionError) }
+  end
+
+  context "without a query" do
+    it { expect{subject.new(fied: :foo)}.to raise_error(Virtus::CoercionError) }
+  end
+
+  context "with a field and a query" do
+    let(:query) { subject.new(field: :foo, query: :bar) }
+    let(:hash_query) { {regexp: {foo: {value: 'bar'}}} }
+
+    it "will create a regexp 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 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 field and an upper cased query" do
+    let(:query) { subject.new(field: :foo, query: "BAR") }
+    let(:hash_query) { {regexp: {foo: {value: 'bar'}}} }
+
+    it "will create a regexp 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 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" do
+    let(:query) { subject.new(field: :foo, query: :bar, boost: 1.2) }
+    let(:hash_query) { {regexp: {foo: {value: 'bar', boost: 1.2}}} }
+
+    it { expect(query.boost).to eq 1.2 }
+
+    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 flags" do
+    let(:query) { subject.new(field: :foo, query: :bar, flags: [:intersection, :complement]) }
+    let(:hash_query) { {regexp: {foo: {value: 'bar', flags: "intersection|complement"}}} }
+
+    it { expect(query.flags).to eq [:intersection, :complement] }
+
+    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 max determinized states" do
+    let(:query) { subject.new(field: :foo, query: :bar, max_determinized_states: 20000) }
+    let(:hash_query) { {regexp: {foo: {value: 'bar', max_determinized_states: 20000}}} }
+
+    it { expect(query.max_determinized_states).to eq 20000 }
+
+    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,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: daedal
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Christopher Schuch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   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
@@ -30,9 +30,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -64,8 +64,10 @@ files:
 - lib/daedal/filters/geo_distance_filter.rb
 - lib/daedal/filters/geo_distance_range_filter.rb
 - lib/daedal/filters/nested_filter.rb
+- lib/daedal/filters/not_filter.rb
 - lib/daedal/filters/or_filter.rb
 - lib/daedal/filters/range_filter.rb
+- lib/daedal/filters/regexp_filter.rb
 - lib/daedal/filters/term_filter.rb
 - lib/daedal/filters/terms_filter.rb
 - lib/daedal/filters/type_filter.rb
@@ -83,6 +85,7 @@ files:
 - lib/daedal/queries/query.rb
 - lib/daedal/queries/query_string_query.rb
 - lib/daedal/queries/range_query.rb
+- lib/daedal/queries/regexp_query.rb
 - lib/daedal/queries/simple_query_string_query.rb
 - lib/daedal/queries/term_query.rb
 - lib/daedal/queries/terms_query.rb
@@ -95,8 +98,10 @@ files:
 - spec/unit/daedal/filters/geo_distance_filter_spec.rb
 - spec/unit/daedal/filters/geo_distance_range_filter_spec.rb
 - spec/unit/daedal/filters/nested_filter_spec.rb
+- spec/unit/daedal/filters/not_filter_spec.rb
 - spec/unit/daedal/filters/or_filter_spec.rb
 - spec/unit/daedal/filters/range_filter_spec.rb
+- spec/unit/daedal/filters/regexp_filter_spec.rb
 - spec/unit/daedal/filters/term_filter_spec.rb
 - spec/unit/daedal/filters/terms_filter_spec.rb
 - spec/unit/daedal/filters/type_filter_spec.rb
@@ -113,6 +118,7 @@ files:
 - 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/regexp_query_spec.rb
 - spec/unit/daedal/queries/simple_query_string_spec.rb
 - spec/unit/daedal/queries/term_query_spec.rb
 - spec/unit/daedal/queries/terms_query_spec.rb
@@ -126,17 +132,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ElasticSearch Query DSL Builders