rubydown 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90da523f65d454d4aeb48b78fbfa2e2b35378c565a2823aae1a2e0dc07d1cf3d
-  data.tar.gz: 920bb095fd9c9855bd1dbb15c2a6a86d0d2e54e5d73b7d2d71644ec60709f5a2
+  metadata.gz: ce37172e6c98263b0b2c9bbdb3df5d695342183756af350fc6460619fcc11602
+  data.tar.gz: 2242d204fec921ef8a3b5c782a28dcf1eaa3d3a9f835218bf5830449fb3f6cfb
 SHA512:
-  metadata.gz: 62cde3191b98f6dc8500a76722979bf022a88e83d156391f4362d33406bf80158f52da205e05ba4ec5b95efde689296766ae179a21e0a886b7dcc8784d698481
-  data.tar.gz: 58b1243ed10666233d24683e0322b3a3b1482452c6bfb1650204df798919bf105a91ac32404261328402183f72d821b2ac8d703dca3e51f2d64cef02a4a8a301
+  metadata.gz: 6354f30245f6e34a1a0eb4a9bf5d26383dac2590455bbbb40ab6c51fbf516a132637d9a913e03763159916b2d9492fa746d2c0b61e75b48815b391ea3a56084e
+  data.tar.gz: 1ad1c76f3200793b6d5c094d6f93968a1078440174bcdabaf5ab8ddc85eb5e56e99c0477de480b648604c76009c5029a0be5d1744e7e5cf84fa3d551ecbc8849

data/.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
        - image: ruby
-      
+
     working_directory: ~/repo
 
     steps:
@@ -19,9 +19,9 @@ jobs:
             apt-get update
             apt-get install -y gnuplot
             gem build rubydown.gemspec
-            gem install rubydown-0.1.0.gem
+            gem install rubydown-0.2.0.gem
             gem install bio
-            
+
       # run tests!
       - run:
           name: run tests
@@ -29,7 +29,7 @@ jobs:
             rubydown -i examples/bio.md -e templates/template.html.erb -o /tmp/bio.html
             rubydown -i examples/table.md -e templates/template.html.erb -o /tmp/table.html
             rubydown -i examples/graph.md -e templates/template.html.erb -o /tmp/graph.html
-            
+
       # collect reports
       - store_artifacts:
           path: /tmp

data/README.md

@@ -18,8 +18,7 @@ https://github.com/pystitch/stitch
 
 ```
 apt install gnuplot # When you use numo-gnuplot in your workflow markdown
-gem install specific_install
-gem specific_install https://github.com/sciruby-jp/rubydown
+gem install rubydown
 ```
 
 ## Usage (example with [rumale](https://github.com/yoshoku/rumale) and [rdatasets](https://github.com/kojix2/rdatasets))
@@ -28,5 +27,5 @@ gem specific_install https://github.com/sciruby-jp/rubydown
 gem install rumale rdatasets
 git clone git://github.com/sciruby-jp/rubydown
 cd rubydown/examples
-rubydown -i rumale.md -o rumale.html
+rubydown -i rumale.md
 ```

data/appveyor.yml

@@ -2,7 +2,7 @@
 install:
   - set PATH=C:\Ruby25-x64\bin;%PATH%
   - gem build rubydown.gemspec
-  - gem install rubydown-0.1.0.gem
+  - gem install rubydown-0.2.0.gem
 
 build: off
 
@@ -20,6 +20,6 @@ test_script:
   - rubydown -i examples\bio.md -e templates\template.html.erb -o bio.html
   - rubydown -i examples\graph.md -e templates\template.html.erb -o graph.html
   - rubydown -i examples\table.md -e templates\template.html.erb -o table.html
-  
+
 artifacts:
   - path: '*.html'

data/exe/rubydown

@@ -3,7 +3,7 @@
 require 'kramdown'
 require 'erb'
 require 'stringio'
-
+require 'base64'
 require 'optparse'
 
 require 'rubydown'
@@ -14,16 +14,23 @@ end
 
 class EvalDoc < Kramdown::Document
   attr_accessor :context, :stdout
+  attr_reader :javascripts
 
   def initialize(text, *opts)
     super(text, *opts)
 
+    @javascripts = {}
     self.context = get_context
     self.root = scan_el(self.root)
   end
 
+  REQUIREJS_SCRIPT_TAG = '<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.6/require.min.js"></script>'
+  MATHJAX_SCRIPT_TAG = "<script src='https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML' async></script>"
+
   private
   def scan_el(el)
+    @javascripts[:mathjax] ||= MATHJAX_SCRIPT_TAG if el.type == :math
+
     new_children = []
     el.children.each do |child_el|
       child_el = scan_el(child_el)
@@ -34,6 +41,7 @@ class EvalDoc < Kramdown::Document
       if is_code && child_el.options[:lang] == 'ruby'
         code = child_el.value.gsub(/^ *ruby *\n/, '')
         new_children << eval_and_elementize(code)
+        @javascripts[:requirejs] ||= REQUIREJS_SCRIPT_TAG
       end
     end
 
@@ -54,6 +62,9 @@ class EvalDoc < Kramdown::Document
     case
     when eval_result.respond_to?(:to_html)
       Kramdown::Document.new(eval_result.to_html, input: :html).root
+    when eval_result.instance_of?(File) && File.extname(eval_result.path) == ".png"
+      img_b64 = Base64.encode64(File.binread(eval_result.path))
+      Kramdown::Document.new("<img src='data:image/png;base64,#{img_b64}' />", input: :html).root
     else
       text_result_el(stdout_string + "=> #{eval_result}")
     end

data/lib/rubydown.rb

@@ -5,27 +5,41 @@ require 'rbplotly'
 require 'numo/gnuplot'
 require 'base64'
 require 'tempfile'
+require 'charty'
 
 
 class Numo::NArray
   def to_html
-    rows = self.to_a.map do |row|
-      elems = row.map do |elem|
+    case ndim
+    when 2
+      rows = self.to_a.map do |row|
+        elems = row.map do |elem|
+          "<td>#{elem}</td>"
+        end
+        "<tr>#{elems.join}</tr>"
+      end
+      "<table>#{rows.join}</table>"
+    when 1
+      cols = self.to_a.map do |elem|
         "<td>#{elem}</td>"
       end
-      "<tr>#{elems.join}</tr>"
+      "<table><tr>#{cols.join}</tr></table>"
+    else
+      inspect
     end
-    "<table>#{rows.join}</table>"
   end
 end
 
-class Numo::Int32
-  def to_html
-    <<-HTML
-      #{self.to_a}
-    HTML
+Charty::RenderContext.prepend Module.new {
+  def render(filename=nil)
+    super
+    if filename.nil?
+      p "The image could not be rendered. In the environment without IRuby, the file name for the charty render method is required."
+    else
+      File.open(filename)
+    end
   end
-end
+}
 
 module Rubydown
   class RbMarkPlot < Numo::Gnuplot

data/lib/rubydown/version.rb

@@ -1,3 +1,3 @@
 module Rubydown
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/rubydown.gemspec

@@ -6,8 +6,8 @@ require "rubydown/version"
 Gem::Specification.new do |spec|
   spec.name          = "rubydown"
   spec.version       = Rubydown::VERSION
-  spec.authors       = ["Kozo Nishida"]
-  spec.email         = ["knishida@riken.jp"]
+  spec.authors       = ["Yusuke Sangenya", "Kozo Nishida", "Kazuhiro Nishiyama"]
+  spec.email         = ["kozo.nishida@gmail.com"]
   spec.license       = 'MIT'
   spec.summary       = "Pure Ruby R Markdown clone."
   spec.description   = "rubydown is R Markdown clone for Rubyists."
@@ -40,6 +40,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "numo-narray", "~> 0.9.1"
   spec.add_dependency "numo-gnuplot", "~> 0.2.4"
   spec.add_dependency "rbplotly", "~> 0.1.2"
+  spec.add_dependency "charty", "0.1.2.dev"
+  spec.add_dependency "matplotlib", "~> 1.0.0"
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"

data/templates/template.html.erb

@@ -16,7 +16,7 @@
         display: none;
       }
     </style>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.6/require.min.js"></script>
+    <%= doc.javascripts.values.join('') %>
   </head>
   <body>
     <article class='markdown-body'>

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rubydown
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
+- Yusuke Sangenya
 - Kozo Nishida
+- Kazuhiro Nishiyama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-10 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -80,6 +82,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: charty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.2.dev
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.2.dev
+- !ruby/object:Gem::Dependency
+  name: matplotlib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +154,7 @@ dependencies:
         version: '3.3'
 description: rubydown is R Markdown clone for Rubyists.
 email:
-- knishida@riken.jp
+- kozo.nishida@gmail.com
 executables:
 - rubydown
 extensions: []