safrano 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2eed096c2669da58d766a50abb6361f96003f8489367bcd4ab784e7a7306410
-  data.tar.gz: 991dbed63c5ceeda823024f9af0ea796a0aad5145c8549ad7cd114222b5ec973
+  metadata.gz: b92fa13256a9916955424463617069d13f71aefee5fedb3a4fc1c17535874e74
+  data.tar.gz: 3bc6d8d42e58d0dca7ba4109238dd042ffb50502969b1dd7f07fe54bcbb7a02e
 SHA512:
-  metadata.gz: 7722469a7e2a9cbfda56d955c3cd2efb97e07d881ac4738e61971b522a642ed8aae9bb387fcc8e625b19e8317cbd4fa57d073c01e2dfe93c88667e23b8a4c914
-  data.tar.gz: '06795fce287398b3f1087d5331427bd95db54359b84ca454304033285e6e8e73f289ac704364f4eb43c1f1f6cdb536e1378a58f14847eebd02a892dcb128bb7f'
+  metadata.gz: d0d0bcaa6df005df66eded6b5e4285af6c88896720e40ab1036d18d541d4d58643c8772a146d6187124ba4af61197cbbd74e3a0b452456745d71ac8e4908d0dc
+  data.tar.gz: e586938c711020382f7ab4e55f271b7b1094a1b45f13db0cc7c8e82e52c75143087daaa05c362cd02dec150a042bc8493c792bdb0e6ef305ce0746f7933672b9

data/lib/core_ext/Hash/transform.rb

@@ -16,11 +16,9 @@ module Safrano
 
         def symbolize_keys!
           transform_keys! do |key|
-            begin
-              key.to_sym
-            rescue StandardError
-              key
-            end
+            key.to_sym
+          rescue StandardError
+            key
           end
         end
       end

data/lib/core_ext/MatchData/matchlen.rb

@@ -4,8 +4,8 @@ module Safrano
     module MatchData
       module MatchLen
         unless method_defined? :match_length
-          def  match_length(i)
-            self[i].length
+          def  match_length(idx)
+            self[idx].length
           end
         end
       end

data/lib/odata/attribute.rb

@@ -2,7 +2,7 @@
 
 require 'json'
 require_relative '../safrano/core'
-require_relative './entity'
+require_relative 'entity'
 
 module Safrano
   # Represents a named and valued attribute of an Entity

data/lib/odata/batch.rb

@@ -3,7 +3,7 @@
 require_relative '../safrano/rack_app'
 require_relative '../safrano/core'
 require 'rack/body_proxy'
-require_relative './common_logger'
+require_relative 'common_logger'
 
 module Safrano
   # Support for OData multipart $batch Requests

data/lib/odata/collection.rb

@@ -164,7 +164,7 @@ module Safrano
         set_relation_info(@parent, childattrib)
 
         @child_method = parent.method(childattrib.to_sym)
-        @child_dataset_method = parent.method("#{childattrib}_dataset".to_sym)
+        @child_dataset_method = parent.method(:"#{childattrib}_dataset")
 
         @cx = navigated_dataset
       end

data/lib/odata/collection_filter.rb

@@ -55,7 +55,7 @@ module Safrano
       @filtexpr.map_result! { |f| dtcx.where(f) }
     end
 
-    # Note: this is really only *parse* error, ie the error encounterd while
+    # NOTE: this is really only *parse* error, ie the error encounterd while
     # trying to build the AST
     # Later when evaluating the AST, there can be other errors, they shall
     # be tracked with @error

data/lib/odata/collection_media.rb

@@ -4,7 +4,7 @@ require 'rack'
 require 'fileutils'
 require 'tempfile'
 require 'pathname'
-require_relative './navigation_attribute'
+require_relative 'navigation_attribute'
 
 module Safrano
   module Media
@@ -141,7 +141,7 @@ module Safrano
         abs_media_directory(entity).children(false).max.to_s
       end
 
-      # Note:  add a new Version and remove the previous one
+      # NOTE:  add a new Version and remove the previous one
       def replace_file(data:, entity:)
         with_media_directory(entity) do |d|
           tp = Tempfile.open('', @abs_temp_dir) do |temp_file|

data/lib/odata/collection_order.rb

@@ -48,7 +48,7 @@ module Safrano
     end
 
     def build_oarg
-      field, ord = @orderp.split(' ')
+      field, ord = @orderp.split
       oargu = if field.include?('/')
                 @assoc, field = field.split('/')
                 @jh.add @assoc

data/lib/odata/complex_type.rb

@@ -132,7 +132,7 @@ module Safrano
       # wrapper
       # for OData Entity  return them directly
       def self.do_execute_func_result(result, _req, apply_query_params: false)
-        # note: Sequel entities instances seem to be thread safe, so we can
+        # NOTE: Sequel entities instances seem to be thread safe, so we can
         # safely add request-dependant data (eg. req.params) there
         apply_query_params ? result : result.inactive_query_params
       end
@@ -273,7 +273,7 @@ module Safrano
   def self.ComplexType(**props)
     Class.new(Safrano::ComplexType) do
       @props = props
-      props.each do |a, _klassmod|
+      props.each_key do |a|
         asym = a.to_sym
         define_method(asym) { @values[asym] }
         define_method("#{a}=") { |val| @values[asym] = val }

data/lib/odata/edm/primitive_types.rb

@@ -29,7 +29,7 @@ module Safrano
 
   DB_TYPE_FLOATP_RGX = /\A\s*(FLOAT)\s*(\(\s*(\d+)\s*\))?\s*\z/i.freeze
 
-  # Note: "char" (quoted!) is postgresql's byte type
+  # NOTE: "char" (quoted!) is postgresql's byte type
   DB_TYPE_INTLIKE_RGX = /\A\s*(smallserial|smallint|integer|int2|int4|int8|int|mediumint|bigint|serial|bigserial|tinyint)\s*/i.freeze
   # used in $metadata
   # cf. Sequel Database column_schema_default_to_ruby_value

data/lib/odata/expand.rb

@@ -41,13 +41,13 @@ module Safrano
     # Recursive array to deep hash
     # [1,2,3,4]  -->  {1=>{2=>{3=>4}}}
     # [1] --> 1
-    DEEPH_0 = ->(inp) { inp.size > 1 ? { inp[0] => DEEPH_0.call(inp[1..-1]) } : inp[0] }
+    DEEPH_0 = ->(inp) { inp.size > 1 ? { inp[0] => DEEPH_0.call(inp[1..]) } : inp[0] }
 
     # used for building output template
     # Recursive array to deep hash
     # [1,2,3,4]  -->  {1=>{2=>{3=>4}}}
     # [1] --> { 1 => {} }
-    DEEPH_1 = ->(inp) { inp.size > 1 ? { inp[0] => DEEPH_1.call(inp[1..-1]) } : { inp[0] => {} } }
+    DEEPH_1 = ->(inp) { inp.size > 1 ? { inp[0] => DEEPH_1.call(inp[1..]) } : { inp[0] => {} } }
 
     NODESEP = '/'
 
@@ -79,7 +79,7 @@ module Safrano
     COMASPLIT = /\s*,\s*/.freeze
     attr_reader :template
 
-    # Note: if you change this method, please also update arity_full_monkey?
+    # NOTE: if you change this method, please also update arity_full_monkey?
     #       see below
     def initialize(expandstr, model)
       @model = model

data/lib/odata/filter/parse.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative './token'
-require_relative './tree'
-require_relative './error'
+require_relative 'token'
+require_relative 'tree'
+require_relative 'error'
 
 # top level Safrano namespace
 module Safrano
@@ -20,6 +20,7 @@ module Safrano
         @input = input
         @stack = []
         @binop_stack = []
+        @binop_stack_markers = []
       end
 
       def server_error
@@ -63,6 +64,13 @@ module Safrano
         @error = ErrorUnmatchedClose.new(tok, typ, @cursor)
       end
 
+      def scoped_prev_binop
+        base = @binop_stack_markers.last || 0
+        return nil if @binop_stack.length <= base
+
+        @binop_stack.last
+      end
+
       def with_accepted(tok, typ)
         (err = @cursor.accept?(tok, typ)) ? (@error = err) : yield
       end
@@ -81,16 +89,19 @@ module Safrano
                 unless @error
                   openarg = ArgTree.new('(')
                   @stack << openarg
+                  @binop_stack_markers << @binop_stack.length
                   grow_at_cursor(openarg)
                 end
               end
 
             when ')'
+              mark_len = @binop_stack_markers.pop
               break invalid_closing_delimiter_error(tok, typ) unless (@cursor = @stack.pop)
 
               with_accepted(tok, typ) do
                 @cursor.update_state(tok, typ)
                 cursor_at_parent
+                @binop_stack.slice!(mark_len..)
               end
             end
 
@@ -101,7 +112,7 @@ module Safrano
 
           when :UnopTree
             unoptr = UnopTree.new(tok)
-            if (prev = @binop_stack.last)
+            if (prev = scoped_prev_binop)
               # handling of lower precedence binding vs the other
               # ones(le,gt,eq...)
               unless prev.precedence < unoptr.precedence
@@ -116,7 +127,7 @@ module Safrano
           when :BinopBool
             with_accepted(tok, typ) do
               binoptr = BinopBool.new(tok)
-              if (prev = @binop_stack.last)
+              if (prev = scoped_prev_binop)
                 # handling of lower precedence binding vs the other
                 # ones(le,gt,eq...)
                 unless prev.precedence < binoptr.precedence
@@ -132,7 +143,7 @@ module Safrano
           when :BinopArithm
             with_accepted(tok, typ) do
               binoptr = BinopArithm.new(tok)
-              if (prev = @binop_stack.last)
+              if (prev = scoped_prev_binop)
                 # handling of lower precedence binding vs the other
                 # ones(le,gt,eq...)
                 unless prev.precedence < binoptr.precedence

data/lib/odata/filter/sequel.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative './base'
-require_relative './sequel_function_adapter'
-require_relative './sequel_datetime_adapter'
+require_relative 'base'
+require_relative 'sequel_function_adapter'
+require_relative 'sequel_datetime_adapter'
 module Safrano
   module Filter
     # Base class for Leaves, Trees, RootTrees etc

data/lib/odata/filter/sequel_datetime_adapter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative './tree'
-require_relative './sequel'
+require_relative 'tree'
+require_relative 'sequel'
 
 module Safrano
   module Filter

data/lib/odata/filter/sequel_function_adapter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative './tree'
-require_relative './sequel'
+require_relative 'tree'
+require_relative 'sequel'
 
 module Safrano
   module Filter

data/lib/odata/filter/token.rb

@@ -31,48 +31,47 @@ module Safrano
 
           inp.scan(RGX) do |groups|
             groups.each_with_index do |tok, i|
-              if tok
+              next unless tok
 
-                typ = case i
-                      when 0
-                        :FuncTree
-                      when 1
-                        :NullLiteral
-                      when 2
-                        case tok
-                        when '(', ')'
-                          :Delimiter
-                        when ','
-                          :Separator
-                        end
-                      when 3
-                        :BinopBool
-                      when 4
-                        :BinopArithm
-                      when 5
-                        :UnopTree
-                      when 6
-                        :QString
-                      when 7
-                        :DecimalLit
-                      when 8
-                        :FPNumber
-                      when 9
-                        :Qualit
-                      when 10
-                        :DateTimeLit
-                      when 11
-                        :DateTimeOffsetLit
-                      when 12
-                        :GuidLit
-                      when 13
-                        :Literal
-                      when 14
-                        :unmatchedQuote
+              typ = case i
+                    when 0
+                      :FuncTree
+                    when 1
+                      :NullLiteral
+                    when 2
+                      case tok
+                      when '(', ')'
+                        :Delimiter
+                      when ','
+                        :Separator
                       end
-                yield tok, typ
-                break
-              end
+                    when 3
+                      :BinopBool
+                    when 4
+                      :BinopArithm
+                    when 5
+                      :UnopTree
+                    when 6
+                      :QString
+                    when 7
+                      :DecimalLit
+                    when 8
+                      :FPNumber
+                    when 9
+                      :Qualit
+                    when 10
+                      :DateTimeLit
+                    when 11
+                      :DateTimeOffsetLit
+                    when 12
+                      :GuidLit
+                    when 13
+                      :Literal
+                    when 14
+                      :unmatchedQuote
+                    end
+              yield tok, typ
+              break
             end
           end
         end

data/lib/odata/filter/tree.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative './base'
-require_relative './error'
+require_relative 'base'
+require_relative 'error'
 
 module Safrano
   module Filter
@@ -314,19 +314,17 @@ module Safrano
         case typ
         when :Delimiter
           if @value == '(' && tok == ')' && @state != :closed
-            if (@parent.class == IdentityFuncTree) ||
+            if @parent.instance_of?(IdentityFuncTree) ||
                @parent.arity_full?(@children.size)
 
               nil
             else
               Parser::ErrorInvalidArity.new(tok, typ, self)
             end
+          elsif @value == '(' && tok == '(' && @state == :open
+            nil
           else
-            if @value == '(' && tok == '(' && @state == :open
-              nil
-            else
-              Parser::ErrorUnmatchedClose.new(tok, typ, self)
-            end
+            Parser::ErrorUnmatchedClose.new(tok, typ, self)
           end
         when :Separator
           if @value == '(' && tok == ',' && @state == :val

data/lib/odata/function_import.rb

@@ -135,7 +135,7 @@ 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
+        pkeys = @params.keys.to_set(&:to_sym)
         if (idiff = @input.keys.to_set - pkeys).empty?
           Contract::OK
         else
@@ -217,7 +217,7 @@ module Safrano
           # (application-)error handling
           # the result is an Error object or class
 
-          # Note: Sequel::Error exceptions are already
+          # NOTE: Sequel::Error exceptions are already
           # handled on rack app level (cf. the call methode )
           Safrano.with_error(result) do |error|
             @error = error

data/lib/odata/model_ext.rb

@@ -452,9 +452,9 @@ module Safrano
       if metadata[:edm_type] == 'Edm.Guid'
         props = db_schema[primary_key]
         @pk_castfunc = if props[:type] == :blob # Edm.Guid but as 16 byte binary Blob on DB level, eg in Sqlite
-                         lambda { |x| "guid'#{UUIDTools::UUID.parse_raw(x)}'" unless x.nil? }
+                         ->(x) { "guid'#{UUIDTools::UUID.parse_raw(x)}'" unless x.nil? }
                        else
-                         lambda { |x| "guid'#{x}'" unless x.nil? }
+                         ->(x) { "guid'#{x}'" unless x.nil? }
                        end
       else
         @pk_castfunc = @casted_cols[primary_key]
@@ -512,7 +512,7 @@ module Safrano
         @odata_upk_parts = odata_upk_build.join(',').split('?')
 
         # regex parts for unordered matching
-        @iuk_rgx_parts = primary_key.map do |pk|
+        @iuk_rgx_parts = primary_key.to_h do |pk|
           kvpredicate = case db_schema[pk][:type]
                         when :integer
                           '(\\d+)'
@@ -520,7 +520,7 @@ module Safrano
                           "'(\\w+)'"
                         end
           [pk, "#{pk}=#{kvpredicate}"]
-        end.to_h
+        end
 
         # single regex assuming the key fields are ordered !
         @iuk_rgx = /\A#{@iuk_rgx_parts.values.join(',\s*')}\z/

data/lib/odata/navigation_attribute.rb

@@ -2,7 +2,7 @@
 
 require 'json'
 require_relative '../safrano/core'
-require_relative './entity'
+require_relative 'entity'
 
 module Safrano
   # remove the relation between entity and parent by clearing
@@ -28,7 +28,7 @@ module Safrano
   def self.create_nav_relation(child, assoc, parent)
     return unless assoc
 
-    # Note: this coding shares some bits from our sequel/plugins/join_by_paths,
+    # NOTE: this coding shares some bits from our sequel/plugins/join_by_paths,
     # method build_unique_join_segments
     # eventually there is an opportunity to have more reusable code here
     case assoc[:type]

data/lib/odata/relations.rb

@@ -72,7 +72,7 @@ module Safrano
     def each_rel
       raise ArgumentError unless block_given?
 
-      @list.each { |_rid, rel| yield rel }
+      @list.each_value { |rel| yield rel }
     end
 
     def get(arg)

data/lib/odata/transition.rb

@@ -34,12 +34,12 @@ module Safrano
           match_len = -1
           tres_next = nil
 
-          @allowed_transitions.each { |t|
+          @allowed_transitions.each do |t|
             if (res = t.longer_match(path_remain, match_len))
               tres_next = res
               match_len = tres_next.match_length
             end
-          }
+          end
           tres_next
         end
       end
@@ -56,12 +56,12 @@ module Safrano
           match_len = -1
           tres_next = nil
 
-          allowed_transitions.each { |t|
+          allowed_transitions.each do |t|
             if (res = t.longer_match(path_remain, match_len))
               tres_next = res
               match_len = tres_next.match_length
             end
-          }
+          end
           tres_next
         end
       end

data/lib/safrano/multipart.rb

@@ -58,7 +58,7 @@ module MIME
         if (hmd = HMD_RGX.match(line))
           @target_hd[hmd[1].downcase] = hmd[2].strip
 
-        elsif CRLF == line
+        elsif line == CRLF
           @target_ct = @target_hd[CTT_TYPE_LC] || TEXT_PLAIN
           @state = new_content
 
@@ -118,7 +118,7 @@ module MIME
       def new_content
         @target =
           if @target_ct.start_with?(MPS) &&
-             (md = (MP_RGX1.match(@target_ct[10..-1]) || MP_RGX2.match(@target_ct[10..-1])))
+             (md = (MP_RGX1.match(@target_ct[10..]) || MP_RGX2.match(@target_ct[10..])))
             multipart_content(md[2].strip)
           elsif @target_ct.start_with?(APP_HTTP)
             MIME::Content::Application::Http.new
@@ -211,7 +211,7 @@ module MIME
           def parse_head(line)
             if (hmd = HMD_RGX.match(line))
               @target.hd[hmd[1].downcase] = hmd[2].strip
-            elsif CRLF == line
+            elsif line == CRLF
               @state = :b
             else
               @target.content << line
@@ -383,15 +383,13 @@ module MIME
             # of the changes
 
             full_req.db.transaction do
-              begin
-                @response.content = @content.map { |part| part.get_response(full_req) }
-              rescue Sequel::Rollback => e
-                # one of the changes of the changeset has failed
-                # --> provide a dummy empty response for the change-parts
-                # then transmit the Rollback to Sequel
-                get_failed_changeset_response(e)
-                raise
-              end
+              @response.content = @content.map { |part| part.get_response(full_req) }
+            rescue Sequel::Rollback => e
+              # one of the changes of the changeset has failed
+              # --> provide a dummy empty response for the change-parts
+              # then transmit the Rollback to Sequel
+              get_failed_changeset_response(e)
+              raise
             end
           else
             @response.content = @content.map { |part| part.get_response(full_req) }
@@ -528,7 +526,7 @@ module MIME
           def parse_head(line)
             if (hmd = HMD_RGX.match(line))
               @target.content.hd[hmd[1].downcase] = hmd[2].strip
-            elsif CRLF == line
+            elsif line == CRLF
               @state = :b
             else
               @body_lines << line

data/lib/safrano/request.rb

@@ -224,14 +224,13 @@ module Safrano
     end
 
     def accept
-      @env['safrano.accept'] ||= begin
+      @env['safrano.accept'] ||=
         if @env.include?('HTTP_ACCEPT') && (@env['HTTP_ACCEPT'].to_s != '')
           @env['HTTP_ACCEPT'].to_s.scan(HEADER_VAL_WITH_PAR)
                              .map! { |e| AcceptEntry.new(e) }.sort
         else
           [AcceptEntry.new('*/*')]
         end
-      end
     end
 
     def accept?(type)

data/lib/safrano/service.rb

@@ -166,7 +166,10 @@ module Safrano
     FINAL_TEMPLATE_FUNC_DEFAULT = ->(_template) {}
     FINAL_TEMPLATE_FUNC_SKIP_META = ->(template) { template.delete(:meta) }
     FINAL_TEMPLATE_FUNC_SKIP_DEFERR = ->(template) { template.delete(:deferr) }
-    FINAL_TEMPLATE_FUNC_SKIP_META_DEFERR = ->(template) { template.delete(:meta); template.delete(:deferr) }
+    FINAL_TEMPLATE_FUNC_SKIP_META_DEFERR = lambda do |template|
+      template.delete(:meta)
+      template.delete(:deferr)
+    end
 
     def self.app_setup_singleton
       @app_setup_singleton
@@ -185,7 +188,7 @@ module Safrano
       # enabled per default starting from 0.6
       @xbugfix_create_response = true
       klass = self.class
-      # TODO better error
+      # TODO: better error
       raise StandardError unless (klass.publish_proc or template_instance)
 
       tmpli = if template_instance
@@ -291,14 +294,14 @@ module Safrano
       (@v2.server_url(surl)) if @v2
     end
 
-    VALID_RESP_FORMAT_OPTS = [:skip_deferred, :skip_metadata]
+    VALID_RESP_FORMAT_OPTS = %i[skip_deferred skip_metadata].freeze
     def valid_resp_format_options(*args)
       raise API::InvalidRespFormatOption.new(args) unless args
 
       args.map!(&:to_sym)
-      args.each { |arg|
+      args.each do |arg|
         raise API::InvalidRespFormatOption.new(arg) unless VALID_RESP_FORMAT_OPTS.include?(arg)
-      }
+      end
       yield(args)
     end
 

data/lib/safrano/type_mapping.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Note: Safrano has hardcoded mapping rules for most of types.
+# NOTE: Safrano has hardcoded mapping rules for most of types.
 # But
 #   it might not be 100% complete
 #   it might not always do what is expected

data/lib/safrano/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Safrano
-  VERSION = '0.8.7'
+  VERSION = '0.8.8'
 end

data/lib/sequel/plugins/join_by_paths.rb

@@ -138,8 +138,8 @@ class JoinByPathsHelper < Set
           result_ = []
 
           # in case of multiple many_to_many rels, we need differing through aliases
-          many_to_many_count = many_to_many_count + 1
-          through_alias = "t#{many_to_many_count}".to_sym
+          many_to_many_count += 1
+          through_alias = :"t#{many_to_many_count}"
 
           # For many_to_many first we add the join with assigment table
           lks_ = [assoc[:left_primary_key]].flatten
@@ -242,7 +242,7 @@ module Sequel
             @aliases_sym[pstr]
           else
             @alias_cnt += 1
-            @aliases_sym[pstr] = "a#{@alias_cnt}".to_sym
+            @aliases_sym[pstr] = :"a#{@alias_cnt}"
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - oz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-16 00:00:00.000000000 Z
+date: 2025-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack