ruby-processing 1.0.3 → 1.0.4

data/lib/ruby-processing/exporters/applet_exporter.rb

@@ -61,7 +61,7 @@ module Processing
     
     def calculate_substitutions
       file_list = Dir.glob(@dest + "{/**/*.{rb,jar},/data/*.*}").map {|f| f.sub(@dest+"/","")}
-      @width_plus_14 = (@width.to_i + 14).to_s
+      @width = @width.to_i
       @file_list = file_list.join(",")
     end
     

data/lib/ruby-processing/exporters/base_exporter.rb

@@ -8,12 +8,12 @@ module Processing
   class BaseExporter
     include FileUtils
     
-    DEFAULT_TITLE = "Ruby-Processing Sketch"
-    DEFAULT_DIMENSIONS = {'width' => '500', 'height' => '500'}
+    DEFAULT_DIMENSIONS = {'width' => '200', 'height' => '200'}
     DEFAULT_DESCRIPTION = ''
     
     # Returns the filepath, basename, and directory name of the sketch.
     def get_main_file(file)
+      @file = file
       return file, File.basename(file), File.dirname(file)
     end
     
@@ -37,40 +37,45 @@ module Processing
     # Searches the source for a class name.
     def extract_class_name(source)
       match = source.match(/(\w+)\s*<\s*Processing::App/)
-      match ? match[1] : nil
+      match ? match[1] : 'Sketch'
     end
     
     # Searches the source for a title.
     def extract_title(source)
       match = source.match(/#{@info[:class_name]}\.new.*?:title\s=>\s["'](.+)["']/m)
-      match ? match[1] : DEFAULT_TITLE
+      match ? match[1] : File.basename(@file, '.rb').titleize
     end
     
     # Searches the source for the width and height of the sketch.
     def extract_dimension(source, dimension)
-      match = source.match(/#{@info[:class_name]}\.new.*?:#{dimension}\s=>\s(\d+)/m)
-      match ? match[1] : DEFAULT_DIMENSIONS[dimension]
+      match = source.match(/#{@info[:class_name]}\.new.*?:#{dimension}\s?=>\s?(\d+)/m)
+      size_match = source.match(/^[^#]*size\(?\s*(\d+)\s*,\s*(\d+)\s*\)?/)
+      return match[1] if match
+      return (dimension == 'width' ? size_match[1] : size_match[2]) if size_match
+      DEFAULT_DIMENSIONS[dimension]
     end
     
     # Searches the source for a description of the sketch.
     def extract_description(source)
-      match = source.match(/# Description:(.*?)\n[^#]/m)
-      match ? match[1].gsub!(/\n(\s*)?#/, "") : DEFAULT_DESCRIPTION
+      match = source.match(/\A((\s*#(.*?)\n)+)[^#]/m)
+      match ? match[1].gsub(/\s*#\s*/, "\n") : DEFAULT_DESCRIPTION
     end
     
-    # Searches the source any libraries that have been loaded.
+    # Searches the source for any libraries that have been loaded.
     def extract_libraries(source)
       libs = []
       code = source.dup
       loop do
-        matchdata = code.match(/load\w+librar(y|ies).+?["':](\S+?)["'\s]/)
+        matchdata = code.match(/^[^#]*load_librar(y|ies)\s+(.+)\n/)
         break unless matchdata
-        match = matchdata[2]
-        @opengl = true if match.match(/opengl/i)
-        local_path = "#{local_dir}/library/#{match}"
-        rp5_path = "#{RP5_ROOT}/library/#{match}"
-        File.exists?(local_path) ? libs << local_path : 
-          (libs << rp5_path if File.exists?(rp5_path))
+        candidates = matchdata[2].gsub(/[:"'\s]/, '').split(/,/)
+        candidates.each do |cand|
+          @opengl = true if cand.match(/opengl/i)
+          local_path = "#{local_dir}/library/#{cand}"
+          rp5_path = "#{RP5_ROOT}/library/#{cand}"
+          libs << rp5_path if File.exists?(rp5_path)
+          libs << local_path if File.exists?(local_path)
+        end
         code = matchdata.post_match
       end
       libs

data/lib/ruby-processing/exporters/creator.rb

@@ -3,6 +3,8 @@ module Processing
   # This class creates blank sketches, with the boilerplate filled in.
   class Creator < BaseExporter
     
+    ALL_DIGITS = /\A\d+\Z/
+    
     # Create a blank sketch, given a path.
     def create!(path, args)
       usage path
@@ -15,16 +17,20 @@ module Processing
       end
       
       # Get the substitutions
-      @name =       main_file.camelize
-      @file_name =  main_file.underscore
-      @title =      main_file.titleize
-      @width =      args[0] || "500"
-      @height =     args[1] || "500"
+      @name           = main_file.camelize
+      @file_name      = main_file.underscore
+      @title          = main_file.titleize
+      
+      bare            = !!args.delete('--bare')
+      @width, @height = args[0], args[1]
+      @with_size      = @width && @width.match(ALL_DIGITS) &&
+                        @height && @height.match(ALL_DIGITS)
   
       # Make the file
       dir = File.dirname path
       mkdir_p dir
-      template = File.new("#{RP5_ROOT}/lib/templates/create/blank_sketch.rb.erb")
+      template_name = bare ? 'bare_sketch.rb.erb' : 'blank_sketch.rb.erb'
+      template = File.new("#{RP5_ROOT}/lib/templates/create/#{template_name}")
       rendered = render_erb_from_string_with_binding(template.read, binding)
       full_path = File.join(dir, "#{@file_name}.rb")
       File.open(full_path, "w") {|f| f.print(rendered) }

data/lib/ruby-processing/runner.rb

@@ -18,11 +18,11 @@ module Processing
   Examples:
     rp5 unpack samples
     rp5 run samples/jwishy.rb
-    rp5 create some_new_sketch 640 480
+    rp5 create some_new_sketch --bare 640 480
     rp5 watch some_new_sketch.rb
     rp5 applet some_new_sketch.rb
     
-  Further information:
+  Everything Else:
     http://wiki.github.com/jashkenas/ruby-processing    
     
       EOS

data/lib/ruby-processing/runners/base.rb

@@ -1,5 +1,64 @@
 $LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../../")
+SKETCH_ROOT = File.dirname(ARGV[0]) unless defined? SKETCH_ROOT
+
+require 'ruby-processing'
+require 'ruby-processing/app'
+
 
 module Processing
+  
   SKETCH_PATH = ARGV[0]
+  
+  # For use with "bare" sketches that don't want to define a class or methods
+  SKETCH_TEMPLATE = <<-EOS
+    class Sketch < Processing::App
+      <% if has_methods %>
+      <%= source %>
+      <% else %>
+      def setup
+        size(DEFAULT_WIDTH, DEFAULT_HEIGHT, JAVA2D)
+        <%= source %>
+        no_loop
+      end
+      <% end %>
+    end
+  EOS
+  
+  # This method is the common entry point to run a sketch, bare or complete.
+  def self.load_and_run_sketch
+    source = self.read_sketch_source
+    has_sketch = !!source.match(/^[^#]*< Processing::App/)
+    has_methods = !!source.match(/^[^#]*def setup/)
+    
+    if has_sketch
+      load Processing::SKETCH_PATH
+      Processing::App.sketch_class.new if !$app
+      return
+    else
+      require 'erb'
+      code = ERB.new(SKETCH_TEMPLATE).result(binding)
+      Object.class_eval code, Processing::SKETCH_PATH, 0
+      Processing::App.sketch_class.new if !$app
+    end
+  end
+  
+  
+  # Read in the sketch source code. Needs to work both online and offline.
+  def self.read_sketch_source
+    if Processing::App.online?
+      # Fuck the following lines. Fucking Java can go sit on broken glass.
+      source = ''
+      url = java.net.URL.new(JRUBY_APPLET.get_code_base, Processing::SKETCH_PATH)
+      input = java.io.BufferedReader.new(java.io.InputStreamReader.new(url.open_stream))
+      while line = input.read_line do
+        source << (line + "\n") if line
+      end
+      input.close
+    else
+      # Ahhh, much better.
+      source = File.read(Processing::SKETCH_PATH)
+    end
+    source
+  end
+  
 end

data/lib/ruby-processing/runners/live.rb

@@ -6,6 +6,6 @@ require "#{File.dirname(__FILE__)}/base.rb"
 
 require 'irb'
 ARGV[0] = nil # To keep IRB from trying to run it multiple times.
-require Processing::SKETCH_PATH
 IRB.setup(__FILE__)
-IRB.start()
+Processing.load_and_run_sketch
+IRB.start()

data/lib/ruby-processing/runners/run.rb

@@ -7,4 +7,5 @@ if ARGV[1] == '--windows-app'
 end
 
 require "#{File.dirname(__FILE__)}/base.rb"
-require Processing::SKETCH_PATH
+
+Processing.load_and_run_sketch

data/lib/ruby-processing/runners/watch.rb

@@ -6,12 +6,13 @@ module Processing
   # the feedback between code and effect.
   class Watcher
     
-    # Sic a new Processing::Watcher on a given sketch.
-    def initialize(sketch)
-      @file = sketch
+    # Sic a new Processing::Watcher on the sketch
+    def initialize
+      @file = Processing::SKETCH_PATH
       @time = Time.now
-      record_state_of_ruby
-      load @file
+      # Doesn't work well enough for now.
+      # record_state_of_ruby
+      Processing.load_and_run_sketch unless $app
       start_watching
     end
     
@@ -24,22 +25,44 @@ module Processing
           file_mtime = File.stat(@file).mtime
           if file_mtime > @time
             @time = file_mtime
-            Processing::App.wipe_out_current_app!
-            rewind_to_recorded_state
+            wipe_out_current_app!
+            # Taking it out the reset until it can be made to work more reliably
+            # rewind_to_recorded_state
             GC.start
             begin
-              load @file
+              Processing.load_and_run_sketch
             rescue SyntaxError
               print "Syntax Error in your sketch: ", $!, "\n"
             end
           end
-          sleep 0.1
+          sleep 0.33
         end
       end
       thread.join
     end
     
     
+    # Used to completely remove all traces of the current sketch, 
+    # so that it can be loaded afresh. Go down into modules to find it, even.
+    def wipe_out_current_app!
+      app = $app
+      return unless app
+      app.no_loop
+      # Wait for the animation thread to finish rendering
+      sleep 0.05
+      app.close
+      constant_names = app.class.to_s.split(/::/)
+      app_class_name = constant_names.pop
+      obj = constant_names.inject(Object) {|o, name| o.send(:const_get, name) }
+      obj.send(:remove_const, app_class_name)    
+    end
+    
+    # The following methods were intended to make the watcher clean up all code
+    # loaded in from the sketch, gems, etc, and have them be reloaded properly
+    # when the sketch is.... but it seems that this is neither a very good idea
+    # or a very possible one. If you can make the scheme work, please do, 
+    # otherwise the following methods will probably be removed soonish.
+    
     # Do the best we can to take a picture of the current Ruby interpreter.
     # For now, this means top-level constants and loaded .rb files.
     def record_state_of_ruby
@@ -57,7 +80,7 @@ module Processing
       new_features   = $LOADED_FEATURES.reject {|f| @saved_features.include?(f) }
       new_globals    = Kernel.global_variables.reject {|g| @saved_globals.include?(g) }
       
-      new_constants.each {|c| Object.send(:remove_const, c) }
+      Processing::App.recursively_remove_constants(Object, new_constants)
       new_load_paths.each {|p| $LOAD_PATH.delete(p) }
       new_features.each {|f| $LOADED_FEATURES.delete(f) }
       new_globals.each do |g| 
@@ -69,7 +92,20 @@ module Processing
       end
     end
     
+    
+    # Used to clean up declared constants in code that needs to be reloaded.
+    def recursively_remove_constants(base, constant_names)
+      constants = constant_names.map {|name| base.const_get(name) }
+      constants.each_with_index do |c, i|
+        java_obj = Java::JavaLang::Object
+        constants[i] = constant_names[i] = nil if c.respond_to?(:ancestors) && c.ancestors.include?(java_obj)
+        constants[i] = nil if !c.is_a?(Class) && !c.is_a?(Module)
+      end
+      constants.each {|c| recursively_remove_constants(c, c.constants) if c }
+      constant_names.each {|name| base.send(:remove_const, name.to_sym) if name }
+    end
+    
   end
 end
 
-Processing::Watcher.new(Processing::SKETCH_PATH)
+Processing::Watcher.new

data/lib/templates/applet/index.html.erb

@@ -24,7 +24,7 @@
       padding: 0;
     }
     #container {
-      width: <%= @width_plus_14 %>px;
+      width: <%= @width + 14 %>px;
       margin: 0 auto;
       margin-top: 20px;
     }
@@ -42,8 +42,8 @@
     }
     #description {
       font-size: 12px;
-      width: <%= @width %>px;
-      padding: 7px;
+      width: <%= @width - 16 %>px;
+      padding: 7px 15px 7px 15px;
       background: #111;
       text-align: justify;
       margin: 0 auto;
@@ -72,7 +72,7 @@
       width="<%= @width %>" height="<%= @height %>">
       
       <param name="archive" value="<%= @file_list %>" />
-      <param name="jruby.script" value="<%= @main_file %>" />
+      <param name="jruby.eval" value="ARGV[0] = '<%= @main_file %>'; require 'ruby-processing/runners/run.rb'" />
       <param name="image" value="images/ruby.jpg" />
       <param name="boxbgcolor" value="#000000" />   
       <param name="lang" value="en" />
@@ -92,14 +92,14 @@
   </div>
   
   <div id="built_with">
-    <a href="http://the-shoebox.org/apps/44/">
+    <a href="http://wiki.github.com/jashkenas/ruby-processing">
       <img src="images/built_with.jpg" alt="Ruby-Processing" />
     </a>
       Via <a href="http://jruby.codehaus.org/">JRuby</a> and <a href="http://processing.org/">Processing</a><br />
       Source: <a href="<%= @main_file %>"><%= @main_file %></a>
   </div>
   
-  <% unless @description.empty? %>
+  <% if @description && !@description.empty? %>
   <div id="description">
     <h1><%= @title %></h1>
     <p><%= @description %></p>

data/lib/templates/create/bare_sketch.rb.erb

@@ -0,0 +1,7 @@
+def setup
+  <%= "size #{@width}, #{@height}" if @with_size %>
+end
+
+def draw
+  
+end

data/lib/templates/create/blank_sketch.rb.erb

@@ -1,4 +1,4 @@
-require 'ruby-processing'
+# <%= @title %>
 
 class <%= @name %> < Processing::App
 
@@ -12,4 +12,4 @@ class <%= @name %> < Processing::App
   
 end
 
-<%= @name %>.new :title => "<%= @title %>", :width => <%= @width %>, :height => <%= @height %>
+<%= @name %>.new :title => "<%= @title %>"<%= ", :width => #{@width}" if @with_size %><%= ", :height => #{@height}" if @with_size %>

data/library/control_panel/control_panel.rb

@@ -97,8 +97,12 @@ module ControlPanel
       set_size 200, 30 + (64 * @elements.size)
       set_default_close_operation javax.swing.JFrame::DISPOSE_ON_CLOSE
       set_resizable false
-      set_location($app.width + 10, 0)
-      show
+      # Need to wait for the sketch to finish sizing...
+      Thread.new do
+        sleep 0.2 while $app.default_size? || !$app.done_displaying?
+        set_location($app.width + 10, 0)
+        show
+      end
     end
     
     def add_element(element, name, has_label=true, button=false)

data/library/pdf/notes.txt

@@ -1,9 +1,8 @@
 The majority of the work in this library is done by iText.
 http://www.lowagie.com/iText/
 
-The version bundled in this release is 2.1.2u. 
+The version bundled in this release is 2.1.4.
 
-The files in the library must be named itext.jar (not iText-2.1.2u.jar) 
-because they're specifically included on the classpath as part of the
-build/platform/make.sh scripts. 
+The files in the library must be named itext.jar because they're specifically
+included on the classpath as part of the build/platform/make.sh scripts. 
 

data/samples/animator.rb

@@ -1,47 +1,43 @@
 # From the Processing Examples
+# Uses the "bare" style, where a Processing::App sketch is implicitly wrapped
+# around the code.
 # -- omygawshkenas
 
-require 'ruby-processing'
+FRAME_COUNT = 12
 
-class Animator < Processing::App
-  FRAME_COUNT = 12
+def setup
+  @frames         = []
+  @last_time      = 0
+  @current_frame  = 0
+  @draw           = false
+  @back_color     = 204
+  size 350, 350
+  stroke_weight 4
+  smooth
+  background @back_color
+  FRAME_COUNT.times { @frames << get() }
+end
 
-  def setup
-    @frames = []
-    @last_time = 0
-    @current_frame = 0
-    @draw = false
-    @back_color = 204
-    stroke_weight 4
-    smooth
-    background @back_color
-    FRAME_COUNT.times { @frames << get() }
-  end
-  
-  def draw
-    time = millis()
-    if time > @last_time + 100
-      next_frame
-      @last_time = time
-    end
-    line(pmouse_x, pmouse_y, mouse_x, mouse_y) if @draw
-  end
-  
-  def mouse_pressed; @draw = true; end
-  def mouse_released; @draw = false; end
-  
-  def key_pressed
-    background @back_color
-    @frames.size.times {|i| @frames[i] = get()}
-  end
-  
-  def next_frame
-    @frames[@current_frame] = get()
-    @current_frame += 1
-    @current_frame = 0 if @current_frame >= @frames.size
-    image(@frames[@current_frame], 0, 0)
+def draw
+  time = millis()
+  if time > @last_time + 100
+    next_frame
+    @last_time = time
   end
-  
+  line(pmouse_x, pmouse_y, mouse_x, mouse_y) if @draw
+end
+
+def mouse_pressed; @draw = true; end
+def mouse_released; @draw = false; end
+
+def key_pressed
+  background @back_color
+  @frames.size.times {|i| @frames[i] = get()}
 end
 
-Animator.new :title => "Animator", :width => 350, :height => 350
+def next_frame
+  @frames[@current_frame] = get()
+  @current_frame += 1
+  @current_frame = 0 if @current_frame >= @frames.size
+  image(@frames[@current_frame], 0, 0)
+end