safrano 0.6.3 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33ec32a310f05cb4118e15152f2209aec1551d6363af29eddae28b92d4abf79d
-  data.tar.gz: 78d6e4c243fc124280ddfc352f0e9376aae269c016bd57b9d9693caff0c7e5c2
+  metadata.gz: b71032a7ee1e048867f3b54f57d920ba772a44f29a3419a598d2206d50e949c7
+  data.tar.gz: d203df34eda2c7aad9385a84e866d273f1a1f37ba981ffdcc8956de9dad35633
 SHA512:
-  metadata.gz: 4344b9959b281e77d830fabf9d812655a50c9560258a5cca3a3364c4569efb10beee34bc7bf0f2fa1b86561fcdff499e40cb3e5a8d819a4b94013870b9a57e91
-  data.tar.gz: e0027ac6315f9b7ee8e1b948de9c5f1236b01f79638ef3ddcc8adad3a1972091ba5ce52f5bea060ad673581b38a7d00cb4a24ed6aa295c92558e228aabde775f
+  metadata.gz: d5cb1583e62f42f9007368204d24f101273049c05e75723dbcd7796732d83e1ac29a1515df0a876a2002c212b0da8204c498070104688fd4b493092072e13dee
+  data.tar.gz: 96aa136d330148331b98943807c83b42e466aa7357c8b360b3f5a66843b9472df41015309b2bef19d993bdabf5f4d1d41e983e7082a1f06d34015370bc87a034

data/lib/odata/complex_type.rb

@@ -82,7 +82,11 @@ module Safrano
 
       # needed for ComplexType result
       def to_odata_json(_req)
-        "#{DJ_OPEN}#{@value.odata_h.to_json}#{DJ_CLOSE}"
+        t = self.class.klassmod.output_template
+        innerh = _req.service.get_entity_odata_h(entity: @value, template: t)
+        innerj = innerh.to_json
+
+        "#{DJ_OPEN}#{innerj}#{DJ_CLOSE}"
       end
 
       # wrapper
@@ -105,7 +109,6 @@ module Safrano
       end
 
       def to_odata_json(req)
-        #        "#{DJ_OPEN}#{{ RESULTSK => coll.map { |c| c.odata_h } }.to_json}#{DJ_CLOSE}"
         template = self.class.klassmod.output_template
         # TODO: Error handling if database contains binary BLOB data that cant be
         # interpreted as UTF-8 then JSON will fail here
@@ -226,7 +229,7 @@ module Safrano
     end
 
     def self.type_name
-      @namespace ? "#{@namespace}.#{self}" : to_s
+      namespace ? "#{namespace}.#{self}" : to_s
     end
 
     def initialize

data/lib/odata/filter/token.rb

@@ -69,7 +69,7 @@ module Safrano
                         :Literal
                       when 14
                         :unmatchedQuote
-                end
+                      end
                 yield tok, typ
                 break
               end

data/lib/odata/request/json.rb

@@ -14,12 +14,9 @@ module Safrano
 
       def self.cast_values_in(resd, typ)
         typ.db_schema.each do |f, props|
-          metadata = typ.cols_metadata[f]
-
           case props[:type]
           when :datetime, :date
             fstr = f.to_s
-            # resd[fstr] = Time.parse(resd[f]) if resd[fstr]
             resd[fstr] = Sequel.datetime_class.from_edm_json(resd[fstr]) if resd[fstr]
           end
         end
@@ -48,7 +45,7 @@ module Safrano
 
       if (defered = resd[:__deferred])
         defered.symbolize_keys!
-      elsif meta = resd[:__metadata]
+      elsif (meta = resd[:__metadata])
         meta.symbolize_keys!
 
         # type is normally namespaced !  --> split.last is the class
@@ -101,7 +98,7 @@ module Safrano
 
       if (defered = resd[:__deferred])
         defered.symbolize_keys!
-      elsif meta = resd[:__metadata]
+      elsif (meta = resd[:__metadata])
         meta.symbolize_keys!
 
         typ = get_class_from_meta(meta)

data/lib/safrano/service.rb

@@ -336,7 +336,8 @@ module Safrano
       @complex_types.add ctklass
     end
 
-    def function_import(name)
+    def function_import(name_p)
+      name = name_p.to_s
       funcimp = Safrano::FunctionImport(name)
       @function_imports[name] = funcimp
       @function_import_keys << name
@@ -365,7 +366,7 @@ module Safrano
 
     # need to be sorted by size too
     def set_funcimports_sorted
-      @function_import_keys.sort_by! { |k| k.size }.reverse!
+      @function_import_keys.sort_by!(&:size).reverse!
     end
     # to be called at end of publishing block to ensure we get the right names
     # and additionally build the list of valid attribute path's used

data/lib/safrano/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.5
 platform: ruby
 authors:
 - oz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 2022-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack