jupyter_on_rails 0.5.0 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db480dd0b66703b18e2b2b381a2b7e8503dbbb7ad9a0d0602689059dc4b965b1
-  data.tar.gz: 0b7dfd212a1d16ba74d816a20e3273e73ec54838d8359501efad1755118e51c3
+  metadata.gz: 769af5be4c72d1dce0739d209f0db7002fa8816f9bd471acd0bed6b3904d8669
+  data.tar.gz: ad10d114debe205827a83f766363ef4221b4b15c2556593f70ac3000a6dcac52
 SHA512:
-  metadata.gz: 3378f5acca6859363fe341814b483f0a8e70c0c8577497aec33330a8866ea733e87c04947a16110706bf4a207105ff846a328147b7f149f98f22d5ca226cb525
-  data.tar.gz: 5ecb5de5b600ba2d83cf045770c9ab0c1cd9d23181f15b57942bc0f23d7a566463c469926bdabf336cd2b76b91fb81227b0a44887aedf36f661f558faae676a1
+  metadata.gz: 1938f2c92fdd5f4c0465b06a16e71c2648e2fac680e6a0b6ccf6fed7cbd68d21b8f0d7731a177b577bb38b99e3fc7206f6794fd1fd1629c4532b25cecc9646b6
+  data.tar.gz: c4fec94fd82d5a61776f2b707872718de2baf45165d0c5785037300aa21295417dd5f8d9a88f8b4b16d369c940300124b1036ec650cc9ce3fd3b961d4efb33a1

data/.github/FUNDING.yml

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

data/CHANGELOG.md

@@ -0,0 +1,48 @@
+# 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)
+
+## [v0.5.0](https://github.com/Yuki-Inoue/jupyter_on_rails/tree/v0.5.0) (2019-03-04)
+[Full Changelog](https://github.com/Yuki-Inoue/jupyter_on_rails/compare/v0.4.2...v0.5.0)
+
+## [v0.4.2](https://github.com/Yuki-Inoue/jupyter_on_rails/tree/v0.4.2) (2019-03-04)
+[Full Changelog](https://github.com/Yuki-Inoue/jupyter_on_rails/compare/v0.4.1...v0.4.2)
+
+## [v0.4.1](https://github.com/Yuki-Inoue/jupyter_on_rails/tree/v0.4.1) (2019-03-04)
+[Full Changelog](https://github.com/Yuki-Inoue/jupyter_on_rails/compare/v0.4.0...v0.4.1)
+
+**Merged pull requests:**
+
+- Daru::DataFrame\#write\_model method [\#4](https://github.com/Yuki-Inoue/jupyter_on_rails/pull/4) ([Yuki-Inoue](https://github.com/Yuki-Inoue))
+
+## [v0.4.0](https://github.com/Yuki-Inoue/jupyter_on_rails/tree/v0.4.0) (2019-02-25)
+[Full Changelog](https://github.com/Yuki-Inoue/jupyter_on_rails/compare/v0.3.4...v0.4.0)
+
+## [v0.3.4](https://github.com/Yuki-Inoue/jupyter_on_rails/tree/v0.3.4) (2019-02-25)
+[Full Changelog](https://github.com/Yuki-Inoue/jupyter_on_rails/compare/v0.3.3...v0.3.4)
+
+## [v0.3.3](https://github.com/Yuki-Inoue/jupyter_on_rails/tree/v0.3.3) (2019-02-25)
+[Full Changelog](https://github.com/Yuki-Inoue/jupyter_on_rails/compare/v0.3.2...v0.3.3)
+
+## [v0.3.2](https://github.com/Yuki-Inoue/jupyter_on_rails/tree/v0.3.2) (2019-02-25)
+[Full Changelog](https://github.com/Yuki-Inoue/jupyter_on_rails/compare/v0.3.1...v0.3.2)
+
+**Merged pull requests:**
+
+- ActiveRecord::Base\#to\_df [\#3](https://github.com/Yuki-Inoue/jupyter_on_rails/pull/3) ([Yuki-Inoue](https://github.com/Yuki-Inoue))
+
+## [v0.3.1](https://github.com/Yuki-Inoue/jupyter_on_rails/tree/v0.3.1) (2019-02-02)
+[Full Changelog](https://github.com/Yuki-Inoue/jupyter_on_rails/compare/v0.2.0...v0.3.1)
+
+## [v0.2.0](https://github.com/Yuki-Inoue/jupyter_on_rails/tree/v0.2.0) (2019-01-23)
+**Merged pull requests:**
+
+- Readme [\#1](https://github.com/Yuki-Inoue/jupyter_on_rails/pull/1) ([Yuki-Inoue](https://github.com/Yuki-Inoue))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -1,6 +1,6 @@
 # JupyterOnRails
 
-Rails is loaded on jupyter dead easy.
+Integrate Rails and Jupyter
 
 ![Alt text](the_screenshot.png?raw=true "Title")
 
@@ -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'
@@ -29,18 +29,20 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0")
+      .reject { |f| f.match(%r{^(test|spec|features)/}) }
+      .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

@@ -19,6 +19,7 @@ module JupyterOnRails
                 assocs = record.send(assoc)
                 next [attrs] unless assocs.present?
 
+                assocs = [assocs] unless assocs.is_a?(ActiveRecord::Associations::CollectionProxy)
                 assocs.map(&:attributes).map do |assoc_attrs|
                   new_attrs = assoc_attrs.transform_keys do |key|
                     "#{assoc}.#{key}".to_sym

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/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.0'
+  VERSION = '0.5.5'
 end

metadata

@@ -1,51 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: jupyter_on_rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.5
 platform: ruby
 authors:
 - Yuki INOUE
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: github_changelog_generator
   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: 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:
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: iruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,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:
     - - ">="
@@ -94,15 +94,16 @@ 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
 - README.md
 - Rakefile
@@ -117,7 +118,6 @@ files:
 - lib/jupyter_on_rails/railtie.rb
 - lib/jupyter_on_rails/railtie/jupyter.rake
 - lib/jupyter_on_rails/version.rb
-- the_screenshot.png
 homepage: https://github.com/Yuki-Inoue/jupyter_on_rails
 licenses: []
 metadata:
@@ -139,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.0.3
 signing_key: 
 specification_version: 4
 summary: Integrate jupyter into rails