atome 0.5.5.6.4 → 0.5.5.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b31290fc95efc0a70d4679d5354bcef415b2366fd11c2daee3821de259d7cc9
-  data.tar.gz: b0fd13de4867f9f139682d786405049097b975e7afe619dcf14781f538db27e6
+  metadata.gz: c5e9aa478d329311763c85b34cbd9a9a24e22cb9179e596e2e66d0701f091005
+  data.tar.gz: 58a73fce3f81a4f00a8d0948167be1686538bb3cf8fb4144b05876406c30e8f7
 SHA512:
-  metadata.gz: 94cf7f832e676b8b26c9ee2441ecbe3dc08eee174f6eb3bec92b68869de9d9bd1c1b81408fbacfd0c12fe7de25b682fd67458263fca0c2bc078704e0f0d285e9
-  data.tar.gz: ecf1425bda14c78a0047a514e84d5ac2ed017f95c05b37598045d8ea6b3f878bc27e560bfe5b2b02884f15a9996f0c2cc3c0505e72170222e0ded5126fd6f829
+  metadata.gz: a6c686bfaf93676f69a7dd20af421bb6751f2ab21f971a5658c3ad6da3b4f8fd5a3ceab28cbf0ef71032a1c125729226c1cda3640fa7f5ac4545d9e657c52b39
+  data.tar.gz: 6752436669092cf5f741ff202fc3815c0897524ee4f85f7746cb6dd4cfdea9164cb4248bfa116a22b46d30e8989f2e3d19336b5a9ebaebf3ad23ed65a1e500bd

data/lib/atome/atome.rb

@@ -6,7 +6,6 @@ class Atome
 
   def initialize(new_atome = {}, &atomes_proc)
     # the keys :renderers, :type and :id should be placed in the first position in the hash
-    #@broadcast = {}
     @history = {}
     @callback = {}
     @tag = {}
@@ -17,8 +16,8 @@ class Atome
     @type = new_atome[:type] || :element
     @attached = []
     @category = []
-    @display = { mode: :default, default: {} }
-    # @copy = []
+    # @display = { mode: :default }
+    # @backup={} # mainly used to restore particle when using grid /table /list display mode
     @html = HTML.new(@id, self)
     @headless = Headless.new(@id, self)
     # now we store the proc in a an atome's property called :bloc

data/lib/atome/genesis/generators/identity.rb

@@ -53,7 +53,7 @@ new(particle: :selected) do |params|
   if params == true
     grab(Universe.current_user).selection << @id
   elsif params == false
-    grab(Universe.current_user).selection.delete(@id)
+    grab(Universe.current_user).selection.collect.delete(@id)
   else
     # TODO: for future use
   end

data/lib/atome/genesis/generators/spatial.rb

@@ -9,3 +9,93 @@ new({ particle: :direction, type: :string })
 new({ particle: :center, type: :string})
 new({particle: :depth, type: :integer})
 new({ particle: :position })
+new({ particle: :organise })
+new({ particle: :spacing })
+new({ particle: :display }) do |params|
+  unless params.instance_of? Hash
+    params = { mode: params }
+  end
+  params
+end
+new({ particle: :layout }) do |params|
+
+  mode_found = params.delete(:mode) || :list
+  elements_style = params.delete(:element) || {}
+  # now we get the list of the atome to layout
+  atomes_to_organise = []
+  if type == :group
+    atomes_to_organise = collect
+  end
+  # if params[:listing] is specified group collection is override
+  atomes_to_organise = params[:listing] if params[:listing]
+  if mode_found == :default
+    # the user want to revert the layout to the default
+    atomes_to_organise.each do |atome_id_to_organise|
+      atome_found = grab(atome_id_to_organise)
+      # now restoring
+      if atome_found.backup
+        atome_found.backup.each do |particle, value|
+          atome_found.send(:delete, particle)
+          atome_found.send(particle, value)
+        end
+        atome_found.remove_layout
+      end
+
+    end
+  else
+
+    if params[:id]
+      container_name = params[:id]
+      container = grab(:view).box({ id: container_name })
+      container_class = container_name
+    else
+      container = grab(:view).box
+      id_found = container.id
+      params[:id] = id_found
+      container_class = id_found
+    end
+    container.remove({ category: :atome })
+    container.category(:matrix)
+    if mode_found == :list
+      params[:organise] = '1fr'
+    end
+    params.each do |particle, value|
+      container.send(particle, value)
+    end
+    # now we add user wanted particles
+    atomes_to_organise.each do |atome_id_to_organise|
+      atome_found = grab(atome_id_to_organise)
+      # now restoring
+      if atome_found.backup
+        atome_found.backup.each do |particle, value|
+          atome_found.send(:delete, particle)
+          atome_found.send(particle, value)
+        end
+        # atome_found.remove_layout
+      end
+      # we remove previous display mode
+      atome_found.remove_layout
+      atome_found.display[:mode] = mode_found
+      atome_found.display[:layout] = id_found
+      atome_found.attach(container_class)
+      atome_found.remove({ category: :atome })
+      atome_found.category(container_class)
+      # the hash below is used to restore element state
+
+      # we only store the state if  atome_found.display[:default]== {} it means this is the original state
+      elements_style.each do |particle, value|
+        # we have to store all elements particle to restore it later
+        atome_found.backup({}) unless atome_found.backup
+        unless atome_found.backup[particle]
+          particle_to_save = atome_found.send(particle) || 0
+          atome_found.backup[particle] = particle_to_save
+        end
+
+        atome_found.send(particle, value)
+      end
+    end
+  end
+  params
+end
+
+

data/lib/atome/genesis/generators/utility.rb

@@ -197,7 +197,6 @@ new({ particle: :copy }) do |items_id|
   grab(:copy).collect << items_id
 end
 
-
 new({ particle: :paste }) do |params|
 
   all_copies = grab(:copy).collect
@@ -211,7 +210,7 @@ new({ particle: :paste }) do |params|
   new_atomes = []
   applies_found = []
   copies_found.each do |copy_found|
-    new_atome = grab(copy_found).duplicate({attach: @id })
+    new_atome = grab(copy_found).duplicate({ attach: @id })
     new_atomes << new_atome.id
     # FIXME: below start to patch because apply is not apply , so we store it and apply it again
     applies_found << new_atome.apply
@@ -226,4 +225,6 @@ end
 
 new({ read: :paste }) do |p|
   @copy
-end
+end
+
+new({ particle: :backup })

data/lib/atome/genesis/sparkle.rb

@@ -87,6 +87,9 @@ Universe.current_machine = machine_id
 A = Atome.new(
   { renderers: default_render, id: :atome, type: :element, tag: { system: true } }
 )
+# atome selector / collector
+Atome.new({ renderers: [:html], id: :selector, collect: [], type: :group, tag: { system: true } })
+
 # atome infos
 def atome_infos
   puts "atome version: #{Atome::VERSION}"

data/lib/atome/helpers/utilities.rb

@@ -280,4 +280,22 @@ class Atome
       debug "#{user_id} not found"
     end
   end
+  def remove_layout
+    display(:default)
+    # we get the current parent (the previous layout)
+    parent_found = grab(attach)
+    # we get the parent of the parent
+    grand_parent = parent_found.attach
+    # and attach the item to the grand parent
+    # we remove the parent category and restore atome category
+    remove({ category: attach })
+    category(:atome)
+    attach(grand_parent)
+    #  we delete the parent (the layout) if it no more children attached
+    if parent_found.attached.length == 0
+      parent_found.delete(true)
+    end
+  end
+
+
 end

data/lib/atome/version.rb

@@ -2,5 +2,5 @@
 
 #  return atome version
 class Atome
-  VERSION = '0.5.5.6.4'
+  VERSION = '0.5.5.6.5'
 end

data/lib/renderers/html/html.rb

@@ -1096,7 +1096,7 @@ class HTML
   end
 
   def play_animation(properties)
-    alert 'change for standard method : action'
+    puts 'change for standard method : action'
     required_keys = [:from, :to, :duration]
     if properties.is_a?(Hash) && (required_keys - properties.keys).empty?
       animate(properties)

data/lib/renderers/html/spatial.rb

@@ -43,4 +43,16 @@ end
 
 new({renderer: :html, method: :depth }) do |params|
   html.style("z-index", params)
+end
+
+new({ method: :organise, renderer: :html }) do |params|
+  html.style(:gridTemplateColumns, params)
+end
+
+new({ method: :spacing, renderer: :html }) do |params|
+  html.style(:gap, "#{params}px")
+end
+
+new({ method: :display, renderer: :html }) do |params|
+  html.style(:display, params)
 end

data/vendor/assets/application/examples/duplicate.rb

@@ -57,8 +57,10 @@ b = circle({ id: :the_cirlce })
 b.text(:hello)
 bb = b.duplicate({  width: 33, left: 234, top: 222 })
 bb.color(:red)
+wait 1 do
 bb2 = b.duplicate({ width: 33, left: 12 })
 bb3 = b.duplicate({ width: 33, left: 444 })
 bb3.color(:green)
 bb2.color(:orange)
+end
 

data/vendor/assets/application/examples/layout.rb

@@ -1,179 +1,7 @@
 # frozen_string_literal: true
 
-# class HTML
-#
-#   def layout_style(option = {})
-#     element_style = {
-#       backgroundColor: 'rebeccapurple',
-#       width: '100%',remove_layout
-#       height: '29px',
-#       borderRadius: '59px',
-#       display: 'flex',
-#       justifyContent: 'center',
-#       alignItems: 'center',
-#       flexDirection: 'column',
-#       marginBottom: '20px',
-#       padding: '0px',
-#       # transform: 'rotate(22deg)',
-#
-#     }
-#
-#     container_style = {
-#       display: :grid,
-#       gridTemplateColumns: 'repeat(4, 1fr)',
-#       overflow: :scroll,
-#       flexDirection: 'column',
-#       gap: '20px',
-#       padding: '0px',
-#
-#     }
-#     element_style = element_style.merge(option[:element]) if option[:element]
-#     container_style = container_style.merge(option[:container]) if option[:container]
-#     @layout_style = { element: element_style, container: container_style }
-#   end
-#
-#   def remove_webview_layout(element, container)
-#     element[:classList].add('atome')
-#     element[:classList].remove('matrix_element')
-#   end
-#
-#   def layout(params)
-#
-#     id_found = params[:id]
-#     mode_found = params[:mode]
-#     width_found = params[:width]
-#     height_found = params[:height]
-#     layout_container = JS.global[:document].getElementById(id_found.to_s)
-#     layout_elements = JS.global[:document].querySelectorAll(".#{id_found}")
-#     if mode_found == :default
-#       # we revert all elements to default state / layout
-#       layout_elements.to_a.each do |element|
-#         element[:classList].remove('matrix_element')
-#         element[:classList].add('atome')
-#       end
-#     else
-#       # we apply new layout to  elements
-#       layout_style({ element: { backgroundColor: :purple } })
-#       layout_container[:classList].remove('atome')
-#       layout_container[:classList].add('matrix')
-#       layout_elements.to_a.each do |element|
-#         # we check if current state is default if yes we store the layout to be able to restore it
-#         element[:style][:borderRadius] = '59px'
-#         element[:classList].remove('atome')
-#         # element[:classList].add('matrix_element')
-#       end
-#     end
-#
-#   end
-# end
-
-class Atome
-  def remove_layout
-    display[:mode] = :default
-    # we get the current parent (the previous layout)
-    parent_found = grab(attach)
-    # we get the parent of the parent
-    grand_parent = parent_found.attach
-    # and attach the item to the grand parent
-    # we remove the parent category and restore atome category
-    remove({ category: attach})
-    category(:atome)
-    attach(grand_parent)
-    #  we delete the parent (the layout) if it no more children attached
-    if parent_found.attached.length == 0
-      parent_found.delete(true)
-    end
-  end
-end
-
-new({ particle: :layout }) do |params|
-  mode_found = params.delete(:mode) || :list
-  elements_style= params.delete(:element) || {}
-  # layout_width = params[:width] ||= 333
-  # layout_height = params[:height] ||= 333
-  # now we get the list of the atome to layout
-  atomes_to_layout = []
-  if type == :group
-    atomes_to_layout = collect
-  end
-  # if params[:list] is specified group collection is override
-  atomes_to_layout = params[:list] if params[:list]
-
-  if mode_found == :default
-    # the user want to revert the layout to the default
-    atomes_to_layout.each do |atome_id_to_layout|
-      atome_to_layout = grab(atome_id_to_layout)
-      unless params[:id]
-        params[:id] = atome_to_layout.display[:layout]
-      end
-      # now we get the default particles and restore it
-      atome_to_layout.display[:default].each do |particle, value|
-        atome_to_layout.send(:delete,particle)
-        atome_to_layout.send(particle,value)
-      end
-
-      atome_to_layout.remove_layout
-    end
-  else
-    if params[:id]
-      container_name = params[:id]
-      container = grab(:view).box({ id: container_name })
-      container_class = container_name
-    else
-      container = grab(:view).box
-      id_found = container.id
-      params[:id] = id_found
-      container_class = id_found
-    end
-    # container.width = layout_width
-    # container.height = layout_height
-    container.remove({ category: :atome})
-    container.category(:matrix)
-    alert ">> #{mode_found}"
-    params.each do |particle, value|
-      container.send(particle, value)
-    end
-    # now we add user wanted particles
-    alert params
-
-    atomes_to_layout.each do |atome_id_to_layout|
-      atome_to_layout = grab(atome_id_to_layout)
-      # we remove previous display mode
-      atome_to_layout.remove_layout
-      atome_to_layout.display[:mode] = mode_found
-      atome_to_layout.display[:layout] = id_found
-      atome_to_layout.attach(container_class)
-      atome_to_layout.remove({ category: :atome})
-      atome_to_layout.category(container_class)
-      #the hash below is used to restore element state
-      original_state={}
-      elements_style.each do |particle, value|
-        # we have to store all elements particle to restore it later
-        original_state[particle]=atome_to_layout.send(particle)
-        atome_to_layout.send(particle, value)
-      end
-      atome_to_layout.display[:default]=original_state
-      # puts "display is : #{atome_to_layout.display}"
-      # atome_to_layout.html.add_class(container_class)
-      # puts container_class
-    end
-  end
-  params
-end
-
-# new({ renderer: :html, method: :layout, type: :hash }) do |params, _user_proc|
-#   html.layout(params)
-# end
-
-new({ particle: :display })
-
-# system
-Atome.new({ renderers: [:html], id: :selector, collect: [], type: :group, tag: { system: true } })
-
-############### tests
-
 b = box({ color: :red, id: :the_box, left: 3 })
-16.times do |index|
+5.times do |index|
   width_found = b.width
   b.duplicate({ left: b.left + index * (width_found + 45), top: 0, category: :custom_category })
 end
@@ -182,7 +10,7 @@ grab(:view).attached.each do |atome_found|
   grab(atome_found).selected(true)
 end
 grab(:the_box_copy_1).text(:hello)
-#################
+
 selected_items = grab(Universe.current_user).selection # we create a group
 # we collect all atomes in the view
 atomes_found = []
@@ -190,38 +18,34 @@ selected_items.each do |atome_found|
   atomes_found << atome_found
 end
 
-random_found = atomes_found.sample(17)
-
+# random_found = atomes_found.sample(17)
+#
 # random_found.each do |atome_id|
 #   atome_found = grab(atome_id)
 #   if atome_found.type == :shape
 #     atome_found.left(rand(700))
-#     atome_found.width(rand(120))
-#     atome_found.height(rand(120))
+#     atome_found.width(rand(200))
+#     atome_found.height(rand(200))
+#     # atome_found.rotate(rand(90))
 #     atome_found.smooth(rand(120))
 #     atome_found.color({ red: rand, green: rand, blue: rand })
 #   end
 # end
+
+selected_items.layout({ mode: :default, width: 500, height: 22 })
+
 wait 1 do
-  selected_items.layout({ mode: :grid, width: 900, height: 500, color: :green,element: {height: 22, rotate: 22} })
-  # alert grab('the_box_copy_4').display
+  selected_items.layout({ mode: :grid, width: 900, height: 500, color: :green, element: { rotate: 22, height: 100, width: 150 } })
   wait 1 do
-    # selected_items.layout({ mode: :grid, width: 800, height: 500 })
+    selected_items.layout({ mode: :grid, width: 1200, height: 500, overflow: :scroll })
     wait 1 do
-      selected_items.layout({ mode: :default, width: 500, height: 500 })
-      # alert grab('the_box_copy_4').display
+      selected_items.layout({ mode: :default, width: 500, height: 22 })
       wait 1 do
-        selected_items.layout({ id: :my_layout, mode: :list, width: 151, height: 800, overflow: :scroll })
+        selected_items.layout({ id: :my_layout, mode: :list, width: 800, height: 800, overflow: :scroll, element: { height: 22, width: 800 } })
         wait 1 do
-          selected_items.layout({ mode: :default, width: 500, height: 500 })
+          selected_items.layout({ mode: :default })
         end
       end
     end
   end
 end
-
-# JS.global[:console].clear()
-
-
-# b=box
-# alert ">> #{b.display}"

data/vendor/assets/application/examples/selected.rb

@@ -21,7 +21,6 @@ t.touch(true) do
     atome_selected.height=rand(333)
 
   end
-
   b.selected(false)
   puts "3 current_user- #{grab(Universe.current_user).selection}"
   puts "3 - b selected : #{b.selected}"

data/vendor/assets/src/css/style.css

@@ -23,7 +23,7 @@ html, body {
     display: grid;
     grid-template-columns: repeat(4, 1fr);
     flex-direction: column;
-    gap: 20px;
+    gap: 12px;
     padding: 3px;
 }
 /*.matrix_element{*/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atome
 version: !ruby/object:Gem::Version
-  version: 0.5.5.6.4
+  version: 0.5.5.6.5
 platform: ruby
 authors:
 - Jean-Eric Godard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2023-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arduino_firmata