[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Fix the unwanted nesting of Segmenter and PageLoader modules
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372528 ) Change subject: Fix the unwanted nesting of Segmenter and PageLoader modules .. Fix the unwanted nesting of Segmenter and PageLoader modules Expose them directly instead of using a wrapper object with same name. Change-Id: I580e3d17577f068178f76ac1415fd04ca81d1ee6 --- M bin/segment M lib/index.js M lib/pageloader/PageLoader.js M lib/routes/v1.js M lib/segmentation/CXSegmenter.js M test/segmentation/CXSegmenter.test.js 6 files changed, 7 insertions(+), 7 deletions(-) Approvals: jenkins-bot: Verified Nikerabbit: Looks good to me, approved diff --git a/bin/segment b/bin/segment index 0ccb3a5..31da4b2 100755 --- a/bin/segment +++ b/bin/segment @@ -1,7 +1,7 @@ #!/usr/bin/env node var script, xhtmlSource, xhtml, result, segmenter, fs = require( 'fs' ), - Segmenter = require( __dirname + '/../lib/segmentation/CXSegmenter' ).CXSegmenter, + Segmenter = require( __dirname + '/../lib/segmentation/CXSegmenter' ), LinearDoc = require( __dirname + '/../lib/lineardoc' ); function normalize( html ) { diff --git a/lib/index.js b/lib/index.js index 0a9b5db..a23edec 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1,7 +1,7 @@ 'use strict'; module.exports = { - Segmenter: require( './segmentation/CXSegmenter.js' ).CXSegmenter, + Segmenter: require( './segmentation/CXSegmenter.js' ), Apertium: require( './mt/Apertium.js' ), Yandex: require( './mt/Yandex.js' ), MTClient: require( './mt/MTClient.js' ), diff --git a/lib/pageloader/PageLoader.js b/lib/pageloader/PageLoader.js index 6a75cd4..dde851a 100644 --- a/lib/pageloader/PageLoader.js +++ b/lib/pageloader/PageLoader.js @@ -69,4 +69,4 @@ } ); }; -module.exports.PageLoader = PageLoader; +module.exports = PageLoader; diff --git a/lib/routes/v1.js b/lib/routes/v1.js index cfd948e..7506a81 100644 --- a/lib/routes/v1.js +++ b/lib/routes/v1.js @@ -14,8 +14,8 @@ var sourceLanguage = req.params.language, title = req.params.title, revision = req.params.revision, - CXSegmenter = require( __dirname + '/../segmentation/CXSegmenter.js' ).CXSegmenter, - PageLoader = require( __dirname + '/../pageloader/PageLoader.js' ).PageLoader, + CXSegmenter = require( __dirname + '/../segmentation/CXSegmenter.js' ), + PageLoader = require( __dirname + '/../pageloader/PageLoader.js' ), pageloader = new PageLoader( app ); return pageloader.load( title, sourceLanguage, revision ).then( diff --git a/lib/segmentation/CXSegmenter.js b/lib/segmentation/CXSegmenter.js index 30b2eb5..e878e2a 100644 --- a/lib/segmentation/CXSegmenter.js +++ b/lib/segmentation/CXSegmenter.js @@ -40,4 +40,4 @@ return this.segmentedDoc.getHtml(); }; -module.exports.CXSegmenter = CXSegmenter; +module.exports = CXSegmenter; diff --git a/test/segmentation/CXSegmenter.test.js b/test/segmentation/CXSegmenter.test.js index a0b9341..8df4c04 100644 --- a/test/segmentation/CXSegmenter.test.js +++ b/test/segmentation/CXSegmenter.test.js @@ -4,7 +4,7 @@ lang, i, len, lang, test, tests, assert = require( '../utils/assert.js' ), LinearDoc = require( '../../lib/lineardoc' ), - Segmenter = require( '../../lib/segmentation/CXSegmenter' ).CXSegmenter, + Segmenter = require( '../../lib/segmentation/CXSegmenter' ), allTests = require( './SegmentationTests.json' ); function normalize( html ) { -- To view, visit https://gerrit.wikimedia.org/r/372528 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I580e3d17577f068178f76ac1415fd04ca81d1ee6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver Gerrit-Branch: master Gerrit-Owner: Santhosh Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Fix the unwanted nesting of Segmenter and PageLoader modules
Santhosh has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372528 ) Change subject: Fix the unwanted nesting of Segmenter and PageLoader modules .. Fix the unwanted nesting of Segmenter and PageLoader modules Expose them directly instead of using a wrapper object with same name. Change-Id: I580e3d17577f068178f76ac1415fd04ca81d1ee6 --- M bin/segment M lib/index.js M lib/pageloader/PageLoader.js M lib/routes/v1.js M lib/segmentation/CXSegmenter.js M test/segmentation/CXSegmenter.test.js 6 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver refs/changes/28/372528/1 diff --git a/bin/segment b/bin/segment index 0ccb3a5..31da4b2 100755 --- a/bin/segment +++ b/bin/segment @@ -1,7 +1,7 @@ #!/usr/bin/env node var script, xhtmlSource, xhtml, result, segmenter, fs = require( 'fs' ), - Segmenter = require( __dirname + '/../lib/segmentation/CXSegmenter' ).CXSegmenter, + Segmenter = require( __dirname + '/../lib/segmentation/CXSegmenter' ), LinearDoc = require( __dirname + '/../lib/lineardoc' ); function normalize( html ) { diff --git a/lib/index.js b/lib/index.js index 0a9b5db..a23edec 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1,7 +1,7 @@ 'use strict'; module.exports = { - Segmenter: require( './segmentation/CXSegmenter.js' ).CXSegmenter, + Segmenter: require( './segmentation/CXSegmenter.js' ), Apertium: require( './mt/Apertium.js' ), Yandex: require( './mt/Yandex.js' ), MTClient: require( './mt/MTClient.js' ), diff --git a/lib/pageloader/PageLoader.js b/lib/pageloader/PageLoader.js index 6a75cd4..dde851a 100644 --- a/lib/pageloader/PageLoader.js +++ b/lib/pageloader/PageLoader.js @@ -69,4 +69,4 @@ } ); }; -module.exports.PageLoader = PageLoader; +module.exports = PageLoader; diff --git a/lib/routes/v1.js b/lib/routes/v1.js index cfd948e..7506a81 100644 --- a/lib/routes/v1.js +++ b/lib/routes/v1.js @@ -14,8 +14,8 @@ var sourceLanguage = req.params.language, title = req.params.title, revision = req.params.revision, - CXSegmenter = require( __dirname + '/../segmentation/CXSegmenter.js' ).CXSegmenter, - PageLoader = require( __dirname + '/../pageloader/PageLoader.js' ).PageLoader, + CXSegmenter = require( __dirname + '/../segmentation/CXSegmenter.js' ), + PageLoader = require( __dirname + '/../pageloader/PageLoader.js' ), pageloader = new PageLoader( app ); return pageloader.load( title, sourceLanguage, revision ).then( diff --git a/lib/segmentation/CXSegmenter.js b/lib/segmentation/CXSegmenter.js index 30b2eb5..e878e2a 100644 --- a/lib/segmentation/CXSegmenter.js +++ b/lib/segmentation/CXSegmenter.js @@ -40,4 +40,4 @@ return this.segmentedDoc.getHtml(); }; -module.exports.CXSegmenter = CXSegmenter; +module.exports = CXSegmenter; diff --git a/test/segmentation/CXSegmenter.test.js b/test/segmentation/CXSegmenter.test.js index a0b9341..8df4c04 100644 --- a/test/segmentation/CXSegmenter.test.js +++ b/test/segmentation/CXSegmenter.test.js @@ -4,7 +4,7 @@ lang, i, len, lang, test, tests, assert = require( '../utils/assert.js' ), LinearDoc = require( '../../lib/lineardoc' ), - Segmenter = require( '../../lib/segmentation/CXSegmenter' ).CXSegmenter, + Segmenter = require( '../../lib/segmentation/CXSegmenter' ), allTests = require( './SegmentationTests.json' ); function normalize( html ) { -- To view, visit https://gerrit.wikimedia.org/r/372528 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I580e3d17577f068178f76ac1415fd04ca81d1ee6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver Gerrit-Branch: master Gerrit-Owner: Santhosh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits