iruby 0.2.9 → 0.6.1

data/lib/iruby/input/autoload.rb

@@ -2,7 +2,7 @@ begin
   require 'erector'
 rescue LoadError
   raise LoadError, <<-ERROR.gsub(/\s+/,' ')
-    IRuby::Input requires the erector gem. 
+    IRuby::Input requires the erector gem.
     `gem install erector` or add `gem 'erector'`
     it to your Gemfile to continue.
   ERROR
@@ -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/builder.rb

@@ -21,7 +21,7 @@ module IRuby
       def html &block
         add_field Class.new(Widget) {
           define_method(:widget_html) { instance_eval &block }
-        }.new 
+        }.new
       end
 
       def text string
@@ -44,7 +44,7 @@ module IRuby
         end
       end
 
-      private 
+      private
 
       def process key, &block
         @processors[key.to_s] = block
@@ -52,14 +52,14 @@ module IRuby
 
       def unique_key key
         @keys ||= []
-        
+
         if @keys.include? key
           (2..Float::INFINITY).each do |i|
             test = "#{key}#{i}"
             break key = test unless @keys.include? test
           end
         end
-        
+
         @keys << key; key
       end
     end

data/lib/iruby/input/button.rb

@@ -10,7 +10,7 @@ module IRuby
         green: 'success',
         aqua: 'info',
         orange: 'warning',
-        red: 'danger', 
+        red: 'danger',
         none: 'link'
       }
 
@@ -37,7 +37,7 @@ module IRuby
       def widget_html
         button(
           @label || to_label(@key),
-          type: 'button', 
+          type: 'button',
           :'data-iruby-key' => @key,
           class: "btn btn-#{COLORS[@color]} pull-right #{@js_class}"
         )

data/lib/iruby/input/cancel.rb

@@ -22,7 +22,7 @@ module IRuby
       def widget_html
         button(
           @label,
-          type: 'button', 
+          type: 'button',
           :'data-dismiss' => 'modal',
           class: "btn btn-danger pull-right iruby-cancel"
         )

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
 
@@ -41,9 +56,12 @@ module IRuby
         widget_label do
           div **params do
             @options.each do |option|
-              label class: 'checkbox-inline' do 
+              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 
+      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
@@ -17,11 +17,12 @@ module IRuby
       end
 
       def widget_html
-        widget_label do 
+        widget_label do
           input(
-            type: @type, 
+            type: @type,
             :'data-iruby-key' => @key,
-            class: "form-control #{@js_class}"
+            class: "form-control #{@js_class}",
+            value: @default
           )
         end
       end

data/lib/iruby/input/file.rb

@@ -13,10 +13,10 @@ module IRuby
 
           # get rid of Chrome's silly path
           name = value['name'].sub('C:\\fakepath\\','')
-          
+
           result[key.to_sym] = {
             name: name,
-            data: uri.data, 
+            data: uri.data,
             content_type: uri.content_type
           }
         end
@@ -46,7 +46,7 @@ module IRuby
       def widget_html
         widget_label do
           input(
-            type: 'file', 
+            type: 'file',
             :'data-iruby-key' => @key,
             class: 'form-control iruby-file'
           )

data/lib/iruby/input/form.rb

@@ -5,7 +5,7 @@ module IRuby
     class InputForm < Widget
       needs :fields, buttons: []
 
-      def widget_js 
+      def widget_js
         javascript = <<-JS
           var remove = function () {
             Jupyter.notebook.kernel.send_input_reply(
@@ -14,7 +14,7 @@ module IRuby
               })
             );
           };
-          
+
           $("#iruby-form").on("remove", remove);
 
           $('#iruby-form').submit(function() {
@@ -33,16 +33,16 @@ module IRuby
             Jupyter.notebook.kernel.send_input_reply(
               JSON.stringify({'#{@id}': result})
             );
-            
+
             $(this).remove();
             return false;
           });
 
           $('#iruby-form').keydown(function(event) {
-            if (event.keyCode == 13 && !event.shiftKey) { 
+            if (event.keyCode == 13 && !event.shiftKey) {
               $('#iruby-form').submit();
-            } else if (event.keyCode == 27) { 
-              $('#iruby-form').remove(); 
+            } else if (event.keyCode == 27) {
+              $('#iruby-form').remove();
             }
           });
         JS

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'
+          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,25 +1,34 @@
 module IRuby
   module Input
     class Radio < Label
-      needs :options
+      needs :options, :default
 
       builder :radio do |*args, **params|
         key = :radio
         key, *args = args if args.first.is_a? Symbol
-        
+
         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(){
             var parent = $(this).closest('.iruby-radio');
-            $(parent).data('iruby-value', 
+            $(parent).data('iruby-value',
               $(parent).find(':checked').val()
             );
           });
+          $('.iruby-radio input').trigger('change');
         JS
       end
 
@@ -29,12 +38,15 @@ module IRuby
           :'data-iruby-value' => @options.first,
           class: 'iruby-radio form-control'
         }
-        widget_label do 
+        widget_label do
           div **params do
             @options.each do |option|
-              label class: 'radio-inline' do 
+              label class: 'radio-inline' do
                 input(
-                  name: @key, value: option, type: 'radio'
+                  name: @key,
+                  value: option,
+                  type: 'radio',
+                  checked: @default == option
                 )
                 text option
               end