iruby 0.2.8 → 0.2.9

data/lib/iruby/input/popup.rb

@@ -0,0 +1,38 @@
+module IRuby
+  module Input
+    class Popup < Widget
+      needs :title, :form, buttons: []
+
+      def widget_css
+        style = '.modal-body { overflow: auto; }'
+        widget_join :widget_css, style, @form, *@buttons
+      end
+
+      def widget_js
+        js = <<-JS
+          require(['base/js/dialog'], function(dialog) {
+            var popup = dialog.modal({
+              title: '#{@title.gsub("'"){"\\'"}}',
+              body: '#{@form.to_html}',
+              destroy: true,
+              sanitize: false,
+              keyboard_manager: Jupyter.notebook.keyboard_manager,
+              open: function() {
+                #{widget_join :widget_js, @form, *@buttons}
+
+                var popup = $(this);
+                $('#iruby-form').submit(function() {
+                  popup.modal('hide');
+                })
+              }
+            });
+
+            popup.find('.modal-footer').each(function(e) {
+              $(this).append('#{@buttons.map(&:to_html).join}');
+            });
+          });
+        JS
+      end
+    end
+  end
+end

data/lib/iruby/input/radio.rb

@@ -0,0 +1,47 @@
+module IRuby
+  module Input
+    class Radio < Label
+      needs :options
+
+      builder :radio do |*args, **params|
+        key = :radio
+        key, *args = args if args.first.is_a? Symbol
+        
+        params[:key] = unique_key(key)
+        params[:options] = args
+        add_field Radio.new(**params)
+      end
+
+      def widget_js
+        <<-JS
+          $('.iruby-radio input').change(function(){
+            var parent = $(this).closest('.iruby-radio');
+            $(parent).data('iruby-value', 
+              $(parent).find(':checked').val()
+            );
+          });
+        JS
+      end
+
+      def widget_html
+        params = {
+          :'data-iruby-key' => @key,
+          :'data-iruby-value' => @options.first,
+          class: 'iruby-radio form-control'
+        }
+        widget_label do 
+          div **params do
+            @options.each do |option|
+              label class: 'radio-inline' do 
+                input(
+                  name: @key, value: option, type: 'radio'
+                )
+                text option
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/iruby/input/select.rb

@@ -0,0 +1,45 @@
+module IRuby
+  module Input
+    class Select < Label
+      needs :options
+
+      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)
+      end
+
+      def widget_css
+        '.iruby-select { margin-left: 0 !important }'
+      end
+
+      def widget_js
+        <<-JS
+          $('.iruby-select').change(function(){
+            $(this).data('iruby-value', 
+              $(this).find('option:selected').text()
+            );
+          });
+        JS
+      end
+
+      def widget_html
+        widget_label do 
+          div class: 'form-control' do 
+            params = {
+              class: 'iruby-select', 
+              :'data-iruby-key' => @key,
+              :'data-iruby-value' => @options.first
+            }
+            
+            select **params do 
+              @options.each {|o| option o }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/iruby/input/textarea.rb

@@ -0,0 +1,22 @@
+module IRuby
+  module Input
+    class Textarea < Field
+      needs rows: 5
+
+      builder :textarea do |key='textarea', **params|
+        params[:key] = unique_key key
+        add_field Textarea.new(**params)
+      end
+
+      def widget_html
+        widget_label do 
+          textarea(
+            rows: @rows,
+            :'data-iruby-key' => @key,
+            class: 'form-control iruby-field'
+          )
+        end
+      end
+    end
+  end
+end

data/lib/iruby/input/widget.rb

@@ -0,0 +1,34 @@
+module IRuby
+  module Input
+    class Widget < Erector::Widget
+      needs key: nil
+
+      def widget_js; end
+      def widget_css; end
+      def widget_html; end
+      def content; widget_html; end
+
+      def self.builder method, &block
+        Builder.instance_eval do 
+          define_method method, &block
+        end
+      end
+
+      def widget_join method, *args
+        strings = args.map do |arg| 
+          arg.is_a?(String) ? arg : arg.send(method)
+        end
+        strings.uniq.join("\n")
+      end
+
+      def widget_display
+        IRuby.display(IRuby.html(
+          Erector.inline{ style raw(widget_css) }.to_html
+        ))
+
+        IRuby.display(IRuby.html(to_html))
+        IRuby.display(IRuby.javascript(widget_js))
+      end
+    end
+  end
+end

data/lib/iruby/session/ffi_rzmq.rb

@@ -14,6 +14,9 @@ module IRuby
       pub_socket = c.socket(ZMQ::PUB)
       pub_socket.bind(connection % config['iopub_port'])
 
+      stdin_socket = c.socket(ZMQ::XREP)
+      stdin_socket.bind(connection % config['stdin_port'])
+
       Thread.new do
         begin
           hb_socket = c.socket(ZMQ::REP)
@@ -24,7 +27,10 @@ module IRuby
         end
       end
 
-      @sockets = { publish: pub_socket, reply: reply_socket }
+      @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/
@@ -70,5 +76,12 @@ module IRuby
 
       @last_recvd_msg = unserialize(msg)
     end
+
+    def recv_input 
+      last_recvd_msg = @last_recvd_msg
+      input = recv(:stdin)[:content]["value"]
+      @last_recvd_msg = last_recvd_msg
+      input
+    end
   end
 end

data/lib/iruby/session/rbczmq.rb

@@ -14,6 +14,9 @@ module IRuby
       pub_socket = c.socket(:PUB)
       pub_socket.bind(connection % config['iopub_port'])
 
+      stdin_socket = c.socket(:ROUTER)
+      stdin_socket.bind(connection % config['stdin_port'])
+
       Thread.new do
         begin
           hb_socket = c.socket(:REP)
@@ -24,7 +27,10 @@ module IRuby
         end
       end
 
-      @sockets = { publish: pub_socket, reply: reply_socket }
+      @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/
@@ -54,5 +60,9 @@ module IRuby
     def recv(socket)
       @last_recvd_msg = unserialize(@sockets[socket].recv_message)
     end
+
+    def recv_input 
+      unserialize(@sockets[:stdin].recv_message)[:content]["value"]
+    end
   end
 end

data/lib/iruby/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iruby
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Daniel Mendler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: data_uri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: A Ruby kernel for Jupyter/IPython frontends (e.g. notebook). Try it at
   try.jupyter.org.
 email:
@@ -110,6 +124,23 @@ files:
 - lib/iruby/command.rb
 - lib/iruby/display.rb
 - lib/iruby/formatter.rb
+- lib/iruby/input.rb
+- lib/iruby/input/README.ipynb
+- lib/iruby/input/autoload.rb
+- lib/iruby/input/builder.rb
+- lib/iruby/input/button.rb
+- lib/iruby/input/cancel.rb
+- lib/iruby/input/checkbox.rb
+- lib/iruby/input/date.rb
+- lib/iruby/input/field.rb
+- lib/iruby/input/file.rb
+- lib/iruby/input/form.rb
+- lib/iruby/input/label.rb
+- lib/iruby/input/popup.rb
+- lib/iruby/input/radio.rb
+- lib/iruby/input/select.rb
+- lib/iruby/input/textarea.rb
+- lib/iruby/input/widget.rb
 - lib/iruby/kernel.rb
 - lib/iruby/logger.rb
 - lib/iruby/ostream.rb
@@ -152,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby Kernel for Jupyter/IPython
@@ -160,3 +191,4 @@ test_files:
 - test/integration_test.rb
 - test/iruby/multi_logger_test.rb
 - test/test_helper.rb
+has_rdoc: