redcar 0.3.6 → 0.3.7

data/lib/json/tools/fuzz.rb

@@ -0,0 +1,139 @@
+require 'json'
+
+require 'iconv'
+ISO_8859_1_TO_UTF8 = Iconv.new('utf-8', 'iso-8859-15')
+class ::String
+  def to_utf8
+    ISO_8859_1_TO_UTF8.iconv self
+  end
+end
+
+class Fuzzer
+  def initialize(n, freqs = {})
+    sum = freqs.inject(0.0) { |s, x| s + x.last }
+    freqs.each_key { |x| freqs[x] /= sum }
+    s = 0.0
+    freqs.each_key do |x|
+      freqs[x] = s .. (s + t = freqs[x])
+      s += t
+    end
+    @freqs = freqs
+    @n = n
+    @alpha = (0..0xff).to_a
+  end
+
+  def random_string
+    s = ''
+    30.times { s << @alpha[rand(@alpha.size)] }
+    s.to_utf8
+  end
+
+  def pick
+    r = rand
+    found = @freqs.find { |k, f| f.include? rand }
+    found && found.first
+  end
+
+  def make_pick
+    k = pick
+    case
+    when k == Hash, k == Array
+      k.new
+    when k == true, k == false, k == nil
+      k
+    when k == String
+      random_string
+    when k == Fixnum
+      rand(2 ** 30) - 2 ** 29
+    when k == Bignum
+      rand(2 ** 70) - 2 ** 69
+    end
+  end
+
+  def fuzz(current = nil)
+    if @n > 0
+      case current
+      when nil
+        @n -= 1
+        current = fuzz [ Hash, Array ][rand(2)].new
+      when Array
+        while @n > 0
+          @n -= 1
+          current << case p = make_pick
+          when Array, Hash
+            fuzz(p)
+          else
+            p
+          end
+        end
+      when Hash
+        while @n > 0
+          @n -= 1
+          current[random_string] = case p = make_pick
+          when Array, Hash
+            fuzz(p)
+          else
+            p
+          end
+        end
+      end
+    end
+    current
+  end
+end
+
+class MyState < JSON.state
+  WS = " \r\t\n"
+
+  def initialize
+    super(
+          :indent       => make_spaces,
+          :space        => make_spaces,
+          :space_before => make_spaces,
+          :object_nl    => make_spaces,
+          :array_nl     => make_spaces,
+          :max_nesting  => false
+         )
+  end
+
+  def make_spaces
+    s = ''
+    rand(1).times { s << WS[rand(WS.size)] }
+    s
+  end
+end
+
+n = (ARGV.shift || 500).to_i
+loop do
+  fuzzer = Fuzzer.new(n,
+                      Hash => 25,
+                      Array => 25,
+                      String => 10,
+                      Fixnum => 10,
+                      Bignum => 10,
+                      nil => 5,
+                      true => 5,
+                      false => 5
+                     )
+  o1 = fuzzer.fuzz
+  json = JSON.generate o1, MyState.new
+  if $DEBUG
+    puts "-" * 80
+    puts json, json.size
+  else 
+    puts json.size
+  end
+  begin
+    o2 = JSON.parse(json, :max_nesting => false)
+  rescue JSON::ParserError => e
+    puts "Caught #{e.class}: #{e.message}\n#{e.backtrace * "\n"}"
+    puts "o1 = #{o1.inspect}", "json = #{json}", "json_str = #{json.inspect}"
+    puts "locals = #{local_variables.inspect}"
+    exit
+  end
+  if o1 != o2
+    puts "mismatch", "o1 = #{o1.inspect}", "o2 = #{o2.inspect}",
+      "json = #{json}", "json_str = #{json.inspect}"
+    puts "locals = #{local_variables.inspect}"
+  end
+end

data/lib/json/tools/server.rb

@@ -0,0 +1,61 @@
+#!/usr/bin/env ruby
+
+require 'webrick'
+include WEBrick
+$:.unshift 'ext'
+$:.unshift 'lib'
+require 'json'
+
+class JSONServlet < HTTPServlet::AbstractServlet
+  @@count = 1
+
+  def do_GET(req, res)
+    obj = {
+      "TIME" => Time.now.strftime("%FT%T"),
+      "foo" => "Bär",
+      "bar" => "© ≠ €!",
+      'a' => 2,
+      'b' => 3.141,
+      'COUNT' => @@count += 1,
+      'c' => 'c',
+      'd' => [ 1, "b", 3.14 ],
+      'e' => { 'foo' => 'bar' },
+      'g' => "松本行弘",
+      'h' => 1000.0,
+      'i' => 0.001,
+      'j' => "\xf0\xa0\x80\x81",
+    }
+    res.body = JSON.generate obj
+    res['Content-Type'] = "application/json"
+  end
+end
+
+def create_server(err, dir, port)
+  dir = File.expand_path(dir)
+  err.puts "Surf to:", "http://#{Socket.gethostname}:#{port}"
+
+  s = HTTPServer.new(
+    :Port         => port,
+    :DocumentRoot => dir,
+    :Logger       => WEBrick::Log.new(err),
+    :AccessLog    => [
+      [ err, WEBrick::AccessLog::COMMON_LOG_FORMAT  ],
+      [ err, WEBrick::AccessLog::REFERER_LOG_FORMAT ],
+      [ err, WEBrick::AccessLog::AGENT_LOG_FORMAT   ]
+    ]
+  )
+  s.mount("/json", JSONServlet)
+  s
+end
+
+default_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'data'))
+dir = ARGV.shift || default_dir
+port = (ARGV.shift || 6666).to_i
+s = create_server(STDERR, dir, 6666)
+t = Thread.new { s.start }
+trap(:INT) do
+  s.shutdown
+  t.join
+  exit
+end
+sleep

data/lib/redcar.rb

@@ -40,10 +40,10 @@ require 'yaml'
 #
 # and so on.
 module Redcar
-  VERSION         = '0.3.6'
+  VERSION         = '0.3.7'
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 3
-  VERSION_RELEASE = 6
+  VERSION_RELEASE = 7
   
   ENVIRONMENTS = [:user, :debug, :test]
   
@@ -88,6 +88,9 @@ module Redcar
     $:.push File.expand_path(File.join(File.dirname(__FILE__), "plugin_manager", "lib"))
     require 'plugin_manager'
     
+    $:.push File.expand_path(File.join(File.dirname(__FILE__), "json", "lib"))
+    require 'json'
+    
     plugin_manager.load
     if plugin_manager.unreadable_definitions.any?
       puts "Couldn't read definition files: "
@@ -103,7 +106,6 @@ module Redcar
       puts
       puts "Unloaded plugins:"
       puts plugin_manager.unloaded_plugins.map {|d| "  * " + d.name}
-
     end
   end
 

data/lib/redcar/runner.rb

@@ -1,10 +1,6 @@
-
-
 module Redcar
-  
   # Cribbed from ruby-processing. Many thanks!
   class Runner
-    
     # Trade in this Ruby instance for a JRuby instance, loading in a 
     # starter script and passing it some arguments.
     # If --jruby is passed, use the installed version of jruby, instead of 
@@ -17,7 +13,7 @@ module Redcar
         exit 1
       end
       ENV['RUBYOPT'] = nil # disable other native args
-      command = "java #{java_args} -Xmx500m -Xss1024k -Djruby.memory.max=500m -Djruby.stack.max=1024k -cp \"#{jruby_complete}\" org.jruby.Main #{"--debug" if debug_mode?} \"#{bin}\" #{cleaned_args} --no-sub-jruby"
+      command = "java #{java_args} -Xmx500m -Xss1024k -Djruby.memory.max=500m -Djruby.stack.max=1024k -cp \"#{jruby_complete}\" org.jruby.Main #{"--debug" if debug_mode?} \"#{bin}\" #{cleaned_args} --no-sub-jruby --ignore-stdin"
       puts command
       exec(command)
     end

data/lib/redcar_quick_start.rb

@@ -8,14 +8,9 @@ module Redcar
     if not $stdin.tty? and not ARGV.include?(DONT_READ_STDIN_ARG)
       data = ""
       begin
-        chunk = $stdin.read_nonblock(1024)
-        data << chunk
-        while chunk
-          chunk = $stdin.read_nonblock(1024)
-          data << chunk
-        end
+      data = $stdin.read
       rescue Errno::EAGAIN
-        retry
+      #  retry
       rescue EOFError
       end
       

data/plugins/application/features/support/env.rb

@@ -11,7 +11,7 @@ module SwtHelper
   end
   
   def active_shell
-    Redcar::ApplicationSWT.display.get_active_shell
+    Redcar.app.focussed_window.controller.shell
   end
   
   def dialog(type)
@@ -125,6 +125,11 @@ end
 
 After do
   close_everything
+  errors = Redcar.app.history.select {|command| command.error }
+  if errors.any?
+    raise "Command errors #{errors.inspect}"
+  end
+  Redcar.app.history.clear
 end
 
 at_exit {

data/plugins/application/lib/application/command/history.rb

@@ -8,6 +8,11 @@ module Redcar
         @max       = 500
       end
     
+      # Clear the command history
+      def clear
+        super
+      end
+      
       # Add a command to the command history if CommandHistory.recording is
       # true.
       def record(command)

data/plugins/application/lib/application/dialog.rb

@@ -27,7 +27,7 @@ module Redcar
       # For example:
       #
       # >> Application::Dialog.message_box("YO!", :type => :info, 
-      # >>                                             :buttons => :yes_no_cancel)
+      # >>                                        :buttons => :yes_no_cancel)
       # => :yes
       def self.message_box(text, options={})
         if buttons = options[:buttons] and !available_message_box_button_combos.include?(buttons)

data/plugins/application_swt/lib/application_swt.rb

@@ -15,7 +15,6 @@ require "application_swt/html_tab"
 require "application_swt/menu"
 require "application_swt/menu/binding_translator"
 require "application_swt/notebook"
-require "application_swt/notebook/drag_and_drop_listener"
 require "application_swt/notebook/tab_transfer"
 require "application_swt/notebook/tab_drag_and_drop_listener"
 require "application_swt/speedbar"

data/plugins/application_swt/lib/application_swt/html_tab.rb

@@ -42,9 +42,11 @@ module Redcar
         end
         
         def changing(event)
-          if event.location =~ %r{file:///controller/([^/]*)(/(.*))?}
+          uri = URI.parse(event.location)
+          if uri.path =~ %r{/controller/([^/]*)}
             event.doit = false
-            @html_tab.controller_action($1, $2)
+            params = uri.query ? CGI.parse(uri.query) : nil
+            @html_tab.controller_action($1, params)
           end
         end
 

data/plugins/application_swt/lib/application_swt/menu.rb

@@ -90,7 +90,9 @@ module Redcar
         end
         
         def widget_selected(e)
-          @entry.command.call
+          Redcar.safely("menu item '#{@entry.text}'") do
+            @entry.command.call
+          end
         end
         
         alias :widget_default_selected :widget_selected

data/plugins/application_swt/lib/application_swt/swt_wrapper.rb

@@ -69,6 +69,7 @@ module Swt
     import org.eclipse.swt.custom.StackLayout
     import org.eclipse.swt.custom.ST
     import org.eclipse.swt.custom.StyledText
+    import org.eclipse.swt.custom.TreeEditor
   end
   
   module DND
@@ -76,6 +77,7 @@ module Swt
     import org.eclipse.swt.dnd.Clipboard
     import org.eclipse.swt.dnd.Transfer
     import org.eclipse.swt.dnd.TextTransfer
+    import org.eclipse.swt.dnd.FileTransfer
     import org.eclipse.swt.dnd.ByteArrayTransfer
     
     import org.eclipse.swt.dnd.DropTarget
@@ -140,6 +142,8 @@ module JFace
     import org.eclipse.jface.viewers.ILabelProvider
     import org.eclipse.jface.viewers.ILazyTreeContentProvider
     import org.eclipse.jface.viewers.ILabelProvider
+    import org.eclipse.jface.viewers.TextCellEditor
+    import org.eclipse.jface.viewers.ViewerDropAdapter
   end
   
   module Text

data/plugins/core/lib/core.rb

@@ -6,6 +6,7 @@ require "core/logger"
 require "core/reentry_helpers"
 require "core/controller"
 require "core/gui"
+require "core/has_spi"
 require "core/interface"
 require "core/model"
 require "core/observable"

data/plugins/core/lib/core/has_spi.rb

@@ -0,0 +1,10 @@
+
+module Redcar
+  module HasSPI
+    def assert_interface(object, interface)
+      unless object.is_a?(interface)
+        raise "#{object.inspect} expected to be a #{interface}"
+      end
+    end
+  end
+end

data/plugins/edit_view/features/new_tab.feature

@@ -4,7 +4,6 @@ Feature: Open a new tab
     When I open a new edit tab
     Then there should be one edit tab
     And the tab should be focussed within the notebook
-    And the tab should have the keyboard focus
 
   Scenario: Close tab
     When I open a new edit tab

data/plugins/edit_view/features/step_definitions/tab_steps.rb

@@ -76,7 +76,7 @@ end
 
 Then /^the tab should have the keyboard focus$/ do
   tab = get_tab(get_tab_folder)
-  tab.controller.edit_view.has_focus?.should be_true
+  tab.controller.edit_view.is_current?.should be_true
 end
 
 Then /^I should (not )?see "(.*)" in the edit tab$/ do |bool, content|

data/plugins/edit_view/lib/edit_view.rb

@@ -140,12 +140,25 @@ module Redcar
     
     # Called by the GUI whenever an EditView is focussed or
     # loses focus. Sends :focussed_edit_view event.
+    #
+    # Will return nil if the application is not focussed or if
+    # no edit view is focussed.
     def self.focussed_edit_view=(edit_view)
+      if edit_view
+        @last_focussed_edit_view = edit_view
+      end
       @focussed_edit_view = edit_view
       edit_view.check_for_updated_document if edit_view
       notify_listeners(:focussed_edit_view, edit_view)
     end
     
+    def self.current
+      tab = Redcar.app.focussed_window.focussed_notebook.focussed_tab
+      if tab.is_a?(Redcar::EditTab)
+        tab.edit_view
+      end
+    end
+    
     def self.sensitivities
       [
         Sensitivity.new(:edit_tab_focussed, Redcar.app, false, [:tab_focussed]) do |tab|

data/plugins/edit_view/lib/edit_view/document/command.rb

@@ -5,7 +5,7 @@ module Redcar
     private
     
     def doc
-      EditView.focussed_edit_view.document
+      EditView.current.document
     end
   end
 end