rsyntaxtree 0.6.7 → 0.6.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4622d2cdbf1276c10f5e5826a6809f3481994df
-  data.tar.gz: 7a733195f3bf02495f36c6cd2037fd1f6bb64913
+  metadata.gz: 4da741645d3844ce99a54efe3df6e8554eeb2b21
+  data.tar.gz: 727dcfd111c5ec58240ee5caf4f417c4b195072f
 SHA512:
-  metadata.gz: 1758c9c59751b9ce6102d791cbd66ee2264e8e3e7d4b252e810a02f53af80246c769a357fae44a5187ca66832213324994fc4082af55599e620b3be4ee5cc9f3
-  data.tar.gz: 0a259f2811dc9aeea8fe860169673e9a23f7af1bb1b84508d4465ad76530a021cb54192cc7158c96ad9547da894d8592ab953b06e0a44cbceb7fe37af93509e7
+  metadata.gz: b862ff816bd3a129b40b4708aa19d587cd1f8e7f92b9a1a480609b3b5cd99bec120cdb46bd84a1a7e442eed25b297c379c235d73fa6765b24ef1072ea61414fc
+  data.tar.gz: a3e621ffc45cb6a17e0d0318c7a43039856964ca771f2c717a42001d8823eea0def499cee932a8d946b6917fbbf988466004e2747110f6c13f3e1f9be5f405b6

data/.gitignore

@@ -10,4 +10,5 @@ Gemfile.lock
 log/
 logs/
 
-
+bin/rsync_code
+bin/linktree.rb

data/Gemfile

@@ -1,4 +1,9 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in rsyntaxtree.gemspec
-gemspec
+gem 'sinatra'
+gem 'haml'
+gem 'rmagick'
+gem 'trollop'
+group :development do
+  gem 'thin'
+end

data/lib/rsyntaxtree.rb

@@ -43,6 +43,20 @@ require 'version'
 
 FONT_DIR = File.expand_path(File.dirname(__FILE__) + "/../fonts")
 
+##################################################
+if !development?
+  # load and store Google Analytics code, if any, to a variable
+  ga_path = File.dirname(__FILE__) + "/../google_analytics_tracking_code"
+  if File.exists?(ga_path)
+    gfile = File.open(ga_path, "r:UTF-8:UTF-8")
+    $GOOGLE_CODE = gfile.read
+    gfile.close
+  else
+    $GOOGLE_CODE = ""
+  end
+end
+##################################################
+
 class RSGenerator 
   include Helpers
   def initialize(params = {})
@@ -51,7 +65,12 @@ class RSGenerator
       case key
       when "data"
         data = URI.unescape(value)
-        data  = data.gsub('-AMP-', '&').gsub('-PRIME-', "'").gsub('-SCOLON-', ';')
+        data  = data.gsub('-AMP-', '&')
+          .gsub('-PERCENT-', "%")
+          .gsub('-PRIME-', "'")
+          .gsub('-SCOLON-', ';')
+          .gsub('-OABRACKET-', '<')
+          .gsub('-CABRACKET-', '>')
         new_params[key] = data
       when "symmetrize", "color", "autosub"
         new_params[key] = value == "on"? true : false
@@ -72,6 +91,8 @@ class RSGenerator
           new_params["font"] = FONT_DIR + "/ArialUnicode.ttf"
         elsif value == "tnr"
           new_params["font"] = FONT_DIR + "/TimesNewRoman.ttf"
+        elsif value == "noto"
+          new_params["font"] = FONT_DIR + "/NotoSansCJK.ttc"
         end
       else
         new_params[key] = value
@@ -122,7 +143,7 @@ class RSGenerator
   
   def draw_svg
     @params["format"] = "svg"
-    sp = StringParser.new(@params["data"].gsub('&', '&amp;'))
+    sp = StringParser.new(@params["data"].gsub('&', '&amp;').gsub('%', '&#37;'))
     sp.parse
     sp.auto_subscript if @params["autosub"]
     elist = sp.get_elementlist

data/lib/rsyntaxtree/imgutils.rb

@@ -28,7 +28,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 # require 'rubygems'
-require 'RMagick'
+require 'rmagick'
 include Magick
 
 def img_get_txt_metrics(text, font, font_size, multiline)

data/lib/rsyntaxtree/string_parser.rb

@@ -49,7 +49,7 @@ class StringParser
   attr_accessor :data, :elist, :pos, :id, :level, :tncnt
   def initialize(str)
     # Clean up the data a little to make processing easier
-    string = str.gsub(/\t/, "")
+    string = str.gsub(/\t/, "") rescue ""
     string.gsub!(/\s+/, " ")
     string.gsub!(/\] \[/, "][")
     string.gsub!(/ \[/, "[")

data/lib/rsyntaxtree/tree_graph.rb

@@ -30,7 +30,7 @@
 require 'imgutils'
 require 'elementlist'
 # require 'rubygems'
-require 'RMagick'
+require 'rmagick'
 include Magick
 
 E_WIDTH   = 60 # Element width

data/lib/rsyntaxtree/version.rb

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

data/public/js/rsyntaxtree.js

@@ -33,7 +33,12 @@ $(function(){
   }
 
   function escape_chrs(data){
-    data = data.replace(/\&/g, "-AMP-").replace(/\'/g, "-PRIME-").replace(/\;/g, "-SCOLON");
+    data = data.replace(/\&/g, "-AMP-")
+      .replace(/\%/g, '-PERCENT-')
+      .replace(/\'/g, "-PRIME-")
+      .replace(/\;/g, "-SCOLON-")
+      .replace(/\</g, "-OABRACKET-")
+      .replace(/\>/g, "-CABRACKET-");
     data = $('<div/>').text(data).html();
     return data;
   }
@@ -129,4 +134,4 @@ $(function(){
   });
 
 
-});
+});

data/views/footer.haml

@@ -1,3 +1,3 @@
 .footer
   %p
-    © Yoichiro Hasebe 2013
+    © Yoichiro Hasebe 2016

data/views/index.haml

@@ -11,7 +11,7 @@
       #alert{:style => "height:20px;"}
     .span12
       %textarea.span12{:id => "data", :cols => 100, :style => "font-size: 11pt; height: 4em;line-height: 140%;"}
-        [S [NP RSyntaxTree^][VP [V generates][NP multilingual syntax trees]]]
+        [S [NP RSyntaxTree^][VP [V generates][NP \[multilingual\] syntax trees]]]
   .row
     .span2
       %h4 Leaf-style
@@ -23,13 +23,14 @@
     .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
+        %option{:value => "noto"}NOTO
     .span2
       %h4 Font-size 
       %select{:name => "fontsize", :style => "width:60px;"}

data/views/layout.haml

@@ -18,18 +18,20 @@
 
     %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
+      #{ $GOOGLE_CODE }
       <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
       <!--[if lt IE 9]>
         <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
       <![endif]-->    
 
-    / Le fav and touch icons 
-    %link{ rel: "apple-touch-icon", href: "/bootstrap/images/apple-touch-icon.png"}
-    %link{ rel: "shortcut icon", href: "/bootstrap/images/favicon.ico"}
-    %link{ rel: "apple-touch-icon", sizes: "72x72", href: "/bootstrap/images/apple-touch-icon-72x72.png"}
-    %link{ rel: "apple-touch-icon", sizes: "114x114", href: "/bootstrap/images/apple-touch-icon-114x114.png"}
+    -# / Le fav and touch icons 
+    -# %link{ :rel => "apple-touch-icon", :href => $SUB_DIRECTORY + "/bootstrap/images/apple-touch-icon.png"}
+    -# %link{ :rel => "shortcut icon", :href => $SUB_DIRECTORY + "/bootstrap/images/favicon.ico"}
+    -# %link{ :rel => "apple-touch-icon", :sizes => "72x72", :href => $SUB_DIRECTORY + "/bootstrap/images/apple-touch-icon-72x72.png"}
+    -# %link{ :rel => "apple-touch-icon", :sizes => "114x114", :href => $SUB_DIRECTORY + "/bootstrap/images/apple-touch-icon-114x114.png"}
 
   %body    
     %div#top{:data => {:subdir => $SUB_DIRECTORY}}

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.5
+      %a.brand{:href => 'https://github.com/yohasebe/rsyntaxtree'}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.91
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-08 00:00:00.000000000 Z
+date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -70,7 +70,6 @@ description: Yet another syntax tree generator made with Ruby and RMagick
 email:
 - yohasebe@gmail.com
 executables:
-- linktree.rb
 - rsyntaxtree
 extensions: []
 extra_rdoc_files: []
@@ -80,7 +79,6 @@ files:
 - README.md
 - Rakefile
 - app.rb
-- bin/linktree.rb
 - bin/rsyntaxtree
 - config.ru
 - fonts/DroidSans.ttf
@@ -133,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rsyntaxtree
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: RSyntaxTree is a graphical syntax tree generator written in Ruby

data/bin/linktree.rb

@@ -1,20 +0,0 @@
-require 'linkparser'
-require 'rsyntaxtree'
-
-dict = LinkParser::Dictionary.new
-sent = dict.parse( "I wonder if Tom knows Jill sneezed her handkerchief off the table" )
-sent.subject        # => "people"
-sent.verb           # => "use"
-sent.object         # => "Ruby"
-bracketed = sent.constituent_tree_string(2)
-bracketed = bracketed.chomp.gsub(/ [A-Z]+\]/){"]"}
-bracketed = bracketed.gsub(/VP (.+?) \[NP/) do |text|
-  "VP [V #{$1}] [NP"
-end
-
-p bracketed
-opts = {}
-opts["data"] = bracketed
-rsg = RSGenerator.new(opts)
-outfile = File.new(File.expand_path("~/Desktop/test.png"), "wb")
-outfile.write rsg.draw_png