rdf-serializers 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3eefb3fefa363f766d3a84709471d7e89cf6bc73f6bcf8ad112f36b4da21b2d
-  data.tar.gz: 7eb9282e4c581e7b2c0316667115a07c6054389147ad0f340dc8312c39254b01
+  metadata.gz: d375c9e57bfcdfcaf9bee6372abbf54ea974e1991a34936917e59c1ed67469a8
+  data.tar.gz: 0efed8bc77b7d97301d08ddaf5e5194c6234fd2c203bc1244d0269f06c81becf
 SHA512:
-  metadata.gz: 8490b88c0abf65e096932fc3061dee4c7dc04591cdae1fddcb8a99dfe0f1579c3fded9e30f719fee447420f1f23258479589cf0735e430f8dfe5042644c584c9
-  data.tar.gz: f0e3e87cbb50b888aaaadce341784bff28e7964ae22d2edb50461e75b6d074f772172b3fb3de6c18560da685960a909cc3be86a9111c32d6f5653a2530f9c076
+  metadata.gz: 6edcec3ce7990cb072e6211ce96452d12dd7c245de15177dffafac781b86e48b3f04e60e01af9853e8523a129cc84210c5e9ed3959a1c192c35184f7379a0f5f
+  data.tar.gz: 807766507554892c53f3dd0c9a3199a9d80b59f8b9c4ddb763b609d57727249f050797dfb55591837ce519b4b31fd3635be96fe14aae48e97dca72e01f997604

data/lib/rdf/serializers/data_type_helper.rb

@@ -3,7 +3,7 @@
 module RDF
   module Serializers
     module DataTypeHelper
-      def xsd_to_rdf(xsd, value, opts = {}) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+      def xsd_to_rdf(xsd, value, **opts) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
         klass =
           case xsd
           when RDF::XSD[:anyURI]
@@ -28,7 +28,7 @@ module RDF
             RDF::Literal
           end
 
-        klass.new(value, opts)
+        klass.new(value, **opts)
       end
     end
   end

data/lib/rdf/serializers/lookup_chain.rb

@@ -20,7 +20,7 @@ module RDF
         resource_namespace = namespace_for(resource_class)
         serializer_name = serializer_from(resource_class)
 
-        "#{resource_namespace}::#{serializer_name}"
+        "#{resource_namespace}::#{serializer_name}" if resource_namespace && serializer_name
       end
 
       # Uses the controller namespace of the resource to find the serializer
@@ -28,8 +28,7 @@ module RDF
       # Example:
       #  Api::V3::AuthorsController => Api::V3::AuthorSerializer
       BY_NAMESPACE = lambda do |resource_class, namespace|
-        resource_name = resource_class_name(resource_class)
-        namespace ? "#{namespace}::#{resource_name}Serializer" : nil
+        (namespace && resource_class.name) ? "#{namespace}::#{resource_class_name(resource_class)}Serializer" : nil
       end
 
       DEFAULT = [
@@ -41,11 +40,11 @@ module RDF
       module_function
 
       def namespace_for(klass)
-        klass.name.deconstantize
+        klass.name&.deconstantize
       end
 
       def resource_class_name(klass)
-        klass.name.demodulize
+        klass.name&.demodulize
       end
 
       def serializer_from_resource_name(name)
@@ -54,7 +53,7 @@ module RDF
 
       def serializer_from(klass)
         name = resource_class_name(klass)
-        serializer_from_resource_name(name)
+        serializer_from_resource_name(name) if name
       end
     end
   end

data/lib/rdf/serializers/object_serializer.rb

@@ -9,20 +9,25 @@ module RDF
       include FastJsonapi::ObjectSerializer
       include SerializationCore
 
+      included do
+        class_attribute :_statements
+        self._statements ||= []
+      end
+
       def dump(*args, **options)
         case args.first
         when :hndjson
           render_hndjson
         else
-          render_repository(*args, options)
+          render_repository(*args, **options)
         end
       end
 
       def triples(*args, **options)
         if include_named_graphs?(*args)
-          repository.triples(*args, options)
+          repository.triples(*args, **options)
         else
-          repository.project_graph(nil).triples(*args, options)
+          repository.project_graph(nil).triples(*args, **options)
         end
       end
 
@@ -107,16 +112,16 @@ module RDF
           .join("\n")
       end
 
-      def render_repository(*args, options)
+      def render_repository(*args, **options)
         if include_named_graphs?(*args)
-          repository.dump(*args, options)
+          repository.dump(*args, **options)
         else
-          repository.project_graph(nil).dump(*args, options)
+          repository.project_graph(nil).dump(*args, **options)
         end
       end
 
       def serializable_hextuples
-        if is_collection?(@resource, @is_collection)
+        if self.class.is_collection?(@resource, @is_collection)
           hextuples_for_collection + meta_hextuples
         elsif !@resource
           []
@@ -153,6 +158,11 @@ module RDF
           serializer_for(association_class_name)
         end
 
+        def inherited(base)
+          super
+          base._statements = _statements.dup
+        end
+
         def serializer_for(name)
           associatopm_serializer = association_serializer_for(name)
           return associatopm_serializer if associatopm_serializer
@@ -164,6 +174,10 @@ module RDF
                              'Consider specifying the serializer directly through options[:serializer].'
           end
         end
+
+        def statements(attribute)
+          self._statements << attribute
+        end
       end
     end
   end

data/lib/rdf/serializers/renderers.rb

@@ -30,7 +30,7 @@ module RDF
             options,
             respond_to?(:serializer_params, true) ? serializer_params : {}
           )
-          RDF::Serializers.serializer_for(resource)&.new(resource, serializer_opts)&.dump(symbol, opts)
+          RDF::Serializers.serializer_for(resource)&.new(resource, serializer_opts)&.dump(symbol, **opts)
         end
       end
 

data/lib/rdf/serializers/serialization_core.rb

@@ -80,47 +80,38 @@ module RDF
 
         def get_included_records_hex(record, includes_list, known_included_objects, fieldsets, params = {})
           return unless includes_list.present?
+          return [] unless relationships_to_serialize
 
-          includes_list.sort.each_with_object([]) do |include_item, included_records|
-            items = parse_include_item(include_item)
-            remaining_items = remaining_items(items)
+          includes_list = parse_includes_list(includes_list)
 
-            items.each do |item|
-              next unless relationships_to_serialize && relationships_to_serialize[item]
+          includes_list.each_with_object([]) do |include_item, included_records|
+            relationship_item = relationships_to_serialize[include_item.first]
 
-              relationship_item = relationships_to_serialize[item]
-              next unless relationship_item.include_relationship?(record, params)
+            next unless relationship_item&.include_relationship?(record, params)
 
-              relationship_type = relationship_item.relationship_type
+            included_objects = Array(relationship_item.fetch_associated_object(record, params))
+            next if included_objects.empty?
 
-              included_objects = relationship_item.fetch_associated_object(record, params)
-              next if included_objects.blank?
+            static_serializer = relationship_item.static_serializer
+            static_record_type = relationship_item.static_record_type
 
-              included_objects = [included_objects] unless relationship_type == :has_many
+            included_objects.each do |inc_obj|
+              serializer = static_serializer || relationship_item.serializer_for(inc_obj, params)
+              record_type = static_record_type || serializer.record_type
 
-              static_serializer = relationship_item.static_serializer
-              static_record_type = relationship_item.static_record_type
-
-              included_objects.each do |inc_obj|
-                serializer = static_serializer || relationship_item.serializer_for(inc_obj, params)
-                record_type = static_record_type || serializer.record_type
-
-                if remaining_items.present?
-                  serializer_records =
-                    serializer
-                    .get_included_records_hex(inc_obj, remaining_items, known_included_objects, fieldsets, params)
-                  included_records.concat(serializer_records) unless serializer_records.empty?
-                end
+              if include_item.last.any?
+                serializer_records = serializer.get_included_records_hex(inc_obj, include_item.last, known_included_objects, fieldsets, params)
+                included_records.concat(serializer_records) unless serializer_records.empty?
+              end
 
-                code = "#{record_type}_#{serializer.iri_from_record(inc_obj)}"
-                next if known_included_objects.key?(code)
+              code = "#{record_type}_#{serializer.iri_from_record(inc_obj)}"
+              next if known_included_objects.include?(code)
 
-                known_included_objects[code] = inc_obj
+              known_included_objects << code
 
-                included_records.concat(
-                  serializer.record_hextuples(inc_obj, fieldsets[record_type], includes_list, params)
-                )
-              end
+              included_records.concat(
+                serializer.record_hextuples(inc_obj, fieldsets[record_type], includes_list, params)
+              )
             end
           end
         end

data/lib/rdf/serializers/version.rb

@@ -2,6 +2,6 @@
 
 module RDFSerializers
   module Version
-    VERSION = '0.0.10'
+    VERSION = '0.0.11'
   end
 end

data/lib/rdf/serializers.rb

@@ -4,7 +4,6 @@ require 'fast_jsonapi'
 
 require 'rdf/serializers/lookup_chain'
 require 'rdf/serializers/config'
-require 'rdf/serializers/statements'
 require 'rdf/serializers/hextuple_serializer'
 require 'rdf/serializers/data_type_helper'
 require 'rdf/serializers/hdnjson_parser'
@@ -58,9 +57,7 @@ module RDF
         serializers_cache.fetch_or_store(cache_key) do
           # NOTE(beauby): When we drop 1.9.3 support we can lazify the map for perfs.
           lookup_chain = serializer_lookup_chain_for(klass, namespace)
-          serializer_class = lookup_chain.map(&:safe_constantize).find do |x|
-            x&.include?(FastJsonapi::SerializationCore)
-          end
+          serializer_class = serializer_class_from_chain(lookup_chain)
 
           if serializer_class
             serializer_class
@@ -77,6 +74,16 @@ module RDF
         @serializers_cache ||= Concurrent::Map.new
       end
 
+      def serializer_class_from_chain(lookup_chain)
+        lookup_chain.map do |klass|
+          klass&.safe_constantize
+        rescue LoadError
+          nil
+        end.find do |klass|
+          klass&.include?(FastJsonapi::SerializationCore)
+        end
+      end
+
       def serializer_lookup_chain_for(klass, namespace = nil)
         lookups = config.serializer_lookup_chain
         Array[*lookups].flat_map do |lookup|

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rdf-serializers
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +91,6 @@ files:
 - lib/rdf/serializers/renderers.rb
 - lib/rdf/serializers/scalar.rb
 - lib/rdf/serializers/serialization_core.rb
-- lib/rdf/serializers/statements.rb
 - lib/rdf/serializers/version.rb
 homepage: https://github.com/ontola/rdf-serializers
 licenses:
@@ -112,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Adds RDF serialization, like n-triples or turtle, to active model serializers

data/lib/rdf/serializers/statements.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module RDF
-  module Serializers
-    module Statements
-      extend ActiveSupport::Concern
-
-      included do
-        class_attribute :_statements
-        self._statements ||= []
-      end
-
-      module ClassMethods
-        def inherited(base)
-          super
-          base._statements = _statements.dup
-        end
-
-        def statements(attribute)
-          self._statements << attribute
-        end
-      end
-    end
-  end
-end
-
-FastJsonapi::ObjectSerializer.include(RDF::Serializers::Statements)