safrano 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a63e3a22f60471d153475bbe642f7321cf0718e71b7ffcc693a748feed9d823
-  data.tar.gz: 939929f69a3dfeab08ebec25bfa41b5fb7a88b2a00ef47825b4fa0030400e94a
+  metadata.gz: b38827d37fa3bfed54a30aa61c04b5da27470071c5e3167fb5a08aa5c48a69af
+  data.tar.gz: 3754e63822b6c504b42bc698df360295ab92bcf96a2ed8fdef4af7f2ed5c8d85
 SHA512:
-  metadata.gz: c9063333a3ab01760260a8e96311af49ae428c926d25d8b56dc64aee289e909227a77a0e3c074861deec296446a5a0ddadcd951ef409ae3dd246c6c7115d9a91
-  data.tar.gz: a9e76a33dfdfea13c9df798ac169accf729f18578f4c0fb7071f51709baa05cea56cee8e3d02934f7aef6c865ce89b3ed72aecfaaf8aad91a9c99617054d2c90
+  metadata.gz: 0c6a3949c741f120955b4582ddad95aa3fefe80f613030970c174b4fe000129e4d2f67dcb43deae5608a2a287a489a4c94d6ba0df5a613c5557b22b8ca4f625b
+  data.tar.gz: 7e5070fa657435fbc3a2932344392e58fa7105863bb045ad5a0aac7227a1e7ce5e4f54628915c81156da2f315eb359409c786243c47697877237ac08294a7872

data/lib/odata/complex_type.rb

@@ -31,8 +31,18 @@ module Safrano
         "Collection(#{@klassmod.type_name})"
       end
 
-      def to_odata_json(coll, _req)
-        "#{DJ_OPEN}#{{ RESULTSK => coll.map { |c| c.odata_h } }.to_json}#{DJ_CLOSE}"
+      def to_odata_json(coll, req)
+#        "#{DJ_OPEN}#{{ RESULTSK => coll.map { |c| c.odata_h } }.to_json}#{DJ_CLOSE}"
+        template = @klassmod.output_template
+        # TODO: Error handling if database contains binary BLOB data that cant be
+        # interpreted as UTF-8 then JSON will fail here
+
+        innerh = req.service.get_coll_odata_h(array: coll,
+                                              template: template)
+                                              
+        innerj = innerh.to_json
+
+        "#{DJ_OPEN}#{innerj}#{DJ_CLOSE}"
       end
     end
     class ResultAsEntity < ResultDefinition
@@ -80,7 +90,8 @@ module Safrano
   # with added OData functionality
   class ComplexType
     attr_reader :values
-
+    EMPTYH = {}.freeze
+    
     @namespace = nil
     def self.namespace
       @namespace
@@ -89,9 +100,41 @@ module Safrano
     def self.props
       @props
     end
-
+    
+    def type_name
+      self.class.type_name
+    end
+    
+    def metadata_h
+      {   type: type_name }
+    end
+    
+    def casted_values
+      # MVP... TODO: handle time mappings like in Entity models
+      values
+    end
+    
+    # needed for nested json output
+    # this is a simpler version of model_ext#output_template
+    def self.default_template
+      template = {}
+      expand_e = {}
+      
+      template[:all_values] = EMPTYH
+      @props.each { |prop, kl| 
+        if kl.respond_to? :default_template
+          expand_e[prop] = kl.default_template
+        end
+      }
+      template[:expand_e] = expand_e
+      template
+    end
+    
+    def self.output_template
+      default_template
+    end
     def self.type_name
-      "#{@namespace}.#{self.to_s}"
+      @namespace ? "#{@namespace}.#{self.to_s}" : self.to_s
     end
 
     def initialize
@@ -102,6 +145,7 @@ module Safrano
 
     def odata_h
       ret = { METAK => { TYPEK => self.class.type_name } }
+
       @values.each { |k, v|
         ret[k] = if v.respond_to? :odata_h
                    v.odata_h

data/lib/odata/model_ext.rb

@@ -94,8 +94,10 @@ module Safrano
 
     # Factory json-> Model Object instance
     def new_from_hson_h(hash)
-      enty = new
-      enty.set_fields(hash, data_fields, missing: :skip)
+      #enty = new
+      #enty.set_fields(hash, data_fields, missing: :skip)
+      enty = create(hash)
+      #enty.set(hash)
       enty
     end
 

data/lib/safrano/contract.rb

@@ -62,6 +62,8 @@ module Safrano
     # All tap_valid* handlers are executed
     #     tap_error* handlers are not executed
     class Valid
+      attr_reader :result
+
       def initialize(result)
         @result = result
       end
@@ -100,10 +102,6 @@ module Safrano
       def error
         nil
       end
-
-      def result
-        @result
-      end
     end # class Valid
 
     def self.valid(result)

data/lib/safrano/service.rb

@@ -112,7 +112,7 @@ module Safrano
     include Safrano
     include ExpandHandler
 
-    XML_PREAMBLE = %Q(<?xml version="1.0" encoding="utf-8" standalone="yes"?>\r\n)
+    XML_PREAMBLE = %(<?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

data/lib/safrano/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - oz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack