atome 0.5.7.3.6 → 0.5.7.4.2

data/lib/atome/kernel/universe.rb

@@ -23,32 +23,24 @@ class Universe
   @allow_sync = false # temp server storage sync
   @connected = false
   @database_ready = false
-  @tools_root=[]
+  @tools_root = []
   @tools = {}
   @allow_tool_operations = false
   @active_tools = []
   @atome_preset = []
-  @default_selection_style={border: { thickness: 1, red: 1, green: 0, blue: 0, alpha: 1, pattern: :dotted }}
-  @applicable_atomes= %i[color shadow border paint animation]
+  @default_selection_style = { border: { thickness: 1, red: 1, green: 0, blue: 0, alpha: 1, pattern: :dotted } }
+  @applicable_atomes = %i[color shadow border paint animation]
   # @historicize=false
   class << self
     attr_reader :atomes, :atomes_ids, :renderer_list, :molecule_list, :atome_list, :particle_list, :classes, :counter,
                 :atomes_specificities
-    attr_accessor :connected, :allow_sync, :allow_localstorage, :database_ready, :edit_mode, :tools,:tools_root,
+    attr_accessor :connected, :allow_sync, :allow_localstorage, :database_ready, :edit_mode, :tools, :tools_root,
                   :allow_tool_operations, :active_tools, :atome_preset, :applicable_atomes, :default_selection_style
 
     def messages
       @messages
     end
 
-    # def eVe(val = nil)
-    #   if val
-    #     @eve = val
-    #   else
-    #     @eve
-    #   end
-    # end
-
     def store_messages(new_msg)
       @messages[new_msg[:msg_nb]] = new_msg[:proc]
     end
@@ -98,13 +90,11 @@ class Universe
 
     def add_sanitizer_method(method_name, &method_proc)
       # this method is used to add sanitizer methods
-      # instance_variable_get('@sanitizers').merge!({ method_name => method_proc })
       @sanitizers.merge!({ method_name => method_proc })
     end
 
     def get_sanitizer_method(method_name)
       # this method is used to add optional methods
-      # instance_variable_get('@sanitizers')[method_name]
       @sanitizers[method_name]
     end
 
@@ -125,21 +115,10 @@ class Universe
       @atomes_ids[id] = aid
     end
 
-    # def update_atome_id(aid, atome, prev_id)
-    #   @atomes[id] = atome
-    #   @atomes.delete(prev_id)
-    # end
-    # def update_atome_id(id, atome, prev_id)
-    #   @atomes[id] = atome
-    #   @atomes.delete(prev_id)
-    # end
-
     def user_atomes
       collected_id = []
-      @atomes.each do |id_found, atome_found|
-        # collected_id << id_found unless atome_found.tag && atome_found.tag[:system]
+      @atomes.each_value do |atome_found|
         collected_id << atome_found.id unless atome_found.tag && atome_found.tag[:system]
-
       end
       collected_id
     end
@@ -217,7 +196,6 @@ class Universe
     end
 
     def current_server
-      # return unless RUBY_ENGINE.downcase == 'opal'
       JS.global[:location][:href].to_s
     end
 
@@ -275,34 +253,16 @@ class Universe
         operation_timing = Time.now.strftime("%Y%m%d%H%M%S%3N") + @increment.to_s
         @increment += 1
         @increment = @increment % 100
-        # puts "===> { #{id} => { #{operation} => { #{element} => #{params} } }, sync: false }"
-        # puts "<==== #{@allow_localstorage} : #{element} ====>"
         if @allow_localstorage.include? element
           JS.global[:localStorage].setItem(operation_timing, "{ #{id} => { #{operation} => { #{element} => #{params} } }, sync: false }")
           @history[@history.length] = { operation_timing => { id => { operation => { element => params } }, sync: false, time: Time.now } }
-          # puts "===> { #{id} => { #{operation} => { #{element} => #{params} } }, sync: false }"
         end
 
-
       end
     end
 
     def story
       @history
-      # # temp algo awaiting db to be ready, just for POC and tests
-      # return unless filter
-      #
-      # operation = filter[:operation]
-      # atome_id = filter[:id]
-      # particle = filter[:particle]
-      # filtered_history = []
-      # @history.each do |operation_number, alteration|
-      #   if alteration[atome_id] && (alteration[atome_id][operation]) && (alteration[atome_id][operation][particle])
-      #     filtered_history << { operation: operation_number, filter[:particle] => alteration[atome_id][operation][particle], sync: alteration[:sync], time: alteration[:time] }
-      #   end
-      # end
-      # filtered_history
     end
-
   end
 end

data/lib/atome/presets/atome.rb

@@ -13,15 +13,10 @@ class Atome
     # TODO : remove Essentials.default_params[atome_preset] || {} as it is
     # applied twice because preset is now a particle
     preset_params = Essentials.default_params[atome_preset] || {}
-    # preset_params =  {preset: atome_preset}
     basic_params[:type] = preset_params[:type] || :element
-    # basic_params[:aid] =  identity_generator(:a)
-    # alert "common =>  #{params[:id]}"
-    # alert "basic_params  #{basic_params[:id].class}"
     basic_params[:id] = params[:id] || identity_generator
     basic_params[:renderers] = @renderers || preset_params[:renderers]
     essential_params = basic_params.merge(preset_params)
-    #
     reordered_params = essential_params.reject { |key, _| params.has_key?(key) }
     params = reordered_params.merge(params)
     params[:id] = params[:id].to_sym
@@ -45,23 +40,6 @@ class Atome
     Atome.new(params, &bloc)
   end
 
-  # def box(params = {}, &bloc)
-  #   atome_preset = :box
-  #   params = atome_common(atome_preset, params)
-  #   preset_common(params, &bloc)
-  # end
-  #
-  # # def intuition(params = {}, &bloc)
-  # #   atome_preset = :intuition
-  # #   params = atome_common(atome_preset, params)
-  # #   preset_common(params, &bloc)
-  # # end
-  #
-  # def circle(params = {}, &bloc)
-  #   atome_preset = :circle
-  #   params = atome_common(atome_preset, params)
-  #   preset_common(params, &bloc)
-  # end
 end
 
 

data/lib/atome/utilities/utilities.rb

@@ -327,7 +327,7 @@ class Atome
     Atome.define_method("#{element}_callback") do |return_params|
       # we test if instance_variable_get("@#{element}_code") is a hash for the can se the particle value is a hash
       proc_found = if instance_variable_get("@#{element}_code").instance_of? Hash
-                     # Then we get the first item of the hash because the proc is attached to it
+                     # Then we get the first item of the hash because the proc is fasten to it
                      instance_variable_get("@#{element}_code").values.first
                      # instance_exec(@callback[element], proc_found)if proc_found.is_a? Proc
                    else
@@ -430,11 +430,12 @@ class Atome
     end
   end
 
-  def detach_atome(atome_id_to_detach)
-    atome_to_detach = grab(atome_id_to_detach)
-    # TODO: remove the condition below and find why it try to detach an atome that doesn't exist
-    nil unless atome_to_detach
-  end
+  # def detach_atome(atome_id_to_detach)
+  #   alert :uuu
+  #   atome_to_detach = grab(atome_id_to_detach)
+  #   # TODO: remove the condition below and find why it try to detach an atome that doesn't exist
+  #   nil unless atome_to_detach
+  # end
 
   def debug(msg)
     puts msg
@@ -459,8 +460,8 @@ class Atome
     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
+    #  we delete the parent (the layout) if it no more children fasten
+    if parent_found.fasten.length == 0
       parent_found.delete(true)
     end
   end
@@ -503,12 +504,22 @@ class Atome
   #   puts "sanitizer temp patch when an atome is passed instead of an id"
   #   @id
   # end
+  # def transform_to_string_keys_and_values(hash)
+  #   hash.transform_keys(&:to_s).transform_values do |value|
+  #     if value.is_a?(Hash)
+  #       transform_to_string_keys_and_values(value)
+  #     else
+  #       value.to_s
+  #     end
+  #   end
+  # end
 
   def sync(params, &bloc)
     params = { data: params } unless params.instance_of? Hash
     message_id = "msg_#{Universe.messages.length}"
     params[:message_id] = message_id
     Universe.store_messages({ msg_nb: message_id, proc: bloc })
+    # params = transform_to_string_keys_and_values(params)
     html.send_message(params)
   end
 

data/lib/atome/version.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 #  return atome version
+
 class Atome
-  VERSION = '0.5.7.3.6'
+  VERSION = '0.5.7.4.2'
 end

data/lib/molecules/init.rb

@@ -6,10 +6,6 @@ end
 
 class Object
   include Molecule
-  # we add a getter for the molecule in standard ruby Object
-  # def molecule
-  #   @molecule
-  # end
 end
 
 class Atome
@@ -17,15 +13,5 @@ class Atome
 end
 
 
-# tests
-# new({application: :compose, header: true, footer: true })
-#
-# new(page: {name: :home, application: :compose, attach: :root })
-#
-# new(module: {name: :home, application: :compose, attach: :root })
-
-
-
-
 
 

data/lib/molecules/intuition/tools.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 def truncate_string(string, max_length)
-  string.length > max_length ? string.slice(0, max_length) + "." : string
+  string.length > max_length ? string.slice(0, max_length) + '.' : string
 end
 
 size = 33
@@ -53,7 +53,7 @@ class Atome
     def activate_click_analysis
       # the condition below avoid touchdown analysis accumulation
       unless @click_analysis_active
-        # this method analyse all object under the touchdown to find the first user objet and return it's id
+        # this method analyse all object under the touchdown to find the first user object and return it's id
         @click_analysis = lambda { |native_event|
           # the instance variable below check if we can apply tool (cf:  if the atome we don't want to apply tool)
           if Universe.allow_tool_operations
@@ -66,10 +66,9 @@ class Atome
                 id_found = atome_touched[:id].to_s
                 atome_found = grab(id_found)
                 # unless (atome_found && atome_found.tag[:system])
-                if atome_found && !atome_found.tag[:system]
-                  Universe.active_tools.each do |tool|
-                    apply_tool(tool, atome_found, event)
-                  end
+                puts 'we have to check if operation is a creation or an alteration to include or exclude the view '
+                Universe.active_tools.each do |tool|
+                  apply_tool(tool, atome_found, event)
                 end
 
                 break
@@ -90,6 +89,7 @@ class Atome
     end
 
     def start_click_analysis
+      # here we capture any touch when usingh tool
       @click_analysis_active = false
       JS.global[:document].addEventListener('mouseup') do |native_event|
         Atome.instance_exec(native_event, &@click_analysis) if @click_analysis.is_a?(Proc)
@@ -120,11 +120,9 @@ class Atome
     end
 
     def creation(current_tool, tool_actions, atome_touched, a_event)
-      # we store prev_local_storage prior to lock it to prevent unwanted logs
-      # prev_local_storage=Universe.allow_localstorage()
+      @creation_mode = true
       storage_allowed = Universe.allow_localstorage
       Universe.allow_localstorage = false
-
       action_found = tool_actions[:action]
       pre = tool_actions[:pre]
       post = tool_actions[:post]
@@ -140,7 +138,6 @@ class Atome
                       else
                         grab(:view).send(atome, temp_val)
                       end
-          # current_tool.data[:treated] << new_atome
           current_tool.data[:created] << new_atome
           params.delete(:atome_touched)
           params[new_atome: new_atome]
@@ -155,6 +152,7 @@ class Atome
     end
 
     def apply_tool(tool, atome_touched, a_event)
+
       current_tool = grab(tool)
       tool_actions = current_tool.data
       method_found = tool_actions[:method]
@@ -165,18 +163,20 @@ class Atome
       end
       tool_name = tool.to_s.sub('_tool', '')
       tools_scheme = Universe.tools[tool_name.to_sym]
-      puts "1 - here slider treat either the target atome types or current atome"
-      puts "2 - need to created a list instead of choosing the last atome found of it's kind"
 
       target = if tools_scheme[:target]
                  grab(atome_touched.send(tools_scheme[:target]).last)
                else
                  atome_touched
                end
-      tools_scheme[:particles]&.each do |particle_f, value_f|
-        target.send(particle_f, value_f)
+      unless method_found == :alteration && target.tag[:system]
+
+        tools_scheme[:particles]&.each do |particle_f, value_f|
+          target.send(particle_f, value_f)
+        end
+        send(method_found, current_tool, tool_actions, target, a_event)
       end
-      send(method_found, current_tool, tool_actions, target, a_event)
+
     end
 
   end
@@ -213,7 +213,6 @@ class Atome
     tool.data[:created] = []
     tool.data[:prev_states] = {}
     # generic behavior
-    # tool.apply(:active_tool_col)
     grab("#{tool_name}_icon").color(:white)
     grab("#{tool_name}_label").color(:white)
     Universe.active_tools << tool_name
@@ -244,8 +243,7 @@ class Atome
         Atome.apply_tool(tool_name, atome_found, event)
       end
     end
-
-    # # activate tool analysis test
+    # activate tool analysis test
     Atome.activate_click_analysis
     tool.active(true)
   end
@@ -255,10 +253,10 @@ class Atome
     tool_scheme = @tool_scheme
     tool = self
     tool.active(false)
-    tool.instance_variable_get("@toolbox")&.each do |sub_tool_id|
+    tool.instance_variable_get('@toolbox')&.each do |sub_tool_id|
       toolbox_tool = grab("#{sub_tool_id}_tool")
       toolbox_tool.deactivate_tool
-      # we delete the attached toolbox if it exist
+      # we delete the fasten toolbox if it exist
       toolbox_tool.delete({ force: true })
     end
     grab("#{tool_name}_icon").color(grab(:toolbox_style).data[:text_color])
@@ -291,7 +289,6 @@ class Atome
     tool_name = "#{params[:name]}_tool"
     index = params[:index]
     tool_scheme = params[:scheme]
-    # @tool_scheme=params[:scheme]
     toolbox = params[:toolbox] || {}
     orientation_wanted = tool_scheme[:orientation] || :sn
 
@@ -343,16 +340,14 @@ class Atome
                                           action: action,
                                           allow_alteration: true,
                                           allow_creation: true,
-                                          # activation: tool_scheme[:activation],
-                                          #  inactivation: tool_scheme[:inactivation], zone: tool_scheme[:zone],
                                           post: tool_scheme[:post],
                                           pre: tool_scheme[:pre],
                                   }
 
                                 })
 
-    tool.instance_variable_set("@tool_scheme", tool_scheme)
-    edition = "M257.7 752c2 0 4-0.2 6-0.5L431.9 722c2-0.4 3.9-1.3 5.3-2.8l423.9-423.9c3.9-3.9 3.9-10.2 0-14.1L694.9 114.9c-1.9-1.9-4.4-2.9-7.1-2.9s-5.2 1-7.1 2.9L256.8 538.8c-1.5 1.5-2.4 3.3-2.8 5.3l-29.5 168.2c-1.9 11.1 1.5 21.9 9.4 29.8 6.6 6.4 14.9 9.9 23.8 9.9z m67.4-174.4L687.8 215l73.3 73.3-362.7 362.6-88.9 15.7 15.6-89zM880 836H144c-17.7 0-32 14.3-32 32v36c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-36c0-17.7-14.3-32-32-32z"
+    tool.instance_variable_set('@tool_scheme', tool_scheme)
+    edition = 'M257.7 752c2 0 4-0.2 6-0.5L431.9 722c2-0.4 3.9-1.3 5.3-2.8l423.9-423.9c3.9-3.9 3.9-10.2 0-14.1L694.9 114.9c-1.9-1.9-4.4-2.9-7.1-2.9s-5.2 1-7.1 2.9L256.8 538.8c-1.5 1.5-2.4 3.3-2.8 5.3l-29.5 168.2c-1.9 11.1 1.5 21.9 9.4 29.8 6.6 6.4 14.9 9.9 23.8 9.9z m67.4-174.4L687.8 215l73.3 73.3-362.7 362.6-88.9 15.7 15.6-89zM880 836H144c-17.7 0-32 14.3-32 32v36c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-36c0-17.7-14.3-32-32-32z'
     icon = tool.vector({ tag: { system: true }, left: 9, top: :auto, bottom: 9, width: 18, height: 18, id: "#{tool_name}_icon",
                          data: { path: { d: edition, id: "p1_#{tool_name}_icon", stroke: :black, 'stroke-width' => 37, fill: :white } } })
 
@@ -368,14 +363,14 @@ class Atome
       tool.instance_variable_set('@prevent_action', true)
       if tool.instance_variable_get('@tool_open') == true
         tool.instance_variable_set('@tool_open', false)
-        tool_scheme[:particles].each do |particle, value|
+        tool_scheme[:particles].each_key do |particle|
           grab("tool_particle_#{particle}").delete({ force: true })
         end
         tool.width(size)
       else
         tool.instance_variable_set('@tool_open', true)
 
-        tool_scheme[:particles].each_with_index do |(particle_name, _value_), ind|
+        tool_scheme[:particles]&.each_with_index do |(particle_name, _value_), ind|
 
           particle = tool.box({ id: "tool_particle_#{particle_name}", tag: { system: true }, depth: 1, smooth: smooth,
                                 apply: %i[inactive_tool_col tool_box_border tool_shade],
@@ -413,16 +408,11 @@ class Atome
             if particle.instance_variable_get('@active')
               grab(slider_id).delete({ force: true })
               particle.instance_variable_set('@active', false)
-              # particle.top(:auto)
-              # particle.top(:bottom)
               particle.height(size)
               particle.top(0)
             else
               particle.height(139 + size / 2)
               particle.top(-139 + size)
-              # particle.top(:auto)
-              # particle.top(:bottom)
-              # particle.color(:green)
               slider_id = "particle_slider_#{particle_name}"
               slider_f = particle.slider({ orientation: :vertical,
                                            id: slider_id,
@@ -441,23 +431,19 @@ class Atome
                 if grab(slider_id).instance_variable_get('@initialised')
                   Atome.selection.each do |atome_id_to_treat|
 
-                    # puts "-------> #{tool_scheme[:particles][particle_name]} , #{value }"
                     tool_scheme[:particles][particle_name] = value.to_f / 100
-                    # tools_scheme[:particles]
                     atome_found = grab(atome_id_to_treat)
                     target = grab(atome_found.color.last)
 
                     target.send(particle_name, value.to_f / 100)
                     label_value.data(value.to_f / 100)
-                    # puts "+++++++> #{tool_scheme[:particles]} }"
                   end
                 end
               end
-              puts "2  ======> opening !!!#{particle_name}"
 
               Atome.selection.each do |atome_id_to_treat|
                 atome_found = grab(atome_id_to_treat)
-                puts "here slider treat either the target atome types or current atome"
+                puts 'here slider treat either the target atome types or current atome'
                 puts "need to created a list instead of choosing the last atome found of it's kind"
                 target = if tool_scheme[:target]
                            grab(atome_found.send(tool_scheme[:target]).last)
@@ -472,8 +458,7 @@ class Atome
             end
 
           end
-        end if tool_scheme[:particles]
-        # tool.width(((size + margin) * (tool_scheme[:particles].length + 1)))
+        end
       end
 
     end
@@ -481,8 +466,6 @@ class Atome
       tool.depth(999)
     end
     tool.touch(true) do
-
-      # puts "==> prevent : #{tool.instance_variable_get('@prevent_action')}"
       unless tool.instance_variable_get('@prevent_action')
         # we add all specific tool actions to @tools_actions_to_exec hash
         # we set allow_tool_operations to false to ignore tool operation when clicking on a tool
@@ -495,10 +478,8 @@ class Atome
           tick[tool_name] = 0
         end
       end
-      puts 'reactivation'
       tool.instance_variable_set('@prevent_action', false)
     end
-
   end
 
 end