ruby-processing 2.4.4 → 2.5.0

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

@@ -1,24 +1,23 @@
 require 'fileutils'
 require 'erb'
-require 'ruby-processing/library_loader'
+require_relative '../../ruby-processing/library_loader'
 
 module Processing
-  
-  # This base exporter implements some of the common 
-  # code-munging needed to generate apps and applets.
+  # This base exporter implements some of the common
+  # code-munging needed to generate apps.
   class BaseExporter
     include FileUtils
     ## hashes with strings as keys need to retain old hash syntax
-    DEFAULT_DIMENSIONS = {'width' => '100', 'height' => '100'}
+    DEFAULT_DIMENSIONS = { 'width' => '100', 'height' => '100' }
     DEFAULT_DESCRIPTION = ''
-    NECESSARY_FOLDERS = ['data', 'lib', 'vendor']
-    
+    NECESSARY_FOLDERS = %w(data lib vendor)
+
     # 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
-    
+
     # Centralized method to read the source of the sketch and extract
     # all the juicy details.
     def extract_information
@@ -35,49 +34,49 @@ module Processing
       hash_to_ivars @info
       @info
     end
-    
+
     # Searches the source for a class name.
     def extract_class_name(source)
       match = source.match(/(\w+)\s*<\s*Processing::App/)
       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] : 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)
       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"
+      warn 'using default dimensions for export, please use constants integer values in size() call instead of computed ones'
       DEFAULT_DIMENSIONS[dimension]
     end
-    
+
     # Searches the source for a description of the sketch.
     def extract_description(source)
       match = source.match(/\A((\s*#(.*?)\n)+)[^#]/m)
       match ? match[1].gsub(/\s*#\s*/, "\n") : DEFAULT_DESCRIPTION
     end
-    
+
     # Searches the source for any libraries that have been loaded.
     def extract_libraries(source)
       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", '') 
+        $1.split(/\s*,\s*/).map do |raw_library_name|
+          raw_library_name.tr("\"':\r\n", '')
         end
       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 
-    # to see if the file exists (that it's not a gem, or a standard lib) 
+
+    # Looks for all of the codes require or load commands, checks
+    # to see if the file exists (that it's not a gem, or a standard lib)
     # and hands you back all the real ones.
     def extract_real_requires(source)
       code = source.dup
@@ -90,48 +89,46 @@ module Processing
         line = line.gsub(/\b(require_relative|require|load)\b/, 'partial_paths << ')
         eval(line)
         where = "{#{local_dir}/,}{#{partial_paths.join(',')}}"
-        unless line =~ /\.[^.]+$/
-          where += ".{rb,jar}"
-        end
+        where += '.{rb,jar}' unless line =~ /\.[^.]+$/
         requirements += Dir[where]
         code = matchdata.post_match
       end
       requirements
     end
-    
-    
+
+
     protected
-    
+
     def read_source_code
       File.read(@main_file_path)
     end
-    
+
     def local_dir
       File.dirname(@main_file_path)
     end
-    
+
     def hash_to_ivars(hash)
-      hash.each{|k,v| instance_variable_set("@" + k.to_s, v) }
+      hash.each { |k, v| instance_variable_set('@' + k.to_s, v) }
     end
-    
+
     def wipe_and_recreate_destination
       remove_entry_secure @dest if File.exist?(@dest)
       mkdir_p @dest
     end
-    
-    def render_erb_in_path_with_binding(path, some_binding, opts={})
-      erbs = Dir.glob(path + "/**/*.erb")
+
+    def render_erb_in_path_with_binding(path, some_binding, opts = {})
+      erbs = Dir.glob(path + '/**/*.erb')
       erbs.each do |erb|
-        string = File.open(erb) {|f| f.read }
+        string = File.open(erb) { |f| f.read }
         rendered = render_erb_from_string_with_binding(string, some_binding)
-        File.open(erb.sub(".erb", ""), "w") {|f| f.print rendered }
+        File.open(erb.sub('.erb', ''), 'w') { |f| f.print rendered }
         rm erb if opts[:delete]
       end
     end
-    
+
     def render_erb_from_string_with_binding(erb, some_binding)
-      rendered = ERB.new(erb, nil, "<>", "rendered").result(some_binding)
+      ERB.new(erb, nil, '<>', 'rendered').result(some_binding)
     end
-    
   end
 end
+

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

@@ -1,30 +1,27 @@
 module Processing
-  
+  require_relative '../../ruby-processing/exporters/base_exporter'
   # 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.
+    # @TODO reduce cyclomatic complexity
     def create!(path, args, p3d)
-      usage path
-      main_file = File.basename(path, ".rb")
-      # Check to make sure that the main file exists
-      already_exists = File.exist?(path) || File.exist?("#{File.dirname(path)}/#{main_file.underscore}.rb")
-      if already_exists
-        puts "That sketch already exists."
-        exit
-      end
-      
+      usage if /\?/ =~ path || /--help/ =~ path
+      main_file = File.basename(path, '.rb')
+      # Check to make sure that the main file doesn't exist already
+      already_exists(path)
+
       # Get the substitutions
       @name           = main_file.camelize
       @file_name      = main_file.underscore
       @title          = main_file.titleize
-      
+
       @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
@@ -32,23 +29,28 @@ module Processing
       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) }
-      puts "Created Sketch \"#{@name}\" in #{full_path.sub(/\A\.\//, '')}"
+      File.open(full_path, 'w') { |f| f.print(rendered) }
+      puts "Created a new Sketch in #{full_path.sub(/\A\.\//, '')}"
+    end
+
+    def already_exist(path)
+      if File.exist?(path) || File.exist?("#{File.dirname(path)}/#{main_file.underscore}.rb")
+        puts 'That sketch already exists.'
+      end
+      exit
     end
-    
+
     # Show the help/usage message for create.
-    def usage(predicate)
-      unless predicate
-        puts <<-USAGE
-  
+    def usage
+      puts <<-USAGE
+
       Usage: script/generate <sketch_to_generate> <width> <height>
       Width and Height are optional.
-      
+
       Example: script/generate fancy_drawing/app 800 600
-  
+
       USAGE
-        exit
-      end
+      exit
     end
   end
 end

data/lib/ruby-processing/helper_methods.rb

@@ -4,7 +4,7 @@ module Processing
     # Nice block method to draw to a buffer.
     # You can optionally pass it a width, a height, and a renderer.
     # Takes care of starting and ending the draw for you.
-    def buffer(buf_width=width, buf_height=height, renderer=@render_mode)
+    def buffer(buf_width = width, buf_height = height, renderer = @render_mode)
       buf = create_graphics(buf_width, buf_height, renderer)
       buf.begin_draw
       yield buf
@@ -14,8 +14,8 @@ module Processing
 
     # A nice method to run a given block for a grid.
     # Lifted from action_coding/Nodebox.
-    def grid(cols, rows, col_size=1, row_size=1)
-      (0...cols*rows).map do |i|
+    def grid(cols, rows, col_size = 1, row_size = 1)
+      (0...cols * rows).map do |i|
         x = col_size * (i % cols)
         y = row_size * i.div(cols)
         yield x, y
@@ -31,22 +31,18 @@ module Processing
     def color(*args)
       a = args[0]
       # convert to signed int
-      if args.length == 1 
+      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
+        elsif a.is_a?(String) && a[0].eql?('#')
+          h = a[1..-1].rjust(6, '0').prepend('ff')
           return color(h.hex)
         end
       end
       super(*args)
     end
-    
-    # Overrides convenience function loop, to add ability to loop over a block 
+
+    # Overrides convenience function loop, to add ability to loop over a block
     # if supplied, otherwise perform as the PApplet class would
     def loop(&block)
       if block_given?
@@ -57,14 +53,14 @@ module Processing
         super
       end
     end
-    
+
     # Overrides Processing convenience function thread, which takes a String
-    # arg (for a function) to more rubylike version, takes a block...    
+    # arg (for a function) to more rubylike version, takes a block...
     def thread(*args, &block)
       if block_given?
         Thread.new *args, &block
       else
-        raise ArgumentError, "thread must be called with a block" , caller    
+        raise ArgumentError, 'thread must be called with a block' , caller
       end
     end
 
@@ -72,7 +68,7 @@ module Processing
     # Here's a convenient way to look for them.
     def find_method(method_name)
       reg = Regexp.new("#{method_name}", true)
-      self.methods.sort.select {|meth| reg.match(meth)}
+      self.methods.sort.select { |meth| reg.match(meth) }
     end
 
     # Proxy over a list of Java declared fields that have the same name as
@@ -80,12 +76,12 @@ module Processing
     def proxy_java_fields
       @declared_fields = {}
       fields = %w(sketchPath key frameRate frame mousePressed keyPressed)
-      fields.each {|f| @declared_fields[f] = java_class.declared_field(f) }
+      fields.each { |f| @declared_fields[f] = java_class.declared_field(f) }
     end
 
     # By default, your sketch path is the folder that your sketch is in.
     # If you'd like to do something fancy, feel free.
-    def set_sketch_path(path=nil)
+    def set_sketch_path(path = nil)
       field = @declared_fields['sketchPath']
       field.set_value(java_self, path || SKETCH_ROOT)
     end
@@ -139,12 +135,12 @@ module Processing
 
     # Is the mouse pressed for this frame?
     def mouse_pressed?
-      field =  @declared_fields['mousePressed'].value(java_self)
+      @declared_fields['mousePressed'].value(java_self)
     end
 
     # Is a key pressed for this frame?
-    def key_pressed? 
-      field =  @declared_fields['keyPressed'].value(java_self)
+    def key_pressed?
+      @declared_fields['keyPressed'].value(java_self)
     end
   end
-end
+end

data/lib/ruby-processing/helpers/numeric.rb

@@ -1,11 +1,10 @@
 class Numeric #:nodoc
-  
+
   def degrees
-    self*180/Math::PI
+    self * 180 / Math::PI
   end
-  
+
   def radians
-    self*Math::PI/180
+    self * Math::PI / 180
   end
-
-end
+end

data/lib/ruby-processing/helpers/string.rb

@@ -1,35 +1,26 @@
 class String #:nodoc:
-  
+
   def titleize
     self.underscore.humanize.gsub(/\b([a-z])/) { $1.capitalize }
   end
-  
+
   def humanize()
-    self.gsub(/_id$/, "").gsub(/_/, " ").capitalize
+    self.gsub(/_id$/, '').gsub(/_/, ' ').capitalize
   end
-  
+
   def camelize(first_letter_in_uppercase = true)
     if first_letter_in_uppercase
-      self.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+      self.gsub(/\/(.?)/) { '::' + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
     else
       self.first + self.camelize[1..-1]
     end
   end
-  
+
   def underscore
-    self.gsub(/::/, '/').
-      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-      gsub(/([a-z\d])([A-Z])/,'\1_\2').
-      tr("-", "_").
-      downcase
+    self.gsub(/::/, '/')
+      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+      .tr('-', '_')
+      .downcase
   end
-  
-  # String.ord is Ruby 1.9, so this is a little fix for R 1.8 
-  # to make it forward compatible and readable
-  unless String.method_defined? :ord
-  	def ord
-  		self[0]
-  	end
-  end  
-  
 end

data/lib/ruby-processing/library_loader.rb

@@ -3,10 +3,10 @@ module Processing
     attr_reader :sketchbook_library_path
 
     def initialize
-      @sketchbook_library_path = File.join(find_sketchbook_path || "", "libraries")
+      @sketchbook_library_path = File.join(find_sketchbook_path || '', 'libraries')
       @loaded_libraries = Hash.new(false)
     end
-      
+
     # Detect if a library has been loaded (for conditional loading)
     def library_loaded?(library_name)
       @loaded_libraries[library_name.to_sym]
@@ -39,12 +39,11 @@ module Processing
         end
       end
 
-      path = get_library_paths(library_name, "rb").first
+      path = get_library_paths(library_name, 'rb').first
       return false unless path
       return @loaded_libraries[library_name] = (require path)
     end
 
-
     # For pure java libraries, such as the ones that are available
     # on this page: http://processing.org/reference/libraries/index.html
     #
@@ -54,50 +53,50 @@ module Processing
     def load_java_library(library_name)
       library_name = library_name.to_sym
       return true if @loaded_libraries[library_name]
-      path = get_library_directory_path(library_name, "jar")
-      jars = get_library_paths(library_name, "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 }
 
       platform_specific_library_paths = get_platform_specific_library_paths(path)
       platform_specific_library_paths = platform_specific_library_paths.select do |path|
-        test(?d, path) && !Dir.glob(File.join(path, "*.{so,dll,jnilib}")).empty?
+        test(?d, path) && !Dir.glob(File.join(path, '*.{so,dll,jnilib}')).empty?
       end
 
       if !platform_specific_library_paths.empty?
-        platform_specific_library_paths << java.lang.System.getProperty("java.library.path")
+        platform_specific_library_paths << java.lang.System.getProperty('java.library.path')
         new_library_path = platform_specific_library_paths.join(java.io.File.pathSeparator)
 
-        java.lang.System.setProperty("java.library.path", new_library_path)
+        java.lang.System.setProperty('java.library.path', new_library_path)
 
-        field = java.lang.Class.for_name("java.lang.ClassLoader").get_declared_field("sys_paths")
+        field = java.lang.Class.for_name('java.lang.ClassLoader').get_declared_field('sys_paths')
         if field
           field.accessible = true
-          field.set(java.lang.Class.for_name("java.lang.System").get_class_loader, nil)
+          field.set(java.lang.Class.for_name('java.lang.System').get_class_loader, nil)
         end
       end
       return @loaded_libraries[library_name] = true
     end
 
     def get_platform_specific_library_paths(basename)
-      bits = "universal"  # for MacOSX, but does this even work, or does Mac return "64"?
-      if java.lang.System.getProperty("sun.arch.data.model") == "32" || 
-        java.lang.System.getProperty("java.vm.name").index("32")
-        bits = "32"
-      elsif java.lang.System.getProperty("sun.arch.data.model") == "64" || 
-        java.lang.System.getProperty("java.vm.name").index("64")
-        bits = "64"
+      bits = 'universal'  # for MacOSX, but does this even work, or does Mac return '64'?
+      if java.lang.System.getProperty('sun.arch.data.model') == '32' ||
+        java.lang.System.getProperty('java.vm.name').index('32')
+        bits = '32'
+      elsif java.lang.System.getProperty('sun.arch.data.model') == '64' ||
+        java.lang.System.getProperty('java.vm.name').index('64')
+        bits = '64'
       end
 
-      match_string, platform = {"Mac" => "macosx", "Linux" => "linux", "Windows" => "windows" }.detect do |string, platform_|
-        java.lang.System.getProperty("os.name").index(string)
+      _match_string_, platform = {'Mac' => 'macosx', 'Linux' => 'linux', 'Windows' => 'windows' }.detect do |string, _platform_|
+        java.lang.System.getProperty('os.name').index(string)
       end
-      platform ||= "other"
-      [ platform, platform+bits ].collect { |p| File.join(basename, p) }
+      platform ||= 'other'
+      [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 = get_library_directory_path(library_name, extension)
       Dir.glob("#{dir}/*.{rb,jar}")
     end
 
@@ -107,12 +106,12 @@ module Processing
       extensions = extension ? [extension] : %w{jar rb}
       extensions.each do |ext|
         [ "#{SKETCH_ROOT}/library/#{library_name}",
-          "#{Processing::CONFIG["PROCESSING_ROOT"]}/modes/java/libraries/#{library_name}/library",
-          "#{RP5_ROOT}/library/#{library_name}/library", 
-          "#{RP5_ROOT}/library/#{library_name}", 
+          "#{Processing::RB_CONFIG['PROCESSING_ROOT']}/modes/java/libraries/#{library_name}/library",
+          "#{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| 
+          "#{@sketchbook_library_path}/#{library_name}"
+        ].each do |path|
           if File.exist?(path) && !Dir.glob(path + "/*.#{ext}").empty?
             return path
           end
@@ -124,14 +123,14 @@ module Processing
     def find_sketchbook_path
       preferences_paths = []
       sketchbook_paths = []
-      if sketchbook_path = Processing::CONFIG["sketchbook_path"]
+      if sketchbook_path = Processing::RB_CONFIG['sketchbook_path']
         return File.expand_path(sketchbook_path)
       else
-        ["'Application Data/Processing'", "AppData/Roaming/Processing", 
-         "Library/Processing", "Documents/Processing", 
-         ".processing", "sketchbook"].each do |prefix|
-          path = "#{ENV["HOME"]}/#{prefix}"
-          pref_path = path+"/preferences.txt"
+        ["'Application Data/Processing'", 'AppData/Roaming/Processing',
+         'Library/Processing', 'Documents/Processing',
+         '.processing', 'sketchbook'].each do |prefix|
+          path = "#{ENV['HOME']}/#{prefix}"
+          pref_path = path+'/preferences.txt'
           if test(?f, pref_path)
             preferences_paths << pref_path
           end
@@ -148,6 +147,5 @@ module Processing
         return sketchbook_path
       end
     end
-    
   end
 end