safrano 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00bf6cd3a561928000b8bf53bbc71f139b162f92adc229e625f010dc6f1ce3c7
-  data.tar.gz: bf154e1b55e4d32e4640d6c993566a45eae8a2bce44b23dd979a9946d3633dc7
+  metadata.gz: 64699787371f5e9f696461faac80382cf2d53fe78d387742d8650e5a4b2c54df
+  data.tar.gz: 530e7619b4b27a1a50a63f832d4f3a8894850c6cea36e638769cdffbc6b7d942
 SHA512:
-  metadata.gz: 9b2fad0321b45bae50f3435b688b31f99d320cfa4f81f14867f64659faa0c4e8ece7bc4f1f7ecc2db2c7710c08f7726bb4d758bf5d09d487a54199afea50119a
-  data.tar.gz: b9a70b4a08fb7a2cc31df7e7637f635a42a85433660f5061f6897e1fb463496252c8d611fb1023e5f27202bbc478b58569d2ad42b1c3359db14e34c92f4ec35c
+  metadata.gz: e5d118f15a3a3ba78f5385867c82370e36612585b7f83329343babb2e3a8a7220d1059ad766fbe7c9e1f7f74a57945c086e60624d0301259c1427f0053b59052
+  data.tar.gz: 52b283be3e8902226f14864a74eae30bc62c65908be748ea37c5a150f574f3130c8957f26251e1958e298eba221eeada9f0155fcc73ed2591034e97466f1e629

data/lib/odata/edm/primitive_types.rb

@@ -20,13 +20,15 @@ module Safrano
   # cf. Sequel Database column_schema_default_to_ruby_value
   #                     schema_column_type
   # https://www.odata.org/documentation/odata-version-2-0/overview/
-  def self.default_edm_type(ruby_type:)
+  def self.default_edm_type(ruby_type:, db_type: )
     case ruby_type
     when :integer
       'Edm.Int32'
     when :string
       'Edm.String'
-    when :date, :datetime,
+    when :date
+      'Edm.DateTime'
+    when :datetime
       'Edm.DateTime'
     when :time
       'Edm.Time'
@@ -38,6 +40,10 @@ module Safrano
       'Edm.Decimal'
     when :blob
       'Edm.Binary'
+    else  # try with db_type:
+      if ( db_type =~ /\ANUMERIC/ )
+        'Edm.Decimal'
+      end
     end
   end
 

data/lib/odata/entity.rb

@@ -311,7 +311,7 @@ module Safrano
   end
 
   module MappingBeforeOutput
-    # needed for proper datetime output
+    # needed for proper datetime or Decimal output
     def casted_values(cols = nil)
       vals = case cols
              when nil
@@ -322,6 +322,10 @@ module Safrano
              else
                selected_values_for_odata(cols)
              end
+      # TODO better design (perf/ do more during startup and less during request runtime )    
+      # TODO replace the quick and dirty BigDecimal hack with something better      
+      self.class.decimal_cols.each { |dc| vals[dc] = BigDecimal(vals[dc].to_s).to_s('F') if vals.key?(dc) }
+             
       self.class.time_cols.each { |tc| vals[tc] = vals[tc]&.iso8601 if vals.key?(tc) }
       vals
     end

data/lib/odata/model_ext.rb

@@ -6,6 +6,7 @@
 
 require 'json'
 require 'rexml/document'
+require 'bigdecimal'
 require_relative '../safrano/core'
 require_relative 'error'
 require_relative 'collection_filter'
@@ -32,6 +33,7 @@ module Safrano
     attr_reader :uri
     attr_reader :odata_upk_parts
     attr_reader :time_cols
+    attr_reader :decimal_cols
     attr_reader :namespace
 
     # initialising block of code to be executed at end of
@@ -73,7 +75,7 @@ module Safrano
       @uparms = nil
       @params = nil
       @cx = nil
-      @@time_cols = nil
+#      @@time_cols = nil
     end
 
     def build_uri(uribase)
@@ -358,11 +360,16 @@ module Safrano
       # Time columns
       @time_cols = db_schema.select { |_c, v| v[:type] == :datetime }.map { |c, _v| c }
 
+      
+
       # add edm_types into schema
       db_schema.each do |_col, props|
-        props[:odata_edm_type] = Safrano.default_edm_type(ruby_type: props[:type])
+        props[:odata_edm_type] = Safrano.default_edm_type(ruby_type: props[:type],
+                                                          db_type: props[:db_type])
       end
-
+      # Edm.Decimal cols
+      @decimal_cols = db_schema.select { |_c, v| v[:odata_edm_type] == 'Edm.Decimal' }.map { |c, _v| c }
+      
       # and finally build the path lists and allowed tr's
       build_attribute_path_list
       build_expand_path_list

data/lib/safrano/service.rb

@@ -375,7 +375,8 @@ module Safrano
       # finalize the uri's and include NoMappingBeforeOutput or MappingBeforeOutput as needed
       @collections.each do |klass|
         klass.build_uri(@uribase)
-        klass.include(klass.time_cols.empty? ? Safrano::NoMappingBeforeOutput : Safrano::MappingBeforeOutput)
+        # TODO perf 
+        klass.include( (klass.time_cols.empty? && klass.decimal_cols.empty?) ? Safrano::NoMappingBeforeOutput : Safrano::MappingBeforeOutput)
 
         # Output create (POST) as single entity (Standard) or as array (non-standard buggy)
         klass.include ( @bugfix_create_response ? Safrano::EntityCreateStandardOutput : Safrano::EntityCreateArrayOutput)
@@ -504,7 +505,9 @@ module Safrano
       doc.add_element('edmx:Edmx', 'Version' => '1.0')
       doc.root.add_namespace('xmlns:edmx', XMLNS::MSFT_ADO_2007_EDMX)
       serv = doc.root.add_element('edmx:DataServices',
-                                  'm:DataServiceVersion' => '1.0')
+      # TODO: export the real version (result from version negotions)
+      # but currently we support only v1 and v2, and most users will use v2
+                                  'm:DataServiceVersion' => '2.0')
       # 'm:DataServiceVersion' => "#{self.dataServiceVersion}" )
       # DataServiceVersion: This attribute MUST be in the data service
       # metadata namespace

data/lib/safrano/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - oz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-20 00:00:00.000000000 Z
+date: 2021-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack