Refactor: prepare for rcs-core@v1

Author: JPeer264

lib/process/process.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const _     = require('lodash');
+const fs    = require('fs');
 const rcs   = require('rcs-core');
 const path  = require('path');
 const glob  = require('glob');
@@ -65,19 +66,21 @@ const rcsProcess = (pathString, options, cb) => {
             // call in series
             // not all selectors are stored, maybe some selectors are duplicated in different files
             async.eachSeries(filesArray, (filePath, callback) => {
-                rcs.replace.fileCss(path.join(options.cwd, filePath), options, (err, data) => {
+                fs.readFile(path.join(options.cwd, filePath), (err, bufferData) => {
                     let joinedPath;
                     let shouldOverwrite = options.overwrite;
 
                     if (err) return callback(err);
 
+                    const data = rcs.replace.bufferCss(bufferData, options);
+
                     joinedPath = path.join(options.newPath, filePath);
 
                     if (!options.overwrite) {
                         shouldOverwrite = joinedPath !== path.join(options.cwd, filePath);
                     }
 
-                    rcs.helper.save(joinedPath, data.data, { overwrite: shouldOverwrite }, (err) => {
+                    rcs.helper.save(joinedPath, data, { overwrite: shouldOverwrite }, (err) => {
                         if (err) return callback(err);
 
                         callback();
@@ -95,19 +98,21 @@ const rcsProcess = (pathString, options, cb) => {
             // all selectors are collected
             // ⚡️ speed it up with async ⚡️
             async.each(filesArray, (filePath, callback) => {
-                rcs.replace.file(path.join(options.cwd, filePath), (err, data) => {
+                fs.readFile(path.join(options.cwd, filePath), (err, bufferData) => {
                     let joinedPath;
                     let shouldOverwrite = options.overwrite;
 
                     if (err) return callback(err);
 
+                    const data = rcs.replace.buffer(bufferData);
+
                     joinedPath = path.join(options.newPath, filePath);
 
                     if (!options.overwrite) {
                         shouldOverwrite = joinedPath !== path.join(options.cwd, filePath);
                     }
 
-                    rcs.helper.save(joinedPath, data.data, { overwrite: shouldOverwrite }, (err) => {
+                    rcs.helper.save(joinedPath, data, { overwrite: shouldOverwrite }, (err) => {
                         if (err) return callback(err);
 
                         callback();

lib/process/processSync.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const fs    = require('fs');
 const rcs   = require('rcs-core');
 const path  = require('path');
 const glob  = require('glob');
@@ -37,13 +38,13 @@ const processSync = (pathString, options) => {
         }
 
         if (options.collectSelectors) {
-            data = rcs.replace.fileCssSync(path.join(options.cwd, filePath), options);
+            data = rcs.replace.bufferCss(fs.readFileSync(path.join(options.cwd, filePath)), options);
         } else {
-            data = rcs.replace.fileSync(path.join(options.cwd, filePath), options);
+            data = rcs.replace.buffer(fs.readFileSync(path.join(options.cwd, filePath)), options);
 
         }
 
-        rcs.helper.saveSync(joinedPath, data.data, { overwrite: shouldOverwrite });
+        rcs.helper.saveSync(joinedPath, data, { overwrite: shouldOverwrite });
     }
 }; // /processSync
 

test/index.spec.js

@@ -28,36 +28,36 @@ describe('integration tests', () => {
 
     describe('processing', () => {
         it('should process js files', done => {
-            rcs.replace.fileCss(fixturesCwd + '/style.css', (err, data) => {
-                app.process('**/*.txt', {
-                    newPath: testCwd,
-                    cwd: fixturesCwd
-                }, (err, data) => {
-                    let newFile      = fs.readFileSync(testCwd + '/main.txt', 'utf8');
-                    let expectedFile = fs.readFileSync(resultsCwd + '/main.txt', 'utf8');
+            rcs.selectorLibrary.fillLibrary(fs.readFileSync(fixturesCwd + '/style.css', 'utf8'));
 
-                    expect(err).to.not.exist;
-                    expect(newFile).to.equal(expectedFile);
+            app.process('**/*.txt', {
+                newPath: testCwd,
+                cwd: fixturesCwd
+            }, (err, data) => {
+                let newFile      = fs.readFileSync(testCwd + '/main.txt', 'utf8');
+                let expectedFile = fs.readFileSync(resultsCwd + '/main.txt', 'utf8');
 
-                    done();
-                });
+                expect(err).to.not.exist;
+                expect(newFile).to.equal(expectedFile);
+
+                done();
             });
         });
 
         it('should process html files', done => {
-            rcs.replace.fileCss(fixturesCwd + '/style.css', (err, data) => {
-                app.process('**/*.html', {
-                    newPath: testCwd,
-                    cwd: fixturesCwd
-                }, (err, data) => {
-                    let newFile      = fs.readFileSync(testCwd + '/index.html', 'utf8');
-                    let expectedFile = fs.readFileSync(resultsCwd + '/index.html', 'utf8');
+            rcs.selectorLibrary.fillLibrary(fs.readFileSync(fixturesCwd + '/style.css', 'utf8'));
 
-                    expect(err).to.not.exist;
-                    expect(newFile).to.equal(expectedFile);
+            app.process('**/*.html', {
+                newPath: testCwd,
+                cwd: fixturesCwd
+            }, (err, data) => {
+                let newFile      = fs.readFileSync(testCwd + '/index.html', 'utf8');
+                let expectedFile = fs.readFileSync(resultsCwd + '/index.html', 'utf8');
 
-                    done();
-                });
+                expect(err).to.not.exist;
+                expect(newFile).to.equal(expectedFile);
+
+                done();
             });
         });
     });