Merge pull request #1912 from freeCodeCamp/fix-manifest-db_size

Fix manifest db_size

Oliver Eyton-Williams committed 3 years ago

Commit 08147e32 parents da5430a ce248ce3 files · +7 −13Browse files

Unified · Split

3 files

@@ -86,16 +86,6 @@ module Docs · 85 unmodified lines
86	json	86	json
87	end	87	end
88		88
89	def as_json_extra(store)
90	json = self.as_json
91	if options[:attribution].is_a?(String)
92	json[:attribution] = options[:attribution].strip
93	end
94	json[:db_size] = store.size(self.db_path) if store.exist?(self.db_path)
95	json[:mtime] = store.mtime(self.meta_path).to_i if store.exist?(self.meta_path)
96	json
97	end
98
99	def store_page(store, id)	89	def store_page(store, id)
100	index = EntryIndex.new	90	index = EntryIndex.new
101	pages = PageDb.new	91	pages = PageDb.new

     def as_json
       @docs.each_with_object [] do |doc, result|
         next unless @store.exist?(doc.meta_path)
-        result << doc.as_json_extra(@store)
+        json = JSON.parse(@store.read(doc.meta_path))
+        if doc.options[:attribution].is_a?(String)
+          json[:attribution] = doc.options[:attribution].strip
+        end
+        result << json
       end
     end

     context "when the doc has a meta file" do
       before do
-        stub(store).exist?("testdoc/db.json") { false }
         stub(store).exist?(meta_path) { true }
+        stub(store).read(meta_path) { '{"name":"Test", "db_size": 776533}' }
       end
       it "includes the doc's meta representation" do
         json = manifest.as_json
         assert_equal 1, json.length
-        assert_equal "{:name=>\"TestDoc\", :slug=>\"testdoc\", :type=>nil, :attribution=>\"foo\", :mtime=>0}", json[0].to_s
+        assert_equal "{\"name\"=>\"Test\", \"db_size\"=>776533, :attribution=>\"foo\"}", json[0].to_s
       end
     end