anticipate new findagrave going live

justincy · justincy · commit 34e1aacfada5 · 2017-10-31T14:46:06.000Z
diff --git a/src/scrapers/findagrave-new.js b/src/scrapers/findagrave-new.js
@@ -4,7 +4,13 @@ var debug = require('debug')('genscrape:scrapers:findagrave-new'),
 
 var urls = [
   utils.urlPatternToRegex("https://new.findagrave.com/memorial/*"),
-  utils.urlPatternToRegex("https://new.findagrave.com/cemetery/online/*")
+  utils.urlPatternToRegex("https://new.findagrave.com/cemetery/online/*"),
+  // The new site isn't live yet. We're just assuming this will be the URL
+  // when it goes live. Trying to be proactive so that we don't have to rollout
+  // a quick fix when the new site does finally go live. The two new.findagrave
+  // URLs above can be removed after the new site is live. - 31 Oct 2017
+  utils.urlPatternToRegex("https://www.findagrave.com/memorial/*"),
+  utils.urlPatternToRegex("https://www.findagrave.com/cemetery/online/*")
 ];
 
 module.exports = function(register){
@@ -104,7 +110,7 @@ function run(emitter){
       value: 'Find A Grave'
     }],
     homepage: {
-      resource: 'https://new.findagrave.com'
+      resource: 'https://www.findagrave.com'
     }
   });
   gedx.addAgent(agent);
@@ -316,8 +322,8 @@ function relativeFact(type, date){
  */
 function getMemorialId(url){
   /**
-   * URLs may be in different forms, such as https://new.findagrave.com/memorial/1234
-   * or https://new.findagrave.com/cemetery/online/1234. The memorial IDs are in
+   * URLs may be in different forms, such as https://www.findagrave.com/memorial/1234
+   * or https://www.findagrave.com/cemetery/online/1234. The memorial IDs are in
    * different positions. The best assumption we can make is that the memorial
    * ID will be the first number in the URL starting from the left.
    */
diff --git a/test/data/findagrave-new/output/alfred-zandell.json b/test/data/findagrave-new/output/alfred-zandell.json
@@ -558,7 +558,7 @@
           "value": "Find A Grave, database and images (https://new.findagrave.com : accessed ), memorial page for Alfred C. Zandell (1876–28 Jul 1939), Find A Grave Memorial no. 53317193, citing Mountain View Cemetery, Walla Walla, Walla Walla County, Washington, USA ; Maintained by Elaine and Bill Schrock (contributor 46915548) ."
         }
       ],
-      "about": "https://new.findagrave.com/memorial/53317193",
+      "about": "https://www.findagrave.com/memorial/53317193",
       "titles": [
         {
           "value": " Alfred C. Zandell (1876-1939) - Find A Grave Memorial"
@@ -579,7 +579,7 @@
         }
       ],
       "homepage": {
-        "resource": "https://new.findagrave.com"
+        "resource": "https://www.findagrave.com"
       }
     }
   ]
diff --git a/test/data/findagrave-new/output/boleslaw-barejka.json b/test/data/findagrave-new/output/boleslaw-barejka.json
@@ -83,7 +83,7 @@
         }
       ],
       "homepage": {
-        "resource": "https://new.findagrave.com"
+        "resource": "https://www.findagrave.com"
       }
     }
   ]
diff --git a/test/data/findagrave-new/output/kenneth-robbins.json b/test/data/findagrave-new/output/kenneth-robbins.json
@@ -339,7 +339,7 @@
         }
       ],
       "homepage": {
-        "resource": "https://new.findagrave.com"
+        "resource": "https://www.findagrave.com"
       }
     }
   ]
diff --git a/test/data/findagrave-new/output/nancy-reagan.json b/test/data/findagrave-new/output/nancy-reagan.json
@@ -277,7 +277,7 @@
         }
       ],
       "homepage": {
-        "resource": "https://new.findagrave.com"
+        "resource": "https://www.findagrave.com"
       }
     }
   ]
diff --git a/test/data/findagrave-new/output/patty-duke.json b/test/data/findagrave-new/output/patty-duke.json
@@ -325,7 +325,7 @@
         }
       ],
       "homepage": {
-        "resource": "https://new.findagrave.com"
+        "resource": "https://www.findagrave.com"
       }
     }
   ]
diff --git a/test/data/findagrave-new/output/raymond-zierak.json b/test/data/findagrave-new/output/raymond-zierak.json
@@ -89,7 +89,7 @@
         }
       ],
       "homepage": {
-        "resource": "https://new.findagrave.com"
+        "resource": "https://www.findagrave.com"
       }
     }
   ]
diff --git a/test/data/findagrave-new/output/robert-coe.json b/test/data/findagrave-new/output/robert-coe.json
@@ -424,7 +424,7 @@
         }
       ],
       "homepage": {
-        "resource": "https://new.findagrave.com"
+        "resource": "https://www.findagrave.com"
       }
     }
   ]
diff --git a/test/data/findagrave-new/output/ronald-reagan-sh.json b/test/data/findagrave-new/output/ronald-reagan-sh.json
@@ -505,7 +505,7 @@
         }
       ],
       "homepage": {
-        "resource": "https://new.findagrave.com"
+        "resource": "https://www.findagrave.com"
       }
     }
   ]
diff --git a/test/data/findagrave-new/output/ronald-reagan.json b/test/data/findagrave-new/output/ronald-reagan.json
@@ -511,7 +511,7 @@
         }
       ],
       "homepage": {
-        "resource": "https://new.findagrave.com"
+        "resource": "https://www.findagrave.com"
       }
     }
   ]
diff --git a/test/data/findagrave-new/output/thomas-york.json b/test/data/findagrave-new/output/thomas-york.json
@@ -794,7 +794,7 @@
         }
       ],
       "homepage": {
-        "resource": "https://new.findagrave.com"
+        "resource": "https://www.findagrave.com"
       }
     }
   ]
diff --git a/test/src/scrapers/findagrave-new.js b/test/src/scrapers/findagrave-new.js
@@ -1,6 +1,6 @@
 var setupTest = require('../../testHelpers').createTestRunner('findagrave-new');
     
-describe('findagrave - new', function(){
+describe.only('findagrave - new', function(){
   
   it('Not famous; no family', setupTest(
     'raymond-zierak',
@@ -47,9 +47,9 @@ describe('findagrave - new', function(){
     'https://new.findagrave.com/memorial/37494703'
   ));
   
-  it('period in a family member\'s name', setupTest(
+  it('period in a family member\'s name; test www', setupTest(
     'alfred-zandell',
-    'https://new.findagrave.com/memorial/53317193'
+    'https://www.findagrave.com/memorial/53317193'
   ));
   
 });

Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,7 @@`
`558`	`558`	`"value": "Find A Grave, database and images (https://new.findagrave.com : accessed ), memorial page for Alfred C. Zandell (1876–28 Jul 1939), Find A Grave Memorial no. 53317193, citing Mountain View Cemetery, Walla Walla, Walla Walla County, Washington, USA ; Maintained by Elaine and Bill Schrock (contributor 46915548) ."`
`559`	`559`	`}`
`560`	`560`	`],`
`561`		`- "about": "https://new.findagrave.com/memorial/53317193",`
	`561`	`+ "about": "https://www.findagrave.com/memorial/53317193",`
`562`	`562`	`"titles": [`
`563`	`563`	`{`
`564`	`564`	`"value": " Alfred C. Zandell (1876-1939) - Find A Grave Memorial"`
`@@ -579,7 +579,7 @@`
`579`	`579`	`}`
`580`	`580`	`],`
`581`	`581`	`"homepage": {`
`582`		`- "resource": "https://new.findagrave.com"`
	`582`	`+ "resource": "https://www.findagrave.com"`
`583`	`583`	`}`
`584`	`584`	`}`
`585`	`585`	`]`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@`
`83`	`83`	`}`
`84`	`84`	`],`
`85`	`85`	`"homepage": {`
`86`		`- "resource": "https://new.findagrave.com"`
	`86`	`+ "resource": "https://www.findagrave.com"`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`]`
Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@`
`339`	`339`	`}`
`340`	`340`	`],`
`341`	`341`	`"homepage": {`
`342`		`- "resource": "https://new.findagrave.com"`
	`342`	`+ "resource": "https://www.findagrave.com"`
`343`	`343`	`}`
`344`	`344`	`}`
`345`	`345`	`]`
Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@`
`277`	`277`	`}`
`278`	`278`	`],`
`279`	`279`	`"homepage": {`
`280`		`- "resource": "https://new.findagrave.com"`
	`280`	`+ "resource": "https://www.findagrave.com"`
`281`	`281`	`}`
`282`	`282`	`}`
`283`	`283`	`]`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@`
`325`	`325`	`}`
`326`	`326`	`],`
`327`	`327`	`"homepage": {`
`328`		`- "resource": "https://new.findagrave.com"`
	`328`	`+ "resource": "https://www.findagrave.com"`
`329`	`329`	`}`
`330`	`330`	`}`
`331`	`331`	`]`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@`
`89`	`89`	`}`
`90`	`90`	`],`
`91`	`91`	`"homepage": {`
`92`		`- "resource": "https://new.findagrave.com"`
	`92`	`+ "resource": "https://www.findagrave.com"`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`	`]`
Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@`
`424`	`424`	`}`
`425`	`425`	`],`
`426`	`426`	`"homepage": {`
`427`		`- "resource": "https://new.findagrave.com"`
	`427`	`+ "resource": "https://www.findagrave.com"`
`428`	`428`	`}`
`429`	`429`	`}`
`430`	`430`	`]`
Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@`
`505`	`505`	`}`
`506`	`506`	`],`
`507`	`507`	`"homepage": {`
`508`		`- "resource": "https://new.findagrave.com"`
	`508`	`+ "resource": "https://www.findagrave.com"`
`509`	`509`	`}`
`510`	`510`	`}`
`511`	`511`	`]`
Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@`
`511`	`511`	`}`
`512`	`512`	`],`
`513`	`513`	`"homepage": {`
`514`		`- "resource": "https://new.findagrave.com"`
	`514`	`+ "resource": "https://www.findagrave.com"`
`515`	`515`	`}`
`516`	`516`	`}`
`517`	`517`	`]`