minidusen 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53ae4e4778bb465b76e102597bcde71ea9a0db5a
-  data.tar.gz: f2edf0821b4675e6be42805345e1cff779a42e43
+  metadata.gz: 22721ff1a24bd3c0c1bcf0df5e3917f0c9b0ca35
+  data.tar.gz: 3781308c4bd9c6614e14750f0c676ac06a749cb8
 SHA512:
-  metadata.gz: dd3747985637690f5ee1f6504518c7e4a79a32c31ed9d5e99c54e0354c38b6e672b517ac518a0042308dbee49b08740c0b2517fecc32142ca61b8f6bf457c734
-  data.tar.gz: 72a9c8759ba4379793959ebd83dcd694076a146e81a4d0d95ff7635e3f0a6cff789381040f68b3b20267ea0dd7457ca709b0f334ebcf5c4c6173de6594dba42a
+  metadata.gz: ae988bf28bbe784d4665ff22fcd70d5d7965786355a36f900b38aab3ea61500d8ee9f856e1d4c383ca7fdbeb07632bfc2c49f00df0d1c25fdead7bc466718224
+  data.tar.gz: 6512014a63c286dcba862579e7a931e31d2bd261dcf1b5f960acec9ccc677294f3b4c140f0fb0ca6a38f3ee0cf17e311848a975f4cc5a59a67d2a52829eb296c

data/.travis.yml

@@ -26,6 +26,11 @@ notifications:
   email:
     - fail@makandra.de
 
+install:
+  # Replace default Travis CI bundler script with a version that doesn't
+  # explode when lockfile doesn't match recently bumped version
+  - bundle install --no-deployment --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+
 matrix:
   exclude:
     - rvm: 2.1.8

data/gemfiles/Gemfile.4.2.pg.lock

@@ -1,7 +1,9 @@
 PATH
   remote: ..
   specs:
-    minidusen (0.8.0)
+    edge_rider (0.3.1)
+      activerecord
+    minidusen (0.8.1)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       edge_rider (>= 0.2.5)
@@ -27,8 +29,6 @@ GEM
     byebug (9.0.5)
     database_cleaner (1.5.3)
     diff-lcs (1.2.5)
-    edge_rider (0.3.1)
-      activerecord
     gemika (0.3.2)
     i18n (0.7.0)
     json (1.8.3)

data/lib/minidusen/parser.rb

@@ -4,7 +4,7 @@ module Minidusen
     class CannotParse < StandardError; end
 
     TEXT_QUERY = /(?:(\-)?"([^"]+)"|(\-)?([\S]+))/
-    FIELD_QUERY = /(\-)?(\w+)\:#{TEXT_QUERY}/
+    FIELD_QUERY = /(?:\s|^|(\-))(\w+)\:#{TEXT_QUERY}/
 
     class << self
 

data/lib/minidusen/version.rb

@@ -1,3 +1,3 @@
 module Minidusen
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/spec/minidusen/parser_spec.rb

@@ -5,19 +5,28 @@ describe Minidusen::Parser do
     describe 'when called with a String' do
 
       it 'parses the given string into tokens' do
-        query = Minidusen::Parser.parse('fieldname:fieldvalue word "a phrase"')
-        query.size.should == 3
+        query = Minidusen::Parser.parse('fieldname:fieldvalue word "a phrase" "deploy:rollback" -"db:seed"')
+        query.size.should == 5
         query[0].field.should == 'fieldname'
         query[0].value.should == 'fieldvalue'
+        query[0].exclude.should == false
         query[1].field.should == 'text'
         query[1].value.should == 'word'
+        query[1].exclude.should == false
         query[2].field.should == 'text'
         query[2].value.should == 'a phrase'
+        query[2].exclude.should == false
+        query[3].field.should == 'text'
+        query[3].value.should == 'deploy:rollback'
+        query[3].exclude.should == false
+        query[4].field.should == 'text'
+        query[4].value.should == 'db:seed'
+        query[4].exclude.should == true
       end
 
       it 'should parse field tokens first, because they usually give maximum filtering at little cost' do
-        query = Minidusen::Parser.parse('word1 field1:field1-value word2 field2:field2-value')
-        query.collect(&:value).should == ['field1-value', 'field2-value', 'word1', 'word2']
+        query = Minidusen::Parser.parse('word1 field1:field1-value word2 field2:field2-value "search:word"')
+        query.collect(&:value).should == ['field1-value', 'field2-value', 'word1', 'word2', 'search:word']
       end
 
       it 'should not consider the dash to be a word boundary' do
@@ -30,6 +39,30 @@ describe Minidusen::Parser do
         query.collect(&:value).should == ['åöÙÔøüéíÁ', 'ÄüÊçñÆ ððÿáÒÉ', 'pulvérisateur', 'pędzić']
       end
 
+      it 'should allow to search for a phrase containing a colon' do
+        query = Minidusen::Parser.parse('"deploy:rollback"')
+        query.size.should == 1
+        query[0].field.should == 'text'
+        query[0].value.should == 'deploy:rollback'
+        query[0].exclude.should == false
+      end
+
+      it 'should parse a field token which is at the beginning of the search string' do
+        query = Minidusen::Parser.parse('filetype:pdf word')
+        query.size.should == 2
+        query[0].field.should == 'filetype'
+        query[0].value.should == 'pdf'
+        query[0].exclude.should == false
+      end
+
+      it 'should parse an excluded field token which is at the beginning of the search string' do
+        query = Minidusen::Parser.parse('-filetype:docx word')
+        query.size.should == 2
+        query[0].field.should == 'filetype'
+        query[0].value.should == 'docx'
+        query[0].exclude.should == true
+      end
+
     end
 
     describe 'when called with a Query' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minidusen
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport