WIP: Make sure we are passing all the expected values forward

Author: vasconsaurus

app/models/media.rb

@@ -82,12 +82,14 @@ def process_and_return_json(options = {})
     cache = Pender::Store.current
     if options.delete(:force) || cache.read(id, :json).nil?
       handle_exceptions(self, StandardError) { self.parse }
+      self.fallback
+
       if data[:error].blank?
         cache.write(id, :json, clean_json(data))
       end
       self.upload_images
     end
-    self.fallback
+
     archive_if_conditions_are_met(options, id, cache)
     parser_requests_metrics
     cache.read(id, :json) || clean_json(data)
@@ -201,15 +203,23 @@ def parse
 
     PARSERS.each do |parser|
       if parseable = parser.match?(self.url)
+        #byebug
         self.parser = parseable
         self.provider, self.type = self.parser.type.split('_')
         parsed_data = self.parser.parse_data(
           self.doc,
           self.original_url,
           self.data.dig('raw', 'json+ld')
+          )
+        self.data.deep_merge!(
+          {
+            provider: self.provider,
+            type: self.type,
+            url: self.parser.url
+          }.merge(parsed_data)
         )
-        self.data.deep_merge!(parsed_data)
         self.url = self.parser.url
+        #byebug
         self.get_oembed_data
         parsed = true
         Rails.logger.info level: 'INFO', message: '[Parser] Parsing new URL', url: self.url, parser: self.parser.to_s, provider: self.provider, type: self.type

test/models/media_test.rb

@@ -226,12 +226,11 @@ class MediaTest < ActiveSupport::TestCase
     doc = ''
     File.open('test/data/page-with-json-ld.html') { |f| doc = f.read }
     Media.any_instance.stubs(:doc).returns(Nokogiri::HTML(doc))
-    m.data = Media.minimal_data(m)
-    m.get_jsonld_data(m)
+    data = m.process_and_return_json
 
-    assert !m.data['raw']['json+ld'].empty?
-    assert m.data['raw']['json+ld'].is_a? Array
-    assert m.data['raw']['json+ld'].first.is_a? Hash
+    assert_not_empty data['raw']['json+ld']
+    assert_kind_of Array, data['raw']['json+ld']
+    assert_kind_of Hash, data['raw']['json+ld'].first
   end
 
   test "should handle errors when call parse on each parser" do

test/models/parser/facebook_item_test.rb

@@ -454,7 +454,7 @@ def apify_content_not_available_response
     assert_match "<div class=\"fb-post\" data-href=\"#{url}\"></div>", data['html']
   end
 
-  test "should return html and empty description when FB url is private" do
+  test "should return html and description with the original url when FB url is private" do
     url = 'https://www.facebook.com/caiosba/posts/1913749825339929'
 
     WebMock.stub_request(:post, /api\.apify\.com\/v2\/acts\/apify/).to_return(status: 200, body: apify_response_not_found)
@@ -471,7 +471,7 @@ def apify_content_not_available_response
     media = Media.new(url: url)
     data = media.process_and_return_json
 
-    assert data[:description].empty?
+    assert_equal url, data[:description]
     assert_match "<div class=\"fb-post\" data-href=\"https://www.facebook.com/caiosba/posts/1913749825339929\">", data['html']
   end