iruby 0.2.9 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edce35917d38e538781f2ab3827063693e6c6417
-  data.tar.gz: 9048d037809e1c69ff223c9363a2e743a5466931
+  metadata.gz: 535b2e6920da18e1d6610cda01d192814a5f9595
+  data.tar.gz: 401889f3e858262e478fa15a3c709bcd6d09bd16
 SHA512:
-  metadata.gz: 319cc7a36eadd9c88ee9aad9cf9a3ae845d32d17efc8c00ec228ae89988b1273ffb2e26e0721ff3337454cd7e7d27ca36d9885fef05b4d9198d14268c5b1785b
-  data.tar.gz: c0ff35cf5547c57343919a427041ed4fb297f3947f26b795252522bf85d7850f7ad44a23c73807606394a9078a68503f3bbaf36074bade8ced1e4b6da22aae91
+  metadata.gz: 5d35b89326c32a1dcb52fc2242e366b693ffcac70b3b0ad232233010a6cd1de7c894429c724fb96a766ed35d995465c7b61e3274c7836639a8afd7a9fa56f0e9
+  data.tar.gz: 423d15b33c265bd943b5811fb3993f79d2da741790948f9efdd5890ca0f755f94d9fdb51ee78faf5adfa612a30d031e4014758725322f4fe22fd099c37a093c4

data/CHANGES

@@ -1,3 +1,24 @@
+0.3 (2017-03-26)
+
+  Bug Fixes:
+    * Disable Jupyter keyboard manager for all popups made using IRuby.popup (@kylekyle).
+    * Fix Iruby/Input date values bug that set date fields to whatever the last date value was (@kylekyle).
+    * Fix a bug where time strings put into prompter would give an 'out of range' error (@kylekyle).
+
+  Enhancements:
+    * Improvements to IRuby dependency detection using `Bundler::Dependencies#specs` (@kou).
+    * Use less memory forcing pry to store only the last 3 commands in memory (@kylekyle).
+    * Use bigger z-index that is used accross all browsers (@kylekyle).
+    * Ability to input date values as DateTime objects in IRuby/Input (@kylekyle).
+    * Add option to have check boxes checked by default (@kylekyle).
+    * Option for multi-select in drop down menus in the prompter (@kylekyle).
+    * Add support for multiple widgets using `IRuby::Input::Multiple` (@kylekyle).
+    * Calender icon for date selector icon (@kylekyle).
+    * Add support for Numo/NArray (@zalt50).
+    * Text now only completes after a space (@zalt50).
+    * Remove the DONTWAIT flag when receiving a message (@cloud-oak).
+    * Add support for CZTop (@kou).
+
 0.2.9 (2016-05-02)
   
   Bug Fixes:

data/Gemfile

@@ -10,6 +10,6 @@ end
 group :plot do
   gem 'gnuplot'
   gem 'rubyvis'
-  gem 'nyaplot', github: 'domitry/nyaplot'
+  gem 'nyaplot', github: 'sciruby/nyaplot'
 end
 

data/README.md

@@ -12,14 +12,14 @@ The installation instructions are divided according to environments mainly becau
 #### Ubuntu/Debian
 At first install IPython/Jupyter. I recommend an installation using virtualenv.
 
-    apt-get install python3-dev virtualenv libzmq3-dev
+    sudo apt-get install python3-dev python-virtualenv
     virtualenv -p python3 venv
     source venv/bin/activate
     pip install 'ipython[notebook]'
 
 After that, install the Ruby gem.
 
-    gem install rbczmq
+    gem install cztop
     gem install iruby
 
 Now you can run iruby with:
@@ -29,17 +29,9 @@ Now you can run iruby with:
 #### Windows
 At first install IPython/Jupyter. I recommend an installation using [Enthought Canopy](https://www.enthought.com/).
 
-Please update your PATH to include build tools or download the DevKit from http://rubyinstaller.org/downloads and follow [this instructions](http://github.com/oneclick/rubyinstaller/wiki/Development-Kit).
-
-After that install ZeroMQ Legacy Stable Release 3.2.4 [x86 build for Windows XP SP3 and newer](http://miru.hk/archive/ZeroMQ-3.2.4~miru1.0-x86.exe).
-
-Rename `libzmq-v100-mt-3_2_4.dll` to `libzmq.dll`.
-
-Add the dll path to the PATH system variable.
-
 Run two commands below:
 
-    gem install ffi-rzmq
+    gem install cztop
     gem install iruby
 
 Now you can run iruby with:
@@ -52,7 +44,7 @@ I recommend an installation using [Anaconda](https://store.continuum.io/cshop/an
 After that, run three commands shown below.
 
     brew install libtool autoconf automake autogen
-    gem install rbczmq
+    gem install cztop
     gem install iruby
 
 #### FreeBSD
@@ -99,8 +91,7 @@ Since jRuby is fully compatible with Ruby version 2.2, it is possible to use iru
 It can be helpful if you want to use java classes in your iruby notebook.
 This will require the following software:
 * jRuby version >= 9.0.4.0
-* ZeroMQ version >= 4.1.4 (You may have to build it from source.)
-* ffi-rzmq gem
+* cztop gem
 * this iruby gem
 
 After installation, make sure that your `env` is set up to jruby.
@@ -126,7 +117,9 @@ and other scientific gems. You can find the prebuild image at [dockerhub](https:
 * IPython/Jupyter >= 3.0.0
 * Ruby >= 2.1.0
 
-If you install IRuby with ffi-rzmq instead of rbczmq, libzmq >= 3.2 is added to the list above.
+If you install IRuby with CZTop, CZMQ >= 4.0.0 is added to the list above.
+
+If you install IRuby with ffi-rzmq, libzmq >= 3.2 is added to the list above.
 
 ### Authors
 

data/lib/iruby.rb

@@ -16,11 +16,15 @@ require 'iruby/comm'
 require 'iruby/session/mixin'
 
 begin
-  require 'iruby/session/rbczmq'
+  require 'iruby/session/cztop'
 rescue LoadError
   begin
-    require 'iruby/session/ffi_rzmq'
+    require 'iruby/session/rbczmq'
   rescue LoadError
-    STDERR.puts "You should install rbczmq or ffi_rzmq before running iruby notebook. See README."
+    begin
+      require 'iruby/session/ffi_rzmq'
+    rescue LoadError
+      STDERR.puts "You should install cztop, rbczmq or ffi_rzmq before running iruby notebook. See README."
+    end
   end
 end

data/lib/iruby/backend.rb

@@ -54,6 +54,7 @@ module IRuby
 
     def initialize
       require 'pry'
+      Pry.memory_size = 3 
       Pry.pager = false # Don't use the pager
       Pry.print = proc {|output, value|} # No result printing
       Pry.exception_handler = proc {|output, exception, _| }

data/lib/iruby/command.rb

@@ -106,7 +106,7 @@ This might not work. Run 'iruby register --force' to fix it." if @iruby_path !=
     def check_bundler
       require 'bundler'
       raise %q{iruby is missing from Gemfile. This might not work.
-Add `gem 'iruby'` to your Gemfile to fix it.} unless Bundler.definition.dependencies.any? {|s| s.name == 'iruby' }
+Add `gem 'iruby'` to your Gemfile to fix it.} unless Bundler.definition.specs.any? {|s| s.name == 'iruby' }
       Bundler.setup
     rescue LoadError
     rescue Exception => e

data/lib/iruby/display.rb

@@ -169,6 +169,16 @@ module IRuby
           LaTeX.vector(obj.to_a)
       end
 
+      type { Numo::NArray }
+      format 'text/latex' do |obj|
+        obj.ndim == 2 ?
+        LaTeX.matrix(obj, obj.shape[0], obj.shape[1]) :
+          LaTeX.vector(obj.to_a)
+      end
+      format 'text/html' do |obj|
+        HTML.table(obj.to_a)
+      end
+
       type { NArray }
       format 'text/latex' do |obj|
         obj.dim == 2 ?

data/lib/iruby/input/README.ipynb

@@ -178,6 +178,55 @@
     "end"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Defaults\n",
+    "\n",
+    "Most inputs will accept a `default` parameter. If no default is given, the deault is `nil`. Since checkboxes can have multiple values selected, you can pass an array of values. To check everything, pass `true` as the default. "
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "result = IRuby.form do \n",
+    "  checkbox :one, 'Fish', 'Cat', 'Dog', default: 'Fish'\n",
+    "  checkbox :many, 'Fish', 'Cat', 'Dog', default: ['Cat', 'Dog']\n",
+    "  checkbox :all, 'Fish', 'Cat', 'Dog', default: true\n",
+    "  button :submit, label: 'All done'\n",
+    "end"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Dates\n",
+    "\n",
+    "The `date` widget provides a calendar popup and returns a `Time` object. It's default should also be a `Time` object. "
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "result = IRuby.form do \n",
+    "  date :birthday\n",
+    "  date :today, default: Time.now\n",
+    "  button\n",
+    "end"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -256,7 +305,7 @@
    "source": [
     "## Dropdowns\n",
     "\n",
-    "Selects are dropdowns of options. By default, the first supplied option is selected. If you don't want any default value, use `nil` as the first parameter. "
+    "A `select` is a dropdown of options. Use a `multiple` to allow multiple selections. `multiple` widgets accept an additional `size` parameters that determines the number of rows. The default is 4. "
    ]
   },
   {
@@ -268,8 +317,11 @@
    "outputs": [],
    "source": [
     "result = IRuby.form do \n",
-    "  text 'Do you have a favorite Stooge?' \n",
-    "  select :stooge, nil, 'Moe', 'Larry', 'Curly'\n",
+    "  select :stooge, 'Moe', 'Larry', 'Curly'\n",
+    "  select :stooge, 'Moe', 'Larry', 'Curly', default: 'Moe'\n",
+    "  multiple :stooges, 'Moe', 'Larry', 'Curly', default: true, size: 3\n",
+    "  multiple :stooges, 'Moe', 'Larry', 'Curly', default: ['Moe','Curly']\n",
+    "  button\n",
     "end"
    ]
   },

data/lib/iruby/input/autoload.rb

@@ -21,4 +21,5 @@ require 'iruby/input/select'
 require 'iruby/input/checkbox'
 require 'iruby/input/radio'
 require 'iruby/input/textarea'
-require 'iruby/input/date'
+require 'iruby/input/date'
+require 'iruby/input/multiple'

data/lib/iruby/input/checkbox.rb

@@ -1,7 +1,7 @@
 module IRuby
   module Input
     class Checkbox < Label
-      needs :options
+      needs :options, :default
 
       builder :checkbox do |*args, **params|
         key = :checkbox
@@ -9,11 +9,24 @@ module IRuby
 
         params[:key] = unique_key(key)
         params[:options] = args
+
+        params[:default] = case params[:default]
+        when false, nil
+          []
+        when true
+          [*params[:options]]
+        else
+          [*params[:default]]
+        end
+
         add_field Checkbox.new(**params)
       end
 
       def widget_css
-        '.iruby-checkbox-container { margin-left: 10px; }'
+        <<-CSS
+          .iruby-checkbox.form-control { display: inline-table; }
+          .iruby-checkbox .checkbox-inline { margin: 0 15px 0 0; }
+        CSS
       end
 
       def widget_js
@@ -30,6 +43,8 @@ module IRuby
               $(parent).data('iruby-value', null);
             }
           });
+
+          $('.iruby-checkbox input').trigger('change');
         JS
       end
 
@@ -43,7 +58,10 @@ module IRuby
             @options.each do |option|
               label class: 'checkbox-inline' do 
                 input(
-                  name: @key, value: option, type: 'checkbox'
+                  name: @key, 
+                  value: option, 
+                  type: 'checkbox',
+                  checked: @default.include?(option)
                 )
                 text option
               end

data/lib/iruby/input/date.rb

@@ -1,26 +1,37 @@
 module IRuby
   module Input
     class Date < Field
-      needs js_class: 'iruby-date'
+      needs js_class: 'iruby-date', icon: '📅'
 
       builder :date do |key='date', **params|
+        params[:default] ||= false
         params[:key] = unique_key key
+        
+        if params[:default].is_a? Time
+          params[:default] = params[:default].strftime('%m/%d/%Y')
+        end
+
         add_field Date.new(**params)
+
+        process params[:key] do |result,key,value|
+          result[key.to_sym] = Time.strptime(value,'%m/%d/%Y')
+        end
       end
 
       def widget_css
-        '#ui-datepicker-div { z-index: 2000; }'
+        '#ui-datepicker-div { z-index: 2000 !important; }'
       end
 
       def widget_js 
         <<-JS
           $('.iruby-date').datepicker({
+            dateFormat: 'mm/dd/yy',
             onClose: function(date) {
-              $('.iruby-date').data('iruby-value', date);
+              $(this).data('iruby-value', date);
             }  
           });
         JS
       end
     end
   end
-end
+end

data/lib/iruby/input/field.rb

@@ -1,7 +1,7 @@
 module IRuby
   module Input
     class Field < Label
-      needs :type => 'text', js_class: 'iruby-field'
+      needs default: nil, type: 'text', js_class: 'iruby-field'
 
       builder :input do |key='input', **params|
         params[:key] = unique_key key
@@ -21,7 +21,8 @@ module IRuby
           input(
             type: @type, 
             :'data-iruby-key' => @key,
-            class: "form-control #{@js_class}"
+            class: "form-control #{@js_class}",
+            value: @default
           )
         end
       end

data/lib/iruby/input/label.rb

@@ -1,13 +1,19 @@
 module IRuby
   module Input
     class Label < Widget
-      needs label: nil
+      needs label: nil, icon: nil
 
       def widget_label
-        label = @label || to_label(@key)
-        div class: 'iruby-label input-group' do
-          span label, class: 'input-group-addon'
+        div class: 'iruby-label input-group' do 
+          span class: 'input-group-addon' do 
+            text @label || to_label(@key)
+          end
+          
           yield
+          
+          if @icon
+            span @icon, class: "input-group-addon"
+          end
         end
       end
 

data/lib/iruby/input/multiple.rb

@@ -0,0 +1,76 @@
+module IRuby
+  module Input
+    class Multiple < Label
+      needs :options, :default, size: nil
+
+      builder :multiple do |*args, **params|
+        key = :multiple
+        key, *args = args if args.first.is_a? Symbol
+
+        params[:key] = unique_key(key)
+        params[:options] = args
+        
+        params[:default] = case params[:default]
+        when false, nil
+          []
+        when true
+          [*params[:options]]
+        else
+          [*params[:default]]
+        end
+
+        add_field Multiple.new(**params)
+      end
+
+      def widget_css
+        <<-CSS
+          .iruby-multiple { 
+            display: table;
+            min-width: 25%;
+          }
+          .form-control.iruby-multiple-container { 
+            display: table; 
+          }
+        CSS
+      end
+
+      def widget_js
+        <<-JS
+          $('.iruby-multiple').change(function(){
+            var multiple = $(this);
+            multiple.data('iruby-value', []);
+
+            multiple.find(':selected').each(function(){
+              multiple.data('iruby-value').push($(this).val());
+            });
+
+            if (multiple.data('iruby-value').length == 0) {
+              multiple.data('iruby-value', null);
+            }
+          });
+
+          $('.iruby-multiple').trigger('change');
+        JS
+      end
+
+      def widget_html
+        widget_label do 
+          div class: 'form-control iruby-multiple-container' do 
+            params = {
+              size: @size,
+              multiple: true,
+              class: 'iruby-multiple', 
+              :'data-iruby-key' => @key
+            }
+            
+            select **params do 
+              @options.each do |o| 
+                option o, selected: @default.include?(o)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/iruby/input/popup.rb

@@ -21,9 +21,12 @@ module IRuby
                 #{widget_join :widget_js, @form, *@buttons}
 
                 var popup = $(this);
+                
                 $('#iruby-form').submit(function() {
                   popup.modal('hide');
-                })
+                });
+                
+                Jupyter.notebook.keyboard_manager.disable();
               }
             });
 
@@ -35,4 +38,4 @@ module IRuby
       end
     end
   end
-end
+end

data/lib/iruby/input/radio.rb

@@ -1,7 +1,7 @@
 module IRuby
   module Input
     class Radio < Label
-      needs :options
+      needs :options, :default
 
       builder :radio do |*args, **params|
         key = :radio
@@ -9,9 +9,17 @@ module IRuby
         
         params[:key] = unique_key(key)
         params[:options] = args
+        params[:default] ||= false
         add_field Radio.new(**params)
       end
 
+      def widget_css
+        <<-CSS
+          .iruby-radio.form-control { display: inline-table; }
+          .iruby-radio .radio-inline { margin: 0 15px 0 0; }
+        CSS
+      end
+
       def widget_js
         <<-JS
           $('.iruby-radio input').change(function(){
@@ -20,6 +28,7 @@ module IRuby
               $(parent).find(':checked').val()
             );
           });
+          $('.iruby-radio input').trigger('change');
         JS
       end
 
@@ -34,7 +43,10 @@ module IRuby
             @options.each do |option|
               label class: 'radio-inline' do 
                 input(
-                  name: @key, value: option, type: 'radio'
+                  name: @key, 
+                  value: option, 
+                  type: 'radio',
+                  checked: @default == option
                 )
                 text option
               end

data/lib/iruby/input/select.rb

@@ -1,18 +1,30 @@
 module IRuby
   module Input
     class Select < Label
-      needs :options
+      needs :options, :default
 
       builder :select do |*args, **params|
         key = :select
         key, *args = args if args.first.is_a? Symbol
 
-        key = unique_key(key)
-        add_field Select.new(key: key, options: args)
+        params[:key] = unique_key(key)
+        params[:options] = args
+        params[:default] ||= false
+
+        unless params[:options].include? params[:default]
+          params[:options] = [nil, *params[:options].compact]
+        end
+
+        add_field Select.new(**params)
       end
 
       def widget_css
-        '.iruby-select { margin-left: 0 !important }'
+        <<-CSS
+          .iruby-select { 
+            min-width: 25%;
+            margin-left: 0 !important;
+          }
+        CSS
       end
 
       def widget_js
@@ -31,11 +43,13 @@ module IRuby
             params = {
               class: 'iruby-select', 
               :'data-iruby-key' => @key,
-              :'data-iruby-value' => @options.first
+              :'data-iruby-value' => @default
             }
             
             select **params do 
-              @options.each {|o| option o }
+              @options.each do |o| 
+                option o, selected: @default == o
+              end
             end
           end
         end

data/lib/iruby/input/textarea.rb

@@ -11,6 +11,7 @@ module IRuby
       def widget_html
         widget_label do 
           textarea(
+            @default,
             rows: @rows,
             :'data-iruby-key' => @key,
             class: 'form-control iruby-field'

data/lib/iruby/kernel.rb

@@ -109,7 +109,7 @@ module IRuby
     def complete_request(msg)
       # HACK for #26, only complete last line
       code = msg[:content]['code']
-      if start = code.rindex("\n")
+      if start = code.rindex(/\s|\R/)
         code = code[start+1..-1]
         start += 1
       end

data/lib/iruby/session/cztop.rb

@@ -0,0 +1,66 @@
+require 'cztop'
+
+module IRuby
+  class Session
+    include SessionSerialize
+
+    def initialize(config)
+      connection = "#{config['transport']}://#{config['ip']}:%d"
+
+      reply_socket = CZTop::Socket::ROUTER.new(connection % config['shell_port'])
+      pub_socket = CZTop::Socket::PUB.new(connection % config['iopub_port'])
+      stdin_socket = CZTop::Socket::ROUTER.new(connection % config['stdin_port'])
+
+      Thread.new do
+        begin
+          hb_socket = CZTop::Socket::REP.new(connection % config['hb_port'])
+          loop do
+            message = hb_socket.receive
+            hb_socket << message
+          end
+        rescue Exception => e
+          IRuby.logger.fatal "Kernel heartbeat died: #{e.message}\n#{e.backtrace.join("\n")}"
+        end
+      end
+
+      @sockets = {
+        publish: pub_socket,
+        reply: reply_socket,
+        stdin: stdin_socket,
+      }
+
+      @session = SecureRandom.uuid
+      unless config['key'].to_s.empty? || config['signature_scheme'].to_s.empty?
+        raise 'Unknown signature scheme' unless config['signature_scheme'] =~ /\Ahmac-(.*)\Z/
+        @hmac = OpenSSL::HMAC.new(config['key'], OpenSSL::Digest.new($1))
+      end
+    end
+
+    # Build and send a message
+    def send(socket, type, content)
+      idents =
+        if socket == :reply && @last_recvd_msg
+          @last_recvd_msg[:idents]
+        else
+          type == :stream ? "stream.#{content[:name]}" : type
+        end
+      header = {
+        msg_type: type,
+        msg_id:   SecureRandom.uuid,
+        username: 'kernel',
+        session:  @session,
+        version:  '5.0'
+      }
+      @sockets[socket] << serialize(idents, header, content)
+    end
+
+    # Receive a message and decode it
+    def recv(socket)
+      @last_recvd_msg = unserialize(@sockets[socket].receive)
+    end
+
+    def recv_input
+      unserialize(@sockets[:stdin].receive)[:content]["value"]
+    end
+  end
+end

data/lib/iruby/session/ffi_rzmq.rb

@@ -67,7 +67,7 @@ module IRuby
       while msg.empty? || socket.more_parts?
         begin
           frame = ''
-          rc = socket.recv_string(frame, 1)
+          rc = socket.recv_string(frame)
           ZMQ::Util.error_check('zmq_msg_send', rc)
           msg << frame
         rescue

data/lib/iruby/version.rb

@@ -1,3 +1,3 @@
 module IRuby
-  VERSION = '0.2.9'
+  VERSION = '0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iruby
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: '0.3'
 platform: ruby
 authors:
 - Daniel Mendler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2017-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,6 +136,7 @@ files:
 - lib/iruby/input/file.rb
 - lib/iruby/input/form.rb
 - lib/iruby/input/label.rb
+- lib/iruby/input/multiple.rb
 - lib/iruby/input/popup.rb
 - lib/iruby/input/radio.rb
 - lib/iruby/input/select.rb
@@ -144,6 +145,7 @@ files:
 - lib/iruby/kernel.rb
 - lib/iruby/logger.rb
 - lib/iruby/ostream.rb
+- lib/iruby/session/cztop.rb
 - lib/iruby/session/ffi_rzmq.rb
 - lib/iruby/session/mixin.rb
 - lib/iruby/session/rbczmq.rb
@@ -183,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby Kernel for Jupyter/IPython
@@ -191,4 +193,3 @@ test_files:
 - test/integration_test.rb
 - test/iruby/multi_logger_test.rb
 - test/test_helper.rb
-has_rdoc: