markuapad 0.2.2 → 0.2.3

data/lib/markuapad/version.rb

@@ -1,3 +1,3 @@
 module Markuapad
-  VERSION = "0.2.2"
+  VERSION = '0.2.3'
 end

data/package.json

@@ -36,6 +36,7 @@
     "react": "^0.13.1",
     "react-dnd": "^1.1.2",
     "react-hot-loader": "^1.2.5",
+    "reflux": "^0.2.12",
     "run-sequence": "^1.0.2",
     "sass-loader": "^1.0.2",
     "style-loader": "^0.8.2",
@@ -52,4 +53,4 @@
     "mocha": "^2.1.0",
     "should": "^5.2.0"
   }
-}
+}

data/src/actions/actions.js

@@ -0,0 +1,7 @@
+import Reflux from 'reflux';
+
+const Actions = Reflux.createActions({
+  'flash': {}
+});
+
+export default Actions;

data/src/jsx/file_browser.jsx

@@ -4,6 +4,7 @@ import FileBrowserListItem from "./file_browser_list_item";
 import FileAccessor from "../file_accessor";
 import HTML5Backend from 'react-dnd/modules/backends/HTML5';
 import { DragDropContext } from 'react-dnd';
+import Actions from '../actions/actions';
 
 import _string from "underscore.string";
 _.string = _string;
@@ -129,15 +130,20 @@ class FileBrowser extends React.Component {
   // Actually create a new file
   createFile(e) {
     let fileNode = this.refs.filename.getDOMNode()
-    FileAccessor.new(fileNode.value, this.state.fileMode, '', (error, file) => {
-      fileNode.value = '';
-      this.setState({ creatingFile: false });
-      this[`list${_.string.capitalize(this.state.fileMode)}`]()
-
-      // Change to the new file
-      this.props.onChangeFile(file)
-    });
 
+    if (this.props.blacklistedFiles.indexOf(fileNode.value.toLowerCase()) !== -1) {
+      Actions.flash('error', `You may not create a file with the name ${fileNode.value} as it is a reserved file.`)
+    }
+    else {
+      FileAccessor.new(fileNode.value, this.state.fileMode, '', (error, file) => {
+        fileNode.value = '';
+        this.setState({ creatingFile: false });
+        this[`list${_.string.capitalize(this.state.fileMode)}`]()
+
+        // Change to the new file
+        this.props.onChangeFile(file)
+      });
+    }
     e.stopPropagation();
     e.preventDefault();
   }
@@ -246,7 +252,8 @@ class FileBrowser extends React.Component {
 FileBrowser.propTypes = {
   projectRoot: React.PropTypes.string.isRequired,
   onChangeFile: React.PropTypes.func.isRequired,
-  currentFile: React.PropTypes.string
+  currentFile: React.PropTypes.string,
+  blacklistedFiles: React.PropTypes.array.isRequired
 };
 
 export default DragDropContext(HTML5Backend)(FileBrowser);

data/src/jsx/main.jsx

@@ -139,7 +139,7 @@ class Main extends React.Component {
         />
         <section className="main-view">
           <section className={this.getWorkspaceClass()}>
-            <FileBrowser onPreviewImage={this.onPreviewImage} onChangeFile={this.onChangeFile} currentFile={this.state.currentFile} projectRoot={this.props.projectRoot }/>
+            <FileBrowser blacklistedFiles={this.props.options.blacklistedFiles} onPreviewImage={this.onPreviewImage} onChangeFile={this.onChangeFile} currentFile={this.state.currentFile} projectRoot={this.props.projectRoot }/>
             <Editor
               onBookContentChanged={this.onBookContentChanged}
               inLiveMode={this.state.inLiveMode}

data/src/jsx/toolbar.jsx

@@ -1,4 +1,5 @@
 import React from "react";
+import Actions from '../actions/actions';
 
 let PROGRESS_TYPE_MAP = {
   'manuscript_update': 'Manuscript Updated.',
@@ -8,6 +9,28 @@ let PROGRESS_TYPE_MAP = {
 }
 
 class Toolbar extends React.Component {
+  state = {
+    flash: null
+  }
+
+  constructor(props) {
+    super(props)
+
+    // Listen to the flash action
+    this.unsub = Actions.flash.listen((type, message) => {
+      // Clear any existing timers
+      clearInterval(this.timer)
+
+      // Set the flash message
+      this.setState({ flash: { type: type, message: message } })
+
+      // Set up the timer to clear the flash message
+      this.timer = setTimeout(() => {
+        this.setState({ error: null })
+      }, 5000)
+    })
+  }
+
   render() {
     return (
       <nav className="toolbar">
@@ -18,6 +41,13 @@ class Toolbar extends React.Component {
               { this.props.inProgress ? <i className="fa fa-refresh fa-spin"></i> : null } { PROGRESS_TYPE_MAP[this.props.progressType] || 'Working...' }
             </a>
           </li>
+          {
+            this.state.flash ?
+              <li onClick={() => this.setState({ flash: null })} key={this.state.flash.type}>
+                <a className={`${this.state.flash.type}`}>{ this.state.flash.message }</a>
+              </li>
+            : null
+          }
           {
             this.props.enablePreview  ?
               [

data/src/markuapad.js

@@ -12,7 +12,8 @@ _.string = _string;
 
 let DEFAULT_OPTIONS = {
   CHANGED_INTERVAL: 100,
-  enablePreview: true
+  enablePreview: true,
+  blacklistedFiles: ['book.txt']
 }
 
 class Markuapad {
@@ -22,7 +23,7 @@ class Markuapad {
 
   create(elementId, options = {}) {
     // apply options to defaults
-    this.options = _.extend(this.options, options);
+    this.options = _.extend({}, this.options, options);
 
     // Project Root
     let projectTitle = options.title || "My First Markuapad Book";
@@ -35,7 +36,7 @@ class Markuapad {
     FileAccessor.setup(this.options.fileAccessor, projectRoot);
 
     // Render the markuapad
-    React.render(React.createFactory(Main)({ bookTitle: projectTitle, options: options, markua: this.markua, projectRoot: projectRoot }), document.getElementById(elementId));
+    React.render(React.createFactory(Main)({ bookTitle: projectTitle, options: this.options, markua: this.markua, projectRoot: projectRoot }), document.getElementById(elementId));
   }
 }
 

data/src/styles/_toolbar.scss

@@ -24,12 +24,17 @@
     &.disabled {
       color: #aaa;
     }
+
+    &.error {
+      color: #fff;
+      background: #FF6347;
+    }
   }
 
   > a.progressMessage {
     @include transition(opacity 1s ease-in-out);
     opacity: 0;
-    border: none; 
+    border: none;
     &.active {
       opacity: .7;
       background: initial;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markuapad
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Braden Simpson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,13 +72,10 @@ files:
 - lib/markuapad.rb
 - lib/markuapad/engine.rb
 - lib/markuapad/version.rb
-- markuapad-0.1.8.gem
-- markuapad-0.1.9.gem
-- markuapad-0.2.0.gem
-- markuapad-0.2.1.gem
 - markuapad.gemspec
 - package.json
 - prepare_gem.sh
+- src/actions/actions.js
 - src/dist.js
 - src/file_accessor.js
 - src/index.js