jruby_art 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96ea5bf6d9711bdc36b0aaf432aecfc58063f9bf
-  data.tar.gz: c8d61f759538b91eb39f0787d9385f6fc539674d
+  metadata.gz: 2b2acc334aa2bcb49c4c0ea1c80699bf8994d5bf
+  data.tar.gz: 1b055e648c9ff3a3c5cc6411d014579b3d54337b
 SHA512:
-  metadata.gz: a83c65f9b8d7c927c3aac436f58e51eea66bcc2105d39bc56269a95a174b22647301efcffaeded3fea88853e1b64a8442d1136f07086e1d169779f1da45a16e8
-  data.tar.gz: 9f378b5748571551737679735fda13c52c79cabf6b698472a81cbc40875ee40b798b0ec3e4d4399c35247ff57ac41eeee5cc1b42920a4116fd6c9c95028f6476
+  metadata.gz: d6fd3f7733ba107fa41f292250b14daedbb259cb021b089d67c1c8c1f9573627d558d796c7f73a32b19348eac210c2e0acb19ed4408da1488aff65d1258bffea
+  data.tar.gz: b87e7cc558472028e995a781df15e353e6c7f72b0a47476b36a2df0d012334202fe88dd15b7e528d4308c74ab76e2dd167546b9a687de174f4a579ce2d9e5dfd

data/lib/jruby_art/helper_methods.rb

@@ -71,13 +71,14 @@ module Processing
 
     # explicitly provide 'processing.org' dist instance method
     def dist(*args)
-      len = args.length
-      if len == 4
+      case args.length
+      when 4
         return dist2d(*args)
-      elsif len == 6
+      when 6
         return dist3d(*args)
+      else
+        fail ArgumentError, 'takes 4 or 6 parameters'
       end
-      fail ArgumentError, 'takes 4 or 6 parameters'
     end
 
     # Uses PImage class method under hood
@@ -161,15 +162,22 @@ module Processing
 
     private
 
+    FIXNUM_COL = -> (x) { x.is_a?(Fixnum) }
+    STRING_COL = -> (x) { x.is_a?(String) }
+    FLOAT_COL = -> (x) { x.is_a?(Float) }
     # parse single argument color int/double/String
     def hex_color(a)
-      if a.is_a?(Fixnum)
-        return Java::Monkstone::ColorUtil.colorLong(a)
-      elsif a.is_a?(String)
+      case a
+      when FIXNUM_COL
+        Java::Monkstone::ColorUtil.colorLong(a)
+      when STRING_COL
         return Java::Monkstone::ColorUtil.colorString(a) if a =~ /#\h+/
         fail StandardError, 'Dodgy Hexstring'
+      when FLOAT_COL
+        Java::Monkstone::ColorUtil.colorDouble(a)
+      else
+        fail StandardError, 'Dodgy Color Conversion'
       end
-      Java::Monkstone::ColorUtil.colorDouble(a)
     end
 
     def dist2d(*args)

data/lib/jruby_art/runner.rb

@@ -24,7 +24,7 @@ module Processing
     watch:            watch for changes on the file and relaunch it on the fly
     live:             run sketch and open a pry console bound to $app
     create [width height][mode][flag]: create a new sketch.
-    setup:            check setup, install jruby-complete, unpack samples
+    setup:            check / install / unpack_samples
 
     Common options:
     --nojruby:  use jruby-complete in place of an installed version of jruby

data/lib/jruby_art/version.rb

@@ -1,4 +1,4 @@
 # A wrapper for version
 module JRubyArt
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/library/control_panel/control_panel.rb

@@ -146,9 +146,9 @@ module ControlPanel
     def look_feel(lf)
       set_feel(lf)
     end
-    
+
     private
-    
+
     def set_feel(lf = 'metal')
       lafinfo = javax.swing.UIManager.getInstalledLookAndFeels
       laf = lafinfo.select do |info|
@@ -161,7 +161,7 @@ module ControlPanel
   # instance methods module
   module InstanceMethods
     def control_panel
-      @control_panel = ControlPanel::Panel.new unless @control_panel
+      @control_panel ||= ControlPanel::Panel.new
       return @control_panel unless block_given?
       yield(@control_panel)
       @control_panel.display

data/vendors/Rakefile

@@ -8,7 +8,7 @@ WARNING = <<-EOS
       
 EOS
 
-JRUBYC_VERSION     = '9.0.4.0'
+JRUBYC_VERSION     = '9.0.5.0'
 EXAMPLES           = '1.3'
 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_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "3b87fc20a8e51e56632d6b0f7a00b5906f5ecd6c6642f9c189105307103220e8")
+  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "7fe1054bf6085f24b9e3069d3e93abf8f17d1448f503eaea2042f98bce2a1d43")
 end
 
 directory "../lib/ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -42,7 +42,7 @@ dependencies:
         version: '5.8'
 description: |2
     JRubyArt is a ruby wrapper for the processing art framework.
-    The current version supports processing-3.0.1, and uses jruby-9.0.4.0
+    The current version supports processing-3.0.1, and uses jruby-9.0.5.0
     as the glue between ruby and java. You can use both processing libraries and ruby
     gems in your sketches. Features create/run/watch/live modes. The "watch" mode,
     provides a nice REPL-ish way to work on your processing sketches. Includes:-