pe-epub - npm Package Compare versions

Comparing version 0.3.2 to 0.3.3

package.json

 {
   "name": "pe-epub",
   "description": "JSON to EPUB",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "private": false,
@@ -6,0 +6,0 @@ "author": {

Peepub.js

@@ -1,3 +0,1 @@
-var http  = require('http');
-var https = require('https');
 var path  = require('path');
@@ -9,9 +7,8 @@ var fs    = require("fs");
 var cheerio      = require('cheerio');
-var Buffers      = require('buffers');
 var Q            = require('q');
-var JSZip        = require('./libs/jszip.js');
-var htmlEntities = require('./libs/html-entities');
+var JSZip        = require('./src/libs/jszip.js');
+var htmlEntities = require('./src/libs/html-entities');
 
 var templatesBase    = 'templates/';
-var templatesDir     = __dirname + '/' + templatesBase;
+var templatesDir     = __dirname + '/src/' + templatesBase;
 // handlebars.templates = require(templatesDir + 'templates.js');
@@ -34,17 +31,2 @@ handlebars.templates = {};
 
-function deleteFolderRecursive(path) {
-  var files = [];
-  if (fs.existsSync(path)) {
-    files = fs.readdirSync(path);
-    files.forEach(function (file, index) {
-      var curPath = path + "/" + file;
-      if (fs.statSync(curPath).isDirectory()) { // recurse
-        deleteFolderRecursive(curPath);
-      } else { // delete file
-        fs.unlinkSync(curPath);
-      }
-    });
-    fs.rmdirSync(path);
-  }
-}
 
@@ -271,13 +253,19 @@ function falseString(str){
             .then(function(res){
-              var asset = {
-                         src : src,
-                'media-type' : res.headers['content-type'],
-                        href : 'assets/' + fileName,
-                         _id : guid()
-              };
-              if(src === json.cover){
-                asset.properties = 'cover-image';
-                asset.id = 'cover-image';
+              if(res.headers){
+                var asset = {
+                           src : src,
+                  'media-type' : res.headers['content-type'],
+                          href : 'assets/' + fileName,
+                           _id : guid()
+                };
+                if(src === json.cover){
+                  asset.properties = 'cover-image';
+                  asset.id = 'cover-image';
+                }
+                that.assets.assets.push(asset);
+
+              } else { // this wasnt a proper image, video or audio file
+                fs.unlink(filePath);
+
               }
-              that.assets.assets.push(asset);
               return Q.fcall(function () { return true;  });
@@ -288,41 +276,42 @@ });
   Q.all(assetPromises)
-    .then(function(){
-      var cssPromises = _.map(json.css, function(css, i){
-        var filePath = that._epubPath('styles') + 'css_' + i + '.css';
-        return that._createFile(filePath, css)
-                .then(function(res){
-                  var asset = {
-                             src : css,
-                    'media-type' : 'text/css',
-                            href : 'styles/' + path.basename(filePath),
-                             _id : guid(),
-                             id  : 'css_' + i
-                  };
-                  that.assets.css.unshift(asset);
-                  return Q.fcall(function () { return true;  });
-                });
-      });
-      return Q.all(cssPromises);
-    })
-    .then(function(){
-      var jsPromises = _.map(json.js, function(js, i){
-        var filePath = that._epubPath('scripts') + 'js_' + i + '.js';
-        return that._createFile(filePath, js)
-                .then(function(res){
-                  var asset = {
-                             src : js,
-                    'media-type' : 'text/javascript',
-                            href : 'scripts/' + path.basename(filePath),
-                             _id : guid(),
-                             id  : 'js_' + i
-                  };
-                  that.assets.js.unshift(asset);
-                  return Q.fcall(function () { return true;  });
-                });
-      });
-      return Q.all(jsPromises);
-    })
-    .then(function(){
-      d.resolve(that.assets.assets.concat(that.assets.css).concat(that.assets.js));
-    }, d.reject);
+  .then(function(){
+    var cssPromises = _.map(json.css, function(css, i){
+      var filePath = that._epubPath('styles') + 'css_' + i + '.css';
+      return that._createFile(filePath, css)
+              .then(function(res){
+                var asset = {
+                           src : css,
+                  'media-type' : 'text/css',
+                          href : 'styles/' + path.basename(filePath),
+                           _id : guid(),
+                           id  : 'css_' + i
+                };
+                that.assets.css.unshift(asset);
+                return Q.fcall(function () { return true;  });
+              });
+    });
+    return Q.all(cssPromises);
+  })
+  .then(function(){
+    var jsPromises = _.map(json.js, function(js, i){
+      var filePath = that._epubPath('scripts') + 'js_' + i + '.js';
+      return that._createFile(filePath, js)
+              .then(function(res){
+                var asset = {
+                           src : js,
+                  'media-type' : 'text/javascript',
+                          href : 'scripts/' + path.basename(filePath),
+                           _id : guid(),
+                           id  : 'js_' + i
+                };
+                that.assets.js.unshift(asset);
+                return Q.fcall(function () { return true;  });
+              });
+    });
+    return Q.all(jsPromises);
+  })
+  .then(function(){
+    d.resolve(that.assets.assets.concat(that.assets.css).concat(that.assets.js));
+  })
+  .fail(d.reject);
   return d.promise;
@@ -474,49 +463,3 @@ };
 
-/**
- * An Array of functions that determine the type of asset and then get them
- * - the goal is to make this extensible
- *
- * @param obj => {
- *          dest : // destination,
- *        source : // where's it coming from,
- *        peepub : // the Peepub instance,
- *             d : // the deferred to resolve or reject
- *        }
- * @return bool whether this test caught it
- */
-Peepub._createFileFuncs = [
-  // pull from the internet
-  function(obj){
-    if((/^https?:\/\//).test(obj.source)){
 
-      ((/^https:\/\//).test(obj.source) ? https : http)
-      .get(obj.source, function(res){
-        if(obj.peepub.useFs){
-          res.pipe(fs.createWriteStream(obj.dest));
-        }
-        obj.peepub.streams[obj.dest] = Buffers();
-        res.on('data', function(data){
-          obj.peepub.streams[obj.dest].push(new Buffer(data));
-        });
-        res.on('end', function(err){
-          if (err){
-            return obj.d.reject(err);
-          }
-          obj.peepub.buffers[obj.dest] = obj.peepub.streams[obj.dest].toBuffer();
-          obj.d.resolve(res);
-          delete obj.peepub.streams[obj.dest];
-        });
-      });
-      return true;
-    }
-  }
-];
-
-/**
- * Don't manipulate the array directly
- */
-Peepub.addCreateFileFunc = function(func){
-  Peepub._createFileFuncs.push(func);
-}
-
 // will pull it from the internet (or not) and write it
@@ -746,140 +689,6 @@ Peepub.prototype._createFile = function(dest, source){
 
+Peepub = require('./src/static.js')(Peepub);
+Peepub = require('./src/public.js')(Peepub);
 
-// PUBLIC //
 
-Peepub.prototype.getJson = function(){
-  var that = this;
-  this._handleDefaults();
-  
-  // we want these to be arrays, but we'll be nice to people
-  var oneToMany = ['subject', 'publisher', 'creator', 'contributor', 'language'];
-  _.each(oneToMany, function _oneToMany(field){
-    if(that.json[field] && !that.json[field + 's']){
-      that.json[field + 's'] = [that.json[field]];
-    }
-    if(that.json[field + 's'] && that.json[field + 's'].length === 1 && that.json[field + 's'][0] === ''){
-      delete that.json[field + 's'];
-    }
-  });
-
-  // required fields
-  _.each(this.requiredFields, function(field){
-    if(!that.json[field]) throw "Missing a required field: " + field;
-  });
-
-  // fixed format required fields
-  if( !_.isUndefined(this.json.fixedFormat) ){
-    if( _.isUndefined(this.json.fixedFormat.w) || _.isUndefined(this.json.fixedFormat.h) ){
-      throw "Fixed format epubs must define width and height: w,h";
-    }
-    if( !this.json.fixedFormat._loaded ){
-      this.json.css.unshift("body { width: "+parseInt(this.json.fixedFormat.w)+"px;height: "+parseInt(this.json.fixedFormat.h)+"px;margin: 0; }");
-      this.json.fixedFormat._loaded = true;
-    }
-  }
-
-  // local pages
-  if( !this._checkedForLocalPages ){
-    this._checkedForLocalPages = true;
-    _.each(that.json.pages, function(page, i){
-      // read local files for pe-eps
-      if((/^file:\/\//).test(page.body)){
-        var $ = cheerio.load(fs.readFileSync(page.body.replace('file://', ''), 'utf8'));
-        that.json.pages[i].body = $('body').html();
-      }
-    });
-  }
-  
-  // modified - 2013-03-20T12:00:00Z
-  var utc = new Date((new Date).toUTCString());
-  function _pad(a){
-    return a.toString().length === 1 ? '0' + a.toString() : a;
-  }
-  this.json.modified =  utc.getFullYear() + '-' + 
-                        _pad(utc.getMonth() + 1) + '-' +
-                        _pad(utc.getDate()) + 'T' + 
-                        _pad(utc.getHours() + 1) + ':' + 
-                        _pad(utc.getMinutes() + 1) + ':' + 
-                        _pad(utc.getSeconds() + 1) + 'Z';
-
-
-  return this.json;
-};
-
-Peepub.prototype.set = function(key, val){
-  this.json[key] = val;
-};
-
-Peepub.prototype.clean = function(){
-  deleteFolderRecursive(this._epubPath());
-  if (fs.existsSync(this.epubFile)) {
-    fs.unlinkSync(this.epubFile);
-  }
-};
-
-Peepub.prototype.create = function(options, callback){
-  var that = this;
-  var d    = Q.defer();
-  
-  if (arguments.length === 1 && typeof options === 'function'){
-    callback = options;
-    options = {};
-
-  } else if(typeof options === 'string') {
-    var tmp = {};
-    if(options.match(/\.epub$/)){
-      tmp.epubDir = path.dirname(options) + '/';
-      this.fileName = path.basename(options);
-    } else {
-      tmp.epubDir = options.replace(/\/$/, '') + '/';
-    }
-    this.useFs = true;
-    options = tmp;
-  }
-  
-  var opts = _.extend({
-    epubDir : null,
-    zip : true
-  }, options);
-
-
-  if(opts.epubDir) {
-    this.epubDir = opts.epubDir;
-  }
-  this._contentOpf()
-  .then(function() {
-    if(opts.zip) {
-      that._zip(function(err, epubPath) {
-        if(callback){
-          callback(err, epubPath);
-        }
-        if(err){
-          d.reject(err);
-        } else {
-          d.resolve(epubPath);
-        }
-      });
-      
-    } else {
-      if(callback){
-        callback(null, that._epubPath());
-      }
-      d.resolve(that._epubPath());
-    }
-  })
-  .fail(function(err){
-    d.reject(err);
-  }).done();
-  return d.promise;
-};
-
-Peepub.prototype.contentOpfPath = function(){
-  if(!this.id) throw "This epub has not been created yet";
-  return this._epubPath() + Peepub.EPUB_CONTENT_DIR + 'content.opf';
-};
-
-Peepub.prototype.getTocPages = function(){
-  return _.filter(this.getJson().pages, function(page){ return page.toc; });
-};
-
 module.exports = Peepub;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

168859

increased by3.22%

Number of package files

31

increased by14.81%

Lines of code

3561

increased by2.83%

Worsened metrics

Number of low supply chain risk alerts

12

increased by33.33%

Number of medium supply chain risk alerts

3

increased by50%

No dependency changes