emp_json 1.3.0 → 1.4.0.pre.g2c7b34d0b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25bc9fd422b25a7c170b13e139529cdb920407263eddfea6090ff8f5db26efcf
-  data.tar.gz: 06211e95f73424b5223fb48777332369346d6ded8b9b1b2ee91271e013e97c87
+  metadata.gz: 1ff805dc9dbb50dd3f829cae6ed5e4b6520bbf5be74a3a72db23b956b03416d9
+  data.tar.gz: 2cb4ba20b7678212f9961d736292315e5af18f98ded5efb79e534610cb86c03d
 SHA512:
-  metadata.gz: 627063d466d24b937749ef9a86dff810f09da1c3b51ed5160b7db71a8369e1e3e8af393f95dc2a3ec1bfb45b8ad763e341a2aeb27ae6a4e4d19b1939f772f89c
-  data.tar.gz: 70af1948aaad44518cac9bb2e666aba0462186add2425bfaafe9661878d9ccf691efe7e1fd36d31e8741b0dceb8a743143138edebb0ca4a3d7f8aecfa6986471
+  metadata.gz: d2fc0b677b6758c91d674484f470935037b567985a2596904033c94e0aef4c94de751cc165c718c9a6f9b336336f1eaf8e5becd89bcc70a900ada4200c238474
+  data.tar.gz: 9290dcf28b062bd42d5b669295e49f46eabef69a8f34d422e61fe67e0dff935171dd7d68637152cbb0d0bd64d961edab92ef92ec0111f15e0a9ce5937b406830

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    emp_json (1.3.0)
+    emp_json (1.4.0.pre.g2c7b34d0b)
 
 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/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.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
+  version: 1.4.0.pre.g2c7b34d0b
 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:
@@ -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: