jupyter_on_rails 0.10.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84b32009995240fae40e2d80e6a68039ed673f69fe96817b12351e2ee68ef379
-  data.tar.gz: 0bf6f03122bfbe572a61cefb2fbda365bda43e935c199a38fa0e8c2780a9f991
+  metadata.gz: 825a6e5e99d4d99d2efc6a11878e1491fcca63fcb551c1d1ad1c209fbada3d41
+  data.tar.gz: e2dd4b956fb8fe643c9bdaaba7bf5676d69fa45c6dc2618fb5ee54801089db26
 SHA512:
-  metadata.gz: 0ae8424810f441ce8b5aac30a7fce4333a20309fe02b5eee48675c7b1968a74b50b5b5afbaf36019c25c1165f625d6659fa0b7a7f38872d6c1b212d0d66e5b33
-  data.tar.gz: 3c54d670bbd7961a0f82a7e5786e8240d00e3ea28ca5ec372015db907f9ef94b615465d97bb7037053a5b8bfcc178539ef0422a379e0775102eb2f1acbaf1470
+  metadata.gz: 47a6707a1a8763e9452d0f7482647fe5cbb2092bb0730a8a16bbea397e6c211a5803c3cacf5668f556f1ba931739144beb50780a5b87b24d82e9e919cf5fc4f1
+  data.tar.gz: e621139221f8ac2c8dd50e711ac0f745928e3a43662ceb515184fef21994c4b191fd5fef5461541e4ff7016943fe79af74bd45b050a129bb5b8c43685f71dba9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jupyter_on_rails (0.10.0)
+    jupyter_on_rails (0.13.0)
       daru
       iruby
       railties
@@ -9,25 +9,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.4.1)
-      actionview (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.2.4)
+      actionview (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionview (7.0.2.4)
+      activesupport (= 7.0.2.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.4.1)
+    activesupport (7.0.2.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
@@ -49,10 +48,10 @@ GEM
       async (~> 1.14)
     async-pool (0.3.6)
       async (~> 1.25)
-    backports (3.21.0)
+    backports (3.23.0)
     builder (3.2.4)
     bump (0.10.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     console (1.12.0)
       fiber-local
     crass (1.0.6)
@@ -75,7 +74,7 @@ GEM
       faraday (>= 0.8)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.1.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     ffi-rzmq (2.0.7)
       ffi-rzmq-core (>= 1.0.7)
     ffi-rzmq-core (1.0.7)
@@ -91,11 +90,11 @@ GEM
       rainbow (>= 2.2.1)
       rake (>= 10.0)
       retriable (~> 3.0)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    io-console (0.5.9)
-    irb (1.3.7)
-      reline (>= 0.2.7)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
     iruby (0.7.4)
       data_uri (~> 0.1)
       ffi-rzmq
@@ -103,21 +102,21 @@ GEM
       mime-types (>= 3.3.1)
       multi_json (~> 1.11)
       native-package-installer
-    loofah (2.12.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.1115)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    mime-types-data (3.2022.0105)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
     multi_json (1.15.0)
     multipart-post (2.1.1)
-    native-package-installer (1.1.1)
+    native-package-installer (1.1.4)
     nio4r (2.5.7)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.21.0)
       faraday (>= 0.9)
@@ -144,16 +143,17 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    railties (7.0.2.4)
+      actionpack (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.0.0)
     rake (13.0.3)
     regexp_parser (2.1.1)
-    reline (0.2.7)
+    reline (0.3.1)
       io-console (~> 0.5)
     retriable (3.1.2)
     rexml (3.2.5)
@@ -173,12 +173,12 @@ GEM
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    thor (1.1.0)
+    thor (1.2.1)
     timers (4.3.3)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

data/lib/jupyter_on_rails/initializer.rb

@@ -1,34 +1,75 @@
 # frozen_string_literal: true
 
 module JupyterOnRails
-  module Initializer
-    def self.run(root:, sandbox:)
-      # Load Daru extensions
-      begin
+  class Initializer
+    def self.run(**opts)
+      new(**opts).run
+    end
+
+    def initialize(root:, sandbox:)
+      @root = root
+      @sandbox = sandbox
+    end
+
+    attr_reader :root, :sandbox
+
+    def run
+      setup_daru
+      load_rails_environment
+      setup_console_methods
+      setup_sandbox_transaction if sandbox
+    end
+
+    def setup_daru
+      require 'active_support/lazy_load_hooks'
+
+      ActiveSupport.on_load(:active_record) do
+        # Load Daru extensions
+
         require 'daru'
-        require 'active_record'
       rescue LoadError
       else
         require 'jupyter_on_rails/daru/active_record_ext'
         require 'jupyter_on_rails/daru/data_frame_ext'
 
-        ::ActiveRecord::Base.instance_eval do
-          include ::JupyterOnRails::Daru::ActiveRecordExt
-        end
+        include ::JupyterOnRails::Daru::ActiveRecordExt
+
         ::Daru::DataFrame.instance_eval do
           include ::JupyterOnRails::Daru::DataFrameExt
         end
+
+        IRuby::Display::Registry.instance_eval do
+          match do |obj|
+            obj.is_a?(ActiveRecord::Relation) ||
+              obj.is_a?(::Class) && obj < ActiveRecord::Base && !obj.abstract_class
+          end
+          priority 100
+          format 'text/html' do |obj|
+            n = 10
+            puts "finding top #{n}"
+            obj.limit(n).to_df.to_html
+          end
+        end
       end
+    end
 
-      original = Dir.pwd
-      Dir.chdir root
+    def load_rails_environment
       app_file = File.expand_path('config/environment.rb', root)
-      require app_file
-      Rails.application.require_environment!
-      Dir.chdir original
+      Dir.chdir(root) do
+        require app_file
+      end
+    end
 
-      return unless sandbox
+    def setup_console_methods
+      require 'rails/console/app'
+      IRuby::Kernel
+        .instance
+        .instance_variable_get(:@backend)
+        .instance_variable_get(:@main)
+        .extend(Rails::ConsoleMethods)
+    end
 
+    def setup_sandbox_transaction
       ActiveRecord::Base.connection.begin_transaction(joinable: false)
       at_exit do
         ActiveRecord::Base.connection.rollback_transaction

data/lib/jupyter_on_rails/kernel.rb

@@ -26,19 +26,6 @@ module JupyterOnRails
       IRuby::Kernel.events.register(:initialized) do |_kernel|
         JupyterOnRails::Initializer.run(root: @root, sandbox: @sandbox)
       end
-
-      IRuby::Display::Registry.instance_eval do
-        match do |obj|
-          obj.is_a?(ActiveRecord::Relation) ||
-            obj.is_a?(::Class) && obj < ActiveRecord::Base && !obj.abstract_class
-        end
-        priority 100
-        format 'text/html' do |obj|
-          n = 10
-          puts "finding top #{n}"
-          obj.limit(n).to_df.to_html
-        end
-      end
     end
   end
 end

data/lib/jupyter_on_rails/railtie/jupyter.rake

@@ -6,12 +6,11 @@ require 'ostruct'
 
 # rubocop:disable Metrics/BlockLength
 namespace :jupyter do
-  desc 'start jupyter notebook'
-  task notebook: :install_kernels do
+  exec_jupyter_command = lambda do |subcomand|
     ipython_dir = ENV['IPYTHONDIR'] || Rails.root / '.ipython'
 
     env = { 'JUPYTER_DATA_DIR' => ipython_dir.to_s }
-    commands = %w[jupyter notebook]
+    commands = ['jupyter', subcomand]
 
     if (Rails.root / 'pyproject.toml').exist?
       commands = %w[poetry run] + commands
@@ -22,6 +21,16 @@ namespace :jupyter do
     Process.exec(env, *commands)
   end
 
+  desc 'start jupyter notebook'
+  task notebook: :install_kernels do
+    instance_exec('notebook', &exec_jupyter_command)
+  end
+
+  desc 'start jupyter lab'
+  task lab: :install_kernels do
+    instance_exec('lab', &exec_jupyter_command)
+  end
+
   desc 'Install the kernel'
   task :install_kernels do
     root = Rails.root

data/lib/jupyter_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JupyterOnRails
-  VERSION = '0.10.0'
+  VERSION = '0.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jupyter_on_rails
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Yuki INOUE
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-30 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Integrate jupyter into rails