izi_json_ld 1.0.6 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 218c8d0a8c8738157adeca124dd26d6a38591ea1
-  data.tar.gz: 6bc6047444d90f426b4baa52934e3efc9f4879f7
+  metadata.gz: 8460fc684cdf425df5ab3eb1c37cf3cec4fd94ce
+  data.tar.gz: ebe42ecc6dd75499a3d4c7d64011652ecd2a44be
 SHA512:
-  metadata.gz: 7f0a6db05d7698790454e2f4f50c47df74892a40af537f29c25a84ce24eb429fcfb8c9fab97960e8c8caf8968d71703d125d13237e869bbf9e354d0d87143ee7
-  data.tar.gz: 8ec1adf33df2e4d1c318873a451d7eb416213389bf7211368eec56e3643d23afcb425e928949a2797dc35eab79d0017f114e33b656c155b5a3de89e8ac119c02
+  metadata.gz: 1ce55344a93dc3e3ddfa65dc5387d48e5fc8af0f65ab072378de5764e37f7b9c52d966c18931a103631e919a1d984c3bbe67065a223fbad0ed4f9b9cb224d6d7
+  data.tar.gz: 8175939a4405a80fe70cad66c8e7e25b4007483123cf76027656eb752389fb989691abb039d22956ce0d68694e4e739759c1263bdf0ff4cc8db120c1c1fc1638

data/app/entities/person_entity.rb

@@ -5,10 +5,16 @@ class PersonEntity < ApplicationEntity
   attribute :person_name, ::IziJsonLd::Types::String
   attribute? :email, ::IziJsonLd::Types::String.optional
   attribute? :image, ::IziJsonLd::Types::String.optional
-  attribute? :sameAs, ::IziJsonLd::Types::String.optional
+  attribute? :sameAs, ::IziJsonLd::Types::OneOrMore[::IziJsonLd::Types::String].optional
   attribute? :worksFor, ::OrganizationEntity
+  attribute? :url, ::IziJsonLd::Types::String.optional
+  attribute? :jobTitle, ::IziJsonLd::Types::String.optional
 
   def dump_attributes
     attributes.except(:person_name).merge(name: person_name)
   end
+
+  def name
+    person_name
+  end
 end

data/app/entities/question_entity.rb

@@ -8,7 +8,7 @@ class QuestionEntity < ApplicationEntity
   attribute? :answer, ::IziJsonLd::Types::String
 
   def dump_attributes
-    attributes.except(:answer).merge(acceptedAnswer: safe_answer.dump)
+    attributes.except(:answer).merge(acceptedAnswer: safe_answer.dump(self))
   end
 
   private

data/app/entities/review_entity.rb

@@ -3,9 +3,33 @@
 class ReviewEntity < ApplicationEntity
   type 'Review'
 
-  attribute? :author, ::IziJsonLd::Types::String.optional
+  attribute? :author, (::IziJsonLd::Types::Strict::String | ::PersonEntity | ::OrganizationEntity).optional
+  attribute? :publisher, (::IziJsonLd::Types::Strict::String | ::PersonEntity | ::OrganizationEntity).optional
   attribute? :reviewRating, RatingEntity.optional
   attribute? :reviewBody, ::IziJsonLd::Types::String.optional
 
   attribute? :datePublished, ::IziJsonLd::Types::DateTime.optional
+
+  def dump_attributes
+    attributes.except(:author, :publisher).merge(
+      author: safe_author,
+      publisher: safe_publisher
+    )
+  end
+
+  private
+
+  def safe_author
+    return if author.blank?
+    return author unless author.is_a?(String)
+
+    ::PersonEntity.new(person_name: author)
+  end
+
+  def safe_publisher
+    return if publisher.blank?
+    return publisher unless publisher.is_a?(String)
+
+    ::OrganizationEntity.new(name: publisher)
+  end
 end

data/lib/izi_json_ld/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IziJsonLd
-  VERSION = '1.0.6'
+  VERSION = '1.0.10'
 end