From c5532e23d45ef77bdbc3c17e18b7afe5cbff9797 Mon Sep 17 00:00:00 2001 From: Daniel Barber Date: Sat, 16 Nov 2019 22:27:21 -0500 Subject: [PATCH] Well that makes things simpler! --- lib/micropub/models/post_json_parser.rb | 11 +---------- test/lib/micropub/models/post_json_parser_test.rb | 12 ++++++------ test/requests/create_post_test.rb | 2 +- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/lib/micropub/models/post_json_parser.rb b/lib/micropub/models/post_json_parser.rb index d005a86..6377690 100644 --- a/lib/micropub/models/post_json_parser.rb +++ b/lib/micropub/models/post_json_parser.rb @@ -20,16 +20,7 @@ class PostJSONParser end def content - data.dig("properties", "content", 0) || nested_content - end - - def nested_content - text = data.dig("properties", "content", "text", 0) - html = data.dig("properties", "content", "html", 0) - - return nil if text.nil? && html.nil? - - { "text" => text, "html" => html }.compact + data.dig("properties", "content", 0) end def category diff --git a/test/lib/micropub/models/post_json_parser_test.rb b/test/lib/micropub/models/post_json_parser_test.rb index e7a84d0..2c147fb 100644 --- a/test/lib/micropub/models/post_json_parser_test.rb +++ b/test/lib/micropub/models/post_json_parser_test.rb @@ -26,9 +26,9 @@ describe PostJSONParser do { "type": ["h-entry"], "properties": { - "content": { - "text": ["Hello, World!"] - } + "content": [{ + "text": "Hello, World!" + }] } } JS @@ -45,9 +45,9 @@ describe PostJSONParser do { "type": ["h-entry"], "properties": { - "content": { - "html": ["

Hello, World!

"] - } + "content": [{ + "html": "

Hello, World!

" + }] } } JS diff --git a/test/requests/create_post_test.rb b/test/requests/create_post_test.rb index 754ad23..d102c13 100644 --- a/test/requests/create_post_test.rb +++ b/test/requests/create_post_test.rb @@ -81,7 +81,7 @@ describe "create post" do post_json = { type: ["h-entry"], properties: { - content: { html: ["

Hello, World!

"] }, + content: [{ html: "

Hello, World!

" }], category: ["one", "two", "three"], }, }.to_json