safrano 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '068df72ed0e610de674a7f8771f1ff4e5a8e1d4217c5755c08bab78e3c735588'
-  data.tar.gz: e45fc20c09b7717c1354e80c9e7afd6b4e71a0b27cc97c99b2fd51b99abcb083
+  metadata.gz: '048c3efb69194f00a6ed5593c23300ae7b9d46f7d98a546d443bd5d9c5d2c6c8'
+  data.tar.gz: 825698055233240072faee6e038e531884e23d938fc1ed9708e98d27cf0db3c6
 SHA512:
-  metadata.gz: 709fe03f7939265381c276192a1db812a26a55a14914de89ae220f37b99efe21ed057f05c0e071bb388eef21c01df9a8408557aca6bc19e30a2767752f7d39f4
-  data.tar.gz: b4fb2033ec0fd0568c23762cbf660f36e879574367c61617c022847fee64747762943139eb91849f8ae762182688c7e424db5545539e1f7896e10c3e6db62113
+  metadata.gz: d2697db38029b2701a418a620b74e7b8080d368cd34461073de46065d7057cb3b852cc62795cabb1bbbad82d10607bff96b899beb483a3c0f03e028cf8cb8a31
+  data.tar.gz: 12a8674563e67e2f3c4e475d5867f8965e0095a0ff0afea80079f6e7e59c56921abc506d33b07ca483f5f2c16024176a6e3679db26b09e979a9f9fb6fac8d755

data/lib/odata/collection.rb

@@ -41,7 +41,8 @@ module OData
   # class methods. They Make heavy use of Sequel::Model functionality
   # we will add this to our Model classes with "extend" --> self is the Class
   module EntityClassBase
-    SINGLE_PK_URL_REGEXP = /\A\('?([\w\s]+)'?\)(.*)/.freeze
+    SINGLE_PK_URL_REGEXP = /\A\(\s*'?([\w\s]+)'?\s*\)(.*)/.freeze
+    ONLY_INTEGER_RGX = /\A[+-]?\d+\z/
 
     attr_reader :nav_collection_url_regexp
     attr_reader :nav_entity_url_regexp
@@ -406,6 +407,32 @@ module OData
       %r{\A/(#{@columns.join('|')})(.*)\z}
     end
 
+    # pkid can be a single value for single-pk models,  or an array.
+    # type checking/convertion is done in check_odata_key_type
+    def find_by_odata_key(pkid)
+      # amazingly this works as expected from an Entity.get_related(...) anonymous class
+      # without need to redefine primary_key_lookup (returns nil for valid but unrelated keys)
+      primary_key_lookup(pkid)
+    end
+
+    # super-minimal type check, but better as nothing
+    def check_odata_val_type(val, type)
+      case type
+      when :integer
+        if (val =~ ONLY_INTEGER_RGX)
+          [true, Integer(val)]
+        else
+          [false, val]
+        end
+      when :string
+        [true, val]
+      else
+        [true, val] # todo...
+      end
+    rescue StandardError
+      [false, val]
+    end
+
     # methods related to transitions to next state (cf. walker)
     module Transitions
       def transition_end(_match_result)
@@ -418,10 +445,17 @@ module OData
 
       def transition_id(match_result)
         if (id = match_result[1])
-          if (y = find_by_odata_key(id))
-            [y, :run]
+
+          ck, casted_id = check_odata_key(id)
+
+          if ck
+            if (y = find_by_odata_key(casted_id))
+              [y, :run]
+            else
+              [nil, :error, ErrorNotFound]
+            end
           else
-            [nil, :error, ErrorNotFound]
+            [nil, :error, BadRequestError]
           end
         else
           [nil, :error, ServerTransitionError]
@@ -440,24 +474,38 @@ module OData
   # special handling for composite key
   module EntityClassMultiPK
     include EntityClassBase
-    # id is for composite key, something like      fx='aas',fy_w='0001'
-    def find_by_odata_key(mid)
+    # input  fx='aas',fy_w='0001'
+    # output true, ['aas', '0001'] ... or false when typ-error
+    def check_odata_key(mid)
       # @iuk_rgx is (needs to be) built on start with
       # collklass.prepare_pk
       md = @iuk_rgx.match(mid).to_a
       md.shift # remove first element which is the whole match
-      # amazingly this works as expected from an Entity.get_related(...) anonymous class
-      # without need to redefine primary_key_lookup (returns nil for valid but unrelated keys)
-      primary_key_lookup(md)
+      mdc = []
+      error = false
+      primary_key.each_with_index { |pk, i|
+        ck, casted = check_odata_val_type(md[i], db_schema[pk][:type])
+        if ck
+          mdc << casted
+        else
+          error = true
+          break
+        end
+      }
+      if error
+        [false, md]
+      else
+        [true, mdc]
+      end
     end
   end
 
   # special handling for single key
   module EntityClassSinglePK
     include EntityClassBase
-    # id is really just the  value of single pk
-    def find_by_odata_key(id)
-      primary_key_lookup(id)
+
+    def check_odata_key(id)
+      check_odata_val_type(id, db_schema[primary_key][:type])
     end
   end
 end

data/lib/odata/filter/parse.rb

@@ -114,9 +114,9 @@ module OData
             end
             grow_at_cursor(unoptr)
 
-          when :BinopTree
+          when :BinopBool
             with_accepted(tok, typ) do
-              binoptr = BinopTree.new(tok)
+              binoptr = BinopBool.new(tok)
               if (prev = @binop_stack.last)
                 # handling of lower precedence binding vs the other
                 # ones(le,gt,eq...)
@@ -129,6 +129,22 @@ module OData
               end
               insert_before_cursor(binoptr)
             end
+          when :BinopArithm
+            with_accepted(tok, typ) do
+              binoptr = BinopArithm.new(tok)
+              if (prev = @binop_stack.last)
+                # handling of lower precedence binding vs the other
+                # ones(le,gt,eq...)
+                unless prev.precedence < binoptr.precedence
+                  @cursor = @binop_stack.pop
+                  @binop_stack << binoptr
+                end
+              else
+                @binop_stack << binoptr
+              end
+              insert_before_cursor(binoptr)
+            end
+
           when :Literal
             with_accepted(tok, typ) do
               @cursor.update_state(tok, typ)

data/lib/odata/filter/sequel.rb

@@ -36,27 +36,30 @@ module OData
           Sequel.like(args[0].leuqes(jh),
                       args[1].leuqes_ends_like(jh))
         when :substringof
-          # there are two possible signatures
-          if (args[0].is_a?(QString) && args[1].is_a?(Literal))
+
+          # there are multiple possible argument types (but all should return edm.string)
+          if (args[0].is_a?(QString))
             # substringof('Rhum', name)  -->
             # name contains substr 'Rhum'
             Sequel.like(args[1].leuqes(jh),
-                        args[0].leuqes_substringof_like(jh))
-          # according to the spec it should be like that?
-          # elsif args[1].is_a? QString
-          ## substringof(name, '__Route du Rhum__')  -->
-          ## '__Route du Rhum__' contains name as a substring
-          # Sequel.like(args[1].leuqes_substringof_like(dtcx),
-          # args[0].leuqes(dtcx)   )
-          # or like that?
-          #          elsif args[1].is_a? QString
-          #          # substringof(name, 'Route du Rhum')  -->
-          #          # name contains substr 'Rhum'  ??
-          #            Sequel.like(args[0].leuqes(dtcx) ,
-          #                        args[1].leuqes_substringof_like(dtcx) )
+                        args[0].leuqes_substringof_sig1(jh))
+          # special non standard (ui5 client) case ?
           elsif (args[0].is_a?(Literal) && args[1].is_a?(Literal))
             Sequel.like(args[1].leuqes(jh),
-                        args[0].leuqes_substringof_like(jh))
+                        args[0].leuqes_substringof_sig1(jh))
+          elsif (args[1].is_a?(QString))
+            # substringof(name, '__Route du Rhum__')  -->
+            # '__Route du Rhum__' contains name as a substring
+            # TODO... check if the database supports instr (how?)
+            # othewise use substr(postgresql) or whatevr?
+            instr_substr_func = if (Sequel::Model.db.adapter_scheme == :postgres)
+                                  Sequel.function(:strpos, args[1].leuqes(jh), args[0].leuqes(jh))
+                                else
+                                  Sequel.function(:instr, args[1].leuqes(jh), args[0].leuqes(jh))
+                                end
+
+            Sequel::SQL::BooleanExpression.new(:>, instr_substr_func, 0)
+
           else
             # TODO... actually not supported?
             raise OData::Filter::Parser::ErrorFunctionArgumentType
@@ -99,8 +102,8 @@ module OData
       end
     end
 
-    # Bin ops
-    class BinopTree < Tree
+    # logical Bin ops
+    class BinopBool
       def leuqes(jh)
         leuqes_op = case @value
                     when :eq
@@ -129,6 +132,30 @@ module OData
       end
     end
 
+    # Arithmetic Bin ops
+    class BinopArithm
+      def leuqes(jh)
+        leuqes_op = case @value
+                    when :add
+                      :+
+                    when :sub
+                      :-
+                    when :mul
+                      :*
+                    when :div
+                      :/
+                    when :mod
+                      :%
+                    else
+                      raise OData::FilterParseError
+                    end
+
+        Sequel::SQL::NumericExpression.new(leuqes_op,
+                                           @children[0].leuqes(jh),
+                                           @children[1].leuqes(jh))
+      end
+    end
+
     # Arguments or lists
     class ArgTree
     end
@@ -147,7 +174,7 @@ module OData
         "%#{@value.to_s}"
       end
 
-      def leuqes_substringof_like(_jh)
+      def leuqes_substringof_sig1(_jh)
         "%#{@value.to_s}%"
       end
     end
@@ -172,9 +199,13 @@ module OData
         "%#{@value}"
       end
 
-      def leuqes_substringof_like(_jh)
+      def leuqes_substringof_sig1(_jh)
         "%#{@value}%"
       end
+
+      def as_string
+        @value
+      end
     end
 
     # Qualit (qualified lits) are words separated by /
@@ -200,7 +231,7 @@ module OData
         "%#{@value}"
       end
 
-      def leuqes_substringof_like(_jh)
+      def leuqes_substringof_sig1(_jh)
         "%#{@value}%"
       end
     end

data/lib/odata/filter/token.rb

@@ -8,11 +8,12 @@ module OData
                        replace substring trim toupper tolower].freeze
         FUNCRGX = FUNCNAMES.join('|').freeze
         QSTRINGRGX = /'((?:[^']|(?:\'{2}))*)'/.freeze
-        BINOPSRGX = '[eE][qQ]|[LlgGNn][eETt]|and|AND|or|OR'.freeze
+        BINOBOOL = '[eE][qQ]|[LlgGNn][eETt]|[aA][nN][dD]|[oO][rR]'.freeze
+        BINOARITHM = '[aA][dD][dD]|[sS][uU][bB]|[mM][uU][lL]|[dD][iI][vV]|[mM][oO][dD]'.freeze
         NOTRGX = 'not|NOT'.freeze
         FPRGX = '\d+(?:\.\d+)?(?:e[+-]?\d+)?'.freeze
         QUALITRGX = '\w+(?:\/\w+)+'.freeze
-        RGX = /(#{FUNCRGX})|([\(\),])|(#{BINOPSRGX})|(#{NOTRGX})|#{QSTRINGRGX}|(#{FPRGX})|(#{QUALITRGX})|(\w+)|(')/.freeze
+        RGX = /(#{FUNCRGX})|([\(\),])|(#{BINOBOOL})|(#{BINOARITHM})|(#{NOTRGX})|#{QSTRINGRGX}|(#{FPRGX})|(#{QUALITRGX})|(\w+)|(')/.freeze
         def each_typed_token(inp)
           typ = nil
 
@@ -36,18 +37,20 @@ module OData
                       :Separator
                     end
                   when 2
-                    :BinopTree
+                    :BinopBool
                   when 3
-                    :UnopTree
+                    :BinopArithm
                   when 4
-                    :QString
+                    :UnopTree
                   when 5
-                    :FPNumber
+                    :QString
                   when 6
-                    :Qualit
+                    :FPNumber
                   when 7
-                    :Literal
+                    :Qualit
                   when 8
+                    :Literal
+                  when 9
                     :unmatchedQuote
                   end
             yield found, typ

data/lib/odata/filter/tree.rb

@@ -119,7 +119,7 @@ module OData
 
       def accept?(tok, typ)
         case typ
-        when :BinopTree
+        when :BinopBool, :BinopArithm
           true
         else
           super(tok, typ)
@@ -193,6 +193,15 @@ module OData
         super(val.downcase.to_sym)
       end
 
+      def update_state(_tok, typ)
+        case typ
+        when :Literal, :Qualit, :QString, :FuncTree, :BinopBool, :BinopArithm, :UnopTree, :FPNumber
+          @state = :closed
+        end
+      end
+    end
+
+    class BinopBool < BinopTree
       # reference:
       # OData v4 par 5.1.1.9 Operator Precedence
       def precedence
@@ -203,28 +212,36 @@ module OData
           2
         when :eq, :ne
           3
-        when :gt, :ge, :lt, :le
+        when :gt, :ge, :lt, :le, :isof
           4
         else
           999
         end
       end
 
-      def update_state(_tok, typ)
-        case typ
-        when :Literal, :Qualit, :QString, :FuncTree, :BinopTree, :UnopTree, :FPNumber
-          @state = :closed
-        end
+      def edm_type
+        :bool
       end
+    end
 
-      def edm_type
+    class BinopArithm < BinopTree
+      # reference:
+      # OData v4 par 5.1.1.9 Operator Precedence
+      def precedence
         case @value
-        when :or, :and, :eq, :ne, :gt, :ge, :lt, :le
-          :bool
+        when :add, :sub
+          5
+        when :mul, :div, :mod
+          6
         else
-          :any
+          999
         end
       end
+
+      # TODO different num types?
+      def edm_type
+        :any
+      end
     end
 
     # Arguments or lists
@@ -279,7 +296,7 @@ module OData
           else
             [false, Parser::ErrorInvalidToken.new(tok, typ, self)]
           end
-        when :BinopTree
+        when :BinopBool, :BinopArithm
           true
         else
           [false, Parser::ErrorInvalidToken.new(tok, typ, self)]
@@ -295,7 +312,7 @@ module OData
     class FPNumber < Leave
       def accept?(tok, typ)
         case typ
-        when :Delimiter, :Separator, :BinopTree
+        when :Delimiter, :Separator, :BinopBool, :BinopArithm
           true
         else
           [false, Parser::ErrorInvalidToken.new(tok, typ, self)]
@@ -312,7 +329,7 @@ module OData
     class Literal < Leave
       def accept?(tok, typ)
         case typ
-        when :Delimiter, :Separator, :BinopTree
+        when :Delimiter, :Separator, :BinopBool, :BinopArithm
           true
         else
           [false, Parser::ErrorInvalidToken.new(tok, typ, self)]
@@ -353,7 +370,7 @@ module OData
 
       def accept?(tok, typ)
         case typ
-        when :Delimiter, :Separator, :BinopTree
+        when :Delimiter, :Separator, :BinopBool, :BinopArithm
           true
         else
           [false, Parser::ErrorInvalidToken.new(tok, typ, self)]

data/lib/rack_app.rb

@@ -145,13 +145,16 @@ module OData
       @service_base.enable_batch
     end
 
+    def self.path_prefix(path_pr)
+      @service_base.path_prefix path_pr
+    end
+
     def self.get_service_base
       @service_base
     end
 
-    def self.set_servicebase(sbase, p_prefix = '')
+    def self.set_servicebase(sbase)
       @service_base = sbase
-      @service_base.path_prefix p_prefix
       @service_base.enable_v1_service
       @service_base.enable_v2_service
     end

data/lib/service.rb

@@ -242,6 +242,8 @@ module OData
 
     def path_prefix(path_pr)
       @xpath_prefix = path_pr.sub(TRAILING_SLASH, '')
+      (@v1.xpath_prefix = @xpath_prefix) if @v1
+      (@v2.xpath_prefix = @xpath_prefix) if @v2
     end
     # end public API
 
@@ -251,7 +253,6 @@ module OData
       other.xtitle = @xtitle
       other.xname = @xname
       other.xnamespace = @xnamespace
-      #      other.xuribase = @xuribase
       other.xpath_prefix = @xpath_prefix
       other.meta = ServiceMeta.new(other) # hum ... #todo: versions as well ?
       other.relman = @relman

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - D.M.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-30 00:00:00.000000000 Z
+date: 2019-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack