rdf-serializers 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4391cb7d489b6d9803ef2e089c5a18ddccdefc7
-  data.tar.gz: 8d6433403ea396f8c5d1b9c3d2ca3f8b31b2a518
+  metadata.gz: baf9653c33444a315a892a3720aa0be0503540db
+  data.tar.gz: ca4fbe6d2ad6b87d3fabd8f1b68167fd0470475b
 SHA512:
-  metadata.gz: d677e2b57abb3e7e61e3e6e0093fde1bfb85bff31d656a9965e4a9a74cd11eaf3386a912397f3c60cdb06ebbcc20c21634034c1b2a340733301eb248a82f957d
-  data.tar.gz: ad515fd70be7102bda3cd44b4ac48f70a8ad02ffce3d1b66e25a2a036d2a8008a8ebcce11d38b04f5dfea51d42a7e91a7af1a7f8bd2a5323a5580d943cf226ee
+  metadata.gz: 06fda50c2eaec5b6bb346e31f40d78d24645211c3d87eef0c6206492d47f481cbde8a0a540ae447a0fdc75a6e31be45e9686bdfd252121f7bb998aa89c7db9ac
+  data.tar.gz: 94a3b7701bd3291a3cff825782ff06945d1382336574de174030991f2c3f20558537c2ce6423fc8d8fd90c460094f3579c6f2d889abdf2af90c2215691ac8a2a

data/lib/active_model_serializers/adapter/rdf.rb

@@ -7,7 +7,7 @@ module ActiveModelSerializers
       autoload :Relationship
 
       delegate :object, to: :serializer
-      delegate :dump, to: :graph
+      delegate :dump, :triples, to: :graph
 
       def initialize(serializer, options = {})
         super
@@ -22,31 +22,31 @@ module ActiveModelSerializers
 
       private
 
-      def add_attribute(data, iri, value)
+      def add_attribute(data, subject, value)
         predicate = data.options[:predicate]
         return unless predicate
         value = value.respond_to?(:each) ? value : [value]
-        value.compact.map { |v| add_triple(iri, predicate, v) }
+        value.compact.map { |v| add_triple(subject, predicate, v) }
       end
 
       def add_triple(subject, predicate, object)
         obj =
           case object
-          when ::RDF::Resource, ::RDF::Literal
+          when ::RDF::Term
             object
           when ActiveSupport::TimeWithZone
             ::RDF::Literal(object.to_datetime)
           else
             ::RDF::Literal(object)
           end
-        @graph << [::RDF::URI(subject), ::RDF::URI(predicate), obj]
+        @graph << ::RDF::Statement.new(subject, ::RDF::URI(predicate), obj)
       end
 
       def attributes_for(serializer, fields)
         serializer.class._attributes_data.map do |key, data|
           next if data.excluded?(serializer)
           next unless fields.nil? || fields.include?(key)
-          add_attribute(data, serializer.read_attribute_for_serialization(:iri), serializer.attributes[key])
+          add_attribute(data, serializer.read_attribute_for_serialization(:rdf_subject), serializer.attributes[key])
         end
       end
 
@@ -86,8 +86,8 @@ module ActiveModelSerializers
         if serializer.is_a?(ActiveModel::Serializer::CollectionSerializer)
           return serializer.map { |child| process_resource(child, include_slice) }
         end
-        return unless serializer.respond_to?(:iri) || serializer.object.respond_to?(:iri)
-        return false unless @resource_identifiers.add?(serializer.read_attribute_for_serialization(:iri))
+        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
@@ -104,7 +104,7 @@ module ActiveModelSerializers
       def resource_object_for(serializer, include_slice = {})
         type = type_for(serializer, instance_options).to_s
         serializer.fetch(self) do
-          break nil if serializer.read_attribute_for_serialization(:iri).nil?
+          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)

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

@@ -6,9 +6,9 @@ module ActiveModelSerializers
       class Relationship < JsonApi::Relationship
         def triples
           return [] if subject.blank? || predicate.blank? || data.empty?
-          data.map do |iri|
-            raise "#{iri} is not a RDF::URI but a #{iri.class}" unless iri.is_a?(::RDF::URI)
-            [subject, predicate, iri]
+          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)
           end
         end
 
@@ -17,32 +17,32 @@ module ActiveModelSerializers
         def data
           @data ||=
             if association.collection?
-              iri_for_many(association).compact
+              objects_for_many(association).compact
             else
-              [iri_for_one(association)].compact
+              [object_for_one(association)].compact
             end
         end
 
-        def iri_for_many(association)
+        def objects_for_many(association)
           collection_serializer = association.lazy_association.serializer
           if collection_serializer.respond_to?(:each)
             collection_serializer.map do |serializer|
-              serializer.read_attribute_for_serialization(:iri)
+              serializer.read_attribute_for_serialization(:rdf_subject)
             end
           else
             []
           end
         end
 
-        def iri_for_one(association)
+        def object_for_one(association)
           if belongs_to_id_on_self?(association)
-            parent_serializer.read_attribute_for_serialization(:iri)
+            parent_serializer.read_attribute_for_serialization(:rdf_subject)
           else
             serializer = association.lazy_association.serializer
             if (virtual_value = association.virtual_value)
               virtual_value[:id]
             elsif serializer && association.object
-              serializer.read_attribute_for_serialization(:iri)
+              serializer.read_attribute_for_serialization(:rdf_subject)
             end
           end
         end
@@ -52,7 +52,7 @@ module ActiveModelSerializers
         end
 
         def subject
-          @subject ||= parent_serializer.read_attribute_for_serialization(:iri)
+          @subject ||= parent_serializer.read_attribute_for_serialization(:rdf_subject)
         end
       end
     end

data/lib/rdf/serializers/version.rb

@@ -2,6 +2,6 @@
 
 module RDFSerializers
   module Version
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-serializers
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Arthur Dingemans