RubyGems - jekyll-jupyter-notebook - Versions diffs - 0.0.2 → 0.0.3 - Mend

jekyll-jupyter-notebook 0.0.2 → 0.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

checksums.yaml +5 -5
data/README.md +7 -1
data/doc/text/news.md +14 -0
data/lib/jekyll-jupyter-notebook.rb +2 -0
data/lib/jekyll-jupyter-notebook/converter.rb +70 -0
data/lib/jekyll-jupyter-notebook/generator.rb +37 -0
data/lib/jekyll-jupyter-notebook/tag.rb +15 -21
data/lib/jekyll-jupyter-notebook/version.rb +1 -1
metadata +5 -3

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2d8a308475c3bbced91a8f917dd2269cd5841f2f
-  data.tar.gz: 7bfd27ff41148e95d335eb16a53ef5649227156d
+SHA256:
+  metadata.gz: 672a0c4369f87053a77bc6065f5fe6c7793c530c006cb92d54ba894efc83879e
+  data.tar.gz: 9d6548fbab78a3632b5e1feb81cf98b0602ad3f7366af1e3b623d3fac2f53497
 SHA512:
-  metadata.gz: 3cdf4e001557890333f746d30ce5c4b6b790ccd61215b0c1fe0a0a5167a16de48436e93040ebc266b8170901b5c64f8709705e9b5ad8aba8d3f193454d17bd43
-  data.tar.gz: 774011d293718da25e201b8348dda74c597e470fc3c9e8e4e5de473accfda7258eda13bf8ffb79aaa04b98be9b607f521cbe3e65648e5655f0daec281a35516d
+  metadata.gz: e84f567d3997d8799d419f0f0a6f7f5c60c46204b8a34b145e62d37f0bfc91e43e27d0182e407c5288b9fe988bf51d7e6aa38d5ba6e4f3cfedd6e5e220058271
+  data.tar.gz: 1093ca8d586c5c3f442ec1710822c11298a0ab2dfe8ae566339ee1e6693fc3c589c1ec57b44897e617f019194bd9ad56f1da73d03b5fbb349b154f17712a2e74

data/README.md CHANGED Viewed

@@ -16,10 +16,16 @@ Add the following line to your site's `Gemfile`:
 gem "jekyll-jupyter-notebook"
 ```
+Run the following command line to make the gem available:
+```console
+% bundle install
+```
 Add the following line to your site's `_config.yml`:
 ```yaml
-gems:
+plugins:
   - jekyll-jupyter-notebook
 ```

data/doc/text/news.md CHANGED Viewed

@@ -1,5 +1,19 @@
 # News
+## 0.0.3 - 2018-03-31
+### Improvements
+  * Improved install document.
+    [GitHub#5][Patch by Jake VanCampen]
+  * Changed to use `iframe` instead of embedding `nbconvert`-ed HTML directory.
+    It required JavaScript.
+### Thanks
+  * Jake VanCampen
 ## 0.0.2 - 2017-09-03
 ### Improvements

data/lib/jekyll-jupyter-notebook.rb CHANGED Viewed

@@ -12,4 +12,6 @@
 require "jekyll-jupyter-notebook/version"
+require "jekyll-jupyter-notebook/converter"
+require "jekyll-jupyter-notebook/generator"
 require "jekyll-jupyter-notebook/tag"

data/lib/jekyll-jupyter-notebook/converter.rb ADDED Viewed

@@ -0,0 +1,70 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+require "tempfile"
+module JekyllJupyterNotebook
+  class Converter < Jekyll::Converter
+    def matches(ext)
+      ext == ".ipynb"
+    end
+    def output_ext(ext)
+      ".html"
+    end
+    def convert(content)
+      config = @config["jupyter_notebook"] || {}
+      html = convert_notebook(content)
+      html.sub!(/<link.+?href="custom.css">/, "")
+      case config["content"] || "html"
+      when "html"
+      when "body"
+        html.sub!(/\A.*?<\/title>/m, "")
+        html.sub!(/<\/head>/, "")
+        html.sub!(/<body>/, "")
+        html.sub!(/<\/body>.*?\z/m, "")
+      when "body-without-style"
+        html.sub!(/\A.*?<body>/m, "")
+        html.sub!(/<\/body>.*?\z/m, "")
+      end
+      html
+    end
+    private
+    def convert_notebook(content)
+      notebook = Tempfile.new(["jekyll-jupyter-notebook", ".ipynb"])
+      notebook.print(content)
+      notebook.close
+      IO.pipe do |input, output|
+        pid = spawn("jupyter",
+                    "nbconvert",
+                    "--to", "html",
+                    "--stdout",
+                    notebook.path,
+                    :out => output)
+        begin
+          output.close
+          html = nil
+          read_thread = Thread.new do
+            html = input.read
+          end
+          read_thread.join
+          html
+        ensure
+          Process.waitpid(pid)
+        end
+      end
+    end
+  end
+end

data/lib/jekyll-jupyter-notebook/generator.rb ADDED Viewed

@@ -0,0 +1,37 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+module JekyllJupyterNotebook
+  module IFramePage
+    def output_ext
+      ext + super
+    end
+  end
+  class Generator < Jekyll::Generator
+    def generate(site)
+      site.static_files.reject! do |static_file|
+        if static_file.extname == ".ipynb"
+          base = static_file.instance_variable_get(:@base)
+          dir = static_file.instance_variable_get(:@dir)
+          name = static_file.name
+          page = Jekyll::Page.new(site, base, dir, name)
+          page.extend(IFramePage)
+          site.pages << page
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+end

data/lib/jekyll-jupyter-notebook/tag.rb CHANGED Viewed

@@ -26,27 +26,21 @@ module JekyllJupyterNotebook
     end
     def render(context)
-      dir = context["page"]["dir"] || File.dirname(context["page"]["path"])
-      notebook_path = File.join(context["site"]["source"],
-                                dir,
-                                @notebook_path)
-      Dir.mktmpdir do |output|
-        system("jupyter",
-               "nbconvert",
-               "--to", "html",
-               "--output-dir", output,
-               notebook_path)
-        html_path = Dir.glob("#{output}/*.html").first
-        html = File.read(html_path)
-        html.sub!(/\A.*?<\/title>/m, "")
-        html.sub!(/<link.+?href="custom.css">/, "")
-        html.sub!(/<\/head>/, "")
-        html.sub!(/<body>/, "")
-        html.sub!(/<\/body>.*?\z/m, "")
-        <<-HTML
-<div class="jupyter-notebook">#{html}</div>
-        HTML
-      end
+      notebook_html_path = "#{@notebook_path}.html"
+      <<-HTML
+<div
+  class="jupyter-notebook"
+  style="position: relative; width: 100%; margin: 0 auto;">
+  <div class="jupyter-notebook-iframe-container">
+    <iframe
+      src="#{CGI.escapeHTML(notebook_html_path)}"
+      style="position: absolute; top: 0; left: 0; border-style: none;"
+      width="100%"
+      height="100%"
+      onload="this.parentElement.style.paddingBottom = (this.contentWindow.document.documentElement.scrollHeight + 10) + 'px'"></iframe>
+  </div>
+</div>
+      HTML
     end
   end
 end

data/lib/jekyll-jupyter-notebook/version.rb CHANGED Viewed

@@ -11,5 +11,5 @@
 # limitations under the License.
 module JekyllJupyterNotebook
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-jupyter-notebook
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-03 00:00:00.000000000 Z
+date: 2018-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -109,6 +109,8 @@ files:
 - doc/text/news.md
 - jekyll-jupyter-notebook.gemspec
 - lib/jekyll-jupyter-notebook.rb
+- lib/jekyll-jupyter-notebook/converter.rb
+- lib/jekyll-jupyter-notebook/generator.rb
 - lib/jekyll-jupyter-notebook/tag.rb
 - lib/jekyll-jupyter-notebook/version.rb
 homepage: https://github.com/red-data-tools/jekyll-jupyter-notebook
@@ -131,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
 summary: Jekyll Jupyter Notebook plugin adds [Jupyter](http://jupyter.org/) Notebook