emp_json 1.4.0 → 1.5.0.pre.g5eec38832

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df0eb71a3f413916a7ad5b68726feef4a55a88dafd7692bc449603007cb4f6a9
-  data.tar.gz: 15904f53e40c7f53a003be6a6bdb6f74c175f2092203eac4f38d859661cb7820
+  metadata.gz: 42a7ee8f987922575b898af0f2166deb5f06645a8bb6dd7af1844384883f1de1
+  data.tar.gz: 00e02e32f02ea629ef7d70156d2d2e911ee4e67133ee6f3a9d65e00e46711eda
 SHA512:
-  metadata.gz: f80fc514087f3b554fbd8d76bf85420e51c85f2284c8546008e36b9dc4684a5d9e6d91982d9c30b2f463faf975e677c7af941e22d7d5d30145036001ce817506
-  data.tar.gz: f44a14332880591806436e5c3d7882a98858701801bda9854bf48c8c2beb54fde146882f716d94b09692b1b7a9408cd280ee657212b6701dfa8ab585a40f42d6
+  metadata.gz: 64db6485db89cac819e8bdbc31f01e925b301a23286de9df69d5335cc477c5812aae187785bc562d39c18933b911ee8886b926f83abacc85bd0845335f5d4896
+  data.tar.gz: d31b26826e6966a7162892f99153be3cdaaa1baf1aac5e699232487294c1d04f1b415f4a6088fd0a4bf07776ee34aea17f9d7cfbf1604b75018736fd556dcdf2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    emp_json (1.4.0)
+    emp_json (1.5.0.pre.g5eec38832)
 
 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

@@ -46,7 +46,7 @@ module Empathy
 
         # Returns a record from a slice.
         def record_from_slice(slice, id, website_iri = nil)
-          slice[absolutized_id(retrieve_id(id), website_iri)] || slice[retrieve_id(id)]
+          slice[absolutized_id(retrieve_id_string(id), website_iri)] || slice[retrieve_id_string(id)]
         end
 
         def field_from_record(record, field)
@@ -56,15 +56,19 @@ 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 resource if resource.is_a?(URI) || resource.is_a?(RDF::URI) || resource.is_a?(RDF::Node)
 
           resource.try(:iri) || resource.try(:subject) || resource.try(:id) || resource
         end
 
+        def retrieve_id_string(resource)
+          retrieve_id(resource).to_s
+        end
+
         def absolutized_id(id, website_iri = nil)
-          return id.to_s.delete_prefix(website_iri) if website_iri.present?
+          return id.delete_prefix(website_iri) if website_iri.present?
 
-          id.to_s
+          id
         end
 
         def normalise_slice_values(values)

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
+  version: 1.5.0.pre.g5eec38832
 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:
@@ -75,9 +75,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0.preview1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.7
 signing_key: