querylicious 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1f4d432e05a5f75fcfc89b7cdba9c08274e3a53
-  data.tar.gz: 8180af54ac20004c003e4ff8db81f360cbad2387
+  metadata.gz: 4b87db5c227da769fcd523b34826d1075a77ba8a
+  data.tar.gz: 29e2d6e298dfc6339d459624f06c0a2ca9e70bc8
 SHA512:
-  metadata.gz: 1f327774005b652a257346a7007ca6b3dfc79ac30ea6b1dd125500629478051ec53fb22023052f609d9003aeb2e544d38bc42b721397cd6c2cb47af696823764
-  data.tar.gz: 0c16fbe5446519fee9b9b4111791e407ff20435e8abb29ae9e16c0c3ae9e8f03782353f1140c56bfdb01c8bf53aa1a601c88445a02fd0279a560ae43c48f909d
+  metadata.gz: 8d56f13d5e40e3f7065d1e0f52bfdb67e3f243b0b3e5e5965b982a934e931c6556d719f235577a2325958ee4fd729a681b0618f7d4a2381d28fd990625d563a8
+  data.tar.gz: d8ba0dcf09d32aca4bfb6ef9004114020ff7b8df769018931b15db96abfc31434da3b69ce1785159e96c60fe5221f2d3a135cfb37f8a78c33a171c66e1e0d7e7

data/CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.3.0] - 2017-11-28
+### Added
+- Add `not_key` reducer alias
+
+### Changed
+- Updated required dependency versions
+
 ## [0.2.0] - 2017-08-15
 ### Added
 - Add support for lists (arrays)
@@ -20,5 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial implementation of querylicious, with query-parser and query-reducer
 
-[Unreleased]: https://github.com/Sonans/querylicious/compare/v0.1.0...HEAD
+[Unreleased]: https://github.com/Sonans/querylicious/compare/v0.3.0...HEAD
+[0.3.0]: https://github.com/Sonans/querylicious/compare/v0.2.0...v0.3.0
+[0.2.0]: https://github.com/Sonans/querylicious/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/Sonans/querylicious/compare/v0.0.0...v0.1.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/querylicious/matcher.rb

@@ -14,7 +14,11 @@ module Querylicious
       end
 
       def not_phrase(&block)
-        key('phrase', op: :not_eql, type: Types::Strict::String, &block)
+        not_key('phrase', type: Types::Strict::String, &block)
+      end
+
+      def not_key(key, type: Types::Any, &block)
+        key(key, op: :not_eql, type: type, &block)
       end
     end
 

data/lib/querylicious/parser.rb

@@ -11,7 +11,7 @@ module Querylicious
 
     rule(:phrase) do
       (
-        (str('NOT').as(:symbol).as(:op) >> space).maybe >> (word | string)
+        (str('NOT').as(:symbol).as(:op) >> space).maybe >> (word | quoted_string)
       ).as(:phrase)
     end
 
@@ -22,14 +22,17 @@ module Querylicious
 
     rule(:key) { word }
     rule(:value) do
-      list | range | (kv_op.as(:op).maybe >> (datetime | integer | word | string))
+      list | range | (kv_op.as(:op).maybe >> (datetime | integer | simple_string | quoted_string))
     end
 
     rule(:kv_op) { (str('>=') | str('>') | str('<=') | str('<')).as(:symbol) }
 
     rule(:word) { match('[[:graph:]&&[^":.,]]').repeat(1).as(:string) }
-    rule(:string) do
-      quotemark >> match('[[^"]&&[:print:]]').repeat(0).as(:string) >> quotemark
+    rule(:simple_string) do
+      match('[[:graph:]&&[^".,]]').repeat(1).as(:string)
+    end
+    rule(:quoted_string) do
+      str('"') >> (str('\"') | match('[[^"]&&[:print:]]')).repeat(0).as(:string) >> str('"')
     end
     rule(:integer) { match('\d').repeat(1).as(:integer) }
 
@@ -41,9 +44,9 @@ module Querylicious
     end
 
     rule(:list) do
-      ((range | datetime | integer | word | string) >>
+      ((range | datetime | integer | simple_string | quoted_string) >>
         (comma >>
-        (range | datetime | integer | word | string)).repeat(1)
+        (range | datetime | integer | simple_string | quoted_string)).repeat(1)
       ).as(:list)
     end
 
@@ -61,7 +64,6 @@ module Querylicious
       str('Z') | (str('+') >> digits2 >> str(':') >> digits2)
     end
 
-    rule(:quotemark) { match('"') }
     rule(:star)      { str('*').as(:symbol) }
     rule(:dotdot)    { str('..') }
     rule(:comma) { str(',') }

data/lib/querylicious/transform.rb

@@ -9,7 +9,7 @@ module Querylicious
   # Transformer for turning a parsed query string into a list of KeyValuePair
   class Transform < Parslet::Transform
     rule('') { nil }
-    rule(string: simple(:it)) { Types::Coercible::String[it] }
+    rule(string: simple(:it)) { Types::Coercible::String[it].gsub('\"', '"') }
     rule(integer: simple(:it)) { Types::Form::Int[it] }
     rule(date: simple(:it)) { Types::Form::Date[it] }
     rule(datetime: simple(:it)) { Types::Form::DateTime[it] }
@@ -44,7 +44,10 @@ module Querylicious
     end
 
     rule(phrase: simple(:text)) do
-      KeyValuePair.new(key: 'phrase', value: text)
+      KeyValuePair.new(
+        key: 'phrase',
+        value: Types::Coercible::String[text]
+      )
     end
     rule(phrase: { object: simple(:text), op: simple(:op) }) do
       KeyValuePair.new(

data/querylicious.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'parslet', '~> 1.8'
   spec.add_runtime_dependency 'dry-matcher', '~> 0.6.0'
-  spec.add_runtime_dependency 'dry-types', '~> 0.11.0'
-  spec.add_runtime_dependency 'dry-struct', '~> 0.3.1'
-  spec.add_runtime_dependency 'dry-initializer', '~> 1.4'
+  spec.add_runtime_dependency 'dry-types', '~> 0.12.0'
+  spec.add_runtime_dependency 'dry-struct', '~> 0.4.0'
+  spec.add_runtime_dependency 'dry-initializer', '~> 2.3'
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 12.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: querylicious
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jo-Herman Haugholt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: An opinionated search query parser