ruby-processing 1.0.10.1 → 1.0.11

data/CHANGELOG

@@ -1,3 +1,8 @@
+v1.0.11 Fixing broken stuffs...
+  * JRuby upgraded to 1.6.5
+  * applet export fixed
+  * application export fixed
+
 v1.0.10 Solidifying before Processing 2.0 ...
   * JRuby upgraded to 1.6.4
   * Processing upgraded to 1.5.1

data/lib/ruby-processing.rb

@@ -14,7 +14,7 @@ require 'ruby-processing/helpers/numeric'
 
 # The top-level namespace, a home for all Ruby-Processing classes.
 module Processing
-  VERSION = "1.0.10" unless defined? Processing::VERSION
+  VERSION = "1.0.11" unless defined? Processing::VERSION
 
   # Are we online -- inside an applet?
   def self.online?

data/lib/ruby-processing/app.rb

@@ -126,12 +126,14 @@ module Processing
       set_sketch_path unless Processing.online?
       mix_proxy_into_inner_classes
       @started = false
-
-      java.lang.Thread.default_uncaught_exception_handler = proc do |thread, exception|
-        puts(exception.class.to_s)
-        puts(exception.message)
-        puts(exception.backtrace.collect { |trace| "\t" + trace })
-        close
+     
+      unless Processing.online?
+        java.lang.Thread.default_uncaught_exception_handler = proc do |thread, exception|
+          puts(exception.class.to_s)
+          puts(exception.message)
+          puts(exception.backtrace.collect { |trace| "\t" + trace })
+          close
+        end
       end
 
       # for the list of all available args, see 
@@ -147,13 +149,24 @@ module Processing
 
       @render_mode  ||= JAVA2D
 
-      x = options[:x] || 0
-      y = options[:y] || 0
-      args << "--location=#{x},#{y}"
+      if Processing.online?
+        JRUBY_APPLET.background_color = nil
+        JRUBY_APPLET.double_buffered = false
+        JRUBY_APPLET.add self
+        JRUBY_APPLET.validate
+        # Add the callbacks to peacefully expire.
+        JRUBY_APPLET.on_stop { self.stop }
+        JRUBY_APPLET.on_destroy { self.destroy }
+        init
+      else
+        x = options[:x] || 0
+        y = options[:y] || 0
+        args << "--location=#{x},#{y}"
 
-      title = options[:title] || File.basename(SKETCH_PATH).sub(/(\.rb|\.pde)$/, '').titleize
-      args << title
-      PApplet.run_sketch(args, self)
+        title = options[:title] || File.basename(SKETCH_PATH).sub(/(\.rb|\.pde)$/, '').titleize
+        args << title
+        PApplet.run_sketch(args, self)
+      end
     end
 
     def started?
@@ -235,15 +248,6 @@ module Processing
       end
     end
 
-    def display_in_an_applet
-      JRUBY_APPLET.background_color = nil
-      JRUBY_APPLET.double_buffered = false
-      JRUBY_APPLET.add self
-      JRUBY_APPLET.validate
-      # Add the callbacks to peacefully expire.
-      JRUBY_APPLET.on_stop { self.stop }
-      JRUBY_APPLET.on_destroy { self.destroy }
-    end
   end # Processing::App
 
 
@@ -255,18 +259,18 @@ module Processing
 
     # Generate the list of method names that we'd like to proxy for inner classes.
     # Nothing camelCased, nothing __internal__, just the Processing API.
-    def self.desired_method_names
+    def self.desired_method_names(inner_class)
       bad_method = /__/    # Internal JRuby methods.
       unwanted = PApplet.superclass.instance_methods + Object.instance_methods
       unwanted -= ['width', 'height', 'cursor', 'create_image', 'background', 'size', 'resize']
       methods = Processing::App.public_instance_methods
-      methods.reject {|m| unwanted.include?(m) || bad_method.match(m) }
+      methods.reject {|m| unwanted.include?(m) || bad_method.match(m) || inner_class.method_defined?(m) }
     end
 
 
     # Proxy methods through to the sketch.
-    def self.proxy_methods
-      code = desired_method_names.inject('') do |code, method|
+    def self.proxy_methods(inner_class)
+      code = desired_method_names(inner_class).inject('') do |code, method|
         code << <<-EOS
           def #{method}(*args, &block)                # def rect(*args, &block)
             if block_given?                           #   if block_given?
@@ -277,24 +281,23 @@ module Processing
           end                                         # end
         EOS
       end
-      module_eval(code, "Processing::Proxy", 1)
+      inner_class.class_eval(code)
     end
 
 
     # Proxy the sketch's constants on to the inner classes.
-    def self.proxy_constants
+    def self.proxy_constants(inner_class)
       Processing::App.constants.each do |name|
-        Processing::Proxy.const_set(name, Processing::App.const_get(name))
+        next if inner_class.const_defined?(name)
+        inner_class.const_set(name, Processing::App.const_get(name))
       end
     end
 
 
     # Don't do all of the work unless we have an inner class that needs it.
     def self.included(inner_class)
-      return if @already_defined
-      proxy_methods
-      proxy_constants
-      @already_defined = true
+      proxy_methods(inner_class)
+      proxy_constants(inner_class)
     end
 
   end # Processing::Proxy

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

@@ -7,8 +7,8 @@ module Processing
     USAGE = <<-EOS
     
     The applet generator will generate a web-ready applet for you.
-    Usage: script/applet <path_to_sketch>
-    Example: script/applet samples/jwishy.rb
+    Usage: rp5 applet <path_to_sketch>
+    Example: rp5 applet samples/jwishy.rb
     
     EOS
     
@@ -33,7 +33,7 @@ module Processing
     end
     
     def compute_destination_name
-      @dest = "#{@main_file.sub(".rb", "")}"
+      @dest = "#{@main_file.sub(".rb", "")}_applet"
     end
     
     def copy_over_necessary_files
@@ -75,4 +75,4 @@ module Processing
     end
     
   end
-end
+end

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

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'erb'
+require 'ruby-processing/library_loader'
 
 module Processing
   
@@ -53,6 +54,7 @@ module Processing
       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
+      warn "using default dimensions for export, please use constants integer values in size() call instead of computed ones"
       DEFAULT_DIMENSIONS[dimension]
     end
     
@@ -64,22 +66,14 @@ module Processing
     
     # Searches the source for any libraries that have been loaded.
     def extract_libraries(source)
-      libs = []
-      code = source.dup
-      loop do
-        matchdata = code.match(/^[^#]*load_librar(y|ies)\s+(.+)\n/)
-        break unless matchdata
-        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)
+      lines = source.split("\n")
+      libs = lines.grep(/^[^#]*load_(?:java_|ruby_)?librar(?:y|ies)\s+(.+)/) do
+        $1.split(/\s*,\s*/).collect do |raw_library_name| 
+          raw_library_name.tr("\"':\r\n", '') 
         end
-        code = matchdata.post_match
-      end
-      libs
+      end.flatten
+      lib_loader = LibraryLoader.new
+      libs.map { |lib| lib_loader.get_library_paths(lib) }.flatten.compact
     end
     
     # Looks for all of the codes require or load commands, checks 
@@ -95,10 +89,14 @@ module Processing
         line = matchdata[0].gsub('__FILE__', "'#{@main_file_path}'")
         line = line.gsub(/\b(require|load)\b/, 'partial_paths << ')
         eval(line)
-        requirements += Dir["{#{local_dir}/,}{#{partial_paths.join(',')}}.{rb,jar}"]
+        where = "{#{local_dir}/,}{#{partial_paths.join(',')}}"
+        unless line =~ /\.[^.]+$/
+          where += ".{rb,jar}"
+        end
+        requirements += Dir[where]
         code = matchdata.post_match
       end
-      return requirements
+      requirements
     end
     
     
@@ -136,4 +134,4 @@ module Processing
     end
     
   end
-end
+end

data/lib/ruby-processing/helper_methods.rb

@@ -31,12 +31,31 @@ module Processing
     def color(*args)
       a = args[0]
       # convert to signed int
-      if args.length == 1 && a.is_a?(Fixnum) && a >= 2**31
-        args = [ a - 2**32 ]
+      if args.length == 1 
+        if a.is_a?(Fixnum) && a >= 2**31
+          args = [ a - 2**32 ]
+        elsif a.is_a?(String) && a[0] == ?#
+          h = a[1..-1]
+          # add opaque alpha channel
+          if h.size <= 6
+            h = "ff" + "0"*(6-h.size) + h
+          end
+          return color(h.hex)
+        end
       end
       super(*args)
     end
 
+    def loop(&block)
+      if block_given?
+        while true do
+          yield
+        end
+      else
+        super
+      end
+    end
+
     # There's just so many functions in Processing,
     # Here's a convenient way to look for them.
     def find_method(method_name)

data/lib/ruby-processing/library_loader.rb

@@ -38,9 +38,9 @@ module Processing
           return false
         end
       else
-        path = get_library_path(library_name, "rb")
+        path = get_library_paths(library_name, "rb").first
         return false unless path
-        return @loaded_libraries[library_name] = (require "#{path}/#{library_name}")
+        return @loaded_libraries[library_name] = (require path)
       end
     end
 
@@ -57,8 +57,8 @@ module Processing
       if Processing.online?
         return @loaded_libraries[library_name] = !!(JRUBY_APPLET.get_parameter("archive").match(%r(#{library_name}))) 
       end
-      path = get_library_path(library_name, "jar")
-      jars = Dir["#{path}/*.jar"]
+      path = get_library_directory_path(library_name, "jar")
+      jars = get_library_paths(library_name, "jar")
       return false if jars.empty?
       jars.each {|jar| require jar }
 
@@ -96,8 +96,30 @@ module Processing
       [ platform, platform+bits ].collect { |p| File.join(basename, p) }
     end
 
+    def get_library_paths(library_name, extension = nil)
+      dir = get_library_directory_path(library_name, extension) 
+      Dir.glob("#{dir}/*.{rb,jar}")
+    end
+
     protected
 
+    def get_library_directory_path(library_name, extension = nil)
+      extensions = extension ? [extension] : %w{jar rb}
+      extensions.each do |ext|
+        [ "#{SKETCH_ROOT}/library/#{library_name}", 
+          "#{RP5_ROOT}/library/#{library_name}/library", 
+          "#{RP5_ROOT}/library/#{library_name}", 
+          "#{@sketchbook_library_path}/#{library_name}/library",
+          "#{@sketchbook_library_path}/#{library_name}" 
+        ].each do |path| 
+          if File.exists?(path) && !Dir.glob(path + "/*.#{ext}").empty?
+            return path
+          end
+        end
+      end
+      nil
+    end
+
     def find_sketchbook_path
       preferences_paths = []
       sketchbook_paths = []
@@ -126,15 +148,5 @@ module Processing
       end
     end
     
-    def get_library_path(library_name, extension)
-      [ "#{SKETCH_ROOT}/library/#{library_name}", 
-        "#{RP5_ROOT}/library/#{library_name}/library", 
-        "#{RP5_ROOT}/library/#{library_name}", 
-        "#{@sketchbook_library_path}/#{library_name}/library",
-        "#{@sketchbook_library_path}/#{library_name}" 
-      ].detect do |path| 
-        File.exists?("#{path}/#{library_name}.#{extension}")
-      end
-    end
   end
 end

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

@@ -5,7 +5,6 @@ SKETCH_ROOT = File.dirname(SKETCH_PATH) unless defined? SKETCH_ROOT
 require 'ruby-processing'
 require 'ruby-processing/app'
 
-
 module Processing
 
   # For use with "bare" sketches that don't want to define a class or methods
@@ -46,9 +45,9 @@ module Processing
     if Processing.online?
       # Fuck the following lines. Fucking Java can go sit on broken glass.
       source = ''
-      url = java.net.URL.new(JRUBY_APPLET.get_code_base, SKETCH_PATH)
-      input = java.io.BufferedReader.new(java.io.InputStreamReader.new(url.open_stream))
-      while line = input.read_line do
+      url = java.net.URL.new(JRUBY_APPLET.java_send(:getCodeBase), SKETCH_PATH)
+      input = java.io.BufferedReader.new(java.io.InputStreamReader.new(url.java_send(:openStream)))
+      while line = input.java_send(:readLine) do
         source << (line + "\n") if line
       end
       input.close

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

@@ -97,7 +97,7 @@
     <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 />
+      Via <a href="http://jruby.org/">JRuby</a> and <a href="http://processing.org/">Processing</a><br />
       Source: <a href="<%= @main_file %>"><%= @main_file %></a>
   </div>
 
@@ -110,4 +110,4 @@
 
 </div>
 </body>
-</html>
+</html>

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-processing
 version: !ruby/object:Gem::Version 
-  hash: 117
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 0
-  - 10
-  - 1
-  version: 1.0.10.1
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -62,21 +61,21 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - bin/rp5
-- lib/ruby-processing/exporters/applet_exporter.rb
 - lib/ruby-processing/exporters/application_exporter.rb
-- lib/ruby-processing/exporters/base_exporter.rb
 - lib/ruby-processing/exporters/creator.rb
+- lib/ruby-processing/exporters/applet_exporter.rb
+- lib/ruby-processing/exporters/base_exporter.rb
 - lib/ruby-processing/helpers/numeric.rb
 - lib/ruby-processing/helpers/string.rb
-- lib/ruby-processing/runners/base.rb
 - lib/ruby-processing/runners/live.rb
 - lib/ruby-processing/runners/run.rb
 - lib/ruby-processing/runners/watch.rb
+- lib/ruby-processing/runners/base.rb
 - lib/ruby-processing/helper_methods.rb
-- lib/ruby-processing/app.rb
 - lib/ruby-processing/config.rb
-- lib/ruby-processing/library_loader.rb
 - lib/ruby-processing/runner.rb
+- lib/ruby-processing/app.rb
+- lib/ruby-processing/library_loader.rb
 - lib/templates/applet/images/built_with.jpg
 - lib/templates/applet/images/top.png
 - lib/templates/applet/images/ruby.jpg
@@ -93,9 +92,9 @@ files:
 - lib/templates/application/run.exe
 - lib/templates/create/bare_sketch.rb.erb
 - lib/templates/create/blank_sketch.rb.erb
-- lib/ruby-processing.rb
 - lib/core/jruby-complete.jar
 - lib/core/core.jar
+- lib/ruby-processing.rb
 - library/boids/boids.rb
 - library/control_panel/control_panel.rb
 - library/dxf/library/dxf.jar