querylicious 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d647b4ba6c6965abc5ceae3ad74e1d98f236d7fd
-  data.tar.gz: c2d9974ae1a66561d63eca13d08a521734b878c9
+  metadata.gz: e1f4d432e05a5f75fcfc89b7cdba9c08274e3a53
+  data.tar.gz: 8180af54ac20004c003e4ff8db81f360cbad2387
 SHA512:
-  metadata.gz: fc6d9de5929616c3c87a780b7d45d3ce8f08ff1f382936868965c6beb992496858377c71e098d8f9936b9751258eea109b0c4b385b9e815162e0ce7ea0b5087c
-  data.tar.gz: 661a448b214094dee8f0835054817b8121de497c255e02121b72ac58c3aa31dc1b6fbf00696b946810035c36491bdbe617436478edad1e7dbb948d2693a2433a
+  metadata.gz: 1f327774005b652a257346a7007ca6b3dfc79ac30ea6b1dd125500629478051ec53fb22023052f609d9003aeb2e544d38bc42b721397cd6c2cb47af696823764
+  data.tar.gz: 0c16fbe5446519fee9b9b4111791e407ff20435e8abb29ae9e16c0c3ae9e8f03782353f1140c56bfdb01c8bf53aa1a601c88445a02fd0279a560ae43c48f909d

data/CHANGELOG.md

@@ -0,0 +1,24 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.2.0] - 2017-08-15
+### Added
+- Add support for lists (arrays)
+
+### Changed
+- Change `type` in the reducer matchers from classes to dry-types
+
+### Fixed
+- Support empty queries
+
+## [0.1.0] - 2017-08-14
+### Added
+- Initial implementation of querylicious, with query-parser and query-reducer
+
+[Unreleased]: https://github.com/Sonans/querylicious/compare/v0.1.0...HEAD
+[0.1.0]: https://github.com/Sonans/querylicious/compare/v0.0.0...v0.1.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/querylicious/key_value_pair.rb

@@ -18,7 +18,8 @@ module Querylicious
               Types::Strict::Int |
               Types::Strict::Date |
               Types::Strict::DateTime |
-              Types::Strict::Range
+              Types::Strict::Range |
+              Types::Strict::Array
     attribute :op, Operators.optional.default(:eql)
   end
 end

data/lib/querylicious/matcher.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'dry-matcher'
+require 'querylicious/types'
 
 module Querylicious
   # A matcher for query key-value pairs
@@ -9,18 +10,18 @@ module Querylicious
     # matchers
     class Evaluator < Dry::Matcher::Evaluator
       def phrase(&block)
-        key('phrase', op: :eql, type: ::String, &block)
+        key('phrase', op: :eql, type: Types::Strict::String, &block)
       end
 
       def not_phrase(&block)
-        key('phrase', op: :not_eql, type: ::String, &block)
+        key('phrase', op: :not_eql, type: Types::Strict::String, &block)
       end
     end
 
     CASES = {
       key:     Dry::Matcher::Case.new(
-        match:   lambda do |pair, key, op: :eql, type: Object|
-          pair.key == key && pair.op == op && pair.value.is_a?(type)
+        match:   lambda do |pair, key, op: :eql, type: Types::Any|
+          pair.key == key && pair.op == op && type.valid?(pair.value)
         end,
         resolve: ->(pair) { pair.value }
       ),

data/lib/querylicious/parser.rb

@@ -6,7 +6,7 @@ module Querylicious
   # Parser for Querylicious search queries
   class Parser < Parslet::Parser
     rule(:expression) do
-      (kv_pair | phrase) >> (space >> expression).repeat
+      ((kv_pair | phrase) >> (space >> expression).repeat).maybe
     end
 
     rule(:phrase) do
@@ -22,12 +22,12 @@ module Querylicious
 
     rule(:key) { word }
     rule(:value) do
-      range | (kv_op.as(:op).maybe >> (datetime | integer | word | string))
+      list | range | (kv_op.as(:op).maybe >> (datetime | integer | word | string))
     end
 
     rule(:kv_op) { (str('>=') | str('>') | str('<=') | str('<')).as(:symbol) }
 
-    rule(:word) { match('[[:graph:]&&[^":.]]').repeat(1).as(:string) }
+    rule(:word) { match('[[:graph:]&&[^":.,]]').repeat(1).as(:string) }
     rule(:string) do
       quotemark >> match('[[^"]&&[:print:]]').repeat(0).as(:string) >> quotemark
     end
@@ -39,6 +39,14 @@ module Querylicious
         (star | datetime | integer | word).as(:end)
       ).as(:range)
     end
+
+    rule(:list) do
+      ((range | datetime | integer | word | string) >>
+        (comma >>
+        (range | datetime | integer | word | string)).repeat(1)
+      ).as(:list)
+    end
+
     rule(:datetime) do
       (date >> str('T') >> time).as(:datetime) | date.as(:date)
     end
@@ -56,6 +64,7 @@ module Querylicious
     rule(:quotemark) { match('"') }
     rule(:star)      { str('*').as(:symbol) }
     rule(:dotdot)    { str('..') }
+    rule(:comma) { str(',') }
 
     rule(:space)     { match('[[:space:]]').repeat(1) }
     rule(:space?)    { space.maybe }

data/lib/querylicious/query_reducer.rb

@@ -43,7 +43,7 @@ module Querylicious
     end
 
     def parse_query(query)
-      Array(transformer.apply(parser.parse(query.strip)))
+      Array(transformer.apply(parser.parse(query.to_s.strip)))
     end
   end
 end

data/lib/querylicious/transform.rb

@@ -8,6 +8,7 @@ require 'querylicious/key_value_pair'
 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(integer: simple(:it)) { Types::Form::Int[it] }
     rule(date: simple(:it)) { Types::Form::Date[it] }
@@ -28,6 +29,8 @@ module Querylicious
       end
     end
 
+    rule( list: sequence(:it)) { Types::Form::Array[it] }
+
     rule(range: { start: simple(:first), end: simple(:last) }) do
       if first == :* && last == :*
         :*
@@ -58,6 +61,13 @@ module Querylicious
       KeyValuePair.new(key: key, value: value, op: op)
     end
 
+    rule(pair: { key: simple(:key), value: sequence(:value) }) do
+      KeyValuePair.new(key: key, value: value)
+    end
+    rule(pair: { key: simple(:key), value: sequence(:value), op: simple(:op) }) do
+      KeyValuePair.new(key: key, value: value, op: op)
+    end
+
     rule(op: simple(:op), string: simple(:it)) do
       { object: Types::Coercible::String[it], op: op }
     end

data/querylicious.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = %w[lib]
 
+  spec.required_ruby_version = '>= 2.3'
+
   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'
@@ -25,9 +27,11 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'dry-initializer', '~> 1.4'
 
   spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'reek', '~> 4.7'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-parameterized', '~> 0.4.0'
+  spec.add_development_dependency 'rubocop', '~> 0.49.1'
   spec.add_development_dependency 'pry', '~> 0.10.4'
-  spec.add_development_dependency 'simplecov', '~> 0.14.1'
+  spec.add_development_dependency 'simplecov', '~> 0.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: querylicious
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jo-Herman Haugholt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -100,14 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: reek
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.49.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.0
 description: 
 email:
 - jo-herman@sonans.no
@@ -174,6 +202,7 @@ files:
 - ".reek"
 - ".rspec"
 - ".rubocop.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -202,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="