emp_json 1.3.0.pre.g9596e781b → 1.4.0.pre.g116cfb0af

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84cc8976cd03cf429641613fd5467538ea535c49e88c71809061f4c3090cb84d
-  data.tar.gz: da8634f8408c17d6d32ec1cca6681016a455f36d51a1c22a96005339a39a392b
+  metadata.gz: db8ae7e00135fe90e122cafa2334da420e5f880ad18b9bc38ef5185974896c71
+  data.tar.gz: 6570ec075a62745233853b38e5d9d6d15a4732356b8c22afb9c087818912a94e
 SHA512:
-  metadata.gz: b549efd7b3131794ec10737312dd71ccef5f8b2ac64aeaa3ecc15662e3fd18fe87813c6493b89db8cb2f932f557e51b239bbbfbccddfb10cef4bcaee75a1c271
-  data.tar.gz: 812cb4fe6c46d2b823e7a1f50422762f3289912a304299dd865a7ce15ab8935c83f7798f96921439f554f0d6eb623e66a0c14c142509a8b6893a080590a8bc87
+  metadata.gz: 850ba38394542800c7f40f08f9be4403ccf1a8b5a91ade1d56852f16fb89238c544b3569db778a7139aee37cc4ea6aa6889172f18cc1bfb1e46214b3eebbff7a
+  data.tar.gz: e2fbc4da1d07b53a03da240a325423eeed185099a24b9c1f069a4f181975f658c88b80e1def378d9284aedd469f77a01c9b59fd9e795885f9921f74b2576a772

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    emp_json (1.3.0.pre.g9596e781b)
+    emp_json (1.4.0.pre.g116cfb0af)
 
 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,8 @@ module Empathy
         RDF_XSD_DATETIME = "#{RDF_XSD}dateTime"
         RDF_XSD_BOOLEAN = "#{RDF_XSD}boolean"
         RDF_XSD_INTEGER = "#{RDF_XSD}integer"
+        RDF_XSD_DECIMAL = "#{RDF_XSD}decimal"
+        RDF_XSD_DOUBLE = "#{RDF_XSD}double"
 
         def object_to_value(value)
           return primitive_to_value(value.iri) if value.respond_to?(:iri)
@@ -59,7 +62,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 +84,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 +100,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
+            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/version.rb

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

data/lib/empathy/emp_json.rb

@@ -10,9 +10,21 @@ require "empathy/emp_json/serializer"
 
 module Empathy
   module EmpJson
-    SUPPORTS_RDF_RB = Object.const_defined?("RDF")
-    SUPPORTS_SEQUENCE = Object.const_defined?("LinkedRails")
-    SUPPORTS_AR = Object.const_defined?("ActiveRecord")
+    # Class for checking if certain gems are present
+    class SupportChecker
+      class << self
+        def check(gem)
+          require gem
+          true
+        rescue LoadError
+          false
+        end
+      end
+    end
+
+    SUPPORTS_RDF_RB = SupportChecker.check("rdf")
+    SUPPORTS_SEQUENCE = SupportChecker.check("linked_rails")
+    SUPPORTS_AR = SupportChecker.check("active_record")
 
     class Error < StandardError; 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,10 @@ module Empathy
 
         RDF_XSD_INTEGER: "http://www.w3.org/2001/XMLSchema#integer"
 
+        RDF_XSD_DECIMAL: "http://www.w3.org/2001/XMLSchema#decimal"
+
+        RDF_XSD_DOUBLE: "http://www.w3.org/2001/XMLSchema#double"
+
         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.3.0.pre.g9596e781b
+  version: 1.4.0.pre.g116cfb0af
 platform: ruby
 authors:
 - Thom van Kalkeren
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies: []
 description: Serializer for the EmpJson specification.
 email: