Move applyParams to standalone file

Kureev Alexey · Kureev Alexey · commit c7b37c0c65d5 · 2016-04-20T17:21:32.000+02:00
diff --git a/src/android/patches/0.17/makePackagePatch.js b/src/android/patches/0.17/makePackagePatch.js
@@ -1,10 +1,7 @@
+const applyParams = require('../applyParams');
+
 module.exports = function makePackagePatch(packageInstance, params) {
-  const processedInstance = packageInstance.replace(
-    /\$\{(\w+)\}/g,
-    (pattern, paramName) => params[paramName]
-      ? `this.getResources().getString(R.strings.${paramName})`
-      : null
-  );
+  const processedInstance = applyParams(packageInstance, params);
 
   return {
     pattern: '.addPackage(new MainReactPackage())',
diff --git a/src/android/patches/0.18/makePackagePatch.js b/src/android/patches/0.18/makePackagePatch.js
@@ -1,10 +1,7 @@
+const applyParams = require('../applyParams');
+
 module.exports = function makePackagePatch(packageInstance, params) {
-  const processedInstance = packageInstance.replace(
-    /\$\{(\w+)\}/g,
-    (pattern, paramName) => params[paramName]
-      ? `this.getResources().getString(R.strings.${paramName})`
-      : null
-  );
+  const processedInstance = applyParams(packageInstance, params);
 
   return {
     pattern: 'new MainReactPackage()',
diff --git a/src/android/patches/0.20/makePackagePatch.js b/src/android/patches/0.20/makePackagePatch.js
@@ -1,10 +1,7 @@
+const applyParams = require('../applyParams');
+
 module.exports = function makePackagePatch(packageInstance, params) {
-  const processedInstance = packageInstance.replace(
-    /\$\{(\w+)\}/g,
-    (pattern, paramName) => params[paramName]
-      ? `this.getResources().getString(R.strings.${paramName})`
-      : null
-  );
+  const processedInstance = applyParams(packageInstance, params);
 
   return {
     pattern: 'new MainReactPackage()',
diff --git a/src/android/patches/applyParams.js b/src/android/patches/applyParams.js
@@ -0,0 +1,8 @@
+module.exports = function applyParams(str, params) {
+  return str.replace(
+    /\$\{(\w+)\}/g,
+    (pattern, paramName) => params[paramName]
+      ? `this.getResources().getString(R.strings.${paramName})`
+      : null
+  );
+};
diff --git a/test/android/patches/applyPatch.js b/test/android/patches/applyPatch.js
@@ -0,0 +1,11 @@
+const chai = require('chai');
+const expect = chai.expect;
+const applyParams = require('../../../src/android/patches/applyParams');
+
+describe('applyParams', () => {
+  it('apply params to the string', () => {
+    expect(
+      applyParams('${foo}', {foo: 'foo'})
+    ).to.be.equal('this.getResources().getString(R.strings.foo)');
+  });
+});
