p5rb 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2aeb9b49c2eeadc91b80d5c207e65e71d510ec41
-  data.tar.gz: cb3054c7c311fa1862f9395b5ff1762e055421e3
+SHA256:
+  metadata.gz: b79ebfd6c7fa06d28955e916d1dd8c40f550eac344f03b7eaf65f6281c3bed2f
+  data.tar.gz: f2b2555f10efd15b009e146dc232a3b947514960cb81c81487bc0c8d39e205e1
 SHA512:
-  metadata.gz: '074992392feb37241a790014a43b600f30f513c4307fcfddd24c0db3820eb7d69c97088fd9e44ec65ca18315133b076897ceae2487af321e38f8e2417bbff3cb'
-  data.tar.gz: 9f1a3b74222b8d23a38cedaae63ad2d078f1e402039cbe5f767d368081a386d5dbbbeeb1a28b0db65041b5ccec5d1b2aa6b68ecfe087be9e4c41c35ec788df09
+  metadata.gz: 5f7ccdcb0a16223887864366aeb2957adb705d8a96bbb60f51195bda826acad9e4a7a67ae925e82f5e7f35c4fdfca2641fac32eb560e8c7d01c9ae280760e008
+  data.tar.gz: ee31129a27f4073937c6bb5c2bdffbcc41c9b1ae29ccb425ee7d49b1bbcca391747461899544e21bd30557d0c1fa51d5f4460d5b62f410de580fa3b01909cc72

data/lib/p5rb.rb

@@ -3,87 +3,200 @@ module P5
     attr_reader :buffer_setup
     attr_reader :buffer_draw
   end
-  instance_variable_set :@buffer_setup, []
-  instance_variable_set :@buffer_draw, []
+  @buffer_setup = []
+  @buffer_draw = []
 
-  @buffer = []
-  class << self
-    def background color
-      @buffer.push "background(#{color})"
-    end
-    def noStroke
-      @buffer.push "noStroke()"
-    end
-    def stroke color
-      @buffer.push "stroke(#{color})"
-    end
-    def translate x, y
-      @buffer.push "translate(#{x}, #{y})"
-    end
-    def circle x, y, r
-      @buffer.push "circle(#{x}, #{y}, #{r})"
-    end
-    def ellipse *args
-      @buffer.push "ellipse(#{args.join ?,})"
-    end
-    def fill color, alpha = nil
-      @buffer.push "fill(#{color}#{", #{alpha}" if alpha})"
-    end
-    def rect x, y, w, h, fill: nil
-      (@buffer.push "push()"; fill fill) if fill
-      @buffer.push "rect(#{x}, #{y}, #{w}, #{h})"
-      @buffer.push "pop()" if fill
-    end
-    def point x, y
-      @buffer.push "point(#{x}, #{y})"
-    end
-    def textSize size
-      @buffer.push "textSize(#{size})"
-    end
-    def textAlign *args
-      @buffer.push "textAlign(#{args.join ", "})"
-    end
-    def text text, x, y, fill: nil
-      (@buffer.push "push()"; fill fill) if fill
-      @buffer.push "text(#{text.inspect}, #{x}, #{y})"
-      @buffer.push "pop()" if fill
+  module Block
+    class << self
+      attr_writer :buffer
+      def raw _
+        @buffer.push _
+      end
+      def background color
+        @buffer.push "background(#{color})"
+      end
+      def noStroke
+        @buffer.push "noStroke()"
+      end
+      def stroke color
+        @buffer.push "stroke(#{color})"
+      end
+      def translate x, y
+        @buffer.push "translate(#{x}, #{y})"
+      end
+      def line x1, y1, x2, y2
+        @buffer.push "line(#{x1}, #{y1}, #{x2}, #{y2})"
+      end
+      def circle x, y, r
+        @buffer.push "circle(#{x}, #{y}, #{r})"
+      end
+      def ellipse *args   # not tested yet
+        @buffer.push "ellipse(#{args.join ?,})"
+      end
+      def fill color, alpha = nil
+        @buffer.push "fill(#{color}#{", #{alpha}" if alpha})"
+      end
+      def rect x, y, w, h, fill: nil
+        (@buffer.push "push()"; fill fill) if fill
+        @buffer.push "rect(#{x}, #{y}, #{w}, #{h})"
+        @buffer.push "pop()" if fill
+      end
+      def point x, y
+        @buffer.push "point(#{x}, #{y})"
+      end
+      def textSize size
+        @buffer.push "textSize(#{size})"
+      end
+      def textAlign *args
+        @buffer.push "textAlign(#{args.join ", "})"
+      end
+      def textWidth text
+        @buffer.push "textWidth(#{text.inspect})"
+      end
+      def textAscent text
+        @buffer.push "textAscent(#{text.inspect})"
+      end
+      def text text, x, y, fill: nil
+        (@buffer.push "push()"; fill fill) if fill
+        @buffer.push "text(#{text.inspect}, #{x}, #{y})"
+        @buffer.push "pop()" if fill
+      end
+      def map *args
+        "map(#{args.join ", "})"
+      end
     end
+  end
 
+  class << self
     def setup &block
-      module_eval &block
-      @buffer_setup = @buffer
-      @buffer = []
+      ::P5::Block.buffer = @buffer_setup
+      ::P5::Block.module_eval &block
     end
-    def draw &block
-      module_eval &block
-      @buffer_draw = @buffer
-      @buffer = []
+    def draw &block   # not tested yet
+      ::P5::Block.buffer = @buffer_draw
+      ::P5::Block.module_eval &block
     end
+  end
 
+  class << self
+    def plot_scatter data, reverse_y: false
+      size = 1000
+      max = nil
+      (x_range, x_from, x_to, x_enum, x_f),
+      (y_range, y_from, y_to, y_enum, y_f) = data.transpose.map do |axis|
+        min, max = axis.minmax
+        range = (min - max).abs
+        division = 10**Math::log10(range).floor
+        from = min.div(division)*division
+        to = -(-max).div(division)*division
+        [
+          to - from,
+          from, to,
+          from.step(to, division),
+        ]
+      end
+      max = [x_range, y_range].max
+      x_f = ->_{ 20 + (size-40.0) * (_ - x_from) / max }
+      y_f = ->_{ 20 + (size-40.0) * (reverse_y ? y_to - _ : _ - y_from) / max }
+      P5 40 + (size-40.0) * x_range / max + 50,   # TODO: properly fix the issue that with wide labels the right end of the plot may be cut off
+         40 + (size-40.0) * y_range / max do
+        setup do
+          textSize 15
+          raw "const w = max([#{y_enum.map{ |_| "textWidth(#{_})" }.join ?,}])"
+          raw "translate(w, 15)"
+          stroke 200
+          textAlign :CENTER, :BOTTOM; x_enum.each{ |_| line x_f[_], y_f[y_from], x_f[_], y_f[y_to]; text _, x_f[_], 20-5 }
+          textAlign :RIGHT, :CENTER;  y_enum.each{ |_| line x_f[x_from], y_f[_], x_f[x_to], y_f[_]; text _, x_f[x_from]-5, y_f[_] }
+          stroke 0
+          data.each{ |x,y| point x_f[x], y_f[y] }
+        end
+      end
+    end
+    def plot_bar_grouped data
+      # TODO: this is currently pretty much hardcoded for a time dates charting
+      cls = data.values.flat_map(&:keys).uniq.sort
+      size = cls.size + 1
+      from, to = data.keys.minmax
+      max = data.values.flat_map(&:values).max
+      P5 500, 500 do
+        setup do
+          noStroke
+          textAlign :CENTER
+          cls.each_with_index{ |_, i| text _, 50+400/(size-2)*i, 25, fill: %w{ 'red' 'green' 'blue' }[i] }
+          textAlign :RIGHT, :TOP
+          (from..to).each do |date|
+            y = map date.ajd.to_i, from.ajd.to_i, to.ajd.to_i, 50, 450
+            text date.strftime("%m-%d"), 45, y
+            rect 50, y,                            map(data.fetch(date,{})[cls[0]]||0, 0, max, 0, 400), 400/(to-from)/size, fill: "'red'"
+            rect 50, "#{y}+#{400/(to-from)/size}", map(data.fetch(date,{})[cls[1]]||0, 0, max, 0, 400), 400/(to-from)/size, fill: "'green'"
+            rect 50, "#{y}+#{800/(to-from)/size}", map(data.fetch(date,{})[cls[2]]||0, 0, max, 0, 400), 400/(to-from)/size, fill: "'blue'"
+          end
+        end
+      end
+    end
+    def plot_bar_stacked data, names, colorize
+      count = {}
+      max = data.map do |_, day|
+        day.each{ |k,v| count[k] ||= 0; count[k] += v }.map(&:last).reduce :+
+      end.max
+      pairs = {}
+      data.each_cons(2) do |(_, day1), (_, day2)|
+        (day1.map(&:first) & day2.map(&:first)).each{ |_| pairs[_] ||= 0; pairs[_] += 1 }
+      end
+      require "pcbr"
+      require "set"
+      pcbr = PCBR.new
+      count.max_by(colorize){ |k,v| v }.each{ |k,v| pcbr.store k, [-v, pairs[k]||0] }
+      top = pcbr.sorted
+      size = 500
+      P5 size, size do
+        setup do
+          noStroke
+          textAlign :RIGHT, :TOP
+          border = 25
+          left = "#{border} + textWidth(\"00-00 - 00-00\") + 5"
+          data.each_with_index do |(bin, day), i|
+            y1 = map i, 0, data.size, border, size-border
+            y2 = map i+1, 0, data.size, border, size-border
+            text bin, "#{left} - 5", y1
+            pos = 0
+            day.sort_by{ |k,| top.index(k) || top.size }.each do |k, v|
+              rect \
+                map(pos, 0, max, left, size-border), y1,
+                map(v, 0, max, 0, "#{size}-#{border}-(#{left})"), "#{y2}-#{y1}",
+                fill: top.include?(k) ? "color('hsl(#{(((3-Math.sqrt(5))*180 * top.index(k)) % 360).round}, 75%, 75%)')" : "color('hsl(0, 0%, 75%)')"
+              pos += v
+            end
+          end
+          top.each_with_index{ |id, i| text names[id].inspect[1..-2], size-border, "#{border} + textAscent('X') * #{i}", fill: "color('hsl(#{(((3-Math.sqrt(5))*180 * top.index(id)) % 360).round}, 75%, 75%)')" }
+        end
+      end
+    end
   end
 end
 
 def P5 width, height, &block
-  P5.module_eval &block
+  ::P5.module_eval &block
   <<~HEREDOC
     <html>
       <head>
+        <meta charset="UTF-8">
         <script src="https://github.com/processing/p5.js/releases/download/v1.4.2/p5.min.js"></script>
         <script>
           function setup() {
             createCanvas(#{width}, #{height});
 #{
-  P5.buffer_setup.join(";\n").gsub(/^/, ?\s*8)
+  ::P5.buffer_setup.join(";\n").gsub(/^/, ?\s*12)
 }
           }
           function draw() {
 #{
-  P5.buffer_draw.join(";\n").gsub(/^/, ?\s*8)
+  ::P5.buffer_draw.join(";\n").gsub(/^/, ?\s*12)
 }
           }
         </script>
       </head>
-      <body><main></main></body>
+      <body style="margin: 0"><main></main></body>
     </html>
   HEREDOC
 end

data/p5rb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "p5rb"
-  spec.version      = "0.0.1"
+  spec.version      = "0.0.3"
   spec.summary      = "Ruby DSL for p5.js"
 
   spec.author       = "Victor Maslov aka Nakilon"
@@ -8,5 +8,7 @@ Gem::Specification.new do |spec|
   spec.license      = "MIT"
   spec.metadata     = {"source_code_uri" => "https://github.com/nakilon/p5rb"}
 
+  spec.add_dependency "pcbr"
+
   spec.files        = %w{ LICENSE p5rb.gemspec lib/p5rb.rb }
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: p5rb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
-dependencies: []
+date: 2022-12-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: pcbr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: nakilon@gmail.com
 executables: []
@@ -39,8 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.3.25
 signing_key: 
 specification_version: 4
 summary: Ruby DSL for p5.js