jupyter_on_rails 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c7984b62f5b12bf1d298c0cdbafa8f1d9fd170a906021a8f60f93c66fc76a90
-  data.tar.gz: f5171d706b598ba6d64b530b023ef3ae99fdb02412dc9e4b5c12718f6797acc8
+  metadata.gz: 5b770fb766b3166356d90236e096219f1813db9335fe51bdbe6fec4ec40a5f03
+  data.tar.gz: 4b87ac90a2fd6bea134c5b2a7a71e136280a3210d6602ef8407a03365fd8edab
 SHA512:
-  metadata.gz: d7af13eea9bcf82b4737e15c335689046058f03718873085a69855f69f951af5aa17447fef78b99c741caacf5683265c63c92fbc016c0ef31ce7054b3b8d7588
-  data.tar.gz: b229902d6cc28b77064cf271cd2d078a0e3956c9ad8ecf8f2f1f35366562d7039b0cf009ea06ff9be1da385afc63719f6418b8af60c39eb6297beae618a92449
+  metadata.gz: 277d7e526c9cbb7ef6b6baf2ac4171e714878fa3b2b2608c3bf1bce1aaa4ddf0b6fc52c94dd2715c7fabc244d1b52a4f483926e1a073a251c98125c2b1cfe00b
+  data.tar.gz: 789d5abb172385ee727f05d037be94377bf3bce09824831117ec6c1a1758632faeb5caa81e4a433f45a1d31fde122aea3df9982ab425426374e82d12e36dcac0

data/.github/FUNDING.yml

@@ -0,0 +1,2 @@
+
+issuehunt: yuki-inoue

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [v0.5.2](https://github.com/Yuki-Inoue/jupyter_on_rails/tree/v0.5.2) (2019-03-09)
+[Full Changelog](https://github.com/Yuki-Inoue/jupyter_on_rails/compare/v0.5.1...v0.5.2)
+
 ## [v0.5.1](https://github.com/Yuki-Inoue/jupyter_on_rails/tree/v0.5.1) (2019-03-09)
 [Full Changelog](https://github.com/Yuki-Inoue/jupyter_on_rails/compare/v0.5.0...v0.5.1)
 

data/README.md

@@ -67,7 +67,8 @@ User.to_df # => Daru::DataFrame is returned
 ### Daru::DataFrame#write_model
 
 For each row, call `to_h` and pass it to `model.new`.
-And then, imports them using `model.import`.
+And then, imports them using `model.insert_all` on Rails >= 6, or `model.import` (requires adding
+`activerecord-import` to your `Gemfile`).
 
 ```ruby
 df.write_model(User)

data/jupyter_on_rails.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["inoueyuworks@gmail.com"]
 
   spec.summary       = %q{Integrate jupyter into rails}
-  spec.description   = %q{`rails jupyter:notebook` to open jupyter with rails app kernel of your project.}
+  spec.description   = %q{Utilities for integrating jupyter and rails.}
   spec.homepage      = "https://github.com/Yuki-Inoue/jupyter_on_rails"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
@@ -31,19 +31,18 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0")
       .reject { |f| f.match(%r{^(test|spec|features)/}) }
-      .reject { |f| f.match(%r{.png$}) }
+      .reject { |f| f.match(/\.png$/) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency 'github_changelog_generator'
+  spec.add_development_dependency 'bump'
 
   spec.add_dependency 'iruby'
   spec.add_dependency 'railties'
 
-  spec.add_dependency 'activerecord-import'
   spec.add_dependency 'daru'
 end

data/lib/jupyter_on_rails/daru/active_record_ext.rb

@@ -5,6 +5,17 @@ module JupyterOnRails
     module ActiveRecordExt
       extend ::ActiveSupport::Concern
 
+      # Rails 4.0 support
+      unless respond_to?(:class_methods)
+        def self.class_methods(&class_methods_module_definition)
+          mod = const_defined?(:ClassMethods, false) ?
+                  const_get(:ClassMethods) :
+                  const_set(:ClassMethods, Module.new)
+
+          mod.module_eval(&class_methods_module_definition)
+        end
+      end
+
       class_methods do
         def to_df
           relation = all
@@ -34,6 +45,10 @@ module JupyterOnRails
           ::Daru::DataFrame.new(datas)
         end
       end
+
+      def to_df
+        ::Daru::DataFrame.new([attributes])
+      end
     end
   end
 end

data/lib/jupyter_on_rails/daru/data_frame_ext.rb

@@ -2,10 +2,28 @@ module JupyterOnRails
   module Daru
     module DataFrameExt
       def write_model(model)
-        require 'activerecord-import'
+        if ActiveRecord.version >= Gem::Version.new('6.0.0.beta1')
+          write_model_rails(model)
+        else
+          write_model_activerecord_import(model)
+        end
+      end
+
+      private
+
+      def write_model_activerecord_import(model)
+        begin
+          require 'activerecord-import'
+        rescue LoadError
+          raise 'write_model requires either Rails >= 6 or the activerecord-import gem'
+        end
+
+        records = map_rows(&:to_h).map(&model.method(:new))
+        model.import(records)
+      end
 
-        objs = map_rows(&:to_h).map(&model.method(:new))
-        model.import(objs)
+      def write_model_rails(model)
+        model.insert_all(map_rows(&:to_h))
       end
     end
   end

data/lib/jupyter_on_rails/iruby_kernel_extention.rb

@@ -8,7 +8,7 @@ module JupyterOnRails
       original = Dir.pwd
       root = IRubyKernelExtention.root
       Dir.chdir root
-      app_file = File.expand_path('config/application.rb', root)
+      app_file = File.expand_path('config/environment.rb', root)
       require app_file
       Rails.application.require_environment!
       Dir.chdir original

data/lib/jupyter_on_rails/railtie/jupyter.rake

@@ -5,10 +5,10 @@ namespace :jupyter do
   desc 'start jupyter notebook'
   task :notebook do
     root = Rails.root
-    ipython_dir = ENV['IPYTHONDIR'] || root / '.ipython'
+    ipython_dir = ENV['JUPYTER_DATA_DIR'] || ENV['IPYTHONDIR'] || root / '.ipython'
     ipython_dir = File.absolute_path(ipython_dir.to_s)
 
-    sh "bundle exec iruby register --force --ipython-dir=#{Shellwords.shellescape(ipython_dir.to_s)}"
+    sh "JUPYTER_DATA_DIR=#{Shellwords.shellescape(ipython_dir.to_s)} bundle exec iruby register --force"
 
     sh "rm -rf #{Shellwords.shellescape(ipython_dir.to_s)}/kernels/rails"
     sh "cp -r #{Shellwords.shellescape(ipython_dir.to_s)}/kernels/ruby #{Shellwords.shellescape(ipython_dir.to_s)}/kernels/rails"
@@ -22,7 +22,7 @@ namespace :jupyter do
 
     File.write(kernel_file, JSON.dump(kernel_h))
 
-    env = { 'IPYTHONDIR' => ipython_dir.to_s }
+    env = { 'JUPYTER_DATA_DIR' => ipython_dir.to_s }
     commands = %w[jupyter notebook]
     commands = %w[pipenv run] + commands if (root / 'Pipfile').exist?
     Process.exec(env, *commands)

data/lib/jupyter_on_rails/version.rb

@@ -1,3 +1,3 @@
 module JupyterOnRails
-  VERSION = '0.5.2'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jupyter_on_rails
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Yuki INOUE
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2020-03-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
@@ -53,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: iruby
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: iruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-import
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,14 +94,14 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "`rails jupyter:notebook` to open jupyter with rails app kernel of your
-  project."
+description: Utilities for integrating jupyter and rails.
 email:
 - inoueyuworks@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
@@ -153,8 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Integrate jupyter into rails