rubysketch 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b5455321365a6f09ff9b1b2fc60610475a1d5393a41b276d433e1030503a1dc
-  data.tar.gz: 159b3ec3b99acf5d95e0d833ccbddc8df382ae7b09c77e1b6e4058ef16d29b9f
+  metadata.gz: cb7fa5f9cc69b67a9339f9f7170c8901999d0007e6b6e74de7d7b55b36bc09d3
+  data.tar.gz: c5158bda3a8ac90ec2255c3bfda5f8c3dbb8e9815bd74b9d5df0f8bfa601024e
 SHA512:
-  metadata.gz: e85a61ae56932d886029b57ab86085c8db14fa817527da37983822a0d37469352f53b53cdbe103fe3c92de31f6424b0ba44c5eee29605976a0756dea89307fea
-  data.tar.gz: 1d6d641becbe81d1a692f2a0fcf016c1f15ac743699e97d0e3bb9f1e0078f6883f3613b0aafb027fba922ceacfee718e768739a7e9a1ecb1aaca38a5141b22a6
+  metadata.gz: b691e41b1e7ba08ad1a732f81333febe97cc68e30244ad7f8aea76b7660b7af5b47ae60542610f797340cc25bf9bc6f673dc893a19dd27e0b83583a19a8c99d8
+  data.tar.gz: 969de4e7e4f840c590c0758af55a53bb28838b05cf63a84d9c389bd99b5493df23cb06a5020f25c8531a906d67be4da014b5e888929e4734c83f18d6f47a87e0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/examples/image.rb

@@ -5,7 +5,7 @@
 require 'rubysketch-processing'
 
 
-icon = loadImage 'rubysketch.png'
+icon = loadImage 'https://xord.org/rubysketch/rubysketch.png'
 
 draw do
   background 0, 10

data/lib/rubysketch.rb

@@ -1,3 +1,8 @@
+require 'digest/sha1'
+require 'pathname'
+require 'tmpdir'
+require 'open-uri'
+
 require 'reflex'
 require 'rubysketch/module'
 require 'rubysketch/starter'

data/lib/rubysketch/processing.rb

@@ -487,7 +487,7 @@ module RubySketch
     # @return [nil] nil
     #
     def colorMode (mode, *maxes)
-      raise ArgumentError, "Invalid color mode: #{mode}" unless [RGB, HSB].include?(mode)
+      raise ArgumentError, "invalid color mode: #{mode}" unless [RGB, HSB].include?(mode)
       raise ArgumentError unless [0, 1, 3, 4].include?(maxes.size)
 
       @hsbColor__ = mode.upcase == HSB
@@ -499,9 +499,9 @@ module RubySketch
     end
 
     # @private
-    private def to_rgba__ (*args)
+    private def toRGBA__ (*args)
       a, b, c, d = args
-      return parse_color__(a, b || alphaMax__) if a.kind_of?(String)
+      return parseColor__(a, b || alphaMax__) if a.kind_of?(String)
 
       rgba = case args.size
         when 1, 2 then [a, a, a, b || alphaMax__]
@@ -514,9 +514,9 @@ module RubySketch
     end
 
     # @private
-    private def parse_color__ (str, alpha)
+    private def parseColor__ (str, alpha)
       result = str.match /^\s*##{'([0-9a-f]{2})' * 3}\s*$/i
-      raise ArgumentError, "Invalid color code: '#{str}'" unless result
+      raise ArgumentError, "invalid color code: '#{str}'" unless result
 
       rgb = result[1..3].map.with_index {|hex, i| hex.to_i(16) / 255.0}
       return *rgb, (alpha / alphaMax__)
@@ -537,13 +537,13 @@ module RubySketch
       @angleScale__ = case mode
         when RADIANS then RAD2DEG__
         when DEGREES then 1.0
-        else raise ArgumentError, "Invalid angle mode: #{mode}"
+        else raise ArgumentError, "invalid angle mode: #{mode}"
       end
       nil
     end
 
     # @private
-    private def to_angle__ (angle)
+    private def toAngle__ (angle)
       angle * @angleScale__
     end
 
@@ -578,7 +578,7 @@ module RubySketch
     end
 
     # @private
-    private def to_xywh__ (mode, a, b, c, d)
+    private def toXYWH__ (mode, a, b, c, d)
       case mode
       when CORNER  then [a,           b,           c,     d]
       when CORNERS then [a,           b,           c - a, d - b]
@@ -607,7 +607,7 @@ module RubySketch
     # @return [nil] nil
     #
     def background (*args)
-      rgba = to_rgba__ *args
+      rgba = toRGBA__ *args
       if rgba[3] == 1
         @painter__.background *rgba
       else
@@ -637,7 +637,7 @@ module RubySketch
     # @return [nil] nil
     #
     def fill (*args)
-      @painter__.fill(*to_rgba__(*args))
+      @painter__.fill(*toRGBA__(*args))
       nil
     end
 
@@ -660,7 +660,7 @@ module RubySketch
     # @return [nil] nil
     #
     def stroke (*args)
-      @painter__.stroke(*to_rgba__(*args))
+      @painter__.stroke(*toRGBA__(*args))
       nil
     end
 
@@ -763,7 +763,7 @@ module RubySketch
     # @return [nil] nil
     #
     def rect (a, b, c, d, *args)
-      x, y, w, h = to_xywh__ @rectMode__, a, b, c, d
+      x, y, w, h = toXYWH__ @rectMode__, a, b, c, d
       case args.size
         when 0 then @painter__.rect x, y, w, h
         when 1 then @painter__.rect x, y, w, h, round: args[0]
@@ -783,7 +783,7 @@ module RubySketch
     # @return [nil] nil
     #
     def ellipse (a, b, c, d)
-      x, y, w, h = to_xywh__ @ellipseMode__, a, b, c, d
+      x, y, w, h = toXYWH__ @ellipseMode__, a, b, c, d
       @painter__.ellipse x, y, w, h
       nil
     end
@@ -812,9 +812,9 @@ module RubySketch
     # @return [nil] nil
     #
     def arc (a, b, c, d, start, stop)
-      x, y, w, h = to_xywh__ @ellipseMode__, a, b, c, d
-      start      = to_angle__ start
-      stop       = to_angle__ stop
+      x, y, w, h = toXYWH__ @ellipseMode__, a, b, c, d
+      start      = toAngle__ start
+      stop       = toAngle__ stop
       @painter__.ellipse x, y, w, h, from: start, to: stop
       nil
     end
@@ -936,7 +936,7 @@ module RubySketch
     # @return [nil] nil
     #
     def rotate (angle)
-      @painter__.rotate to_angle__ angle
+      @painter__.rotate toAngle__ angle
       nil
     end
 
@@ -954,7 +954,7 @@ module RubySketch
     # @return [nil] nil
     #
     def popMatrix ()
-      raise "Matrix stack underflow" if @matrixStack__.empty?
+      raise "matrix stack underflow" if @matrixStack__.empty?
       @painter__.matrix = @matrixStack__.pop
       nil
     end
@@ -992,7 +992,7 @@ module RubySketch
     # @return [nil] nil
     #
     def popStyle ()
-      raise "Style stack underflow" if @styleStack__.empty?
+      raise "style stack underflow" if @styleStack__.empty?
       @painter__.fill,
       @painter__.stroke,
       @painter__.stroke_width,
@@ -1039,12 +1039,34 @@ module RubySketch
 
     # Loads image.
     #
-    # @param filename [String] file name to load image
+    # @param filename  [String] file name to load image
+    # @param extension [String] type of image to load (ex. 'png')
     #
-    def loadImage (filename)
+    def loadImage (filename, extension = nil)
+      filename = getImage__ filename, extension if filename =~ %r|^https?://|
       Image.new Rays::Image.load filename
     end
 
+    # @private
+    private def getImage__ (uri, ext)
+      ext ||= File.extname uri
+      raise "unsupported image type" unless ext =~ /^\.?(png)$/i
+
+      tmpdir = Pathname(Dir.tmpdir) + Digest::SHA1.hexdigest(self.class.name)
+      path   = tmpdir + Digest::SHA1.hexdigest(uri)
+      path   = path.sub_ext ext
+
+      URI.open uri do |input|
+        tmpdir.mkdir unless tmpdir.directory?
+        path.open('w') do |output|
+          while buf = input.read(2 ** 16)
+            output.write buf
+          end
+        end
+      end
+      path.to_s
+    end
+
   end# Processing
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -111,7 +111,6 @@ files:
 - examples/glsl.rb
 - examples/hello.rb
 - examples/image.rb
-- examples/rubysketch.png
 - examples/shapes.rb
 - lib/rubysketch-processing.rb
 - lib/rubysketch.rb