rsyntaxtree 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a15703d35fdf78cb04cc1feab0b566831258c73
-  data.tar.gz: 892261a1d4a749b2bc5dd90099f9390212971f97
+  metadata.gz: e4622d2cdbf1276c10f5e5826a6809f3481994df
+  data.tar.gz: 7a733195f3bf02495f36c6cd2037fd1f6bb64913
 SHA512:
-  metadata.gz: 74b42d05ac9a5350abb93978a296b99432cd485a09aa9427a83a276cfd49f91949d55e279cb931046b9bc5b5774a8938fa7e0e5cbf9e651095b1ed95187588a1
-  data.tar.gz: 8e3af22d82521d900cc583d963f851497ba040f72b5a0efcb637f743f76387ee8682ebbfa69e569bee6484ff9b15572d5b17265bc85484818262389eb4107620
+  metadata.gz: 1758c9c59751b9ce6102d791cbd66ee2264e8e3e7d4b252e810a02f53af80246c769a357fae44a5187ca66832213324994fc4082af55599e620b3be4ee5cc9f3
+  data.tar.gz: 0a259f2811dc9aeea8fe860169673e9a23f7af1bb1b84508d4465ad76530a021cb54192cc7158c96ad9547da894d8592ab953b06e0a44cbceb7fe37af93509e7

data/config.ru

@@ -3,4 +3,6 @@ path = File.expand_path("../", __FILE__)
 require 'sinatra'
 require "#{path}/app"
 
+$SUB_DIRECTORY = "/rsyntaxtree"
+
 run Sinatra::Application

data/lib/rsyntaxtree/string_parser.rb

@@ -74,14 +74,19 @@ class StringParser
     text = @data.strip
     text_r = text.split(//)
     open_br, close_br = [], []
+    escape = false
     text_r.each do |chr|
-      if chr == '['
+      if chr == "\\"
+        escape = true
+      elsif chr == '[' && !escape
         open_br.push(chr)
-      elsif chr == ']'
+      elsif chr == ']' && !escape
         close_br.push(chr)
         if open_br.length < close_br.length
           break
         end
+      elsif escape
+        escape = false
       end
     end
 
@@ -149,24 +154,38 @@ class StringParser
       return ""
     end
     
+    escape = false
     while(((@pos + i) < data.length) && !gottoken)
       ch = data[@pos + i];
       case ch
       when "["
-        if(i > 0)
-          gottoken = true
-        else
+        if escape
           token += ch
+          escape = false
+        else
+          if(i > 0)
+            gottoken = true
+          else
+            token += ch
+          end
         end
       when "]"
-        if(i == 0 )
+        if escape
           token += ch
+          escape = false
+        else
+          if(i == 0 )
+            token += ch
+          end
+          gottoken = true
         end
-        gottoken = true
+      when "\\"
+        escape = true
       when /[\n\r]/
         gottoken = false # same as do nothing  
       else
         token += ch
+        escape = false if escape
       end
       i += 1
     end

data/lib/rsyntaxtree/version.rb

@@ -1,4 +1,4 @@
 module RSyntaxTree
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end
 

data/public/js/rsyntaxtree.js

@@ -1,4 +1,7 @@
 $(function(){                 
+
+  var subdir = $('#top').data('subdir');
+
   function alert(msg, type){
     $("#alert").html("<div style='padding:2px; margin:0;' class='" + type + 
     "'>" + msg + "</p></div>");
@@ -18,7 +21,7 @@ $(function(){
   
   function draw_graph(data){
 	$.ajax({
-	    url: '/draw_png',
+	    url: subdir + '/draw_png',
 	    type: 'POST',
 	    data: make_params(data),
 	    success: function (raw_data) {
@@ -36,7 +39,7 @@ $(function(){
   }
 
   function postForm(data, format){
-    $('<form/>', {action: 'download_' + format, method: 'POST'})
+    $('<form/>', {action: subdir + '/download_' + format, method: 'POST'})
       .append($('<input/>', {type: 'hidden', name: 'data', value: data}))
       .append($('<input/>', {type: 'hidden', name: 'format', value: $("select[name=format]").val()}))
       .append($('<input/>', {type: 'hidden', name: 'leafstyle', value: $("select[name=leafstyle]").val()}))
@@ -55,7 +58,7 @@ $(function(){
     data = escape_chrs(data);
     $.ajax({
        type: "POST",
-       url:"/check",
+       url: subdir + "/check",
        data:"data=" + data,
        success: function(msg){
          if(msg != "true"){
@@ -73,7 +76,7 @@ $(function(){
     data = escape_chrs(data);
     $.ajax({
        type: "POST",
-       url:"/check",
+       url: subdir + "/check",
        data:"data=" + data,
        success: function(msg){
          if(msg != "true"){
@@ -92,7 +95,7 @@ $(function(){
     data = escape_chrs(data);
     $.ajax({
        type: "POST",
-       url:"/check",
+       url: subdir + "/check",
        data:"data=" + data,
        success: function(msg){
          if(msg != "true"){
@@ -108,7 +111,7 @@ $(function(){
   $("#check").click(function(){    
     $.ajax({
        type: "POST",
-       url:"/check",
+       url: subdir + "/check",
        data:"data=" + escape_chrs($("#data").val()),
        success: function(msg){
          if(msg == "true"){

data/views/index.haml

@@ -19,15 +19,15 @@
         %option{:value => "auto"}Auto
         %option{:value => "triangle"}Triangle
         %option{:value => "bar"}Bar
-        %option{:value => "nothing"}Nothing
+        %option{:value => "nothing"}None
     .span2
       %h4 Font-style
       %select{:name => "fontstyle", :style => "width:110px;"}
+        %option{:value => "cjk"}CJK
         %option{:value => "sans-serif"}San-Serif
         %option{:value => "serif"}Serif
         %option{:value => "jp-gothic"}JP-Gothic
         %option{:value => "jp-mincho"}JP-Mincho
-        %option{:value => "cjk"}CJK
         %option{:value => "aru"}ARU
         %option{:value => "tnr"}TNR
     .span2
@@ -110,7 +110,7 @@
       %p
         Every branch or leaf of a tree must belong to a node. To create a node, place a label 
         right next to the opening bracket. Arbitrary number of branches can follow with a 
-        preceding space.
+        preceding space. To print opening or closing bracket itself, escape it with a backslash ('\[' and '\]')
 
       %p
         There are several modes in which the connectors between terminal nodes and their leaves are 

data/views/layout.haml

@@ -6,7 +6,7 @@
     %meta{:name => "description", :content => ""}
     %meta{:name => "author", :content => ""}
 
-    %link{ :href => "/bootstrap/css/bootstrap.css", :type => "text/css", :rel => "stylesheet" }
+    %link{ :href => $SUB_DIRECTORY + "/bootstrap/css/bootstrap.css", :type => "text/css", :rel => "stylesheet" }
 
     :plain
       <style type="text/css">
@@ -16,8 +16,8 @@
         }
       </style>
 
-    %link{ :href => "/bootstrap/css/bootstrap-responsive.css", :type => "text/css", :rel => "stylesheet" }
-    %link{ :href => "/css/rsyntaxtree.css", :type => "text/css", :rel => "stylesheet" }
+    %link{ :href => $SUB_DIRECTORY + "/bootstrap/css/bootstrap-responsive.css", :type => "text/css", :rel => "stylesheet" }
+    %link{ :href => $SUB_DIRECTORY + "/css/rsyntaxtree.css", :type => "text/css", :rel => "stylesheet" }
 
     :plain
       <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
@@ -32,10 +32,11 @@
     %link{ rel: "apple-touch-icon", sizes: "114x114", href: "/bootstrap/images/apple-touch-icon-114x114.png"}
 
   %body    
+    %div#top{:data => {:subdir => $SUB_DIRECTORY}}
     %div= haml :navbar
     %div= yield
 
     / Placed at the end of the document so the pages load faster
-    %script{ :type => "text/javascript", :src =>"/bootstrap/js/jquery.js"}
-    %script{ :type => "text/javascript", :src =>"/bootstrap/js/bootstrap.js"}
-    %script{ :type => "text/javascript", :src =>"/js/rsyntaxtree.js"}
+    %script{ :type => "text/javascript", :src => $SUB_DIRECTORY + "/bootstrap/js/jquery.js"}
+    %script{ :type => "text/javascript", :src => $SUB_DIRECTORY + "/bootstrap/js/bootstrap.js"}
+    %script{ :type => "text/javascript", :src => $SUB_DIRECTORY + "/js/rsyntaxtree.js"}

data/views/navbar.haml

@@ -5,4 +5,4 @@
         %span.icon-bar
         %span.icon-bar
         %span.icon-bar
-      %a.brand{:href => 'https://github.com/yohasebe/rsyntaxtree'}RSyntaxTree 0.6.6
+      %a.brand{:href => 'https://github.com/yohasebe/rsyntaxtree'}RSyntaxTree 0.6.5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rsyntaxtree
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: RSyntaxTree is a graphical syntax tree generator written in Ruby