atome 0.5.3.7.3 → 0.5.3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c9363d9399a6e64a2ba1fe03cf0be0f8a5ed36fa1d6ab58b59fc7cf7a2d4add
-  data.tar.gz: 43e83f421a13dba82a3c635f3cc593954fecfa265937f9e87db0fee73cb1897f
+  metadata.gz: a7a73219833a1b762ef00a884f0799800a1b638742057c29352c98c4208f47df
+  data.tar.gz: 7b343fa8cecaa21084ab2e764ce251b38dc954a8ff97d49e1a951fdcd18760fc
 SHA512:
-  metadata.gz: f6120ad4f0a7ac8288c612dd31dbb7a4314d778e55e4ab65939c831b9b9c8e2fcbb077a916fd7a7b82757e536ec056bd987a65ef6ebcf7686297087edc5ae35b
-  data.tar.gz: 4e27af6dd5d4f5b6de378f8e196c93a3788c8e0103eeb5848e58ab616370bdddd9522894aae25499a510af4ccb479063318d5e3a1543d85510a144ea56bc621e
+  metadata.gz: 482d2e6986aef0fa1ff7dc11df7b89e62fb9fab3211196f9ef5b8be39050478d6735b24e99e9b0e263fdd0fbfcc1fc323ed28ee26daeb7871294ff847cf37d16
+  data.tar.gz: d81ed5c1b4c5e5eacdc3cb85726d0e3d81781726c052bff148664fcf8fd11843f2af975ac3478be9c18b2cffd3cb6cf8a11c6a77de896b528095cc894b378fdf

data/lib/atome/atome.rb

@@ -14,7 +14,6 @@ class Atome
     atomes.each_value do |elements|
       # the instance variable below contain the id all any atomes that need to be informed when changes occurs
       @broadcast = {}
-      # @at_time = {}
       # now we store the proc in a an atome's property called :bloc
       elements[:code] = atomes_proc if atomes_proc
       @atome = elements
@@ -31,7 +30,7 @@ class Atome
       if params || params == false
         # the line below execute the proc created when using the build_particle method
         instance_exec(params, user_proc, &method_proc) if method_proc.is_a?(Proc)
-        params = sanitize(element, params)
+        params = sanitize(element, params,&user_proc)
         create_particle(element, store, render)
         send("set_#{element}", params, &user_proc)
       else
@@ -50,14 +49,17 @@ class Atome
 
   def atome_creation_pre_treatment(element, params, &user_proc)
     params = sanitize(element, params)
+    run_optional_proc("pre_render_#{@atome[:type]}".to_sym, self, params, &user_proc)
     create_atome(element)
+    run_optional_proc("post_render_#{@atome[:type]}".to_sym, self, params, &user_proc)
     send("set_#{element}", params, &user_proc)
   end
 
   def atome_initializer(element, params = {})
     temp_default = Essentials.default_params[element] || {}
     generated_render = params[:renderers] || []
-    generated_id = params[:id] || "#{element}_#{Universe.atomes.length}"
+    generated_id = params[:id] || identity_generator(:element)
+
     generated_parents = params[:parents] || [id.value]
     generated_children = params[:children] || []
     temp_default[:id] = generated_id
@@ -88,8 +90,8 @@ class Atome
     end
   end
 
-  def run_optional_proc(proc_name, atome = self, element, &user_proc)
-    params = instance_variable_get("@#{element}")
+  def run_optional_proc(proc_name, atome = self, params, &user_proc)
+    # params = instance_variable_get("@#{element}")
     option_found = Universe.get_optional_method(proc_name)
     atome.instance_exec(params, user_proc, atome, &option_found) if option_found.is_a?(Proc)
   end
@@ -115,14 +117,12 @@ class Atome
     # we create a proc holder of any new particle if user pass a bloc
     store_code_bloc(element, &user_proc) if user_proc
     # Params is now an instance variable so it should be passed thru different methods
-    instance_variable_set("@#{element}", params)
-    run_optional_proc("pre_render_#{@atome[:type]}".to_sym, self, element, &user_proc)
-    run_optional_proc("pre_render_#{element}".to_sym, self, element, &user_proc)
-    rendering(element, &user_proc) if render
-    run_optional_proc("post_render_#{@atome[:type]}".to_sym, self, element, &user_proc)
-    run_optional_proc("post_render_#{element}".to_sym, self, element, &user_proc)
+    instance_variable_set("@#{element}", params) if store
+    run_optional_proc("pre_render_#{element}".to_sym, self, params, &user_proc)
+    rendering(element,params, &user_proc) if render
+    run_optional_proc("post_render_#{element}".to_sym, self, params, &user_proc)
     broadcasting(element)
-    store_value(element) if store
+    store_value(element)  if store
     self
   end
 
@@ -154,7 +154,6 @@ class Atome
     virtual_atome.user_proc = user_proc
     virtual_atome.value = @atome[element]
     virtual_atome
-    "it should contain the atome not : #{element}"
   end
 
   def create_atome(new_atome)

data/lib/atome/extensions/atome.rb

@@ -20,7 +20,13 @@ def new(params, &bloc)
   end
 end
 
+def identity_generator(type=:element)
+  "#{type}_#{Universe.counter}"
+  # { date: Time.now, location: geolocation }
+end
+
 def grab(atome_to_get)
+  atome_to_get = atome_to_get.value if atome_to_get.instance_of? Atome
   Universe.atomes[atome_to_get]
 end
 

data/lib/atome/extensions/mathematic.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class Atome
+  def /val
+    val=val.value if val.instance_of? Atome
+    value/val
+  end
+
+  def *val
+    val=val.value if val.instance_of? Atome
+    value*val
+  end
+
+  def -val
+    val=val.value if val.instance_of? Atome
+    value-val
+  end
+
+
+  def +val
+    val=val.value if val.instance_of? Atome
+    value+val
+  end
+end

data/lib/atome/extensions/matrix.rb

@@ -242,7 +242,8 @@ module Matrix
     default_renderer = Essentials.default_params[:render_engines]
     atome_type = :matrix
     generated_render = params[:renderers] || default_renderer
-    generated_id = params[:id] || "#{atome_type}_#{Universe.atomes.length}"
+    generated_id = params[:id] || identity_generator(:matrix)
+
     generated_parents = params[:parents] || [id.value]
     generated_children = params[:children] || []
     params = atome_common(atome_type, generated_id, generated_render, generated_parents, generated_children, params)

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

@@ -1,18 +1,30 @@
 # frozen_string_literal: true
 
 new({ atome: :color })
+
 new({ sanitizer: :color }) do |params|
   parent_found = found_parents_and_renderers[:parent]
-  parent_found = [:black_matter] if parent_found == [:view]
+  if parent_found == [:view]
+    parent_found = [:black_matter] if parent_found == [:view]
+  elsif color.value
+    # we delete any previous color if there's one
+    detached(color.value)
+    grab(color.value)&.delete(true)# we had the condition because the color may exist but
+    # so it is not sanitized so it has no id
+  end
+
   render_found = found_parents_and_renderers[:renderers]
-  default_params = { renderers: render_found, id: "color_#{Universe.atomes.length}", type: :color,
+  generated_id = params[:id] || identity_generator(:color)
+
+  default_params = { renderers: render_found, id: generated_id, type: :color,
                      attach: parent_found,
                      red: 0, green: 0, blue: 0, alpha: 1 }
   params = create_color_hash(params) unless params.instance_of? Hash
   new_params = default_params.merge!(params)
-  atome[:color] = new_params
+  atome[:color] = new_params[:id]
   new_params
 end
+
 new({ atome: :image })
 new({ sanitizer: :image }) do |params|
   unless params.instance_of? Hash
@@ -20,7 +32,8 @@ new({ sanitizer: :image }) do |params|
     params = { path: "./medias/images/#{params}" }
   end
   default_renderer = Essentials.default_params[:render_engines]
-  generated_id = params[:id] || "image_#{Universe.atomes.length}"
+  generated_id = params[:id] || identity_generator(:image)
+
   generated_render = params[:renderers] || default_renderer
   generated_parents = params[:parents] || id.value
   # TODO : the line below should get the value from default params Essentials
@@ -33,36 +46,63 @@ new({ atome: :video })
 new({ sanitizer: :video }) do |params|
   parent_found = found_parents_and_renderers[:parent]
   render_found = found_parents_and_renderers[:renderers]
-  default_params = { renderers: render_found, id: "video_#{Universe.atomes.length}", type: :video,
+  generated_id = params[:id] || identity_generator(:video)
+
+  default_params = { renderers: render_found, id: generated_id, type: :video,
                      parents: parent_found }
   default_params.merge!(params)
 end
 new({ atome: :shadow })
 new({ sanitizer: :shadow }) do |params|
+
   parent_found = found_parents_and_renderers[:parent]
-  parent_found = [:user_view] if parent_found == [:view]
+  if parent_found == [:view]
+    parent_found = [:black_matter] if parent_found == [:view]
+  elsif shadow.value
+    # we delete any previous color if there's one
+    detached(shadow.value)
+    grab(shadow.value)&.delete(true)# we had the condition because the shadow may exist but
+    # so it is not sanitized so it has no id
+  end
+  ## we delete any previous shadow if there's one
+  # if shadow.value
+  #   attached.value.delete(shadow.value)
+  #   grab(shadow.value)&.delete(true) # we had the condition because the color may exist but 
+  #   # so it is not sanitized so it has no id
+  # end
+  # parent_found = found_parents_and_renderers[:parent]
+  # parent_found = [:user_view] if parent_found == [:view]
   render_found = found_parents_and_renderers[:renderers]
-  default_params = { renderers: render_found, id: "shadow_#{Universe.atomes.length}", type: :shadow,
+  generated_id = params[:id] || identity_generator(:shadow)
+
+  default_params = { renderers: render_found, id: generated_id, type: :shadow,
                      attach: parent_found,
                      red: 0, green: 0, blue: 0, alpha: 1, blur: 3, left: 3, top: 3 }
-  default_params.merge!(params)
+  # default_params.merge!(params)
+  params = create_shadow_hash(params) unless params.instance_of? Hash
+  new_params = default_params.merge!(params)
+  atome[:shadow] = new_params
+  new_params
+
 end
 new({ atome: :shape })
 new({ atome: :code })
 new({ atome: :audio })
 new({ atome: :element })
-new({ sanitizer: :element })do |params|
+new({ sanitizer: :element }) do |params|
   parent_found = found_parents_and_renderers[:parent]
   render_found = []
-  default_params = { renderers: render_found, id: "element_#{Universe.atomes.length}", type: :element,
+  generated_id = params[:id] || identity_generator(:element)
+
+  default_params = { renderers: render_found, id: generated_id, type: :element,
                      parents: parent_found, data: '' }
   default_params.merge!(params)
 end
 new({ atome: :web })
-new({ sanitizer: :web })do |params|
+new({ sanitizer: :web }) do |params|
   default_renderer = Essentials.default_params[:render_engines]
+  generated_id = params[:id] || identity_generator(:web)
 
-  generated_id = params[:id] || "web_#{Universe.atomes.length}"
   generated_render = params[:renderers] || default_renderer
   generated_parents = params[:parents] || id.value
   # TODO : the line below should get the value from default params Essentials
@@ -77,7 +117,7 @@ new({ sanitizer: :animation }) do |params|
   default_renderer = Essentials.default_params[:render_engines]
   atome_type = :animation
   generated_render = params[:renderers] || default_renderer
-  generated_id = params[:id] || "#{atome_type}_#{Universe.atomes.length}"
+  generated_id = params[:id] || identity_generator(atome_type)
   generated_parents = params[:parents] || []
   generated_children = params[:children] || []
   params = atome_common(atome_type, generated_id, generated_render, generated_parents, generated_children, params)
@@ -89,93 +129,10 @@ new({ sanitizer: :text }) do |params|
   default_renderer = Essentials.default_params[:render_engines]
   atome_type = :text
   generated_render = params[:renderers] || default_renderer
-  generated_id = params[:id] || "#{atome_type}_#{Universe.atomes.length}"
+  generated_id = params[:id] || identity_generator(atome_type)
   generated_parents = params[:parents] || [id.value]
   generated_children = params[:children] || []
   params = atome_common(atome_type, generated_id, generated_render, generated_parents, generated_children, params)
   params
 end
 
-
-# generator = Genesis.generator
-#
-# generator.build_atome(:animation)
-# generator.build_atome(:color)
-# generator.build_sanitizer(:color) do |params|
-#   parent_found = found_parents_and_renderers[:parent]
-#   parent_found = [:black_matter] if parent_found == [:view]
-#   render_found = found_parents_and_renderers[:renderers]
-#   default_params = { renderers: render_found, id: "color_#{Universe.atomes.length}", type: :color,
-#                      attach: parent_found,
-#                      red: 0, green: 0, blue: 0, alpha: 1 }
-#   params = create_color_hash(params) unless params.instance_of? Hash
-#   new_params = default_params.merge!(params)
-#   atome[:color] = new_params
-#   new_params
-# end
-#
-# generator.build_atome(:video)
-# generator.build_sanitizer(:video) do |params|
-#   parent_found = found_parents_and_renderers[:parent]
-#   render_found = found_parents_and_renderers[:renderers]
-#   default_params = { renderers: render_found, id: "video_#{Universe.atomes.length}", type: :video,
-#                      parents: parent_found }
-#   default_params.merge!(params)
-# end
-# generator.build_atome(:shadow)
-# generator.build_sanitizer(:shadow) do |params|
-#   parent_found = found_parents_and_renderers[:parent]
-#   parent_found = [:user_view] if parent_found == [:view]
-#   render_found = found_parents_and_renderers[:renderers]
-#   default_params = { renderers: render_found, id: "shadow_#{Universe.atomes.length}", type: :shadow,
-#                      attach: parent_found,
-#                      red: 0, green: 0, blue: 0, alpha: 1, blur: 3, left: 3, top: 3 }
-#   default_params.merge!(params)
-# end
-# generator.build_atome(:shape)
-# generator.build_atome(:text)
-# generator.build_atome(:code)
-# generator.build_atome(:audio)
-# generator.build_atome(:element)
-# generator.build_sanitizer(:element) do |params|
-#   parent_found = found_parents_and_renderers[:parent]
-#   render_found = []
-#   default_params = { renderers: render_found, id: "element_#{Universe.atomes.length}", type: :element,
-#                      parents: parent_found, data: '' }
-#   default_params.merge!(params)
-# end
-# generator.build_atome(:collector)
-# generator.build_atome(:web)
-# generator.build_sanitizer(:web) do |params|
-#   default_renderer = Essentials.default_params[:render_engines]
-#
-#   generated_id = params[:id] || "web_#{Universe.atomes.length}"
-#   generated_render = params[:renderers] || default_renderer
-#   generated_parents = params[:parents] || id.value
-#   # TODO : the line below should get the value from default params Essentials
-#   temp_default = { renderers: generated_render, id: generated_id, type: :web, parents: [generated_parents],
-#                    children: [], width: 120, height: 120, path: 'https://www.youtube.com/embed/usQDazZKWAk' }
-#   params = temp_default.merge(params)
-#   params
-# end
-# generator.build_sanitizer(:animation) do |params|
-#   default_renderer = Essentials.default_params[:render_engines]
-#   atome_type = :animation
-#   generated_render = params[:renderers] || default_renderer
-#   generated_id = params[:id] || "#{atome_type}_#{Universe.atomes.length}"
-#   generated_parents = params[:parents] || []
-#   generated_children = params[:children] || []
-#   params = atome_common(atome_type, generated_id, generated_render, generated_parents, generated_children, params)
-#   params
-# end
-# generator.build_sanitizer(:text) do |params|
-#   params = { data: params } unless params.instance_of? Hash
-#   default_renderer = Essentials.default_params[:render_engines]
-#   atome_type = :text
-#   generated_render = params[:renderers] || default_renderer
-#   generated_id = params[:id] || "#{atome_type}_#{Universe.atomes.length}"
-#   generated_parents = params[:parents] || [id.value]
-#   generated_children = params[:children] || []
-#   params = atome_common(atome_type, generated_id, generated_render, generated_parents, generated_children, params)
-#   params
-# end

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

@@ -2,7 +2,14 @@
 
 
 
-new({particle: :touch })
+new({particle: :touch , type: :hash, store: false })
+new({ post: :touch }) do |params, user_bloc|
+  @touch = {} if @touch == nil
+  @touch[params] = user_bloc
+  # as store for touch is set to false we have to manually save the instance variable
+  store_value(:touch)
+end
+
 new({particle: :play }) do
   @atome[:pause] = :false
 end

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

@@ -2,9 +2,7 @@
 
 new({ particle: :attached })
 new({ sanitizer: :attached }) do |params|
-  unless params.instance_of? Array
-    params = [params]
-  end
+  params = [params] unless params.instance_of? Array
   params
 end
 new({ pre: :attached }) do |children_ids|
@@ -13,32 +11,44 @@ new({ pre: :attached }) do |children_ids|
     child_found = grab(child_id)
     parents_found = @atome[:id]
     child_found.family(parents_found)
-    # parents_found.atome[:attach] = [] unless parents_found.atome[:attach]
     child_found.atome[:attach] = [parents_found]
   end
 end
 new({ particle: :type })
 new({ particle: :children })
-new({ pre: :children }) do |children_ids|
-  children_ids.each do |child_id|
+
+new ({ sanitizer: :children }) do |params|
+  # TODO factorise the line below and 'sanitized_params' for all particle type of Array
+  params = [params] unless params.instance_of? Array
+  sanitized_params = []
+  params.each do |child_id|
     child_id = child_id.value if child_id.instance_of? Atome
+    sanitized_params << child_id
     child_found = grab(child_id)
     parents_found = @atome[:id]
     # FIXME : broadcast may malfunction because of the commented line below,
-    # FIXME suite : if uncomment object hierreachy is broken (cf Vie Project)
-    # child_found.family(parents_found)
+    # FIXME suite : if uncomment object hierarchy is broken (cf Vie Project)
+    # FIXME : parent child problem may be caused by th eline below
+    child_found.family(parents_found)
     child_found.atome[:parents] = [parents_found]
   end
+  sanitized_params
 end
+
 new({ particle: :parents })
-new({ pre: :parents }) do |parents_ids|
-  parents_ids.each do |parents_id|
+new({ sanitizer: :parents }) do |params|
+  params = [params] unless params.instance_of? Array
+  sanitized_params = []
+  params.each do |parents_id|
     parents_id = parents_id.value if parents_id.instance_of? Atome
+    sanitized_params << parents_id
     parents_found = grab(parents_id)
     family(parents_id)
     parents_found.atome[:children] << atome[:id]
   end
+  sanitized_params
 end
+
 new({ particle: :family })
 new({ particle: :link })
 new({ particle: :id })
@@ -62,8 +72,10 @@ new({ pre: :attach }) do |parents_ids|
     parents_found.atome[:attached] << atome[:id]
   end
 end
-new({ particle: :detached })
-new({ particle: :intricate, type: :array  })
+new({ particle: :detached }) do |value|
+  attached.value.delete(value)
+end
+new({ particle: :intricate, type: :array })
 new({ particle: :clones }) do |clones_found|
   clones_found.each_with_index do |clone_found, index|
     particles_intricated = clone_found[:intricate] ||= []
@@ -77,66 +89,3 @@ new({ particle: :clones }) do |clones_found|
     end
   end
 end
-
-# generator = Genesis.generator
-#
-# generator.build_particle(:type)
-# generator.build_particle(:parents)
-# generator.build_particle(:children)
-# generator.build_option(:pre_render_parents) do |parents_ids|
-#   parents_ids.each do |parents_id|
-#     parents_id = parents_id.value if parents_id.instance_of? Atome
-#     parents_found = grab(parents_id)
-#     family(parents_id)
-#     parents_found.atome[:children] << atome[:id]
-#   end
-# end
-# generator.build_option(:pre_render_children) do |children_ids|
-#   children_ids.each do |child_id|
-#     child_id = child_id.value if child_id.instance_of? Atome
-#     child_found = grab(child_id)
-#     parents_found = @atome[:id]
-#     # FIXME : broadcast may malfunction because of the commented line below,
-#     # FIXME suite : if uncomment object hierreachy is broken (cf Vie Project)
-#     # child_found.family(parents_found)
-#     child_found.atome[:parents] = [parents_found]
-#   end
-# end
-# generator.build_particle(:family, { render: true, store: false })
-# generator.build_particle(:link) do |child_id|
-#   child_found = grab(child_id)
-#   child_found.atome[:parents] << @atome[:id]
-#   child_found.refresh
-# end
-# generator.build_particle(:id)
-# generator.build_sanitizer(:id)
-# generator.build_particle(:name)
-# generator.build_particle(:active)
-# generator.build_particle(:attach)
-# generator.build_option(:pre_render_attach) do |parents_ids|
-#   parents_ids.each do |parents_id|
-#     parents_id = parents_id.value if parents_id.instance_of? Atome
-#     parents_found = grab(parents_id)
-#     family(parents_id)
-#     parents_found.atome[:attached] = [] unless parents_found.atome[:attached]
-#     parents_found.atome[:attached] << atome[:id]
-#   end
-# end
-#
-# generator.build_particle(:detached) do |attach_to_remove|
-#   attached.value.delete(attach_to_remove)
-# end
-# generator.build_particle(:intricate, { type: :array })
-# generator.build_particle(:clones) do |clones_found|
-#   clones_found.each_with_index do |clone_found, index|
-#     particles_intricated = clone_found[:intricate] ||= []
-#     clone_id = "#{particles[:id]}_clone_#{index}"
-#     original_id = atome[:id]
-#     clone_found[:id] = clone_id
-#     clone_found = particles.merge(clone_found)
-#     cloned_atome = Atome.new({ clone: clone_found })
-#     cloned_atome.monitor({ atomes: [original_id], particles: particles_intricated }) do |_atome, particle, value|
-#       cloned_atome.send(particle, value)
-#     end
-#   end
-# end

data/lib/atome/helpers/utilities.rb

@@ -6,6 +6,7 @@ class Atome
 
   def collapse
     @atome.each do |element, value|
+      # puts "=============> #{element}"
       send(element, value) unless element == :type
     end
   end
@@ -14,15 +15,12 @@ class Atome
     true
   end
 
-  def sanitize(element, params)
+  def sanitize(element, params,&user_proc)
     bloc_found = Universe.get_sanitizer_method(element)
-    params = instance_exec(params, &bloc_found) if bloc_found.is_a?(Proc)
+    params = instance_exec(params,user_proc, &bloc_found) if bloc_found.is_a?(Proc)
     params
   end
 
-  def identity_generator
-    { date: Time.now, location: geolocation }
-  end
 
   def history(property, value)
     "historize : #{property} #{value}"
@@ -42,11 +40,11 @@ class Atome
 
   def monitor(params=nil, &proc_monitoring)
     if params
-      atome[:monitor] ||= {}
+      monitoring=atome[:monitor] ||= {}
       params[:atomes].each do |atome_id|
         target_broadcaster = grab(atome_id).instance_variable_get('@broadcast')
         monitor_id = params[:id] || "monitor#{target_broadcaster.length}"
-        atome[:monitor] [monitor_id]=params.merge({code: proc_monitoring})
+        monitoring[monitor_id]=params.merge({code: proc_monitoring})
         target_broadcaster[monitor_id] = { particles: params[:particles], code:  proc_monitoring }
       end
     else
@@ -105,7 +103,8 @@ class Atome
   def collector(params = {}, &bloc)
     atome_type = :collector
     generated_render = params[:renderers] || []
-    generated_id = params[:id] || "#{atome_type}_#{Universe.atomes.length}"
+    generated_id = params[:id] || identity_generator(atome_type)
+
     generated_parents = params[:parents] || [id.value]
     generated_children = params[:children] || []
     params = atome_common(atome_type, generated_id, generated_render, generated_parents, generated_children, params)
@@ -118,6 +117,18 @@ class Atome
     end
   end
 
+  def include?(value)
+    self.value.include?(value)
+  end
+
+
+
+  def each_with_index(*args)
+    self.value.each_with_index do |val, index|
+      yield(val, index)
+    end
+  end
+
   def [](range)
     if value[range].class == Atome
       return value[range]

data/lib/atome/kernel/batch.rb

@@ -17,7 +17,8 @@ class Batch
   end
 
   def initialize(params)
-    @id = params[:id] || "batch_#{Universe.atomes.length}"
+    @id = params[:id] || identity_generator(:batch)
+    Universe.add_to_atomes(@id, self)
     Universe.add_to_atomes(@id, self)
   end
 
@@ -27,7 +28,7 @@ class Batch
     end
   end
 
-  # TODO:  automatise collector methods creation when creato,g a new atome type
+  # TODO:  automatise collector methods creation when creating a new atome type
   def color(args, &block)
 
     dispatch(:color, args, &block)

data/lib/atome/kernel/universe.rb

@@ -2,6 +2,7 @@
 
 # universe method here
 class Universe
+  @counter=0
   @atomes = {}
   @classes = {}
   @atome_list = []
@@ -10,7 +11,7 @@ class Universe
   @options = {}
   @sanitizers = {}
   class << self
-    attr_reader :atomes, :renderer_list, :atome_list, :particle_list, :classes
+    attr_reader :atomes, :renderer_list, :atome_list, :particle_list, :classes, :counter
 
     def add_to_particle_list(particle = nil, type)
       instance_variable_get('@particle_list')[particle]=type
@@ -43,6 +44,7 @@ class Universe
     def add_to_atomes(id, atome)
       # instance_variable_get('@atomes').merge!(atome)
       @atomes[id] = atome
+      @counter=@counter+1
     end
 
     def update_atome_id(id, atome, prev_id)

data/lib/atome/presets/atome.rb

@@ -5,7 +5,7 @@
 # TODO: Factorise codes below
 # TODO we must clarified/unified the usage of presets and sanitizer it is not clear
 
-# shaper creation
+
 class Atome
   def atome_common(atome_type, generated_id, generated_render, generated_parents, generated_children, params)
     temp_default = Essentials.default_params[atome_type] || {}
@@ -21,7 +21,7 @@ class Atome
     default_renderer = Essentials.default_params[:render_engines]
     atome_type = :box
     generated_render = params[:renderers] || default_renderer
-    generated_id = params[:id] || "#{atome_type}_#{Universe.atomes.length}"
+    generated_id = params[:id] || identity_generator(:box)
     generated_parents = params[:parents] || [id.value]
     generated_children = params[:children] || []
 
@@ -34,74 +34,11 @@ class Atome
     default_renderer = Essentials.default_params[:render_engines]
     atome_type = :circle
     generated_render = params[:renderers] || default_renderer
-    generated_id = params[:id] || "#{atome_type}_#{Universe.atomes.length}"
+    generated_id = params[:id] || identity_generator(:circle)
     generated_parents = params[:parents] || [id.value]
     generated_children = params[:children] || []
     params = atome_common(atome_type, generated_id, generated_render, generated_parents, generated_children, params)
     Atome.new({ atome_type => params }, &bloc)
   end
 
-  # def image(params = {}, &bloc)
-  #   default_renderer = Essentials.default_params[:render_engines]
-  #   generated_id = params[:id] || "image_#{Universe.atomes.length}"
-  #   generated_render = params[:renderers] || default_renderer
-  #   generated_parents = params[:parents] || id.value
-  #   # TODO : the line below should get the value from default params Essentials
-  #   temp_default = { renderers: generated_render, id: generated_id, type: :image, parents: [generated_parents],
-  #                    children: [], width: 99, height: 99, path: './medias/images/atome.svg' }
-  #   params = temp_default.merge(params)
-  #   Atome.new({ image: params }, &bloc)
-  # end
-  #
-  # def text(params = {}, &bloc)
-  #   default_renderer = Essentials.default_params[:render_engines]
-  #   atome_type = :text
-  #   generated_render = params[:renderers] || default_renderer
-  #   generated_id = params[:id] || "#{atome_type}_#{Universe.atomes.length}"
-  #   generated_parents = params[:parents] || [id.value]
-  #   generated_children = params[:children] || []
-  #   params = atome_common(atome_type, generated_id, generated_render, generated_parents, generated_children, params)
-  #   Atome.new({ atome_type => params }, &bloc)
-  # end
-
-  # def element(params = 'kjh', &bloc)
-  #   atome_type = :element
-  #
-  #   generated_render = params[:renderers] || []
-  #
-  #   generated_id = params[:id] || "#{atome_type}_#{Universe.atomes.length}"
-  #   generated_parents = params[:parents] || [id.value]
-  #   generated_children = params[:children] || []
-  #
-  #   generated_data = ""
-  #   params = atome_common(atome_type, generated_id, generated_render, generated_parents, generated_children, params)
-  #   # FIXME: do not merge generated_data like this but change the atomecommon
-  #   params.merge(generated_data)
-  #
-  #   Atome.new({ atome_type => params }, &bloc)
-  # end
-
-  # def web(params = {}, &bloc)
-  #   default_renderer = Essentials.default_params[:render_engines]
-  #
-  #   generated_id = params[:id] || "web_#{Universe.atomes.length}"
-  #   generated_render = params[:renderers] || default_renderer
-  #   generated_parents = params[:parents] || id.value
-  #   # TODO : the line below should get the value from default params Essentials
-  #   temp_default = { renderers: generated_render, id: generated_id, type: :web, parents: [generated_parents],
-  #                    children: [], width: 120, height: 120, path: 'https://www.youtube.com/embed/usQDazZKWAk' }
-  #   params = temp_default.merge(params)
-  #   Atome.new({ image: params }, &bloc)
-  # end
-
-  # def animation(params = {}, &bloc)
-  #   default_renderer = Essentials.default_params[:render_engines]
-  #   atome_type = :animation
-  #   generated_render = params[:renderers] || default_renderer
-  #   generated_id = params[:id] || "#{atome_type}_#{Universe.atomes.length}"
-  #   generated_parents = params[:parents] || []
-  #   generated_children = params[:children] || []
-  #   params = atome_common(atome_type, generated_id, generated_render, generated_parents, generated_children, params)
-  #   Atome.new({ atome_type => params }, &bloc)
-  # end
 end

data/lib/atome/renderers/browser/event.rb

@@ -4,6 +4,11 @@ generator = Genesis.generator
 
 generator.build_render(:browser_touch) do |value, proc|
   atome_id = @browser_object.attribute(:id)
+   # value.each do |tap_mode, user_proc|
+   #   alert "#{tap_mode} : #{user_proc}\n #{tap_mode.class} : #{user_proc.class}"
+   #   BrowserHelper.send("browser_touch_#{tap_mode}", atome_id,self, user_proc)
+   # end
+  # alert "#{value} : #{proc}\n #{value.class} : #{proc.class}"
   BrowserHelper.send("browser_touch_#{value}", atome_id,self, proc)
 end
 

data/lib/atome/renderers/renderer.rb

@@ -4,8 +4,8 @@
 class Atome
   private
 
-  def rendering(element, &user_proc)
-    params=instance_variable_get("@#{element}")
+  def rendering(element,params, &user_proc)
+    # params=instance_variable_get("@#{element}")
     render_engines = @atome[:renderers]
     render_engines.each do |render_engine|
       send("#{render_engine}_#{element}", params, &user_proc)

data/lib/atome/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Atome
-  VERSION = '0.5.3.7.3'
+  VERSION = '0.5.3.8.0'
 end

data/lib/atome.rb

@@ -10,6 +10,7 @@ require 'atome/helpers/essentials'
 require 'atome/renderers/renderer'
 require 'atome/helpers/color_helper/color'
 require 'atome/extensions/atome'
+require 'atome/extensions/mathematic'
 require 'atome/atome'
 require 'atome/helpers/callbacks'
 require 'atome/genesis/generators/atome'

data/vendor/assets/src/medias/images/logos/vimeo.svg

@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg height="800px" width="800px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
-	 viewBox="0 0 231.228 231.228" xml:space="preserve">
-<g>
-	<path style="fill:#3FA9F5;" d="M16.398,91.213c-0.596,0.367-1.192,0.412-1.833,0.412c-0.367,0.138-0.779,0.275-1.238,0.275
-		c-3.85,0.138-6.325-3.804-8.479-6.508s-4.446-5.271-4.767-8.846c0-0.092,0.046-0.183,0.092-0.275
-		c-0.275-0.963-0.229-1.971,0.183-2.934C14.06,43.499,50.499,24.203,81.987,21.728c0.137,0,0.275,0,0.412,0
-		c1.512,0,2.658,0.688,3.483,0.688c7.288,4.583,9.946,16.5,12.238,23.192c5.225,15.446,8.525,32.543,12.1,48.447
-		c3.667,16.546,8.984,58.164,32.955,30.938c6.142-6.967,10.359-16.821,13.475-26.767c-1.054-5.454-0.137-10.817-5.133-15.401
-		c-5.454-5.042-11.459-7.517-18.884-6.692c-1.238,0.137-2.063-0.55-2.429-1.513c-1.925-1.467-2.979-4.079-1.375-6.784
-		c16.317-27.592,55.414-68.935,88.598-37.264c34.559,33.047-4.308,91.578-23.971,120.912
-		c-21.084,31.443-67.469,75.902-109.911,55.368c-14.575-7.059-19.617-23.055-23.376-37.676
-		c-6.646-25.805-12.742-51.747-19.342-77.598c-0.092-0.183-0.229-0.321-0.367-0.504c-0.963-1.833-1.283-4.217-2.704-5.729
-		c-2.108-2.292-5.317-2.063-8.021-1.421C24.831,85.163,20.706,88.784,16.398,91.213z"/>
-</g>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg height="800px" width="800px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 viewBox="0 0 231.228 231.228" xml:space="preserve">
+<g>
+	<path style="fill:#3FA9F5;" d="M16.398,91.213c-0.596,0.367-1.192,0.412-1.833,0.412c-0.367,0.138-0.779,0.275-1.238,0.275
+		c-3.85,0.138-6.325-3.804-8.479-6.508s-4.446-5.271-4.767-8.846c0-0.092,0.046-0.183,0.092-0.275
+		c-0.275-0.963-0.229-1.971,0.183-2.934C14.06,43.499,50.499,24.203,81.987,21.728c0.137,0,0.275,0,0.412,0
+		c1.512,0,2.658,0.688,3.483,0.688c7.288,4.583,9.946,16.5,12.238,23.192c5.225,15.446,8.525,32.543,12.1,48.447
+		c3.667,16.546,8.984,58.164,32.955,30.938c6.142-6.967,10.359-16.821,13.475-26.767c-1.054-5.454-0.137-10.817-5.133-15.401
+		c-5.454-5.042-11.459-7.517-18.884-6.692c-1.238,0.137-2.063-0.55-2.429-1.513c-1.925-1.467-2.979-4.079-1.375-6.784
+		c16.317-27.592,55.414-68.935,88.598-37.264c34.559,33.047-4.308,91.578-23.971,120.912
+		c-21.084,31.443-67.469,75.902-109.911,55.368c-14.575-7.059-19.617-23.055-23.376-37.676
+		c-6.646-25.805-12.742-51.747-19.342-77.598c-0.092-0.183-0.229-0.321-0.367-0.504c-0.963-1.833-1.283-4.217-2.704-5.729
+		c-2.108-2.292-5.317-2.063-8.021-1.421C24.831,85.163,20.706,88.784,16.398,91.213z"/>
+</g>
 </svg>

data/vendor/assets/src/medias/rubies/examples/add.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 my_video = Atome.new(
-
+  video: { renderers: [:browser],  id: :video1, type: :video, parents: [:view],
+           path: './medias/videos/avengers.mp4', left: 333, top: 33, width: 777
+  }
 )
 
 my_video.touch(true) do
@@ -20,4 +22,4 @@ end
 
 my_video.markers({ markers: { begin: 6, code: jumper } })
 
-my_video.add({ markers: { my_stop: { begin: 16, code: stoper } } })
+my_video.add({ markers: { my_stop: { begin: 16, code: stoper } } })

data/vendor/assets/src/medias/rubies/examples/animation.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-bb = box({ id: :the_ref, width: 369 })
-bb.color(:red)
+bb = text({ id: :the_ref, width: 369, data: "touch me!" })
+bb.color(:orange)
 box({ id: :my_box, drag: true })
 c = circle({ id: :the_circle, left: 222, drag: { move: true, inertia: true, lock: :start } })
 c.shadow({ renderers: [:browser], id: :shadow2, type: :shadow,

data/vendor/assets/src/medias/rubies/examples/clone.rb

@@ -28,7 +28,7 @@ grab(:the_box_clone_1).rotate(33)
 
 
 wait 5 do
-  b.clones.value.each do |clone_found|
+  b.clones.each do |clone_found|
     grab(clone_found[:id]).delete(true)
   end
 end

data/vendor/assets/src/medias/rubies/examples/delete.rb

@@ -9,7 +9,7 @@ wait 4 do
 end
 
 wait 3 do
-  b.children.value.each do |attached_atome_id|
+  b.children.each do |attached_atome_id|
     b.delete({id: attached_atome_id})
     b.shadow({ renderers: [:browser], id: :shadow2, type: :shadow, parents: [], children: [],
                 left: 3, top: 9, blur: 3, direction: '',
@@ -24,6 +24,3 @@ wait 2 do
 end
 
 
-wait 1 do
-  b.delete({id: :the_circle})
-end

data/vendor/assets/src/medias/rubies/examples/detached.rb

@@ -4,10 +4,10 @@ color({ red: 0.8, green: 0.8, blue: 0.8, id: :active_color })
 color( { red: 0.3, green:  0.3, blue: 0.3, id: :inactive_color } )
 
 b=box
-b.attached([:inactive_color])
+b.attached(:inactive_color)
 puts b.attached
 b.touch(true) do
-  b.detached([:inactive_color])
-  b.attached([:active_color])
+  b.detached(:inactive_color)
+  b.attached(:active_color)
   puts b.attached
 end

data/vendor/assets/src/medias/rubies/examples/drag.rb

@@ -2,8 +2,8 @@
 
 a = box({ width: 333, height: 333, id: :the_boxy })
 a.color(:red)
-b = box({ width: 33, height: 33, id: :the_box, drag: true })
-b.parents([a.id.value])
+b = circle({ width: 33, height: 33, id: :the_box, drag: true })
+b.parents([a.id])
 b.color(:black)
 # b.parents([:the_boxy ])
 b.drag({ move: true }) do |e|
@@ -37,4 +37,11 @@ b.drag({ lock: :x })
 b.drag({ constraint: :parent })
 b.drag({ snap: { x: 100, y: 190 } })
 
-# b.drag({ constraint: :the_boxy })
+# b.drag({ constraint: :the_boxy })
+
+cc=circle(drag: true)
+bb=box({drag: true, color: :yellow})
+
+bb.parents(cc.id)
+
+# alert"#{b.parents.class} :  #{b.parents}"

data/vendor/assets/src/medias/rubies/examples/monitoring.rb

@@ -11,7 +11,7 @@ c = Atome.new(shape: { type: :shape, id: :my_pix, children: [], parents: [:view]
                        left: 50, right: 78
 })
 
-a.monitor({ atomes: grab(:view).children.value, particles: [:left] }) do |atome, element, value|
+a.monitor({ atomes: grab(:view).children, particles: [:left] }) do |atome, element, value|
   puts "monitoring: #{atome.id}, #{element}, #{value}"
 end
 
@@ -31,14 +31,14 @@ end
 
 aa.box({ id: :theboxy })
 
-aa.monitor({ atomes: grab(:view).children.value, particles: [:left] }) do |_atome, _element, value|
+aa.monitor({ atomes: grab(:view).children, particles: [:left] }) do |_atome, _element, value|
   puts "the left value was change to : #{value}"
 end
 
-aa.monitor({ atomes: grab(:view).children.value, particles: [:width] }) do |_atome, _element, value|
+aa.monitor({ atomes: grab(:view).children, particles: [:width] }) do |_atome, _element, value|
   puts "the width's value was change to : #{value}"
 end
 
-aa.monitor({ atomes: grab(:view).children.value, particles: [:left], id: :my_monitorer }) do |_atome, _element, value|
+aa.monitor({ atomes: grab(:view).children, particles: [:left], id: :my_monitorer }) do |_atome, _element, value|
   puts "the second monitor left value was log to : #{value}"
 end

data/vendor/assets/src/medias/rubies/examples/table.rb

@@ -61,7 +61,7 @@ grab(:my_table_26).color(:purple)
 # test.color(:blue)
 # m.columns(6).data[0..3].color(:white)
 
-grab(m.id.value).drag({ move: true }) do |e|
+grab(m.id).drag({ move: true }) do |e|
   puts e
 end
 wait 1 do
@@ -127,7 +127,7 @@ m.delete({ relations: :rel_2 })
 # grab("my_table_9").children .each do |child|
 #   grab(child).color(:white)
 # end
-matrix_ratio=m.height.value/m.width.value
+matrix_ratio=m.height/m.width
 # alert prev_size
 $window.on :resize do |e|
   # m.top(0)

data/vendor/assets/src/medias/rubies/examples/text.rb

@@ -3,24 +3,30 @@
 my_text = Atome.new(
   text: { renderers: [:browser], id: :text1, type: :text, parents: [:view], children: [], visual: { size: 33 },
           data: 'My first text!', left: 120, top: 33, width: 199, height: 33,
-          color: { renderers: [:browser], id: :c31, type: :color, parents: [:text1], children: [],
-                   red: 0.6, green: 0.6, blue: 0.6, alpha: 1 }
+
   }
 )
 
+Atome.new(color: { renderers: [:browser], id: :c31, type: :color, parents: [:text1], children: [],
+                   red: 0.6, green: 0.6, blue: 0.6, alpha: 1 })
+
 wait 1 do
   my_text.data(:kool)
 end
 
 text({ id: :the_text, left: 0 })
 
-text2 = Atome.new(
-    text: { renderers: [:browser], id: :text2, type: :text, parents: [:view], children: [], visual: { size: 33 },
-            data: 'My second text!', left: 333, top: 33, width: 199, height: 33,
-            color: { renderers: [:browser], id: :c31, type: :color, parents: [:text1], children: [],
-                     red: 0.6, green: 0.6, blue: 0.6, alpha: 1 }
-    }
+text2=Atome.new(
+  text: { renderers: [:browser], id: :text2, type: :text, parents: [:view], children: [], visual: { size: 33 },
+          data: 'My second text!', left: 333, top: 33, width: 199, height: 33,
+
+  }
 )
+
+
+
+Atome.new(color: { renderers: [:browser], id: :c33, type: :color, parents: [:text2], children: [],
+                   red: 0.6, green: 0.6, blue: 0.1, alpha: 1 })
 wait 2 do
   text2.data(:ok)
 end

data/vendor/assets/src/medias/rubies/examples/touch.rb

@@ -2,9 +2,9 @@
 
 separator=120
 b=box({ left: separator, id: :test_box })
-c=box({ left: b.left.value+separator })
-d=box({ left: c.left.value+separator })
-e=box({ left: d.left.value+separator })
+c=box({ left: b.left+separator })
+d=box({ left: c.left+separator })
+e=box({ left: d.left+separator })
 
 b.touch(:down) do
   b.color(:red)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atome
 version: !ruby/object:Gem::Version
-  version: 0.5.3.7.3
+  version: 0.5.3.8.0
 platform: ruby
 authors:
 - Jean-Eric Godard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arduino_firmata
@@ -394,6 +394,7 @@ files:
 - lib/atome/atome.rb
 - lib/atome/extensions/atome.rb
 - lib/atome/extensions/geolocation.rb
+- lib/atome/extensions/mathematic.rb
 - lib/atome/extensions/matrix.rb
 - lib/atome/extensions/ping.rb
 - lib/atome/extensions/sha.rb
@@ -556,6 +557,7 @@ files:
 - vendor/assets/src/medias/images/atome.svg
 - vendor/assets/src/medias/images/ballanim.png
 - vendor/assets/src/medias/images/blank.png
+- vendor/assets/src/medias/images/green_planet.png
 - vendor/assets/src/medias/images/icons/email.svg
 - vendor/assets/src/medias/images/icons/mail_gray.svg
 - vendor/assets/src/medias/images/icons/mail_green.svg