agnostic_backend 0.9.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ed2f8294a4e610eb4603d376fb93a6e6d2e96e4
-  data.tar.gz: f6e47ceafa6f3777bbcddd2f019e514ebbd01330
+  metadata.gz: 411f2aeb7e28494accdde867a4e9ada54c1afd10
+  data.tar.gz: 99f6f24769f66ccdc45aa0ba7102f73a6478da3f
 SHA512:
-  metadata.gz: aad2c7bb9671be7eb720a4aabf1e067ed1ac51df44d7a86e4fee5ccfb75750891c878d6f184327a84337493b720f966a7b36cbe4ef746b4dd561c7118fabd005
-  data.tar.gz: 67837152d83201cc3c509826a00372123735885d72b7b17a441d61ad8544f2b45267f54215344a16acde1f1dfb7c8adc0f3f5ac37cae0c4b038d6e075af4c630
+  metadata.gz: 1e89af91cd5444b63a78be5247636c932aaf2faf6de4684196ef03b56167a7625bfe13256d10d5674aa5924e8f1d47e60d6ce72663b4433a72e6f3de7651509b
+  data.tar.gz: fe6ce999953541727dcf2a7cb5c1f14708ec4918deed31c7390d98226eef8b5dcaa4b3ecaa38627513d10b035b3ea5694ac6f70ef517464845822d9dadea43a5

data/lib/agnostic_backend/queryable/cloudsearch/executor.rb

@@ -16,11 +16,13 @@ module AgnosticBackend
         def to_s
           result = ''
           result += "search?q=#{query_expression}" if query_expression
+          result += " filter=#{filter_query}" if filter_query
           result += " return=#{return_expression}" if return_expression
           result += " sort=#{sort}" if sort
           result += " size=#{size}" if size
           result += " offset=#{start}" if start
           result += " cursor=#{scroll_cursor}" if scroll_cursor
+          result += " parser=#{query_parser}"
           result
         end
 
@@ -44,11 +46,16 @@ module AgnosticBackend
 
         private
 
+        def filter_visitor
+          options[:filter_visitor]
+        end
+
         def client
           query.context.index.cloudsearch_domain_client
         end
 
         def filter_query
+          filter_expression.accept(filter_visitor) if filter_expression
         end
 
         def query_expression
@@ -80,7 +87,12 @@ module AgnosticBackend
         end
 
         def query_parser
-          'structured'
+          case visitor
+          when SimpleVisitor
+            'simple'
+          else
+            'structured'
+          end
         end
 
         def return_expression

data/lib/agnostic_backend/queryable/cloudsearch/query.rb

@@ -3,9 +3,16 @@ module AgnosticBackend
     module Cloudsearch
       class Query < AgnosticBackend::Queryable::Query
 
-        def initialize(base)
+        def initialize(base, **options)
           super
-          @executor = Executor.new(self, Visitor.new)
+          case options[:parser]
+          when :simple
+            @executor = Executor.new(self, SimpleVisitor.new, filter_visitor: Visitor.new)
+          when :structured
+            @executor = Executor.new(self, Visitor.new, filter_visitor: Visitor.new)
+          else
+            @executor = Executor.new(self, Visitor.new, filter_visitor: Visitor.new)
+          end
         end
 
         def execute

data/lib/agnostic_backend/queryable/cloudsearch/query_builder.rb

@@ -4,8 +4,8 @@ module AgnosticBackend
       class QueryBuilder < AgnosticBackend::Queryable::QueryBuilder
         private
 
-        def create_query(context)
-          AgnosticBackend::Queryable::Cloudsearch::Query.new(context)
+        def create_query(context, **options)
+          AgnosticBackend::Queryable::Cloudsearch::Query.new(context, **options)
         end
       end
     end

data/lib/agnostic_backend/queryable/cloudsearch/simple_visitor.rb

@@ -0,0 +1,130 @@
+module AgnosticBackend
+  module Queryable
+    module Cloudsearch
+      class SimpleVisitor < AgnosticBackend::Queryable::Visitor
+
+        private
+
+        def visit_criteria_equal(subject)
+          raise UnsupportedNodeError
+        end
+
+        def visit_criteria_not_equal(subject)
+          raise UnsupportedNodeError
+        end
+
+        def visit_criteria_greater(subject)
+          raise UnsupportedNodeError
+        end
+
+        def visit_criteria_less(subject)
+          raise UnsupportedNodeError
+        end
+
+        def visit_criteria_greater_equal(subject)
+          raise UnsupportedNodeError
+        end
+
+        def visit_criteria_less_equal(subject)
+          raise UnsupportedNodeError
+        end
+
+        def visit_criteria_greater_and_less(subject)
+          raise UnsupportedNodeError
+        end
+
+        def visit_criteria_greater_equal_and_less(subject)
+          raise UnsupportedNodeError
+        end
+
+        def visit_criteria_greater_and_less_equal(subject)
+          raise UnsupportedNodeError
+        end
+
+        def visit_criteria_greater_equal_and_less_equal(subject)
+          raise UnsupportedNodeError
+        end
+
+        def visit_criteria_contains(subject)
+          raise UnsupportedNodeError
+        end
+
+        def visit_criteria_starts(subject)
+          raise UnsupportedAttributeError unless subject.attribute.any?
+          "#{visit(subject.value)}*"
+        end
+
+        def visit_criteria_free_text(subject)
+          raise UnsupportedAttributeError unless subject.attribute.any?
+          "#{visit(subject.value)}"
+        end
+
+        def visit_criteria_fuzzy(subject)
+          raise UnsupportedAttributeError unless subject.attribute.any?
+          "#{visit(subject.value)}~#{subject.fuzziness}"
+        end
+
+        def visit_operations_not(subject)
+          raise UnsupportedNodeError
+        end
+
+        def visit_operations_and(subject)
+          raise UnsupportedNodeError
+        end
+
+        def visit_operations_or(subject)
+          raise UnsupportedNodeError
+        end
+
+        def visit_operations_ascending(subject)
+          "#{visit(subject.attribute)} asc"
+        end
+
+        def visit_operations_descending(subject)
+          "#{visit(subject.attribute)} desc"
+        end
+
+        def visit_query(subject)
+          "#{subject.children.map{|c| visit(c)}.join(' ')}"
+        end
+
+        def visit_expressions_where(subject)
+          visit(subject.criterion) #search?q=
+        end
+
+        def visit_expressions_select(subject)
+          "#{subject.projections.map{|c| visit(c)}.join(',')}" #return=
+        end
+
+        def visit_expressions_order(subject)
+          "#{subject.qualifiers.map{|c| visit(c)}.join(',')}" #sort=
+        end
+
+        def visit_expressions_limit(subject)
+          visit(subject.limit) #size=
+        end
+
+        def visit_expressions_offset(subject)
+          visit(subject.offset) #offset=
+        end
+
+        def visit_expressions_scroll_cursor(subject)
+          visit(subject.scroll_cursor)  #cursor=
+        end
+
+        def visit_attribute(subject)
+          subject.name.split('.').join('__')
+        end
+
+        def visit_value(subject)
+          case subject.type
+          when :string,:string_array,:text,:text_array
+            subject.value
+          else
+            subject.value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/agnostic_backend/queryable/cloudsearch/visitor.rb

@@ -89,6 +89,10 @@ module AgnosticBackend
           visit(subject.criterion) #search?q=
         end
 
+        def visit_expressions_filter(subject)
+          visit(subject.criterion)
+        end
+
         def visit_expressions_select(subject)
           "#{subject.projections.map{|c| visit(c)}.join(',')}" #return=
         end

data/lib/agnostic_backend/queryable/criteria/binary.rb

@@ -45,6 +45,15 @@ module AgnosticBackend
 
       class FreeText < Relational;
       end
+
+      class Fuzzy < Relational
+        attr_reader :fuzziness
+
+        def initialize(attribute:, value:, context: nil, fuzziness: 1)
+          @fuzziness = fuzziness
+          super(attribute: attribute, value: value, context: context)
+        end
+      end
     end
   end
 end

data/lib/agnostic_backend/queryable/criteria_builder.rb

@@ -60,6 +60,10 @@ module AgnosticBackend
         Criteria::FreeText.new(attribute: attribute, value: value, context: context)
       end
 
+      def fuzzy(attribute, value, fuzziness)
+        Criteria::Fuzzy.new(attribute: attribute, value: value, context: context, fuzziness: fuzziness)
+      end
+
       def asc(attribute)
         Operations::Ascending.new(attribute: attribute, context: context)
       end

data/lib/agnostic_backend/queryable/elasticsearch/query.rb

@@ -3,7 +3,7 @@ module AgnosticBackend
     module Elasticsearch
       class Query < AgnosticBackend::Queryable::Query
 
-        def initialize(base)
+        def initialize(base, **options)
           super
           @executor = Executor.new(self, Visitor.new)
         end

data/lib/agnostic_backend/queryable/elasticsearch/query_builder.rb

@@ -4,8 +4,8 @@ module AgnosticBackend
       class QueryBuilder < AgnosticBackend::Queryable::QueryBuilder
         private
 
-        def create_query(context)
-          AgnosticBackend::Queryable::Elasticsearch::Query.new(context)
+        def create_query(context, **options)
+          AgnosticBackend::Queryable::Elasticsearch::Query.new(context, **options)
         end
       end
     end

data/lib/agnostic_backend/queryable/executor.rb

@@ -4,9 +4,12 @@ module AgnosticBackend
 
       attr_reader :query
       attr_reader :visitor
+      attr_reader :options
 
-      def initialize(query, visitor)
-        @query, @visitor = query, visitor
+      def initialize(query, visitor, **options)
+        @query = query
+        @visitor = visitor
+        @options = options
       end
 
       def execute
@@ -38,6 +41,10 @@ module AgnosticBackend
       def scroll_cursor_expression
         query.children.find { |e| e.is_a? Expressions::ScrollCursor }
       end
+
+      def filter_expression
+        query.children.find { |e| e.is_a? Expressions::Filter }
+      end
     end
   end
 end

data/lib/agnostic_backend/queryable/expressions/expression.rb

@@ -14,6 +14,17 @@ module AgnosticBackend
         end
       end
 
+
+      class Filter < Expression
+        def initialize(criterion:, context:)
+          super([criterion], context)
+        end
+
+        def criterion
+          children.first
+        end
+      end
+
       class Select < Expression
         def initialize(attributes:, context:)
           super(attributes.map { |a| Attribute.new(a, parent: self, context: context) }, context)

data/lib/agnostic_backend/queryable/query.rb

@@ -3,11 +3,14 @@ module AgnosticBackend
     class Query < TreeNode
       attr_accessor :errors
       attr_reader :context
+      attr_reader :executor
+      attr_reader :options
 
-      def initialize(context)
+      def initialize(context, **options)
         super()
         @errors ||= Hash.new { |hash, key| hash[key] = Array.new }
         @context = context
+        @options = options
       end
 
       def execute

data/lib/agnostic_backend/queryable/query_builder.rb

@@ -43,13 +43,19 @@ module AgnosticBackend
         self
       end
 
-      def build
-        query = create_query(self)
+      def filter(filter)
+        @filter = filter
+        self
+      end
+
+      def build(**options)
+        query = create_query(self, **options)
         query.children << build_where_expression if @criterion
         query.children << build_select_expression if @projections
         query.children << build_order_expression if @order_qualifiers
         query.children << build_limit_expression if @limit
         query.children << build_offset_expression if @offset
+        query.children << build_filter_expression if @filter
         query.children << build_scroll_cursor_expression if @scroll_cursor
 
         @query = query
@@ -57,7 +63,7 @@ module AgnosticBackend
 
       private
 
-      def create_query(context)
+      def create_query(context, **options)
         raise NotImplementedError, 'AbstractMethod'
       end
 
@@ -65,6 +71,10 @@ module AgnosticBackend
         Expressions::Where.new(criterion: @criterion, context: self)
       end
 
+      def build_filter_expression
+        Expressions::Filter.new(criterion: @filter, context: self)
+      end
+
       def build_select_expression
         Expressions::Select.new(attributes: @projections, context: self)
       end

data/lib/agnostic_backend/queryable/validator.rb

@@ -84,6 +84,11 @@ module AgnosticBackend
         visit(subject.value)
       end
 
+      def visit_criteria_fuzzy(subject)
+        visit(subject.attribute)
+        visit(subject.value)
+      end
+
       def visit_operations_not(subject)
         visit(subject.operand)
       end
@@ -108,6 +113,10 @@ module AgnosticBackend
         visit(subject.criterion)
       end
 
+      def visit_expressions_filter(subject)
+        visit(subject.criterion)
+      end
+
       def visit_expressions_select(subject)
         subject.projections.each { |c| visit(c) }
       end

data/lib/agnostic_backend/queryable/visitor.rb

@@ -1,5 +1,8 @@
 module AgnosticBackend
   module Queryable
+    class UnsupportedNodeError < StandardError; end
+    class UnsupportedAttributeError < StandardError; end
+
     class Visitor
       def visit(subject)
         method_name = class_to_method_name(subject.class)
@@ -96,6 +99,10 @@ module AgnosticBackend
         raise NotImplementedError
       end
 
+      def visit_expressions_filter(subject)
+        raise NotImplementedError
+      end
+
       def visit_expressions_select(subject)
         raise NotImplementedError
       end

data/lib/agnostic_backend/version.rb

@@ -1,3 +1,3 @@
 module AgnosticBackend
-  VERSION = "0.9.9"
+  VERSION = "1.0.0"
 end

data/lib/agnostic_backend.rb

@@ -40,6 +40,8 @@ require 'agnostic_backend/queryable/cloudsearch/query'
 require 'agnostic_backend/queryable/cloudsearch/query_builder'
 require 'agnostic_backend/queryable/cloudsearch/result_set'
 require 'agnostic_backend/queryable/cloudsearch/visitor'
+require 'agnostic_backend/queryable/cloudsearch/simple_visitor'
+
 
 require 'agnostic_backend/cloudsearch/index'
 require 'agnostic_backend/cloudsearch/index_field'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: agnostic_backend
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 1.0.0
 platform: ruby
 authors:
 - Iasonas Gavriilidis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -171,6 +171,7 @@ files:
 - lib/agnostic_backend/queryable/cloudsearch/query.rb
 - lib/agnostic_backend/queryable/cloudsearch/query_builder.rb
 - lib/agnostic_backend/queryable/cloudsearch/result_set.rb
+- lib/agnostic_backend/queryable/cloudsearch/simple_visitor.rb
 - lib/agnostic_backend/queryable/cloudsearch/visitor.rb
 - lib/agnostic_backend/queryable/criteria/binary.rb
 - lib/agnostic_backend/queryable/criteria/criterion.rb