p5rb 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2aeb9b49c2eeadc91b80d5c207e65e71d510ec41
-  data.tar.gz: cb3054c7c311fa1862f9395b5ff1762e055421e3
+SHA256:
+  metadata.gz: f5142534f423ae6b2e335259f2b2e949d0c67923caed5257b18536467cd071dc
+  data.tar.gz: 2d0fdb1a392ba9601bc82c0ca5ac5f281ea8b09dadf27f8a44800af2c0bf5683
 SHA512:
-  metadata.gz: '074992392feb37241a790014a43b600f30f513c4307fcfddd24c0db3820eb7d69c97088fd9e44ec65ca18315133b076897ceae2487af321e38f8e2417bbff3cb'
-  data.tar.gz: 9f1a3b74222b8d23a38cedaae63ad2d078f1e402039cbe5f767d368081a386d5dbbbeeb1a28b0db65041b5ccec5d1b2aa6b68ecfe087be9e4c41c35ec788df09
+  metadata.gz: 7e1cf13da82440fc26ef0cf0ac63a022e58c3b9543b78256c04f984e3e5aa3ba3abe37b3a36ed941eb3ab9791dcbfbbe8a4a24a47d2a8ef7044f8d64ed8fd8d7
+  data.tar.gz: d1b0f0a06fa8a585f5534ff1d1e8d9071fa06543bebc2bc141fa4b54f8887f199646f1f3cfc727267e4caaad87c12d8977379040309fbe3ac7a9f78655035038

data/lib/p5rb.rb

@@ -3,68 +3,135 @@ 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.inspect}#{", #{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
+      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 data
+      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
   end
 end
 
 def P5 width, height, &block
-  P5.module_eval &block
+  ::P5.module_eval &block
   <<~HEREDOC
     <html>
       <head>
@@ -73,17 +140,17 @@ def P5 width, height, &block
           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.2"
   spec.summary      = "Ruby DSL for p5.js"
 
   spec.author       = "Victor Maslov aka Nakilon"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p5rb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-12-08 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nakilon@gmail.com
@@ -39,8 +39,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