safrano 0.5.5 → 0.6.0

data/lib/odata/entity.rb

@@ -2,8 +2,8 @@
 
 require 'json'
 require 'rexml/document'
-require 'safrano.rb'
-require 'odata/model_ext.rb' # required for  self.class.entity_type_name ??
+require 'safrano'
+require 'odata/model_ext' # required for  self.class.entity_type_name ??
 require_relative 'navigation_attribute'
 
 module Safrano
@@ -86,9 +86,9 @@ module Safrano
       "#{self.class.uri}#{@odata_pk}"
     end
 
-    D = 'd'.freeze
-    DJ_OPEN = '{"d":'.freeze
-    DJ_CLOSE = '}'.freeze
+    D = 'd'
+    DJ_OPEN = '{"d":'
+    DJ_CLOSE = '}'
 
     # Json formatter for a single entity (probably OData V1/V2 like)
     def to_odata_json(request:)
@@ -176,7 +176,7 @@ module Safrano
         destroy(transaction: false)
       end
     rescue StandardError => e
-      raise SequelAdapterError.new(e)
+      raise SequelAdapterError, e
     end
 
     # TODO: differentiate between POST/PUT/PATCH/MERGE
@@ -203,7 +203,7 @@ module Safrano
       if req.walker.media_value
         odata_media_value_put(req)
       elsif req.accept?(APPJSON)
-        data = JSON.parse(req.body.read)
+        data = Safrano::OData::JSON.parse_one(req.body.read, self.class)
         data.delete('__metadata')
 
         if req.in_changeset
@@ -220,7 +220,7 @@ module Safrano
     end
 
     def odata_patch(req)
-      req.with_parsed_data do |data|
+      req.with_parsed_data(self.class) do |data|
         data.delete('__metadata')
 
         # validate payload column names
@@ -401,9 +401,9 @@ module Safrano
     include Entity
     def pk_uri
       pku = +''
-      self.class.odata_upk_parts.each_with_index { |upart, i|
+      self.class.odata_upk_parts.each_with_index do |upart, i|
         pku = "#{pku}#{upart}#{pk[i]}"
-      }
+      end
       pku
     end
 
@@ -419,7 +419,7 @@ module Safrano
   module EntityCreateStandardOutput
     # Json formatter for a create  entity POST call / Standard version; return as json object
     def to_odata_create_json(request:)
-      # TODO Perf: reduce method call overhead
+      # TODO: Perf: reduce method call overhead
       # we added this redirection for readability and flexibility
       to_odata_json(request: request)
     end
@@ -428,7 +428,7 @@ module Safrano
   module EntityCreateArrayOutput
     # Json formatter for a create  entity POST call Array version
     def to_odata_create_json(request:)
-      # TODO Perf: reduce method call overhead
+      # TODO: Perf: reduce method call overhead
       # we added this redirection for readability and flexibility
       to_odata_array_json(request: request)
     end

data/lib/odata/error.rb

@@ -59,12 +59,12 @@ module Safrano
       message = (m = @msg.to_s).empty? ? to_s : m
       if req.accept?(APPJSON)
         # json is default content type so we dont need to specify it here again
-        [self.http_code, EMPTY_HASH,
-         { 'odata.error' => { 'code' => "#{http_code}",
+        [http_code, EMPTY_HASH,
+         { 'odata.error' => { 'code' => http_code.to_s,
                               'type' => to_s,
                               'message' => message } }.to_json]
       else
-        [self.http_code, CT_TEXT, message]
+        [http_code, CT_TEXT, message]
       end
     end
   end
@@ -82,8 +82,8 @@ module Safrano
       if req.accept?(APPJSON)
         # json is default content type so we dont need to specify it here again
         [self.class.http_code, EMPTY_HASH,
-         { 'odata.error' => { 'code' => "#{self.class.http_code}",
-                              'type' => "#{self.class}",
+         { 'odata.error' => { 'code' => self.class.http_code.to_s,
+                              'type' => self.class.to_s,
                               'message' => message } }.to_json]
       else
         [self.class.http_code, CT_TEXT, message]
@@ -184,7 +184,7 @@ module Safrano
   class BadRequestSelectInvalidProps < BadRequestError
     include ErrorInstance
     def initialize(model, iprops)
-      @msg = ((iprops.size > 1) ? "Bad Request: the $select properties #{iprops.to_a.join(', ')} are invalid for entityset #{model.entity_set_name}" : "Bad Request: the $select property #{iprops.first} is invalid for entityset #{model.entity_set_name}")
+      @msg = (iprops.size > 1 ? "Bad Request: the $select properties #{iprops.to_a.join(', ')} are invalid for entityset #{model.entity_set_name}" : "Bad Request: the $select property #{iprops.first} is invalid for entityset #{model.entity_set_name}")
     end
   end
 
@@ -232,7 +232,7 @@ module Safrano
     @msg = 'The requested OData version is not yet supported'
   end
   # batch not implemented (Safrano specific)
-  class BatchNotImplementedError < NotImplementedError
+  class BatchNotImplementedError < RuntimeError
     @msg = 'Not implemented: OData batch'
   end
 

data/lib/odata/expand.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'odata/error.rb'
+require 'odata/error'
 
 # all dataset expanding related classes in our OData module
 # ie  do eager loading
@@ -52,7 +52,7 @@ module Safrano
     # [1] --> { 1 => {} }
     DEEPH_1 = ->(inp) { inp.size > 1 ? { inp[0] => DEEPH_1.call(inp[1..-1]) } : { inp[0] => {} } }
 
-    NODESEP = '/'.freeze
+    NODESEP = '/'
 
     def initialize(exstr)
       exstr.strip!

data/lib/odata/filter/base.rb

@@ -49,10 +49,13 @@ module Safrano
     class ArgTree < Tree
     end
 
-    # Numbers (floating point, ints, dec)
+    # Numbers (floating point, ints)
     class FPNumber < Leave
     end
 
+    class DecimalLit < Leave
+    end
+
     # Literals are unquoted words without /
     class Literal < Leave
     end
@@ -70,5 +73,11 @@ module Safrano
     # Quoted Strings
     class QString < Leave
     end
+
+    # DateTime Literals
+    class DateTimeLit < Leave
+    end
+    class DateTimeOffsetLit < Leave
+    end
   end
 end

data/lib/odata/filter/error.rb

@@ -16,7 +16,7 @@ module Safrano
       # Parser errors
 
       class Error
-        def Error.http_code
+        def self.http_code
           const_get(:HTTP_CODE)
         end
         HTTP_CODE = 400
@@ -70,7 +70,7 @@ module Safrano
         include ::Safrano::ErrorInstance
         def initialize(tok, typ, cur)
           super
-          @msg = "Bad Request: wrong number of parameters for function #{cur.parent.value.to_s} in $filter"
+          @msg = "Bad Request: wrong number of parameters for function #{cur.parent.value} in $filter"
         end
       end
       # Invalid separator in this context (missing parenthesis?)

data/lib/odata/filter/parse.rb

@@ -174,7 +174,21 @@ module Safrano
               @cursor.update_state(tok, typ)
               grow_at_cursor(FPNumber.new(tok))
             end
-
+          when :DecimalLit
+            with_accepted(tok, typ) do
+              @cursor.update_state(tok, typ)
+              grow_at_cursor(DecimalLit.new(tok))
+            end
+          when :DateTimeLit
+            with_accepted(tok, typ) do
+              @cursor.update_state(tok, typ)
+              grow_at_cursor(DateTimeLit.new(tok))
+            end
+          when :DateTimeOffsetLit
+            with_accepted(tok, typ) do
+              @cursor.update_state(tok, typ)
+              grow_at_cursor(DateTimeOffsetLit.new(tok))
+            end
           when :unmatchedQuote
             break unmatched_quote_error(tok, typ)
 
@@ -188,7 +202,7 @@ module Safrano
           break(@error) if @error
         end
         (@error = @tree.check_types) unless @error
-        @error ? @error : Contract.valid(@tree)
+        @error || Contract.valid(@tree)
       end
     end
   end

data/lib/odata/filter/sequel.rb

@@ -2,7 +2,7 @@
 
 require_relative './base'
 require_relative './sequel_function_adapter'
-
+require_relative './sequel_datetime_adapter'
 module Safrano
   module Filter
     # Base class for Leaves, Trees, RootTrees etc
@@ -184,9 +184,10 @@ module Safrano
         Contract.collect_result!(@children[0].leuqes(jh),
                                  @children[1].leuqes(jh)) do |c0, c1|
           if c1 == NullLiteral::LEUQES
-            if @value == :eq
+            case @value
+            when :eq
               leuqes_op = :IS
-            elsif @value == :ne
+            when :ne
               leuqes_op = :'IS NOT'
             end
           end
@@ -242,6 +243,12 @@ module Safrano
       end
     end
 
+    class DecimalLit
+      def leuqes(_jh)
+        success Sequel.lit(@value)
+      end
+    end
+
     # Literals are unquoted words
     class Literal
       def leuqes(jh)
@@ -271,7 +278,7 @@ module Safrano
 
     # Null
     class NullLiteral
-      def leuqes(jh)
+      def leuqes(_jh)
         # Sequel's representation of NULL
         success LEUQES
       end
@@ -304,5 +311,25 @@ module Safrano
         success "%#{@value}%"
       end
     end
+
+    # DateTime literals  datetime'2017-04-15T00:00:00'
+    class DateTimeLit
+      # datetime method is defined dynamically by adapter-specific include on startup
+      # --> sequel_datetime_adapter.rb
+      def leuqes(_jh)
+        # success Sequel.function(:datetime, @value)
+        success datetime(@value)
+      end
+    end
+
+    # DateTimeOffset literals  datetimeoffset'2017-04-15T00:00:00+02:00'
+    class DateTimeOffsetLit
+      # datetime method is defined dynamically by adapter-specific include on startup
+      # --> sequel_datetime_adapter.rb
+      def leuqes(_jh)
+        # success Sequel.function(:datetime, @value)
+        success datetime(@value)
+      end
+    end
   end
 end

data/lib/odata/filter/sequel_datetime_adapter.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative './tree'
+require_relative './sequel'
+
+module Safrano
+  module Filter
+    # sqlite adapter specific DateTime handler
+    module DateTimeSqlite
+      def datetime(_val)
+        Sequel.function(:datetime, @value)
+      end
+    end
+    # non-sqlite adapter specific DateTime handler
+    module DateTimeDefault
+      def datetime(_val)
+        Sequel.lit("'#{@value}'")
+      end
+    end
+  end
+end

data/lib/odata/filter/token.rb

@@ -15,9 +15,16 @@ module Safrano
         BINOBOOL = '[eE][qQ]|[LlgGNn][eETt]|[aA][nN][dD]|[oO][rR]'
         BINOARITHM = '[aA][dD][dD]|[sS][uU][bB]|[mM][uU][lL]|[dD][iI][vV]|[mM][oO][dD]'
         NOTRGX = 'not|NOT|Not'
-        FPRGX = '\d+(?:\.\d+)?(?:e[+-]?\d+)?'
+        FPRGX = '\d+(?:\.\d+)?(?:e[+-]?\d+)?[df]?'
+        DECIMALRGX = '\d+(?:\.\d+)[mM]'
         QUALITRGX = '\w+(?:\/\w+)+'
-        RGX = /(#{FUNCRGX})|(#{NULLRGX})|([\(\),])|(#{BINOBOOL})\s+|(#{BINOARITHM})|(#{NOTRGX})|#{QSTRINGRGX}|(#{FPRGX})|(#{QUALITRGX})|(\w+)|(')/.freeze
+        # datetime'yyyy-mm-ddThh:mm[:ss[.fffffff]]' NOTE: Spaces are not allowed between datetime and quoted portion.
+        # datetime is case-insensitive
+        DATIRGX = '\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?:\:\d{2})?(?:\.\d{1,7})?'
+        DATETIMERGX = /datetime'#{DATIRGX}[zZ]?'/i.freeze
+        DATIOFFRGX = /datetimeoffset'#{DATIRGX}(?:[zZ]|[+-]\d{2}:\d{2})'/.freeze
+
+        RGX = /(#{FUNCRGX})|(#{NULLRGX})|([(),])|(#{BINOBOOL})\s+|(#{BINOARITHM})|(#{NOTRGX})|#{QSTRINGRGX}|(#{DECIMALRGX})|(#{FPRGX})|(#{QUALITRGX})|(#{DATETIMERGX})|(#{DATIOFFRGX})|(\w+)|(')/.freeze
 
         def each_typed_token(inp)
           typ = nil
@@ -52,12 +59,18 @@ module Safrano
                   when 6
                     :QString
                   when 7
-                    :FPNumber
+                    :DecimalLit
                   when 8
-                    :Qualit
+                    :FPNumber
                   when 9
-                    :Literal
+                    :Qualit
                   when 10
+                    :DateTimeLit
+                  when 11
+                    :DateTimeOffsetLit
+                  when 12
+                    :Literal
+                  when 13
                     :unmatchedQuote
                   end
             yield found, typ

data/lib/odata/filter/tree.rb

@@ -45,6 +45,11 @@ module Safrano
         super(val, &block)
       end
 
+      # shortcut used for testing
+      def first_child_value
+        @children.first.value
+      end
+
       def attach(child)
         child.parent = self
         @children << child
@@ -66,7 +71,7 @@ module Safrano
       def accept?(tok, typ)
         case typ
         when :Literal, :NullLiteral, :Qualit, :QString, :FuncTree, :ArgTree,
-             :UnopTree, :FPNumber
+             :UnopTree, :FPNumber, :DecimalLit, :DateTimeLit, :DateTimeOffsetLit
           nil
         when :Delimiter
           if tok == '('
@@ -232,7 +237,8 @@ module Safrano
 
       def update_state(_tok, typ)
         case typ
-        when :Literal, :NullLiteral, :Qualit, :QString, :FuncTree, :BinopBool, :BinopArithm, :UnopTree, :FPNumber
+        when :Literal, :NullLiteral, :Qualit, :QString, :FuncTree, :BinopBool, :BinopArithm,
+            :UnopTree, :FPNumber, :DecimalLit, :DateTimeLit, :DateTimeOffsetLit
           @state = :closed
         end
       end
@@ -297,7 +303,8 @@ module Safrano
           @state = :closed
         when :Separator
           @state =  :sep
-        when :Literal, :NullLiteral, :Qualit, :QString, :FuncTree, :FPNumber
+        when :Literal, :NullLiteral, :Qualit, :QString, :FuncTree, :FPNumber, :DecimalLit,
+             :DateTimeLit, :DateTimeOffsetLit
           @state =  :val
         end
       end
@@ -307,8 +314,8 @@ module Safrano
         case typ
         when :Delimiter
           if @value == '(' && tok == ')' && @state != :closed
-            if (@parent.class == IdentityFuncTree) or
-               (@parent.arity_full?(@children.size))
+            if (@parent.class == IdentityFuncTree) ||
+               @parent.arity_full?(@children.size)
 
               nil
             else
@@ -327,11 +334,10 @@ module Safrano
           elsif @state == :sep
             Parser::ErrorInvalidToken.new(tok, typ, self)
           end
-        when :Literal, :NullLiteral, :Qualit, :QString, :FuncTree, :FPNumber
+        when :Literal, :NullLiteral, :Qualit, :QString, :FuncTree, :FPNumber, :DecimalLit,
+             :DateTimeLit, :DateTimeOffsetLit
           if (@state == :open) || (@state == :sep)
-            if @parent.arity_full?(@children.size)
-              Parser::ErrorInvalidArity.new(tok, typ, self)
-            end
+            Parser::ErrorInvalidArity.new(tok, typ, self) if @parent.arity_full?(@children.size)
           else
             Parser::ErrorInvalidToken.new(tok, typ, self)
           end
@@ -349,6 +355,13 @@ module Safrano
 
     # Numbers (floating point, ints, dec)
     class FPNumber
+      def initialize(val)
+        # 1.53f --> value 1.53
+        # 1.53d --> value 1.53
+        # 1.53 --> value 1.53
+        val[-1] =~ /[fd]/i ? super(val[0..-2]) : super(val)
+      end
+
       def accept?(tok, typ)
         case typ
         when :Delimiter, :Separator, :BinopBool, :BinopArithm
@@ -363,7 +376,28 @@ module Safrano
         :number
       end
     end
+    class DecimalLit
+      def initialize(val)
+        # 1.53m --> value 1.53
+        # Warning, this assumes that the m|M part in the input is really not optional
+        # cf. DECIMALRGX in token.rb
+
+        super(val[0..-2])
+      end
+
+      def accept?(tok, typ)
+        case typ
+        when :Delimiter, :Separator, :BinopBool, :BinopArithm
+          nil
+        else
+          Parser::ErrorInvalidToken.new(tok, typ, self)
+        end
+      end
 
+      def edm_type
+        :decimal
+      end
+    end
     # Literals are unquoted words without /
     class Literal
       def accept?(tok, typ)
@@ -409,6 +443,46 @@ module Safrano
       end
     end
 
+    # DateTimeLit
+    class DateTimeLit
+      def initialize(val)
+        # datetime'2000-12-12T12:00:53' --> value 2000-12-12T12:00:53
+        super(val[9..-2])
+      end
+
+      def accept?(tok, typ)
+        case typ
+        when :Delimiter, :Separator, :BinopBool, :BinopArithm
+          nil
+        else
+          Parser::ErrorInvalidToken.new(tok, typ, self)
+        end
+      end
+
+      def edm_type
+        :datetime
+      end
+    end
+    # DateTimeOffsetLit
+    class DateTimeOffsetLit
+      def initialize(val)
+        # datetimeoffset'2000-12-12T12:00:53+02:00' --> value 2000-12-12T12:00:53+02:00
+        super(val[15..-2])
+      end
+
+      def accept?(tok, typ)
+        case typ
+        when :Delimiter, :Separator, :BinopBool, :BinopArithm
+          nil
+        else
+          Parser::ErrorInvalidToken.new(tok, typ, self)
+        end
+      end
+
+      def edm_type
+        :datetimeoffset
+      end
+    end
     # Quoted Strings
     class QString
       DBL_QO = "''"

data/lib/odata/function_import.rb

@@ -84,14 +84,14 @@ module Safrano
       def check_missing_params
         # do we have all parameters provided ?  use Set difference to check
         pkeys = @params.keys.map(&:to_sym).to_set
-        unless (idiff = @input.keys.to_set - pkeys).empty?
+        if (idiff = @input.keys.to_set - pkeys).empty?
+          Contract::OK
+        else
 
           Safrano::ServiceOperationParameterMissing.new(
             missing: idiff.to_a,
             sopname: @name
           )
-        else
-          Contract::OK
         end
       end
 
@@ -134,12 +134,14 @@ module Safrano
                                #                       EntitySet= @entity_set ,
                                'ReturnType' => @returning.type_metadata,
                                'm:HttpMethod' => @http_method)
-        @input.each do |iname, type|
-          funky.add_element('Parameter',
-                            'Name' => iname.to_s,
-                            'Type' => type.type_name,
-                            'Mode' => 'In')
-        end if @input
+        if @input
+          @input.each do |iname, type|
+            funky.add_element('Parameter',
+                              'Name' => iname.to_s,
+                              'Type' => type.type_name,
+                              'Mode' => 'In')
+          end
+        end
         funky
       end