snabberb 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98ff77b3a36c5ca9051b8daed1c6498da9ce011240cd5fe869969a1dbee957ec
-  data.tar.gz: 4dc1ed366b54af762a35bc206b3dbf55f2b8110a6fab8341dea9ec59862b808f
+  metadata.gz: a6a868a7ec1133bc5e3617bde205e2f0a84041aa2ce6f97269e2fddafeb8497f
+  data.tar.gz: 92cf990366dea913a45f51154152e81d250574470664015547d71cb7f1f953f8
 SHA512:
-  metadata.gz: f67e569452ffeb5df152569141de8711fda3819ea7c67d4757f71b27864f6bfa743b9feb5bd0103f873743fab6b85899043c73c885b3fd5db3c1def1cdad5f00
-  data.tar.gz: 32e7c025a1bb9fcb4d9ef3e7b9adeadab45db078e6d2f3930e5e4bd30a4efa0067f20ceebc6ca4835860be9249c321f4f0987d9b36e0f04a9d84daa58e441cfb
+  metadata.gz: fee9ee7329921aa01e1f98f3db5c4d00e17450234753cb97dca55ffc932eb5223f7cc64fe4f856104741e0bea6524f3fec2de080521fd0c72123c346493558d9
+  data.tar.gz: 10356451c19e97f22922256fd24f9e6fdbd5ec6247056cfdc4e5eed3bd07fb5d0a9ebd36063ff827ac1a203df15183948734b0847997786eb6d067032e24f2ba

data/.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /tmp/
 /examples/roda/public
+/examples/roda/build
 
 .DS_STORE
 *.swp

data/examples/rack/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    snabberb (0.2.0)
+    snabberb (0.2.1)
       opal (~> 1.0)
 
 GEM
@@ -11,12 +11,12 @@ GEM
     c_lexer (2.6.4.1.1)
       ast (~> 2.4.0)
       parser (= 2.6.4.1)
-    opal (1.0.1)
+    opal (1.0.2)
       ast (>= 2.3.0)
       parser (~> 2.6)
     parser (2.6.4.1)
       ast (~> 2.4.0)
-    rack (2.0.8)
+    rack (2.1.0)
 
 PLATFORMS
   ruby
@@ -28,4 +28,4 @@ DEPENDENCIES
   snabberb!
 
 BUNDLED WITH
-   2.0.2
+   2.1.2

data/examples/roda/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    snabberb (0.2.0)
+    snabberb (0.2.1)
       opal (~> 1.0)
 
 GEM
@@ -14,9 +14,9 @@ GEM
     concurrent-ruby (1.1.5)
     execjs (2.7.0)
     libv8 (7.3.492.27.1)
-    mini_racer (0.2.8)
+    mini_racer (0.2.9)
       libv8 (>= 6.9.411)
-    opal (1.0.1)
+    opal (1.0.2)
       ast (>= 2.3.0)
       parser (~> 2.6)
     opal-sprockets (0.4.8.1.0.3.7)
@@ -25,8 +25,8 @@ GEM
       tilt (>= 1.4)
     parser (2.6.4.1)
       ast (~> 2.4.0)
-    rack (2.0.8)
-    roda (3.26.0)
+    rack (2.1.0)
+    roda (3.27.0)
       rack
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
@@ -46,4 +46,4 @@ DEPENDENCIES
   snabberb!
 
 BUNDLED WITH
-   2.0.2
+   2.1.2

data/examples/roda/{app → assets/js}/application.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'compiled-opal'
+require 'polyfill'
+require 'snabberb'
 require 'set'
 
 class Tile < Snabberb::Component
@@ -18,6 +21,7 @@ class Hex < Snabberb::Component
 
   needs :x
   needs :y
+  needs :id
   needs :selected, default: Set.new, store: true
 
   def translation
@@ -50,6 +54,7 @@ class Hex < Snabberb::Component
         transform: transform,
         fill: selected ? 'yellow' : 'white',
         stroke: 'black',
+        id: @id,
       },
       style: { cursor: 'pointer' },
       on: { click: onclick }
@@ -66,9 +71,14 @@ class Map < Snabberb::Component
   def render
     hexes = @size_x.times.flat_map do |x|
       @size_y.times.map do |y|
-        h(Hex, x: y.even? ? x + 1 : x, y: x.even? ? y + 1 : y)
+        row = y
+        column = x
+
+        next nil if (row.even? && column.even?) || (row.odd? && column.odd?)
+
+        h(Hex, id: "#{row},#{column}", x: x, y: y)
       end
-    end
+    end.compact
 
     container_style = {
       width: '100%',
@@ -76,9 +86,10 @@ class Map < Snabberb::Component
       overflow: 'auto',
     }
 
+    # adding 44 and 21 helps with lower size_x and size_y values
     svg_style = {
-      width: "#{@size_x * 50}px",
-      height: "#{@size_y * 80}px",
+      width: "#{44 + (@size_x * 50)}px",
+      height: "#{21 + (@size_y * 80)}px",
     }
 
     h(:div, { props: { id: 'map_id' }, style: container_style }, [

data/examples/roda/{app → assets/js}/polyfill.js

@@ -1,2 +1 @@
 if (typeof setTimeout === 'undefined') { function setTimeout(func) { func() } }
-if (typeof OpalLoaded === 'undefined') { OpalLoaded = [] }

data/examples/roda/config.ru

@@ -2,37 +2,40 @@
 
 require 'execjs'
 require 'opal'
-require 'opal/sprockets'
 require 'roda'
-require 'sprockets'
 require 'snabberb'
+require 'tilt/opal'
 
-LIB_NAME = 'lib.js'
-LIB_PATH = "./public/#{LIB_NAME}"
-Opal.append_path('app')
-File.write(LIB_PATH, Opal::Builder.build('requires')) unless File.file?(LIB_PATH)
+class OpalTemplate < Opal::TiltTemplate
+  def evaluate(_scope, _locals)
+    builder = Opal::Builder.new(stubs: 'opal')
+    builder.append_paths('assets/js')
+    builder.append_paths('build')
 
-class App < Roda
-  plugin :public
+    opal_path = 'build/compiled-opal.js'
+    File.write(opal_path, Opal::Builder.build('opal')) unless File.exist?(opal_path)
 
-  context = ExecJS.compile(File.read(LIB_PATH) + Opal::Builder.build('application').to_s)
+    content = builder.build(file).to_s
+    map_json = builder.source_map.to_json
+    "#{content}\n#{to_data_uri_comment(map_json)}"
+  end
+
+  def to_data_uri_comment(map_json)
+    "//# sourceMappingURL=data:application/json;base64,#{Base64.encode64(map_json).delete("\n")}"
+  end
+end
 
-  environment = Sprockets::Environment.new
-  Opal.paths.each { |p| environment.append_path(p) }
+Tilt.register 'rb', OpalTemplate
 
-  javascript_include_tags = "<script src=#{LIB_NAME}></script>" + Opal::Sprockets.javascript_include_tag(
-    'application',
-    sprockets: environment,
-    prefix: '/assets',
-    debug: true,
-  )
+class App < Roda
+  plugin :public
+  plugin :assets, js: 'application.rb'
+  compile_assets
+  context = ExecJS.compile(File.read("#{assets_opts[:compiled_js_path]}.#{assets_opts[:compiled]['js']}.js"))
 
   route do |r|
     r.public
-
-    r.on 'assets' do
-      r.run environment
-    end
+    r.assets
 
     r.root do
       context.eval(
@@ -40,7 +43,7 @@ class App < Roda
           'Index',
           'Map',
           'map_id',
-          javascript_include_tags: javascript_include_tags,
+          javascript_include_tags: assets(:js),
           size_x: 30,
           size_y: 30,
         )

data/lib/snabberb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Snabberb
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/opal/snabberb/component.rb

@@ -107,9 +107,9 @@ module Snabberb
       @root.node = node
     end
 
-    # Store a value and trigger and update.
+    # Store a value and trigger and update unless skip is true.
     # If called with no arguments, return the store object.
-    def store(key = nil, value = nil)
+    def store(key = nil, value = nil, skip: false)
       return @store if key.nil?
       raise "Cannot store key '#{key}' since it is not a stored need of #{self.class}." unless stores?(key)
 
@@ -119,7 +119,7 @@ module Snabberb
       instance_variable_set(ivar, value)
       @root.instance_variable_set(ivar, value) if !root? && @root.stores?(key)
 
-      update
+      update unless skip
     end
 
     def class_needs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snabberb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Toby Mao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -136,9 +136,9 @@ files:
 - examples/roda/Gemfile
 - examples/roda/Gemfile.lock
 - examples/roda/README.md
-- examples/roda/app/application.rb
-- examples/roda/app/polyfill.js
-- examples/roda/app/requires.rb
+- examples/roda/assets/js/application.rb
+- examples/roda/assets/js/polyfill.js
+- examples/roda/build/.keep
 - examples/roda/config.ru
 - examples/roda/roda_example.png
 - lib/snabberb.rb
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A simple Opal view framework based on Snabbdom.

data/examples/roda/app/requires.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-require 'opal'
-require 'polyfill'
-require 'snabberb'