rdf-serializers 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 57bc75187cb8b34149be75b41e6be7c195c22fef
-  data.tar.gz: 339e1701a6a8f04dfb4776bbd4cb3615765bc401
+SHA256:
+  metadata.gz: 3a641b5b49c74bdc4479196b25f4c70e5718fabb324a703e10e4f60d07fb8574
+  data.tar.gz: 45be5ccf9f007536f261332f396d65a8ecf8b2f63bd5ee9878320e50433a415c
 SHA512:
-  metadata.gz: 0526660616a11ce3d3fb062dad5c47f968123fc657f5c941fc3250c8f98f7f70197255485f9d77266143e69e7ee0ef590def34f2e17be00d6f272788e592c4ab
-  data.tar.gz: 73f4828406d358c6596eb12ce66bb40b6030656eeb599a626c3012e8b0772abc3f8ecf386786505308c2e0ce9b8ddab1431bba2816a8e880dd2596ec0476c3ff
+  metadata.gz: d908f4bf5f1886890c23e9268779aa4755b3de4f2e5b1e4910f2117c21983a21fef01bc32a8af24b89942b4e1b2fc46d46d0b0481fea52831d86a8b779d42c9a
+  data.tar.gz: f9bdabf7f8455e09dd9ae273d565061c13f127f718cb271f9387cb442a0a5469daa4f0cda5b8058181f74d178c54ab4caae9ca6deb89f65f510a9dafae248d8f

data/lib/active_model_serializers/adapter/rdf.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/ClassLength
 module ActiveModelSerializers
   module Adapter
     class RDF < Base
@@ -7,7 +8,6 @@ module ActiveModelSerializers
       autoload :Relationship
 
       delegate :object, to: :serializer
-      delegate :dump, :triples, to: :repository
 
       def initialize(serializer, options = {})
         super
@@ -16,29 +16,37 @@ module ActiveModelSerializers
         @resource_identifiers = Set.new
       end
 
+      def dump(*args, **options)
+        if include_named_graphs?(*args)
+          repository.dump(*args, options)
+        else
+          repository.project_graph(nil).dump(*args, options)
+        end
+      end
+
+      def triples(*args, **options)
+        if include_named_graphs?(*args)
+          repository.triples(*args, options)
+        else
+          repository.project_graph(nil).triples(*args, options)
+        end
+      end
+
       protected
 
       attr_reader :fieldset
 
       private
 
-      def add_attribute(subject, predicate, value)
+      def add_attribute(subject, predicate, value, graph)
         return unless predicate
-        value = value.respond_to?(:each) ? value : [value]
-        value.compact.map { |v| add_triple(subject, predicate, v) }
-      end
-
-      def add_triple(subject, predicate, object, graph = nil)
-        obj =
-          case object
-          when ::RDF::Term
-            object
-          when ActiveSupport::TimeWithZone
-            ::RDF::Literal(object.to_datetime)
-          else
-            ::RDF::Literal(object)
-          end
-        @repository << ::RDF::Statement.new(subject, ::RDF::URI(predicate), obj, graph_name: graph)
+
+        normalized = value.is_a?(Array) ? value : [value]
+        normalized.compact.map { |v| add_triple([subject, predicate, v, graph]) }
+      end
+
+      def add_triple(triple)
+        @repository << (triple.is_a?(Array) ? normalized_triple(*triple) : triple)
       end
 
       def attributes_for(serializer, fields)
@@ -46,7 +54,8 @@ module ActiveModelSerializers
           add_attribute(
             serializer.read_attribute_for_serialization(:rdf_subject),
             serializer.class._attributes_data[key].try(:options).try(:[], :predicate),
-            value
+            value,
+            serializer.class._attributes_data[key].try(:options).try(:[], :graph)
           )
         end
       end
@@ -54,30 +63,74 @@ module ActiveModelSerializers
       def custom_triples_for(serializer)
         serializer.class.try(:_triples)&.map do |key|
           serializer.read_attribute_for_serialization(key).each do |triple|
-            @repository << triple
+            add_triple(triple)
           end
         end
       end
 
       def repository
         return @repository if @repository.present?
+
         @repository = ::RDF::Repository.new
 
         serializers.each { |serializer| process_resource(serializer, @include_directive) }
         serializers.each { |serializer| process_relationships(serializer, @include_directive) }
-        instance_options[:meta]&.each { |meta| add_triple(*meta) }
+        instance_options[:meta]&.each { |meta| add_triple(meta) }
+
+        raise_missing_nodes if raise_on_missing_nodes?
 
         @repository
       end
 
+      def include_named_graphs?(*args)
+        ::RDF::Serializers.config.always_include_named_graphs ||
+          ::RDF::Writer.for(*args.presence || :nquads).instance_methods.include?(:write_quad)
+      end
+
+      def missing_nodes
+        @missing_nodes ||=
+          @repository
+          .objects
+          .select(&:node?)
+          .reject { |n| @repository.has_subject?(n) }
+          .map { |n| @repository.query([nil, nil, n]).first }
+      end
+
+      def normalized_object(object) # rubocop:disable Metrics/MethodLength
+        case object
+        when ::RDF::Term
+          object
+        when ::RDF::List
+          list = object.statements
+          @repository << object.statements
+          list.first.subject
+        when ActiveSupport::TimeWithZone
+          ::RDF::Literal(object.to_datetime)
+        else
+          ::RDF::Literal(object)
+        end
+      end
+
+      def normalized_triple(subject, predicate, object, graph = nil)
+        ::RDF::Statement.new(
+          subject,
+          ::RDF::URI(predicate),
+          normalized_object(object),
+          graph_name: graph || ::RDF::Serializers.config.default_graph
+        )
+      end
+
       def process_relationship(serializer, include_slice)
         return serializer.each { |s| process_relationship(s, include_slice) } if serializer.respond_to?(:each)
+
         return unless serializer&.object && process_resource(serializer, include_slice)
+
         process_relationships(serializer, include_slice)
       end
 
       def process_relationships(serializer, include_slice)
         return unless serializer.respond_to?(:associations)
+
         serializer.associations(include_slice).each do |association|
           process_relationship(association.lazy_association.serializer, include_slice[association.key])
         end
@@ -88,16 +141,28 @@ module ActiveModelSerializers
           return serializer.map { |child| process_resource(child, include_slice) }
         end
         return unless serializer.respond_to?(:rdf_subject) || serializer.object.respond_to?(:rdf_subject)
+
         return false unless @resource_identifiers.add?(serializer.read_attribute_for_serialization(:rdf_subject))
+
         resource_object_for(serializer, include_slice)
         true
       end
 
+      def raise_on_missing_nodes?
+        Rails.env.development? || Rails.env.test?
+      end
+
+      def raise_missing_nodes
+        return if missing_nodes.empty?
+
+        raise "The following triples point to nodes that are not included in the graph:\n#{missing_nodes.join("\n")}"
+      end
+
       def relationships_for(serializer, requested_associations, include_slice)
         include_directive = JSONAPI::IncludeDirective.new(requested_associations, allow_wildcard: true)
         serializer.associations(include_directive, include_slice).each do |association|
           Relationship.new(serializer, instance_options, association).triples.each do |triple|
-            @repository << triple
+            add_triple(triple)
           end
         end
       end
@@ -106,6 +171,7 @@ module ActiveModelSerializers
         type = type_for(serializer, instance_options).to_s
         serializer.fetch(self) do
           break nil if serializer.read_attribute_for_serialization(:rdf_subject).nil?
+
           requested_fields = fieldset&.fields_for(type)
           attributes_for(serializer, requested_fields)
           custom_triples_for(serializer)
@@ -124,3 +190,4 @@ module ActiveModelSerializers
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/lib/active_model_serializers/adapter/rdf/relationship.rb

@@ -5,10 +5,12 @@ module ActiveModelSerializers
     class RDF
       class Relationship < JsonApi::Relationship
         def triples
-          return [] if subject.blank? || predicate.blank? || data.empty?
+          return [] if no_data?
+
           data.map do |object|
             raise "#{object} is not a RDF::Resource but a #{object.class}" unless object.is_a?(::RDF::Resource)
-            ::RDF::Statement.new(subject, predicate, object)
+
+            ::RDF::Statement.new(subject, predicate, object, graph_name: graph_name)
           end
         end
 
@@ -23,6 +25,14 @@ module ActiveModelSerializers
             end
         end
 
+        def graph_name
+          association.reflection.options[:graph] || ::RDF::Serializers.config.default_graph
+        end
+
+        def no_data?
+          subject.blank? || predicate.blank? || data.empty?
+        end
+
         def objects_for_many(association)
           collection_serializer = association.lazy_association.serializer
           if collection_serializer.respond_to?(:each)

data/lib/rdf/serializers.rb

@@ -2,3 +2,4 @@
 
 require 'active_model_serializers/adapter/rdf'
 require 'active_model_serializers/serializer'
+require 'rdf/serializers/config'

data/lib/rdf/serializers/config.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module RDF
+  module Serializers
+    def self.configure
+      yield @config ||= RDF::Serializers::Configuration.new
+    end
+
+    def self.config
+      @config
+    end
+
+    class Configuration
+      include ActiveSupport::Configurable
+      config_accessor :always_include_named_graphs
+      config_accessor :default_graph
+    end
+
+    configure do |config|
+      config.always_include_named_graphs = true
+    end
+  end
+end

data/lib/rdf/serializers/renderers.rb

@@ -16,7 +16,8 @@ module RDF
         symbols = [symbols] unless symbols.respond_to?(:each)
         symbols.each do |symbol|
           format = RDF::Format.for(symbol)
-          raise "#{symbol} if not a known rdf format" if format.nil?
+          raise "#{symbol} is not a known rdf format" if format.nil?
+
           Mime::Type.register format.content_type.first, format.file_extension.first
           add_renderer(format, opts)
         end

data/lib/rdf/serializers/version.rb

@@ -2,6 +2,6 @@
 
 module RDFSerializers
   module Version
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-serializers
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Arthur Dingemans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -33,7 +33,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -68,10 +68,12 @@ files:
 - lib/active_model_serializers/adapter/rdf/relationship.rb
 - lib/active_model_serializers/serializer.rb
 - lib/rdf/serializers.rb
+- lib/rdf/serializers/config.rb
 - lib/rdf/serializers/renderers.rb
 - lib/rdf/serializers/version.rb
-homepage: https://github.com/argu-co/rdf-serializers
-licenses: []
+homepage: https://github.com/ontola/rdf-serializers
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -88,8 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Adds RDF serialization, like n-triples or turtle, to active model serializers