atome 0.5.7.1.6 → 0.5.7.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c05197d3eeae9cee5e96894387b264fa64b3f0436c513d03c9bee7edd7edc7aa
-  data.tar.gz: d21606ce307a9c85eca0207d95b502572bf287668c360228230d917672306f53
+  metadata.gz: 49d9ecf130f643cc65b60e7a935dd513871f3ecf0afca6b97476b57650ac0fee
+  data.tar.gz: 60843a34a863fc4ed3b324d0ae29913c58355eb69c7a8a732eb9445c933d256e
 SHA512:
-  metadata.gz: 69e1cc8e30ca124fa5402bd30ea6cb302bbef0b7aa90cad60cbcf9c80cef49bfefc2dc1ba35551f5ecc8d604154fd62f7c21dc3ca6340902d1a6a2c390d18aae
-  data.tar.gz: 4a3b520343611c272ea18853bf5449af84e35adbc8153538b1c3a969dcbaaccbe60375ba08ac97eb70e27b8cdf57ba38d0eb1f1d8d5a9ac998d80832f4a44476
+  metadata.gz: e599f47ecf7ab87cf472fe12d95ac2991ad3e192b85e74252304b738537ec0c513bbda6371331912ffaee9fa33be66795a2ba31ca3607296d4e910bd4b06d0b9
+  data.tar.gz: 5041dfd0b3600ec8b406f7a3d9bfbdc6e9e66c3e8b002ba576292d01e6277f379040d1f0f945922a21e33bcc09e8037f8889fb62caf4cb06472bad0109bba827

data/lib/atome/extensions/atome.rb

@@ -642,7 +642,7 @@ class Object
     end
   end
 
-  def above(item, margin)
+  def above(item, margin=6)
     pos = item.to_px(:bottom) + item.height + margin
     if item.display == :none
       33
@@ -651,7 +651,7 @@ class Object
     end
   end
 
-  def below(item, margin)
+  def below(item, margin=6)
     pos = item.to_px(:top) + item.to_px(:height) + margin
     if item.display == :none
       0
@@ -661,7 +661,7 @@ class Object
 
   end
 
-  def after(item, margin)
+  def after(item, margin=6)
     left_f = if item.left.instance_of?(Integer)
                item.left
              else
@@ -681,7 +681,7 @@ class Object
     end
   end
 
-  def before(item, margin)
+  def before(item, margin=6)
     pos = item.to_px(:right) + item.width + margin
     if item.display == :none
       0

data/lib/atome/genesis/sparkle.rb

@@ -64,6 +64,7 @@ Atome.new(
 Atome.new(
   { renderers: default_render, aid: :view,type: :shape, attach: :user_view, apply: [:view_color],
     tag: { system: true }, left: 0, right: 0, top: 0, bottom: 0, width: :auto, height: :auto, overflow: :auto,
+    language: :english
   }
 
 )
@@ -166,17 +167,18 @@ def init_database
 
   particles = Universe.particle_list
   # now we populate the DB
-  A.sync({ action: :crate_db_table, data: { table: :user, type: :string } }) do |_db_state|
+  A.sync({ action: :create_db_table, data: { table: :user, type: :string } }) do |_db_state|
     # puts "===> #{_db_state}"
   end
-
-  A.sync({ action: :create_db_column, data: { table: :user, column: :email, type: :string, unique: true } }) do |_db_state|
+  A.sync({ action: :create_db_table, data: { table: :atome } }) do |_db_state|
   end
 
-  A.sync({ action: :create_db_column, data: { table: :user, column: :password, type: :string } }) do |_db_state|
+  A.sync({ action: :create_db_table, data: { table: :history } }) do |_db_state|
   end
 
-  A.sync({ action: :crate_db_table, data: { table: :history } }) do |_db_state|
+  A.sync({ action: :create_db_column, data: { table: :user, column: :email, type: :string, unique: true } }) do |_db_state|
+  end
+  A.sync({ action: :create_db_column, data: { table: :user, column: :password, type: :string } }) do |_db_state|
   end
   A.sync({ action: :create_db_column, data: { table: :history, column: :aid, type: :string } }) do |_db_state|
   end
@@ -187,13 +189,6 @@ def init_database
   A.sync({ action: :create_db_column, data: { table: :history, column: :date, type: :datetime } }) do |_db_state|
   end
 
-  A.sync({ action: :crate_db_table, data: { table: :atome } }) do |_db_state|
-  end
-  particles.each do |particle, infos|
-    type = infos[:type]
-    A.sync({ action: :create_db_column, data: { table: :atome, column: particle, type: type } }) do |_db_state|
-    end
-  end
 
   # now we send localstorage content to the server
   puts "sending localstorage"

data/lib/atome/version.rb

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

data/lib/molecules/intuition/tools.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-
-
 size = 33
 smooth = 3
 shadow({
@@ -25,10 +23,10 @@ class Atome
   class << self
     def init_intuition
       Atome.start_click_analysis
-      root = Universe.tools_root
-      root.each_with_index do |root_tool, index|
+      toolbox_root = Universe.tools_root
+      toolbox_root[:tools].each_with_index do |root_tool, index|
         tools_scheme = Universe.tools[root_tool]
-        A.build_tool({ name: root_tool, scheme: tools_scheme, index: index })
+        A.build_tool({ name: root_tool, scheme: tools_scheme, index: index ,toolbox: toolbox_root[:toolbox] })
       end
     end
 
@@ -92,11 +90,11 @@ class Atome
           Universe.allow_localstorage = false
           #################################
           touch_found = atome_touched.touch
-          touch_procs=atome_touched.instance_variable_get("@touch_code")
+          touch_procs = atome_touched.instance_variable_get("@touch_code")
           resize_found = atome_touched.resize
-          resize_procs=atome_touched.instance_variable_get("@resize_code")
-          current_tool.data[:prev_states][atome_touched] = {events: { touch: touch_found, resize: resize_found },
-                                                            procs: {touch_code: touch_procs, resize_code: resize_procs } }
+          resize_procs = atome_touched.instance_variable_get("@resize_code")
+          current_tool.data[:prev_states][atome_touched] = { events: { touch: touch_found, resize: resize_found },
+                                                             procs: { touch_code: touch_procs, resize_code: resize_procs } }
           #################################
           current_tool.instance_exec(params, &pre) if pre.is_a? Proc
           Universe.allow_localstorage = storage_allowed
@@ -174,11 +172,15 @@ class Atome
   end
 
   def build_tool(params)
-    label = params[:name]
+    # here is the main entry for tool creation
+    language ||= grab(:view).language
+
+    label = params.dig(:scheme, :int8, language) || params[:name]
     tool_name = "#{params[:name]}_tool"
     index = params[:index]
-    orientation_wanted = :sn
     tool_scheme = params[:scheme]
+    toolbox=params[:toolbox] || {}
+    orientation_wanted = tool_scheme[:orientation] || :sn
     color({ id: :active_tool_col, alpha: 1, red: 1, green: 1, blue: 1 })
     color({ id: :inactive_tool_col, alpha: 0.6 })
     grab(:intuition).storage[:tool_open] ||= []
@@ -188,8 +190,10 @@ class Atome
     case orientation_wanted
     when :sn
       top = :auto
-      bottom = index * (size + 3)
-      left = 0
+      bottom_offset=toolbox[:bottom] || 3
+      spacing = toolbox[:spacing] || 3
+      bottom = index * (size + spacing)+bottom_offset
+      left = toolbox[:left] || 3
       right = :auto
     when :ns
     when :ew
@@ -231,7 +235,18 @@ class Atome
                                   }
 
                                 })
-    tool.vector({ tag: { system: true }, left: 9, top: :auto, bottom: 9, width: 18, height: 18, id: "#{tool_name}_icon" })
+    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, stroke: :black, 'stroke-width' => 37, fill: :white } }})
+    # wait 2 do
+    # alert "#{tool_name}_icon"
+    # alert "current vector : #{grab("#{tool_name}_icon").id}"
+    grab("#{tool_name}_icon").color(:blue)
+    # icon.color(:red)
+    # end
+    # icon= tool_scheme[:icon] || params[:name]
+    # tool.image({path: "medias/images/icons/#{icon}.svg"})
     tool.text({ tag: { system: true }, data: label, component: { size: 9 }, color: :grey, id: "#{tool_name}_label" })
     code_for_zone = tool_scheme[:zone]
     tool.instance_exec(tool, &code_for_zone) if code_for_zone.is_a? Proc

data/lib/molecules/intuition/utilities.rb

@@ -129,7 +129,6 @@ new(molecule: :list) do |params, _bloc|
     # let's create the container
     new_atome = { renderers: renderer_found, attach: list.id }.merge(styles_found).merge({ type: :shape })
 
-
     el = Atome.new(new_atome)
     if action
       el.touch(action[:touch]) do
@@ -329,11 +328,11 @@ class Atome
 
     width(params[:width])
     height(params[:height])
-    current_matrix=self
+    current_matrix = self
     real_width = current_matrix.to_px(:width)
     real_height = current_matrix.to_px(:height)
     spacing = current_matrix.data[:spacing]
-    matrix_cells= current_matrix.data[:matrix]
+    matrix_cells = current_matrix.data[:matrix]
 
     total_spacing_x = spacing * (matrix_cells.collect.length ** (0.5) + 1)
     total_spacing_y = spacing * (matrix_cells.collect.length ** (0.5) + 1)
@@ -363,13 +362,21 @@ class Atome
 end
 
 new(molecule: :matrix) do |params, &bloc|
-  id = params[:id]
-  rows = params[:rows]
-  columns = params[:columns]
-  spacing = params[:spacing]
-  size = params[:size]
+  params  ||= {}
+  # We test if self is main if so we attach the matrix to the view
+  parent_found = if self == self
+                   grab(:view)
+                 else
+                   self
+                 end
+
+  id = params[:id] || identity_generator
+  rows = params[:rows] || 8
+  columns = params[:columns] || 8
+  spacing = params[:spacing] || 6
+  size = params[:size] || '100%'
 
-  parent_found = self
+  # parent_found = self
   current_matrix = group({ id: id })
 
   current_matrix.data({ spacing: spacing, size: size })
@@ -414,7 +421,7 @@ new(molecule: :matrix) do |params, &bloc|
   end
   current_matrix.collect(matrix_cells)
   matrix_back.cells(current_matrix)
-  params= params.merge({matrix: current_matrix})
+  params = params.merge({ matrix: current_matrix })
   matrix_back.data(params)
   matrix_back
 end

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

@@ -1,2 +1,204 @@
 # frozen_string_literal: true
 
+
+########################### Test  check and verification below ############################
+
+new({ tool: :blur }) do |params|
+
+  active_code = lambda {
+    puts :alteration_tool_code_activated
+  }
+
+  inactive_code = lambda { |param|
+    puts :alteration_tool_code_inactivated
+  }
+  pre_code = lambda { |params|
+    puts "pre_creation_code,atome_touched: #{:params}"
+
+  }
+  post_code = lambda { |params|
+    puts "post_creation_code,atome_touched: #{:params}"
+
+  }
+
+  zone_spe = lambda { |current_tool|
+    puts "current tool is : #{:current_tool} now creating specific zone"
+    # b = box({ width: 33, height: 12 })
+    # b.text({ data: :all })
+
+  }
+
+  {
+    activation: active_code,
+    inactivation: inactive_code,
+    alteration: { width: 22, blur: 3 },
+    pre: pre_code,
+    post: post_code,
+    zone: zone_spe,
+    icon: :color,
+    int8: { french: :couleur, english: :color, german: :colorad } }
+
+end
+
+new({ tool: :box }) do |params|
+
+  active_code = lambda {
+    puts :creation_tool_code_activated
+  }
+
+  inactive_code = lambda { |atomes_treated|
+    puts :creation_tool_code_inactivated
+
+  }
+  pre_creation_code = lambda { |params|
+    puts "pre_creation_code : atome_touched : #{:params} "
+
+  }
+
+  post_creation_code = lambda { |params|
+    puts "post_creation_code,atome_touched: #{:params}"
+  }
+
+  { creation: { box: { color: :blue, width: 66, height: 66 } },
+    activation: active_code,
+    inactivation: inactive_code,
+    pre: pre_creation_code,
+    post: post_creation_code,
+    int8: { french: :formes, english: :shape, german: :jesaispas } }
+
+end
+
+
+new({ tool: :project }) do
+  active_code = lambda {
+
+    alert :get_projects_now
+    # if  Atome.selection.instance_of? Array
+    # end
+    # Atome.selection.each do |atome_id_to_treat|
+    #   # #   # reinit first to avoid multiple drag event
+    #   # #   grab(atome_id_to_treat).drag(false)
+    # end
+    # drag_remove
+    # puts :alteration_tool_code_activated
+  }
+  { activation: active_code }
+end
+
+new({tool: :test}) do
+  active_code = lambda {
+    b=grab(:view).box({})
+    b.touch(true) do
+      alert :kool
+    end
+  }
+  # active_code=:tito
+  { activation: active_code }
+end
+
+
+Universe.tools_root= {tools: [:blur, :box, :test],toolbox: { orientation: :ew, left:9 , bottom: 9, spacing: 9} }
+# Universe.tools_root=[:test]
+Atome.init_intuition
+
+wait 1 do
+  grab(:blur_tool_icon).color(:red)
+  wait 1 do
+    grab(:box_tool_icon).color(:red)
+    wait 1 do
+      grab(:test_tool_icon).color(:red)
+    end
+  end
+end
+
+
+# ################### check below
+
+# b = box({ left: 123, top: 66, selected: false, id: :the_box, color: :green })
+# b.touch(:down) do
+#   puts " on touch : #{Universe.allow_localstorage}"
+# end
+# b.resize(true) do
+#   puts :good!
+# end
+# the_circ = circle({ left: 123, top: 120, selected: false, id: :the_circle })
+#
+# the_circ.touch(:down) do |params|
+#   puts " down : params: #{params}, id: #{the_circ.id}"
+# end
+#
+# the_circ.touch(:up) do
+#   puts "up :kool"
+# end
+# the_circ.drag(true) do
+#   puts "drag : now"
+# end
+#
+# bb = box({ left: 333, width: 120, selected: false, id: :big_box })
+#
+# b = box({ id: :the_big_boxy })
+
+#################@
+# text({ data: :hello, selected: true, left: 120, id: :texting, blur: 12 })
+# text({data: :hello, left: 120, id: :texting})
+# Universe.tools.each_with_index do |(tool_name, bloc), index|
+#  Atome.instance_exec(&bloc) if bloc.is_a?(Proc)
+#   # alert "#{tool_name} : #{tool_content}"
+#   # alert b.id
+# end
+
+# wait 2 do
+#   # c.preset( {:box=>{:width=>39, :height=>39, :apply=>[:box_color], :left=>0, :top=>0}} )
+#   c.preset( :box )
+# end
+# b=box({left: 333, top: 333})
+# b.touch(true) do
+#   alert Atome.selection
+# end
+# grab(:the_texting).color(:white)
+# grab(:the_texting).left(33)
+# grab(:the_texting).top(133)
+# grab(:the_texting).width(133)
+# grab(:the_texting).top(133)
+# grab(:the_texting).data(:kool)
+# grab(:the_texting).type(:text)
+# grab(:the_texting).rotate(:text)
+
+# b=box
+# b.touch(true) do
+#   puts :ok
+#   # alert b.instance_variable_get('@touch')
+#   # alert b.instance_variable_get('@touch_code')
+#   b.touch(false)
+#   wait 3 do
+#     puts :ready
+#     b.touch(true) do
+#       puts :kool
+#     end
+#     # alert b.touch
+#     # alert b.instance_variable_get('@touch')
+#     # alert b.instance_variable_get('@touch_code')
+#   end
+# end
+
+# A.html.record
+
+# A.html.record
+
+
+
+
+
+
+
+# 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"
+#
+# v = vector({left: 99, data: { path: { d: edition, id: :p1, stroke: :black, 'stroke-width' => 37, fill: :red } } })
+# v2 = vector({top: 66,data: { circle: { cx: 300, cy: 300, r: 340, id: :p2, stroke: :blue, 'stroke-width' => 35, fill: :yellow } } } )
+# wait 1 do
+#   v.color(:blue)
+#   wait 1 do
+#     v2.color(:blue)
+#   end
+# end
+

data/vendor/assets/server/database.rb

@@ -32,21 +32,9 @@ class Database
       end
     end
 
-    # def create_column(table, column_name, type)
-    #   eden = Sequel.connect("sqlite://eden.sqlite3")
-    #   if eden.table_exists?(table)
-    #     unless eden.schema(table).any? { |column| column.first == column_name }
-    #       Sequel.migration do
-    #         change do
-    #           add_column table, column_name, type
-    #         end
-    #       end.apply(eden, :up)
-    #     end
-    #   end
-    # end
     def create_column(table, column_name, type)
       eden = Sequel.connect("sqlite://eden.sqlite3")
-      if eden.table_exists?(table)
+      if eden.table_exists?(table) ||  !eden.schema(table).any? { |col| col[0] == column_name }
         begin
           Sequel.migration do
             change do
@@ -54,10 +42,14 @@ class Database
             end
           end.apply(eden, :up)
         rescue Sequel::DatabaseError => e
-          puts "error adding column  : #{e.message}"
+          puts "column  #{e.message} already exist"
         end
       end
+
     end
+
+
+
   end
 
 end

data/vendor/assets/server/eDen.rb

@@ -234,7 +234,7 @@ class EDen
       { data: { message: 'database_ready' }, message_id: message_id }
     end
 
-    def crate_db_table(data, message_id, ws)
+    def create_db_table(data, message_id, ws)
       table = data['table']
       type = data['type']
       primary = data['primary']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atome
 version: !ruby/object:Gem::Version
-  version: 0.5.7.1.6
+  version: 0.5.7.1.7
 platform: ruby
 authors:
 - Jean-Eric Godard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-28 00:00:00.000000000 Z
+date: 2024-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine