izi_json_ld 1.0.7 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ec495cac09672d3ff4561af894fa3af2fba2a8d
-  data.tar.gz: 20e90d7eded79d6e3a4974bf96d286d09de77389
+  metadata.gz: dcc874ab5405c6e7f56fc9bde4bec4e288b44831
+  data.tar.gz: a2f871bd7e3a815180c17a2395a1e4744e0a54bf
 SHA512:
-  metadata.gz: 782a8cfc927ed88896335c18196069fc420a816f5b71b610a2802bba16d361f0b6fcb3663c30666bb5133a41e32ab61c4ba302db72b3e0224cfcda339cebc7db
-  data.tar.gz: 5fd3171e82f21a8c04040e99ce25522f8da7431b40302372e8cdcba9e0ac602c282cfa9eab2bd8142c68c4cb65099a7f1082a9b96d850d91f35d3b2b52dc083b
+  metadata.gz: d6cc1e6e99a9e7a40d82ee84d0499bd3e39f2743e268e1d403feab724351847e4e3f84fa9b2e7f04a0b00a058604ed811a13042e62674c17bdfbc6a2fa7080f9
+  data.tar.gz: 582a5dc61fb74a9db7dd4c61058bf7c0e0e3f5b83ea91de48312c3e27c9c4fa04c76b0c90d2a9d800ba85926922fd123675c4980ef0d7e8b91f7188667d6c757

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/product_entity.rb

@@ -4,11 +4,29 @@ class ProductEntity < ApplicationEntity
   type 'Product'
 
   attribute :name, ::IziJsonLd::Types::String
-  attribute? :brand, ::IziJsonLd::Types::String.optional
+  attribute? :brand, (::IziJsonLd::Types::Strict::String | ::OrganizationEntity).optional
   attribute? :image, ::IziJsonLd::Types::String.optional
   attribute? :description, ::IziJsonLd::Types::String.optional
+  attribute? :sku, ::IziJsonLd::Types::String.optional
+  attribute? :gtin, ::IziJsonLd::Types::String.optional
+  attribute? :mpn, ::IziJsonLd::Types::String.optional
 
   attribute? :offers, OfferEntity.optional
   attribute? :aggregateRating, AggregateRatingEntity.optional
   attribute? :review, ::IziJsonLd::Types::OneOrMore[::ReviewEntity].optional
+
+  def dump_attributes
+    attributes.except(:brand).merge(
+      brand: safe_brand
+    )
+  end
+
+  private
+
+  def safe_brand
+    return if brand.blank?
+    return brand unless brand.is_a?(String)
+
+    ::OrganizationEntity.new(name: brand)
+  end
 end

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.7'
+  VERSION = '1.0.11'
 end