ruby-processing 2.6.6 → 2.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adc61b4d1f9863347b5dad489be21b9e11175b73
-  data.tar.gz: 47b8d8b0468f353e62e8e7d3ed39dfc898ae5861
+  metadata.gz: 66a5c0578c17ec6e9ace637abb2626d7c4907549
+  data.tar.gz: 711c1d6afedd64b8ca08956f7fd86a76db6841ea
 SHA512:
-  metadata.gz: ec80fa518a755bffba552c7dbada41cd2ceb56b2152d63c41374245fad0b1fc617f4f43b54a80239273201be5f2d8da8e9793c44b3c5c0399db85e4869b86ded
-  data.tar.gz: 31caff147a9a4acd94db75b20c96b4d2e8694cdeefc176466b5c35f6316b66cee10a4e271fe871d7ce14808810f076d2ff1f31813961a05009a7fc9b540e5529
+  metadata.gz: 3d8d40e8e3a1b996de6071faf63b0b8f9b2ac912a7d8564c93bb94c18ccea8641f67e019cc7090fd879539de2649554070318d7a090620bda3c59b59ef81f1e8
+  data.tar.gz: a193bb65ae7813300bc723a478d543e457a9b4fedd6c97e1e5d506c78ee43eebfbc543962ccdc6ea3504090ad1c5b170bda7c07e654d7a568b17165fb23e0904

data/lib/ruby-processing.rb

@@ -9,7 +9,6 @@ end
 SKETCH_ROOT ||= Dir.pwd
 
 require 'ruby-processing/version'
-require 'ruby-processing/helpers/string'
 require 'ruby-processing/helpers/numeric'
 require 'ruby-processing/helpers/range'
 

data/lib/ruby-processing/app.rb

@@ -4,6 +4,7 @@
 # web applets, going fullscreen and so on.
 require 'java'
 require_relative '../ruby-processing/helper_methods'
+require_relative '../ruby-processing/helpers/string_extra'
 require_relative '../ruby-processing/library_loader'
 require_relative '../ruby-processing/config'
 
@@ -185,10 +186,8 @@ module Processing
       x = options.fetch(:x, xc)
       y = options.fetch(:y, yc)
       args << "--location=#{x},#{y}"  # important no spaces here
-      title = options.fetch(
-        :title,
-        File.basename(SKETCH_PATH).sub(/(\.rb)$/, '').titleize
-        )
+      string_extra = StringExtra.new(File.basename(SKETCH_PATH).sub(/(\.rb)$/, ''))
+      title = options.fetch(:title, string_extra.titleize)
       args << title
       PApplet.run_sketch(args.to_java(:string), self)
     end

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

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'erb'
 require_relative '../library_loader'
+require_relative '../helpers/string_extra'
 
 module Processing
   # This base exporter implements some of the common
@@ -42,8 +43,9 @@ module Processing
 
     # Searches the source for a title.
     def extract_title(source)
+      generated_title = StringExtra.new(File.basename(@file, '.rb')).titleize
       match = source.match(/#{@info[:class_name]}\.new.*?:title\s=>\s["'](.+?)["']/m)
-      match ? match[1] : File.basename(@file, '.rb').titleize
+      match ? match[1] : generated_title
     end
 
     # Searches the source for the width and height of the sketch.

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

@@ -50,11 +50,14 @@ end
 CODE
 
 module Processing
+  require_relative '../helpers/string_extra'
+  require_relative '../helpers/camel_string'
   # Write file to disk
   class SketchWriter
     attr_reader :file
     def initialize(path)
-      @file = "#{File.dirname(path)}/#{path.underscore}.rb"
+      underscore = StringExtra.new(path).underscore
+      @file = "#{File.dirname(path)}/#{underscore}.rb"
     end
 
     def save(template)
@@ -69,7 +72,8 @@ module Processing
     ALL_DIGITS = /\A\d+\Z/
 
     def already_exist(path)
-      new_file = "#{File.dirname(path)}/#{path.underscore}.rb"
+      underscore = StringExtra.new(path).underscore
+      new_file = "#{File.dirname(path)}/#{underscore}.rb"
       return if !File.exist?(path) && !File.exist?(new_file)
       puts 'That file already exists!'
       exit
@@ -131,9 +135,9 @@ module Processing
       main_file = File.basename(path, '.rb') # allow uneeded extension input
       # Check to make sure that the main file doesn't exist already
       already_exist(path)
-      @name = main_file.camelize
+      @name = CamelString.new(main_file).camelize
       writer = SketchWriter.new(main_file)
-      @title = main_file.titleize
+      @title = StringExtra.new(main_file).titleize
       @width, @height = args[0], args[1]
       @mode = args[2].upcase unless args[2].nil?
       template = @mode.nil? ? class_template : class_template_mode

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

@@ -0,0 +1,18 @@
+require 'forwardable'
+
+# Avoid the monkey patching of String for camelize
+class CamelString
+  extend Forwardable
+  def_delegators(:@string, *String.public_instance_methods(false))
+  def initialize(str = 'no_name')
+    @string = (str.length > 60) ? 'long_name' : str
+  end
+
+  def camelize(first_letter_in_uppercase = true)
+    if first_letter_in_uppercase
+      @string.gsub(/\/(.?)/) { '::' + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+    else
+      @string[0] + camelize[1..-1]
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+require 'forwardable'
+
+# Avoid the monkey patching of String for underscore/titleize/humanize
+class StringExtra
+  extend Forwardable
+  def_delegators(:@string, *String.public_instance_methods(false))
+  def initialize(str = 'no_name')
+    @string = (str.length > 60) ? 'long_name' : str
+  end
+
+  def titleize
+    gsub(/::/, '/')
+      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+      .tr('-', '_')
+      .downcase
+      .gsub(/_id$/, '')
+      .gsub(/_/, ' ').capitalize
+      .gsub(/\b([a-z])/) { $1.capitalize }
+  end
+
+  def humanize
+    gsub(/_id$/, '').gsub(/_/, ' ').capitalize
+  end
+
+  def underscore
+    gsub(/::/, '/')
+      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+      .tr('-', '_')
+      .downcase
+  end
+end

data/lib/ruby-processing/runner.rb

@@ -33,7 +33,7 @@ module Processing
 
     Examples:
     rp5 setup unpack_samples
-    rp5 run samples/contributed/jwishy.rb
+    rp5 run rp_samples/samples/contributed/jwishy.rb
     rp5 create some_new_sketch 640 480 p3d (P3D mode example)
     rp5 create some_new_sketch 640 480 --wrap (a class wrapped default sketch)
     rp5 watch some_new_sketch.rb

data/lib/ruby-processing/version.rb

@@ -1,3 +1,3 @@
 module RubyProcessing
-  VERSION = '2.6.6'
+  VERSION = '2.6.7'
 end

data/vendors/Rakefile

@@ -8,8 +8,8 @@ WARNING = <<-EOS
       
 EOS
 
-JRUBYC_VERSION     = '1.7.18'
-EXAMPLES           = '1.2'
+JRUBYC_VERSION     = '1.7.19'
+EXAMPLES           = '1.4'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os'] 
 
@@ -27,7 +27,7 @@ file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   rescue
     warn(WARNING)
   end
-  check_sha1("jruby-complete-#{JRUBYC_VERSION}.jar", "a1be3e1790aace5c99614a87785454d875eb21c2")
+  check_sha1("jruby-complete-#{JRUBYC_VERSION}.jar", "9973923de511c06d979e950801b51a95d19e8be3")
 end
 
 directory "../lib/ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-processing
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.6.7
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -18,7 +18,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -111,9 +111,10 @@ files:
 - lib/ruby-processing/exporters/base_exporter.rb
 - lib/ruby-processing/exporters/creator.rb
 - lib/ruby-processing/helper_methods.rb
+- lib/ruby-processing/helpers/camel_string.rb
 - lib/ruby-processing/helpers/numeric.rb
 - lib/ruby-processing/helpers/range.rb
-- lib/ruby-processing/helpers/string.rb
+- lib/ruby-processing/helpers/string_extra.rb
 - lib/ruby-processing/library_loader.rb
 - lib/ruby-processing/runner.rb
 - lib/ruby-processing/runners/base.rb

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

@@ -1,25 +0,0 @@
-class String #:nodoc:
-  def titleize
-    underscore.humanize.gsub(/\b([a-z])/) { $1.capitalize }
-  end
-
-  def humanize
-    gsub(/_id$/, '').gsub(/_/, ' ').capitalize
-  end
-
-  def camelize(first_letter_in_uppercase = true)
-    if first_letter_in_uppercase
-      gsub(/\/(.?)/) { '::' + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
-    else
-      first + camelize[1..-1]
-    end
-  end
-
-  def underscore
-    gsub(/::/, '/')
-      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-      .tr('-', '_')
-      .downcase
-  end
-end