emp_json 1.4.0.pre.g2575975e4 → 1.5.0.pre.g3c92a8018

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42aaaba45f4492719c1b3528f66916835db5953cc0653e8be87480c190b8f406
-  data.tar.gz: 98f3f75abd3a9b9132451d82920081b4e5a1700eaccb5267ba2a5f60334895b0
+  metadata.gz: 121becc966e6a9833e11c3c60bee8be33c16b923563ab42d16308e32f71cf95b
+  data.tar.gz: 68eca93dbd9657472016c6a678fe119c8c969d4d34d2d160411a2b4e896d0c58
 SHA512:
-  metadata.gz: 298e200bc75c0f5bf8bb4c6e42d3c2f5369ba24a0ab50b9d4cb0ecfa9e245b9b33930f5c2a15ffc00ac1aa2180762eb048507794c53d5a9d76f73b4f1178ba1d
-  data.tar.gz: 4fe179db61decfb069f343f64f5f3f4f5aba494ec9f0a88061485ecad5a13d3e36d61fe86b35f7ef6ed05bdd86593444682649f61fd67d6cbc29719006c3dd06
+  metadata.gz: f12f1975dcf8e7d503ac784a3244fab8df777ed7e031f12700f60bd6ae625e873ca8082f3dd6bd81c784cbf3b3d0c635e8a9c083eee0969282e793cf8d4b6f9f
+  data.tar.gz: 643f72eb86e12c1dcd5a0e4f0b3f8fe51e850bac06fd42fa4fb518673dce7ffe2f13350d9ea45deed304819d3dd6974c9702a67f212f16e361b2c0ec5bad1056

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    emp_json (1.4.0.pre.g2575975e4)
+    emp_json (1.5.0.pre.g3c92a8018)
 
 GEM
   remote: https://rubygems.org/

data/lib/empathy/emp_json/helpers/primitives.rb

@@ -14,6 +14,7 @@ module Empathy
         EMP_TYPE_STRING = "s"
         EMP_TYPE_BOOL = "b"
         EMP_TYPE_INTEGER = "i"
+        EMP_TYPE_DOUBLE = "d"
         EMP_TYPE_LONG = "l"
         EMP_TYPE_PRIMITIVE = "p"
         EMP_TYPE_LANGSTRING = "ls"
@@ -28,6 +29,9 @@ module Empathy
         RDF_XSD_DATETIME = "#{RDF_XSD}dateTime"
         RDF_XSD_BOOLEAN = "#{RDF_XSD}boolean"
         RDF_XSD_INTEGER = "#{RDF_XSD}integer"
+        RDF_XSD_FLOAT = "#{RDF_XSD}float"
+        RDF_XSD_DOUBLE = "#{RDF_XSD}double"
+        RDF_XSD_DECIMAL = "#{RDF_XSD}decimal"
 
         def object_to_value(value)
           return primitive_to_value(value.iri) if value.respond_to?(:iri)
@@ -59,7 +63,9 @@ module Empathy
             shorthand(EMP_TYPE_BOOL, value.to_s)
           when Integer
             integer_to_value(value)
-          when Float, Numeric
+          when Float
+            shorthand(EMP_TYPE_DOUBLE, value.to_s)
+          when Numeric
             use_rdf_rb_for_primitive(value)
           when RDF::Literal
             rdf_literal_to_value(value)
@@ -79,7 +85,7 @@ module Empathy
           end
         end
 
-        def rdf_literal_to_value(value) # rubocop:disable Metrics/AbcSize
+        def rdf_literal_to_value(value) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
           case value.datatype.to_s
           when RDF_RDFV_LANGSTRING
             {
@@ -95,10 +101,14 @@ module Empathy
             shorthand(EMP_TYPE_DATETIME, value.value)
           when RDF_XSD_BOOLEAN
             shorthand(EMP_TYPE_BOOL, value.value)
+          when RDF_XSD_DOUBLE
+            shorthand(EMP_TYPE_DOUBLE, value.value)
+          when RDF_XSD_DECIMAL, RDF_XSD_FLOAT
+            primitive(value.datatype.to_s, value.value)
           when RDF_XSD_INTEGER
             integer_to_value(value.to_i)
           else
-            throw "unknown RDF::Literal"
+            throw "unknown RDF::Literal: #{value.datatype}"
           end
         end
 

data/lib/empathy/emp_json/helpers/slices.rb

@@ -56,7 +56,8 @@ module Empathy
         end
 
         def retrieve_id(resource)
-          return resource.to_s if resource.is_a?(URI) || resource.is_a?(RDF::URI) || resource.is_a?(RDF::Node)
+          return RDF::URI(resource) if resource.is_a?(URI)
+          return resource if resource.is_a?(RDF::URI) || resource.is_a?(RDF::Node)
 
           resource.try(:iri) || resource.try(:subject) || resource.try(:id) || resource
         end

data/lib/empathy/emp_json/serializer/fields.rb

@@ -58,7 +58,7 @@ module Empathy
         end
 
         def value_for_attribute(attr, resource, serialization_params)
-          return resource.try(attr.method) if attr.method.is_a?(Symbol)
+          return resource.try(attr.method) if attr.method.is_a?(Symbol) || attr.method.is_a?(String)
 
           FastJsonapi.call_proc(attr.method, resource, serialization_params)
         end

data/lib/empathy/emp_json/version.rb

@@ -2,6 +2,6 @@
 
 module Empathy
   module EmpJson
-    VERSION = "1.4.0"
+    VERSION = "1.5.0"
   end
 end

data/sig/lib/empathy/emp_json/helpers/primitives.rbs

@@ -16,6 +16,8 @@ module Empathy
 
         EMP_TYPE_INTEGER: "i"
 
+        EMP_TYPE_DOUBLE: "d"
+
         EMP_TYPE_LONG: "l"
 
         EMP_TYPE_PRIMITIVE: "p"
@@ -42,6 +44,12 @@ module Empathy
 
         RDF_XSD_INTEGER: "http://www.w3.org/2001/XMLSchema#integer"
 
+        RDF_XSD_FLOAT: "http://www.w3.org/2001/XMLSchema#float"
+
+        RDF_XSD_DOUBLE: "http://www.w3.org/2001/XMLSchema#double"
+
+        RDF_XSD_DECIMAL: "http://www.w3.org/2001/XMLSchema#decimal"
+
         type shorthand = { type: string, v: string }
         type primitive = { type: string, dt: string, v: string }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emp_json
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre.g2575975e4
+  version: 1.5.0.pre.g3c92a8018
 platform: ruby
 authors:
 - Thom van Kalkeren
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies: []
 description: Serializer for the EmpJson specification.
 email: