safrano 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88f62ce611a5030382ea19c2e7c22b47f454b85c51261e5bad060d82e4680dff
-  data.tar.gz: '088e66ed4a107a3bef8dd6db68c8ca626f7d3acef6ed2e58eb53d871e6349613'
+  metadata.gz: 9f2ebcbe8cf374526aa263f93515e2424753898ad878904d6d5d087bc6317c4e
+  data.tar.gz: 48190a71451991630bd48347c3cf2acb701423bb58266fa736b0cf7a5b6f3bdf
 SHA512:
-  metadata.gz: 2d719e317178a4baebc2e40cc50b95559921fe2936a6a03437f7f92714d173ef6160b10620ce5476ea54a7433b3dd1366b49ec37a48b121b8f808ad030e2c364
-  data.tar.gz: 535ee0f1d4fed30a0c94918c31149a2e95fce90051548a2ccca6bffb71930c0767543255695496c3623249070b5efb1b6a203a1dae6f868c1e4da9a126a85346
+  metadata.gz: 70ef7d275b566269879e4cd37f019958cd354504d1dede907adcf4d078e47361412997c69eec2c403317013ef5ac8019315aeb8cc89715906f2f12bd59e885dc
+  data.tar.gz: 1ff899294284a5e9531187533938e14ae304c1344131177dff1612037ca32e6a27dfcd72b367dd705afbb5cd5b9d38e9c11dc7b8f7766d470c2ac4c45686372b

data/lib/odata/attribute.rb

@@ -53,7 +53,7 @@ module Safrano
     # methods related to transitions to next state (cf. walker)
     module Transitions
       def transition_end(_match_result)
-        [nil, :end]
+        Transition::RESULT_END
       end
 
       def transition_value(_match_result)
@@ -64,7 +64,7 @@ module Safrano
                              Safrano::TransitionValue].freeze
 
       def allowed_transitions
-        ALLOWED_TRANSITIONS
+        Transitions::ALLOWED_TRANSITIONS
       end
     end
     include Transitions

data/lib/odata/collection.rb

@@ -77,17 +77,20 @@ module Safrano
         end
       end
 
-      D = 'd'.freeze
-      DJ_OPEN = '{"d":'.freeze
-      DJ_CLOSE = '}'.freeze
+      D = 'd'
+      DJ_OPEN = '{"d":'
+      DJ_CLOSE = '}'
       EMPTYH = {}.freeze
 
       def to_odata_json(request:)
         template = @modelk.output_template(expand_list: @uparms.expand.template,
                                            select: @uparms.select)
+        # TODO: Error handling if database contains binary BLOB data that cant be
+        # interpreted as UTF-8 then JSON will fail here
         innerj = request.service.get_coll_odata_h(array: @cx.all,
                                                   template: template,
                                                   icount: @inlinecount).to_json
+
         "#{DJ_OPEN}#{innerj}#{DJ_CLOSE}"
       end
 

data/lib/odata/collection_filter.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'odata/error.rb'
+require 'odata/error'
 
-require_relative 'filter/parse.rb'
-require_relative 'filter/sequel.rb'
+require_relative 'filter/parse'
+require_relative 'filter/sequel'
 
 # filter base class and subclass in our OData namespace
 module Safrano
@@ -45,12 +45,12 @@ module Safrano
     # the join-helper is shared by the order-by object and was potentially already
     # partly built on order-by object creation.
     def finalize(jh)
-      @filtexpr = @ast.if_valid do |ast| ast.sequel_expr(jh) end
+      @filtexpr = @ast.if_valid { |ast| ast.sequel_expr(jh) }  
     end
 
     def apply_to_dataset(dtcx)
       #     normally finalize is called before, and thus @filtexpr is set
-      @filtexpr.map_result! do |f| dtcx.where(f) end
+      @filtexpr.map_result! { |f| dtcx.where(f) } 
     end
 
     # Note: this is really only *parse* error, ie the error encounterd while

data/lib/odata/collection_media.rb

@@ -2,7 +2,7 @@
 
 require 'rack'
 require 'fileutils'
-require_relative './navigation_attribute.rb'
+require_relative './navigation_attribute'
 
 module Safrano
   module Media
@@ -24,9 +24,16 @@ module Safrano
 
       def register
         @abs_klass_dir = File.absolute_path(@media_dir_name, @root)
+      end
+
+      def create_abs_class_dir
         FileUtils.makedirs @abs_klass_dir unless Dir.exist?(@abs_klass_dir)
       end
 
+      def finalize
+        create_abs_class_dir
+      end
+
       # minimal working implementation...
       #  Note: @file_server works relative to @root directory
       def odata_get(request:, entity:)
@@ -53,7 +60,7 @@ module Safrano
           # simple design: one file per directory, and the directory
           # contains the media entity-id --> implicit link between the media
           # entity
-          File.join(media_path(entity), Dir.glob('*').sort.first)
+          File.join(media_path(entity), Dir.glob('*').min)
         end
       end
 
@@ -62,6 +69,11 @@ module Safrano
         File.absolute_path(media_path(entity), @root)
       end
 
+      # absolute filename
+      def abs_filename(entity)
+        File.absolute_path(filename(entity), @root)
+      end
+
       # this is relative to abs_klass_dir(entity) eg to /@root/Photo
       # simplest implementation is media_directory = entity.media_path_id
       # --> we get a 1 level depth flat directory structure
@@ -101,7 +113,7 @@ module Safrano
       def ressource_version(entity)
         Dir.chdir(@abs_klass_dir) do
           in_media_directory(entity) do
-            Dir.glob('*').sort.last
+            Dir.glob('*').max
           end
         end
       end
@@ -201,9 +213,14 @@ module Safrano
       @media_handler = Safrano::Media::Static.new(mediaklass: self)
     end
 
+    def finalize_media
+      @media_handler.finalize
+    end
+
     def use(klass, args)
       args[:mediaklass] = self
       @media_handler = klass.new(**args)
+      @media_handler.create_abs_class_dir
     end
 
     # API method for setting the model field mapped to SLUG on upload
@@ -261,9 +278,16 @@ module Safrano
           req.register_content_id_ref(new_entity)
           new_entity.copy_request_infos(req)
 
+          # call before_create_media hook
+          new_entity.before_create_media if new_entity.respond_to? :before_create_media
+
           media_handler.save_file(data: data,
                                   entity: new_entity,
                                   filename: filename)
+
+          # call after_create_media hook
+          new_entity.after_create_media if new_entity.respond_to? :after_create_media
+
           # json is default content type so we dont need to specify it here again
           [201, EMPTY_HASH, new_entity.to_odata_post_json(service: req.service)]
         else # TODO: other formats

data/lib/odata/complex_type.rb

@@ -3,14 +3,14 @@
 module Safrano
   module FunctionImport
     class ResultDefinition
-      D = 'd'.freeze
-      DJ_OPEN = '{"d":'.freeze
-      DJ_CLOSE = '}'.freeze
-      METAK = '__metadata'.freeze
-      TYPEK = 'type'.freeze
-      VALUEK = 'value'.freeze
-      RESULTSK = 'results'.freeze
-      COLLECTION = 'Collection'.freeze
+      D = 'd'
+      DJ_OPEN = '{"d":'
+      DJ_CLOSE = '}'
+      METAK = '__metadata'
+      TYPEK = 'type'
+      VALUEK = 'value'
+      RESULTSK = 'results'
+      COLLECTION = 'Collection'
 
       def initialize(klassmod)
         @klassmod = klassmod
@@ -97,8 +97,8 @@ module Safrano
     def initialize
       @values = {}
     end
-    METAK = '__metadata'.freeze
-    TYPEK = 'type'.freeze
+    METAK = '__metadata'
+    TYPEK = 'type'
 
     def odata_h
       ret = { METAK => { TYPEK => self.class.type_name } }

data/lib/odata/error.rb

@@ -37,6 +37,15 @@ module Safrano
         super(msg, symbname)
       end
     end
+
+    # duplicate attribute name
+    class ModelDuplicateAttributeError < NameError
+      def initialize(klass, symb)
+        symbname = symb.to_s
+        msg = "There is already an attribute :#{symbname} defined in class #{klass}"
+        super(msg, symbname)
+      end
+    end
   end
 
   # base module for HTTP errors, when used as a Error Class

data/lib/odata/filter/base.rb

@@ -57,6 +57,11 @@ module Safrano
     class Literal < Leave
     end
 
+    # Null Literal is unquoted null word
+    class NullLiteral < Literal
+      LEUQES = nil
+    end
+
     # Qualit (qualified lits) are words separated by /
     # path/path/path/attrib
     class Qualit < Literal

data/lib/odata/filter/parse.rb

@@ -151,6 +151,12 @@ module Safrano
               grow_at_cursor(Literal.new(tok))
             end
 
+          when :NullLiteral
+            with_accepted(tok, typ) do
+              @cursor.update_state(tok, typ)
+              grow_at_cursor(NullLiteral.new(tok))
+            end
+
           when :Qualit
             with_accepted(tok, typ) do
               @cursor.update_state(tok, typ)

data/lib/odata/filter/sequel.rb

@@ -183,6 +183,13 @@ module Safrano
                     end
         Contract.collect_result!(@children[0].leuqes(jh),
                                  @children[1].leuqes(jh)) do |c0, c1|
+          if c1 == NullLiteral::LEUQES
+            if @value == :eq
+              leuqes_op = :IS
+            elsif @value == :ne
+              leuqes_op = :'IS NOT'
+            end
+          end
           Sequel::SQL::BooleanExpression.new(leuqes_op, c0, c1)
         end
       end
@@ -262,6 +269,14 @@ module Safrano
       end
     end
 
+    # Null
+    class NullLiteral
+      def leuqes(jh)
+        # Sequel's representation of NULL
+        success LEUQES
+      end
+    end
+
     # Qualit (qualified lits) are words separated by /
     class Qualit
       def leuqes(jh)

data/lib/odata/filter/token.rb

@@ -10,13 +10,14 @@ module Safrano
                        day hour minute month second year
                        round floor ceiling].freeze
         FUNCRGX = FUNCNAMES.join('|')
+        NULLRGX = 'null|NULL|Null'
         QSTRINGRGX = /'((?:[^']|(?:'{2}))*)'/.freeze
         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'
+        NOTRGX = 'not|NOT|Not'
         FPRGX = '\d+(?:\.\d+)?(?:e[+-]?\d+)?'
         QUALITRGX = '\w+(?:\/\w+)+'
-        RGX = /(#{FUNCRGX})|([\(\),])|(#{BINOBOOL})\s+|(#{BINOARITHM})|(#{NOTRGX})|#{QSTRINGRGX}|(#{FPRGX})|(#{QUALITRGX})|(\w+)|(')/.freeze
+        RGX = /(#{FUNCRGX})|(#{NULLRGX})|([\(\),])|(#{BINOBOOL})\s+|(#{BINOARITHM})|(#{NOTRGX})|#{QSTRINGRGX}|(#{FPRGX})|(#{QUALITRGX})|(\w+)|(')/.freeze
 
         def each_typed_token(inp)
           typ = nil
@@ -34,27 +35,29 @@ module Safrano
                   when 0
                     :FuncTree
                   when 1
+                    :NullLiteral
+                  when 2
                     case found
                     when '(', ')'
                       :Delimiter
                     when ','
                       :Separator
                     end
-                  when 2
-                    :BinopBool
                   when 3
-                    :BinopArithm
+                    :BinopBool
                   when 4
-                    :UnopTree
+                    :BinopArithm
                   when 5
-                    :QString
+                    :UnopTree
                   when 6
-                    :FPNumber
+                    :QString
                   when 7
-                    :Qualit
+                    :FPNumber
                   when 8
-                    :Literal
+                    :Qualit
                   when 9
+                    :Literal
+                  when 10
                     :unmatchedQuote
                   end
             yield found, typ

data/lib/odata/filter/tree.rb

@@ -65,7 +65,7 @@ module Safrano
       # nil is considered as accepted, otherwise non-nil=the error
       def accept?(tok, typ)
         case typ
-        when :Literal, :Qualit, :QString, :FuncTree, :ArgTree,
+        when :Literal, :NullLiteral, :Qualit, :QString, :FuncTree, :ArgTree,
              :UnopTree, :FPNumber
           nil
         when :Delimiter
@@ -232,7 +232,7 @@ module Safrano
 
       def update_state(_tok, typ)
         case typ
-        when :Literal, :Qualit, :QString, :FuncTree, :BinopBool, :BinopArithm, :UnopTree, :FPNumber
+        when :Literal, :NullLiteral, :Qualit, :QString, :FuncTree, :BinopBool, :BinopArithm, :UnopTree, :FPNumber
           @state = :closed
         end
       end
@@ -297,7 +297,7 @@ module Safrano
           @state = :closed
         when :Separator
           @state =  :sep
-        when :Literal, :Qualit, :QString, :FuncTree, :FPNumber
+        when :Literal, :NullLiteral, :Qualit, :QString, :FuncTree, :FPNumber
           @state =  :val
         end
       end
@@ -327,7 +327,7 @@ module Safrano
           elsif @state == :sep
             Parser::ErrorInvalidToken.new(tok, typ, self)
           end
-        when :Literal, :Qualit, :QString, :FuncTree, :FPNumber
+        when :Literal, :NullLiteral, :Qualit, :QString, :FuncTree, :FPNumber
           if (@state == :open) || (@state == :sep)
             if @parent.arity_full?(@children.size)
               Parser::ErrorInvalidArity.new(tok, typ, self)

data/lib/odata/function_import.rb

@@ -2,8 +2,10 @@
 
 require_relative 'complex_type'
 require_relative 'edm/primitive_types'
+require_relative 'transition'
+
 module Safrano
-  def Safrano.FunctionImport(name)
+  def self.FunctionImport(name)
     FunctionImport::Function.new(name)
   end
 
@@ -24,7 +26,7 @@ module Safrano
 
       def input(**parmtypes)
         @input = {}
-        parmtypes.each { |k, t|
+        parmtypes.each do |k, t|
           @input[k] = case t.name
                       when 'Integer'
                         Safrano::Edm::Edm::Int32
@@ -37,7 +39,7 @@ module Safrano
                       else
                         t
                       end
-        }
+        end
         self
       end
 
@@ -91,20 +93,20 @@ module Safrano
         return nil unless @input # anything to check ?
 
         # do we have all parameters provided ?
-        check_missing_params.tap_error do |error| return error end
+        check_missing_params.tap_error { |error| return error }
         # ==> all params were provided
 
         # now we shall check the content and type of the parameters
-        @input.each { |ksym, typ|
+        @input.each do |ksym, typ|
           typ.convert_from_urlparam(v = @params[ksym.to_s])
              .tap_valid do |retval|
             @funcparams[ksym] = retval
           end
-             .tap_error do |error|
+             .tap_error do
             # return is really needed here, or we end up returning nil below
             return parameter_convertion_error(ksym, typ, v)
           end
-        }
+        end
         nil
       end
 
@@ -125,12 +127,12 @@ module Safrano
                                #                       EntitySet= @entity_set ,
                                'ReturnType' => @returning.type_metadata,
                                'm:HttpMethod' => @http_method)
-        @input.each { |iname, type|
+        @input.each do |iname, type|
           funky.add_element('Parameter',
                             'Name' => iname.to_s,
                             'Type' => type.type_name,
                             'Mode' => 'In')
-        } if @input
+        end if @input
         funky
       end
 
@@ -159,7 +161,7 @@ module Safrano
       end
 
       def transition_end(_match_result)
-        [nil, :end]
+        Transition::RESULT_END
       end
     end
   end

data/lib/odata/model_ext.rb

@@ -299,6 +299,14 @@ module Safrano
 
       attr_class = assoc[:class_name].constantize
       lattr_name_str = (attr_name_str || assoc_symb.to_s)
+
+      # check duplicate attributes names
+      raise Safrano::API::ModelDuplicateAttributeError.new(self, lattr_name_str) if @columns.include? lattr_name_str.to_sym
+
+      if @nav_entity_attribs_keys
+        raise Safrano::API::ModelDuplicateAttributeError.new(self, lattr_name_str) if @nav_entity_attribs_keys.include? lattr_name_str
+      end
+
       @nav_collection_attribs[lattr_name_str] = attr_class
       @nav_collection_attribs_keys << lattr_name_str
       @nav_collection_url_regexp = @nav_collection_attribs_keys.join('|')
@@ -317,6 +325,14 @@ module Safrano
 
       attr_class = assoc[:class_name].constantize
       lattr_name_str = (attr_name_str || assoc_symb.to_s)
+
+      # check duplicate attributes names
+      raise Safrano::API::ModelDuplicateAttributeError.new(self, lattr_name_str) if @columns.include? lattr_name_str.to_sym
+
+      if @nav_collection_attribs_keys
+        raise Safrano::API::ModelDuplicateAttributeError.new(self, lattr_name_str) if @nav_collection_attribs_keys.include? lattr_name_str
+      end
+
       @nav_entity_attribs[lattr_name_str] = attr_class
       @nav_entity_attribs_keys << lattr_name_str
       @nav_entity_url_regexp = @nav_entity_attribs_keys.join('|')
@@ -352,6 +368,9 @@ module Safrano
 
       build_allowed_transitions
       build_entity_allowed_transitions
+
+      # for media
+      finalize_media if self.respond_to? :finalize_media
     end
 
     KEYPRED_URL_REGEXP = /\A\(\s*'?([\w=,'\s]+)'?\s*\)(.*)/.freeze

data/lib/odata/walker.rb

@@ -30,9 +30,9 @@ module Safrano
     # are $links requested ?
     attr_reader :do_links
 
-    NIL_SERVICE_FATAL = 'Walker is called with a nil service'.freeze
-    EMPTYSTR = ''.freeze
-    SLASH = '/'.freeze
+    NIL_SERVICE_FATAL = 'Walker is called with a nil service'
+    EMPTYSTR = ''
+    SLASH = '/'
 
     def initialize(service, path, content_id_refs = nil)
       raise NIL_SERVICE_FATAL unless service

data/lib/safrano/contract.rb

@@ -106,11 +106,11 @@ module Safrano
       end
     end # class Valid
 
-    def Contract.valid(result)
+    def self.valid(result)
       Contract::Valid.new(result)
     end
 
-    def Contract.and(*contracts)
+    def self.and(*contracts)
       # pick the first error if any
       if (ff = contracts.find(&:error))
         return ff
@@ -118,18 +118,18 @@ module Safrano
 
       # return a new one with @result = list of the contracts's results
       # usually this then be reduced again with #collect_result! or #               #if_valid_collect methods
-      Contract.valid(contracts.map(&:result))
+      valid(contracts.map(&:result))
     end
 
     # shortcut for Contract.and(*contracts).collect_result!
-    def Contract.collect_result!(*contracts)
+    def self.collect_result!(*contracts)
       # pick the first error if any
       if (ff = contracts.find(&:error))
         return ff
       end
 
       # return a new one with @result = yield(*list of the contracts's results)
-      Contract.valid(yield(*contracts.map(&:result)))
+      valid(yield(*contracts.map(&:result)))
     end
 
     # generic success return, when return value does not matter

data/lib/safrano/core.rb

@@ -6,22 +6,22 @@ module Safrano
   EMPTY_ARRAY = [].freeze
   EMPTY_HASH = {}.freeze
   EMPTY_HASH_IN_ARY = [EMPTY_HASH].freeze
-  EMPTY_STRING = ''.freeze
+  EMPTY_STRING = ''
   ARY_204_EMPTY_HASH_ARY = [204, EMPTY_HASH, EMPTY_ARRAY].freeze
-  SPACE = ' '.freeze
-  COMMA = ','.freeze
+  SPACE = ' '
+  COMMA = ','
 
   # some prominent constants... probably already defined elsewhere eg in Rack
   # but lets KISS
-  CONTENT_TYPE = 'Content-Type'.freeze
-  CTT_TYPE_LC = 'content-type'.freeze
-  TEXTPLAIN_UTF8 = 'text/plain;charset=utf-8'.freeze
-  APPJSON = 'application/json'.freeze
-  APPXML = 'application/xml'.freeze
-  MP_MIXED = 'multipart/mixed'.freeze
-  APPXML_UTF8 = 'application/xml;charset=utf-8'.freeze
-  APPATOMXML_UTF8 = 'application/atomsvc+xml;charset=utf-8'.freeze
-  APPJSON_UTF8 = 'application/json;charset=utf-8'.freeze
+  CONTENT_TYPE = 'Content-Type'
+  CTT_TYPE_LC = 'content-type'
+  TEXTPLAIN_UTF8 = 'text/plain;charset=utf-8'
+  APPJSON = 'application/json'
+  APPXML = 'application/xml'
+  MP_MIXED = 'multipart/mixed'
+  APPXML_UTF8 = 'application/xml;charset=utf-8'
+  APPATOMXML_UTF8 = 'application/atomsvc+xml;charset=utf-8'
+  APPJSON_UTF8 = 'application/json;charset=utf-8'
 
   CT_JSON = { CONTENT_TYPE => APPJSON_UTF8 }.freeze
   CT_TEXT = { CONTENT_TYPE => TEXTPLAIN_UTF8 }.freeze

data/lib/safrano/deprecation.rb

@@ -22,7 +22,7 @@ module Safrano
   module Deprecation
     @backtrace_filter = false
     @output = $stderr
-    @prefix = "SAFRANO DEPRECATION WARNING: ".freeze
+    @prefix = 'SAFRANO DEPRECATION WARNING: '
 
     class << self
       # How to filter backtraces.  +false+ does not include backtraces, +true+ includes
@@ -64,10 +64,10 @@ module Safrano
     # otherwise do nothing as the ruby implementation does not support constant deprecation.
     def self.deprecate_constant(mod, constant)
       # :nocov:
-      if RUBY_VERSION > '2.3'
-        # :nocov:
-        mod.deprecate_constant(constant)
-      end
+      return unless RUBY_VERSION > '2.3'
+
+      # :nocov:
+      mod.deprecate_constant(constant)
     end
   end
 end

data/lib/safrano/multipart.rb

@@ -110,11 +110,11 @@ module MIME
         @target.ct = @target_ct
         @state = :bmp
       end
-      MPS = 'multipart/'.freeze
+      MPS = 'multipart/'
       MP_RGX1 = %r{^(digest|mixed);\s*boundary="(.*)"}.freeze
       MP_RGX2 = %r{^(digest|mixed);\s*boundary=(.*)}.freeze
       #      APP_HTTP_RGX = %r{^application/http}.freeze
-      APP_HTTP = 'application/http'.freeze
+      APP_HTTP = 'application/http'
       def new_content
         @target =
           if @target_ct.start_with?(MPS) &&

data/lib/safrano/rack_app.rb

@@ -56,7 +56,7 @@ module Safrano
     NOCACHE_HDRS = { 'Cache-Control' => 'no-cache',
                      'Expires' => '-1',
                      'Pragma' => 'no-cache' }.freeze
-    DATASERVICEVERSION = 'DataServiceVersion'.freeze
+    DATASERVICEVERSION = 'DataServiceVersion'
     include MethodHandlers
 
     def before

data/lib/safrano/request.rb

@@ -9,7 +9,7 @@ module Safrano
   # is not passed
   class Request < Rack::Request
     HEADER_PARAM = /\s*[\w.]+=(?:[\w.]+|"(?:[^"\\]|\\.)*")?\s*/.freeze
-    HEADER_VAL_RAW = '(?:\w+|\*)\/(?:\w+(?:\.|\-|\+)?|\*)*'.freeze
+    HEADER_VAL_RAW = '(?:\w+|\*)\/(?:\w+(?:\.|\-|\+)?|\*)*'
     HEADER_VAL_WITH_PAR = /(?:#{HEADER_VAL_RAW})\s*(?:;#{HEADER_PARAM})*/.freeze
     ON_CGST_ERROR = (proc { |r| raise(Sequel::Rollback) if r.in_changeset })
 
@@ -194,7 +194,7 @@ module Safrano
       if (rqv = env['HTTP_DATASERVICEVERSION'])
         if (m = DATASERVICEVERSION_RGX.match(rqv))
           # client request an too new version --> 501
-          if ((v = m[1]) > Safrano::MAX_DATASERVICE_VERSION) or
+          if ((v = m[1]) > Safrano::MAX_DATASERVICE_VERSION) ||
              (v < Safrano::MIN_DATASERVICE_VERSION)
             Safrano::VersionNotImplementedError
           else

data/lib/safrano/service.rb

@@ -15,8 +15,8 @@ module Safrano
   # and will be included in Service class
   module ExpandHandler
     PATH_SPLITTER = %r{\A(\w+)/?(.*)\z}.freeze
-    DEFERRED = '__deferred'.freeze
-    URI = 'uri'.freeze
+    DEFERRED = '__deferred'
+    URI = 'uri'
 
     def get_deferred_odata_h(entity_uri:, attrib:)
       { DEFERRED => { URI => "#{entity_uri}/#{attrib}" } }
@@ -24,8 +24,8 @@ module Safrano
 
     # default v2
     # overriden in ServiceV1
-    RESULTS_K = 'results'.freeze
-    COUNT_K = '__count'.freeze
+    RESULTS_K = 'results'
+    COUNT_K = '__count'
     def get_coll_odata_h(array:, template:, icount: nil)
       array.map! do |w|
         get_entity_odata_h(entity: w, template: template)
@@ -40,7 +40,7 @@ module Safrano
     end
 
     EMPTYH = {}.freeze
-    METADATA_K = '__metadata'.freeze
+    METADATA_K = '__metadata'
     def get_entity_odata_h(entity:, template:)
       # start with metadata
       hres = { METADATA_K => entity.metadata_h }
@@ -90,21 +90,20 @@ module Safrano
   # xml namespace constants needed for the output of XML service and
   # and metadata
   module XMLNS
-    MSFT_ADO = 'http://schemas.microsoft.com/ado'.freeze
-    MSFT_ADO_2009_EDM = "#{MSFT_ADO}/2009/11/edm".freeze
-    MSFT_ADO_2007_EDMX = "#{MSFT_ADO}/2007/06/edmx".freeze
-    MSFT_ADO_2007_META = MSFT_ADO + \
-                         '/2007/08/dataservices/metadata'.freeze
-
-    W3_2005_ATOM = 'http://www.w3.org/2005/Atom'.freeze
-    W3_2007_APP = 'http://www.w3.org/2007/app'.freeze
+    MSFT_ADO = 'http://schemas.microsoft.com/ado'
+    MSFT_ADO_2009_EDM = "#{MSFT_ADO}/2009/11/edm"
+    MSFT_ADO_2007_EDMX = "#{MSFT_ADO}/2007/06/edmx"
+    MSFT_ADO_2007_META = "#{MSFT_ADO}/2007/08/dataservices/metadata"
+
+    W3_2005_ATOM = 'http://www.w3.org/2005/Atom'
+    W3_2007_APP = 'http://www.w3.org/2007/app'
   end
 end
 
 # Link to Model
 module Safrano
-  MAX_DATASERVICE_VERSION = '2'.freeze
-  MIN_DATASERVICE_VERSION = '1'.freeze
+  MAX_DATASERVICE_VERSION = '2'
+  MIN_DATASERVICE_VERSION = '1'
   CV_MAX_DATASERVICE_VERSION = Contract.valid(MAX_DATASERVICE_VERSION).freeze
   CV_MIN_DATASERVICE_VERSION = Contract.valid(MIN_DATASERVICE_VERSION).freeze
   include XMLNS
@@ -113,7 +112,7 @@ module Safrano
     include Safrano
     include ExpandHandler
 
-    XML_PREAMBLE = %Q(<?xml version="1.0" encoding="utf-8" standalone="yes"?>\r\n).freeze
+    XML_PREAMBLE = %Q(<?xml version="1.0" encoding="utf-8" standalone="yes"?>\r\n)
 
     # This is just a hash of entity Set Names to the corresponding Class
     # Example
@@ -161,8 +160,8 @@ module Safrano
     end
 
     TRAILING_SLASH = %r{/\z}.freeze
-    DEFAULT_PATH_PREFIX = '/'.freeze
-    DEFAULT_SERVER_URL = 'http://localhost:9494'.freeze
+    DEFAULT_PATH_PREFIX = '/'
+    DEFAULT_SERVER_URL = 'http://localhost:9494'
 
     def enable_batch
       @batch_handler = Safrano::Batch::EnabledHandler.new
@@ -530,7 +529,7 @@ module Safrano
 
     # methods related to transitions to next state (cf. walker)
     module Transitions
-      DOLLAR_ID_REGEXP = Regexp.new('\A\/\$').freeze
+      DOLLAR_ID_REGEXP = Regexp.new('\A\/\$')
       ALLOWED_TRANSITIONS_FIXED = [
         Safrano::TransitionEnd,
         Safrano::TransitionMetadata,

data/lib/safrano/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - oz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -56,16 +56,16 @@ dependencies:
   name: rfc2047
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.0.rc.2
 signing_key: 
 specification_version: 4
 summary: Safrano is a Ruby OData server library based on Sequel and Rack