atome 0.5.5.6.5 → 0.5.5.6.7.9

data/exe/atome

@@ -70,6 +70,7 @@ def build_aui(destination, project_name)
   # now building opal version
   js_directory = "#{destination}/#{project_name}/src/js"
   opal_js = "#{js_directory}/aui.js"
+  FileUtils.mkdir_p(js_directory)
   File.new opal_js, 'w'
   # we add platform_specific script to the Opal framework
   opal_content = Opal::Builder.build("#{path}aui.rb").to_s
@@ -131,7 +132,19 @@ STR
   File.open(opal_compiler, 'w') do |f|
     f.puts opal_compiler_content
   end
-  `cd #{destination}/#{project_name}/tmp/application/;pwd;ruby .opal_compiler.rb`
+  if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+    # Code à exécuter sous Windows
+    `cd #{destination}\\#{project_name}\\tmp\\application\\ && echo %cd% && ruby .opal_compiler.rb`
+
+  elsif RbConfig::CONFIG['host_os'] =~ /darwin|mac os/
+    # Code à exécuter sous MacOS
+    `cd #{destination}/#{project_name}/tmp/application/;pwd;ruby .opal_compiler.rb`
+
+  else
+    # Code à exécuter sous Unix/Linux
+    `cd #{destination}/#{project_name}/tmp/application/;pwd;ruby .opal_compiler.rb`
+  end
+
 end
 
 def add_to_application_folder(script_source, destination, project_name)
@@ -165,7 +178,7 @@ def create_application(source, destination, project_name)
   end
   # we copy all folder to be refreshed
   files_list.each do |file|
-    FileUtils.cp_r("#{source}/vendor/assets/#{file}", "#{destination}/#{project_name}/#{file}") unless Dir.exist?(file)
+    FileUtils.cp_r("#{source}/vendor/assets/#{file}", "#{destination}/#{project_name}/#{file}")
   end
   build_aui(destination, project_name)
 end
@@ -201,6 +214,7 @@ def build_atome_kernel_for_opal(source, destination, project_name)
   #  now lets build the atome kernel
   atome_directory = "#{destination}/#{project_name}/src/js/atome"
   kernel_js = "#{atome_directory}/kernel.js"
+  FileUtils.mkdir_p(atome_directory)
   File.new kernel_js, 'w'
   builder = Opal::Builder.new
   builder.append_paths("#{source}/lib/")
@@ -243,22 +257,77 @@ def wasm_initialize (source, destination, project_name, wasi_source)
   #### IMPORTANT TO REFRESH RUBY WASM TO THE LATEST VERSION, (when ruby_browser get far too large)
   # and UNCOMMENT the line  below : ('curl -LO ....')
   unless File.exist?("#{wasm_temp_folder}/ruby-3_2-wasm32-unknown-wasi-full-js.tar.gz")
-    # `cd #{wasm_temp_folder};curl -LO https://github.com/ruby/ruby.wasm/releases/latest/download/ruby-3_2-wasm32-unknown-wasi-full-js.tar.gz`
-    `cd #{wasm_temp_folder};curl -LO https://github.com/ruby/ruby.wasm/releases/download/2023-11-17-a/ruby-3_2-wasm32-unknown-wasi-full-js.tar.gz`
-    # debug :  https://github.com/ruby/ruby.wasm/releases/download/2023-11-17-a/ruby-3_2-wasm32-unknown-wasi-minimal-js-debug.tar.gz
-    # standard :     `cd #{wasm_temp_folder};curl -LO https://github.com/ruby/ruby.wasm/releases/download/2023-11-17-a/ruby-3_2-wasm32-unknown-wasi-full-js.tar.gz`
+
+    if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+      application_location = "#{destination}\\#{project_name}"
+      wasm_temp_folder = "#{application_location}\\tmp"
+      `cd /d #{wasm_temp_folder} && curl -LO https://github.com/ruby/ruby.wasm/releases/download/2023-11-17-a/ruby-3_2-wasm32-unknown-wasi-full-js.tar.gz
+`
+    elsif RbConfig::CONFIG['host_os'] =~ /darwin|mac os/
+      # Code à exécuter sous MacOS
+      # `cd #{wasm_temp_folder};curl -LO https://github.com/ruby/ruby.wasm/releases/latest/download/ruby-3_2-wasm32-unknown-wasi-full-js.tar.gz`
+      `cd #{wasm_temp_folder};curl -LO https://github.com/ruby/ruby.wasm/releases/download/2023-11-17-a/ruby-3_2-wasm32-unknown-wasi-full-js.tar.gz`
+      # debug :  https://github.com/ruby/ruby.wasm/releases/download/2023-11-17-a/ruby-3_2-wasm32-unknown-wasi-minimal-js-debug.tar.gz
+      # standard :     `cd #{wasm_temp_folder};curl -LO https://github.com/ruby/ruby.wasm/releases/download/2023-11-17-a/ruby-3_2-wasm32-unknown-wasi-full-js.tar.gz`
+
+    else
+      # Code à exécuter sous Unix/Linux
+      `cd #{wasm_temp_folder};curl -LO https://github.com/ruby/ruby.wasm/releases/download/2023-11-17-a/ruby-3_2-wasm32-unknown-wasi-full-js.tar.gz`
+    end
+
   end
-  `cd #{wasm_temp_folder}; tar xfz ruby-3_2-wasm32-unknown-wasi-full-js.tar.gz`
-  `mv #{wasm_temp_folder}/3_2-wasm32-unknown-wasi-full-js/usr/local/bin/ruby #{wasm_temp_folder}/system_ruby_browser.wasm`
-  `rm -f #{application_location}/src/wasm/ruby_browser.wasm`
-  cmd = <<~STRDELIM
-    #{application_location}/src-wasm/wasm/#{wasi_source} pack #{wasm_temp_folder}/system_ruby_browser.wasm
-    --mapdir usr::#{wasm_temp_folder}/3_2-wasm32-unknown-wasi-full-js/usr
-    --mapdir lib::#{source}/lib/
-    --mapdir /::#{application_location}/application/
-    --mapdir utilities::#{application_location}/src/utilities/
-    -o #{application_location}/src/wasm/ruby_browser.wasm
-  STRDELIM
+
+  if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+    # Code à exécuter sous Windows
+    application_location = "#{destination}\\#{project_name}"
+
+    `cd /d #{wasm_temp_folder} && tar xfz ruby-3_2-wasm32-unknown-wasi-full-js.tar.gz`
+    `move #{wasm_temp_folder}\\3_2-wasm32-unknown-wasi-full-js\\usr\\local\\bin\\ruby #{wasm_temp_folder}\\system_ruby_browser.wasm`
+    `del #{application_location}\\src\\wasm\\ruby_browser.wasm`
+  elsif RbConfig::CONFIG['host_os'] =~ /darwin|mac os/
+    # Code à exécuter sous MacOS
+    `cd #{wasm_temp_folder}; tar xfz ruby-3_2-wasm32-unknown-wasi-full-js.tar.gz`
+    `mv #{wasm_temp_folder}/3_2-wasm32-unknown-wasi-full-js/usr/local/bin/ruby #{wasm_temp_folder}/system_ruby_browser.wasm`
+    `rm -f #{application_location}/src/wasm/ruby_browser.wasm`
+  else
+    # Code à exécuter sous Unix/Linux
+    `cd #{wasm_temp_folder}; tar xfz ruby-3_2-wasm32-unknown-wasi-full-js.tar.gz`
+    `mv #{wasm_temp_folder}/3_2-wasm32-unknown-wasi-full-js/usr/local/bin/ruby #{wasm_temp_folder}/system_ruby_browser.wasm`
+    `rm -f #{application_location}/src/wasm/ruby_browser.wasm`
+  end
+
+  if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+    # Code à exécuter sous Windows
+    cmd = <<~STRDELIM
+      "#{application_location}\\src-wasm\\wasm\\#{wasi_source}" pack "#{wasm_temp_folder}\\system_ruby_browser.wasm"
+          -mapdir usr::"#{wasm_temp_folder}\\3_2-wasm32-unknown-wasi-full-js\\usr"
+          -mapdir lib::"#{source}\\lib\\"
+          -mapdir \::"#{application_location}\\application\\"
+          -mapdir utilities::"#{application_location}\\src\\utilities\\"
+          -o "#{application_location}\\src\\wasm\\ruby_browser.wasm"
+    STRDELIM
+  elsif RbConfig::CONFIG['host_os'] =~ /darwin|mac os/
+    # Code à exécuter sous MacOS
+    cmd = <<~STRDELIM
+      #{application_location}/src-wasm/wasm/#{wasi_source} pack #{wasm_temp_folder}/system_ruby_browser.wasm
+      --mapdir usr::#{wasm_temp_folder}/3_2-wasm32-unknown-wasi-full-js/usr
+      --mapdir lib::#{source}/lib/
+      --mapdir /::#{application_location}/application/
+      --mapdir utilities::#{application_location}/src/utilities/
+      -o #{application_location}/src/wasm/ruby_browser.wasm
+    STRDELIM
+  else
+    # Code à exécuter sous Unix/Linux
+    cmd = <<~STRDELIM
+      #{application_location}/src-wasm/wasm/#{wasi_source} pack #{wasm_temp_folder}/system_ruby_browser.wasm
+      --mapdir usr::#{wasm_temp_folder}/3_2-wasm32-unknown-wasi-full-js/usr
+      --mapdir lib::#{source}/lib/
+      --mapdir /::#{application_location}/application/
+      --mapdir utilities::#{application_location}/src/utilities/
+      -o #{application_location}/src/wasm/ruby_browser.wasm
+    STRDELIM
+  end
+
   cleaned_cmd = cmd.lines.reject { |line| line.start_with?('#') }.join
   command = cleaned_cmd.chomp.gsub("\n", ' ')
   system(command)
@@ -277,14 +346,33 @@ end
 
 def build_for_osx(destination, mode = :dev)
   # dev or build
+  if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+    # Code à exécuter sous Windows
+    `cd /d #{destination} && cargo tauri #{mode}`
 
-  `cd #{destination};cargo tauri #{mode}`
+  elsif RbConfig::CONFIG['host_os'] =~ /darwin|mac os/
+    # Code à exécuter sous MacOS
+    `cd #{destination};cargo tauri #{mode}`
+  else
+    # Code à exécuter sous Unix/Linux
+    `cd #{destination};cargo tauri #{mode}`
+  end
 
 end
 
 def build_for_server(destination, project_name, port, production)
   prod = '--env production' if production
-  `cd #{destination}/#{project_name}/server;puma --port #{port} #{prod}`
+  if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+    # Code à exécuter sous Windows
+    `cd /d #{destination}\\#{project_name}\\server && puma --port #{port} #{prod}`
+  elsif RbConfig::CONFIG['host_os'] =~ /darwin|mac os/
+    # Code à exécuter sous MacOS
+    `cd #{destination}/#{project_name}/server;puma --port #{port} #{prod}`
+  else
+    # Code à exécuter sous Unix/Linux
+    `cd #{destination}/#{project_name}/server;puma --port #{port} #{prod}`
+  end
+
 end
 
 # def run_application(build_target, location, port = 9292, production = false)
@@ -295,10 +383,24 @@ end
 # below we analyse the ARGV
 location = '/'
 project_name = ARGV[1]
-destination = `pwd`.chomp
+
+if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+  # Code à exécuter sous Windows
+  destination = `cd`.chomp
+  wasi_file = 'wasi-vfs.exe'
+
+elsif RbConfig::CONFIG['host_os'] =~ /darwin|mac os/
+  # Code à exécuter sous MacOS
+  destination = `pwd`.chomp
+  wasi_file = 'wasi-vfs-osx_arm' # default to osx arm
+else
+  # Code à exécuter sous Unix/Linux
+  destination = `pwd`.chomp
+  wasi_file = 'wasi-vfs-unix'
+end
+
 source = Pathname(__FILE__).parent.parent.to_s
 
-wasi_file = 'wasi-vfs-osx_arm' # default to osx arm
 # TODO : get wasi params from ARG to allow compile on windows / Unix
 if ARGV.include?('create')
   create_application(source, destination, project_name)
@@ -319,23 +421,18 @@ end
 if ARGV.include?('update')
   # TODO: also update index.html and all other files except the application folder
   # first we delete everything but application
-  folders_to_keep = ['application']
-  Dir.foreach(destination) do |item|
+
+  files_to_treat = %w[server src-tauri src-wasm Guardfile Rakefile src/css src/js/atome src/js/third_parties src/medias
+src/favicon.ico src/index.html src/index_opal.html src/index_server.html src/index_server_wasm.html]
+  files_to_treat.each do |item|
     item_path = File.join(destination, item)
-    if File.directory?(item_path) && !folders_to_keep.include?(item)
+    if File.directory?(item_path)
       FileUtils.rm_rf(item_path) unless item == '.' || item == '..'
     elsif File.file?(item_path)
       File.delete(item_path)
     end
-  end
-  # now we update
-  puts "#{source}/vendor/assets"
-
-  update_source = "#{source}/vendor/assets"
-
-  Dir.glob("#{update_source}/*").each do |item|
-    target = File.join(destination, File.basename(item))
-    FileUtils.cp_r(item, target) unless File.exist?(target)
+    source_item = "#{source}/vendor/assets/#{item}"
+    FileUtils.cp_r(source_item, item)
   end
 end
 
@@ -349,7 +446,17 @@ if ARGV.include?('guard')
 end
 
 if ARGV.include?('run')
-  current_path = `pwd`.chomp
+
+  if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+    # Code à exécuter sous Windows
+    current_path = `cd`.chomp
+  elsif RbConfig::CONFIG['host_os'] =~ /darwin|mac os/
+    # Code à exécuter sous MacOS
+    current_path = `pwd`.chomp
+  else
+    # Code à exécuter sous Unix/Linux
+    current_path = `pwd`.chomp
+  end
   segments = current_path.split("/")
   project_name = segments.last
   destination = segments[0...-1].join("/")
@@ -366,7 +473,18 @@ if ARGV.include?('run')
     threads = []
     threads << Thread.new do
       sleep 1
-      `open http://localhost:9292`
+
+      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+        # Code à exécuter sous Windows
+        `start "" "#{destination}\\#{project_name}\\src\\index_opal.html`
+      elsif RbConfig::CONFIG['host_os'] =~ /darwin|mac os/
+        # Code à exécuter sous MacOS
+        `open http://localhost:9292`
+      else
+        # Code à exécuter sous Unix/Linux
+        `open http://localhost:9292`
+      end
+
     end
     build_for_server(destination, project_name, 9292, :production)
   when 'osx'
@@ -386,7 +504,18 @@ if ARGV.include?('run')
   else
     wasi_file = 'wasi-vfs-osx_arm'
     wasm_common(source, destination, project_name, wasi_file, 'pure_wasm')
-    `open #{current_path}/src/index.html`
+
+    if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+      # Code à exécuter sous Windows
+      `start "" "#{current_path}\\src\\index.html"`
+    elsif RbConfig::CONFIG['host_os'] =~ /darwin|mac os/
+      # Code à exécuter sous MacOS
+      `open #{current_path}/src/index.html`
+    else
+      # Code à exécuter sous Unix/Linux
+      `open #{current_path}/src/index.html`
+    end
+
   end
 
 end

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

@@ -228,3 +228,6 @@ new({ read: :paste }) do |p|
 end
 
 new({ particle: :backup })
+
+new({ particle: :import })
+

data/lib/atome/helpers/utilities.rb

@@ -2,10 +2,19 @@
 
 # toolbox   method here
 require 'json'
+
 class Atome
   class << self
+
+    def file_handler(parent, content, bloc)
+      grab(parent).instance_exec(content, &bloc)
+    end
+
+
+
     def controller_sender(message)
       return if $host == :html
+
       json_msg = message.to_json
       js_json_msg = json_msg.inspect
       js_command = "atomeJS.controller_sender(#{js_json_msg})"
@@ -44,6 +53,9 @@ class Atome
   end
 
   # local server messaging
+  def file_for_opal(parent, bloc)
+    JS.eval("fileForOpal('#{parent}', #{bloc})")
+  end
 
   def response_listener(hashed_msg)
     js_action = hashed_msg.JS[:action]
@@ -127,6 +139,7 @@ class Atome
   def atome_post_process(element, params, new_atome, &user_proc)
 
     return unless Atome.instance_variable_get("@post_#{element}").is_a?(Proc)
+
     new_atome.instance_exec(params, user_proc, &Atome.instance_variable_get("@post_#{element}"))
 
   end
@@ -280,6 +293,7 @@ class Atome
       debug "#{user_id} not found"
     end
   end
+
   def remove_layout
     display(:default)
     # we get the current parent (the previous layout)
@@ -297,5 +311,4 @@ class Atome
     end
   end
 
-
 end

data/lib/atome/version.rb

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

data/lib/platform_specific/opal/atome_opal_extensions.rb

@@ -7,4 +7,5 @@ require 'extensions/ping'
 require 'extensions/sha'
 require 'extensions/color'
 require 'native'
+require 'promise'
 

data/lib/renderers/html/utility.rb

@@ -36,3 +36,49 @@ new({renderer: :html, method: :match}) do |params, bloc|
     html.match(params)
   end
 end
+
+
+new({ renderer: :html, method: :import, type: :blob }) do |_params, bloc|
+
+  if Atome::host == 'web-opal'
+    file_for_opal(@id, bloc) do |file_content|
+      bloc.call(file_content)
+    end
+
+  else
+    # Wasm version
+    def create_file_browser(_options = '', &bloc)
+      div_element = JS.global[:document].getElementById(@id.to_s)
+      input_element = JS.global[:document].createElement("input")
+      input_element[:type] = "file"
+      input_element[:style][:position] = "absolute"
+      input_element[:style][:display] = "none"
+      input_element[:style][:width] = "0px"
+      input_element[:style][:height] = "0px"
+
+      input_element.addEventListener("change") do |native_event|
+        event = Native(native_event)
+        file = event[:target][:files][0]
+        if file
+          puts "file requested: #{file[:name]}"
+          file_reader = JS.global[:FileReader].new
+          file_reader.addEventListener("load") do |load_event|
+            file_content = load_event[:target][:result]
+            Atome.file_handler(@id, file_content, bloc)
+          end
+          file_reader.readAsText(file)
+        end
+      end
+
+      div_element.addEventListener("mousedown") do |event|
+        input_element.click
+      end
+      div_element.appendChild(input_element)
+    end
+    create_file_browser(:options) do |file_content|
+      # puts "wasm ===>#{file_content}"
+      bloc.call(file_content)
+    end
+  end
+
+end

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

@@ -1,50 +1,15 @@
 #  frozen_string_literal: true
 
-# support=box({top: 250, left: 12, width: 300, height: 40, smooth: 9, color:{red: 0.3, green: 0.3, blue: 0.3}, id: :support })
-#
-# support.shadow({
-#                  id: :s3,
-#                  left: 3, top: 3, blur: 9,
-#                  invert: true,
-#                  red: 0, green: 0, blue: 0, alpha: 0.7
-#                })
-def create_file_browser
-  div_element = JS.global[:document].createElement("div")
-
-  # Définir les propriétés CSS de l'élément div
-  div_element[:style][:width] = "33px"        # Taille: largeur de 100 pixels
-  div_element[:style][:height] = "33px"       # Taille: hauteur de 100 pixels
-  div_element[:style][:backgroundColor] = "rgba(255,0,0,0.3)"  # Couleur de fond rouge
-  div_element[:style][:position] = "absolute"  # Positionnement absolu
-  div_element[:style][:top] = "0px"           # Position par rapport au haut de l'écran
-  div_element[:style][:left] = "0px"          # Position par rapport à la gauche de l'écran
-
-  # Définir un ID pour l'élément div
-  div_element[:id] = "monDiv"
-
-  input_element = JS.global[:document].createElement("input")
-  input_element[:type] = "file"
-  input_element[:style][:position] = "absolute"
-  input_element[:style][:display] = "none"
-  input_element[:style][:width] = "0px"
-  input_element[:style][:height] = "0px"
-  input_element.addEventListener("change") do |native_event|
-    event = Native(native_event)
-    file = event[:target][:files][0]
-    if file
-      puts "file requested: #{file[:name]}"
-      # support.controller({ action: :loadProject,  params: { path: file[:name]} })
-    end
-  end
-  div_element.addEventListener("mousedown") do |event|
-    # Déclenchez manuellement un clic sur l'input
-    input_element.click
-  end
-  view_div = JS.global[:document].querySelector("#view")
-
-  view_div.appendChild(input_element)
-  view_div.appendChild(div_element)
-
+b = box({ drag: true })
+b.import(true) do  |content|
+  puts "add code here, content:  #{content}"
 end
 
-create_file_browser
+
+
+
+
+
+
+
+

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

@@ -2,7 +2,7 @@
 
 
 c=circle({left: 220})
-t=text({left: 550,data: :hello,password: { read: {atome: :my_secret} }})
+t=text({left: 550,data: :hello,password: { read: { atome: :my_secret} }})
 b = box({ id: :the_box, left: 66,smooth: 1.789,
           password: {
             read: {
@@ -18,16 +18,16 @@ b = box({ id: :the_box, left: 66,smooth: 1.789,
 
 
 
-b.authorise({ read: {atome: :the_pass,smooth: :read_pass }, write: {smooth: :write_pass}, destroy: true}  )
+b.authorise({ read: { atome: :the_pass, smooth: :read_pass }, write: { smooth: :write_pass}, destroy: true}  )
 puts b.smooth
 # next will be rejected because destroy: true
 puts b.smooth
 #
-b.authorise({ read: {atome: :wrong_pass,smooth: :no_read_pass }, write: {smooth: :wrong_write_pass}, destroy: false}  )
+b.authorise({ read: { atome: :wrong_pass, smooth: :no_read_pass }, write: { smooth: :wrong_write_pass}, destroy: false}  )
 puts 'will send the wrong password'
 puts b.smooth
 
-b.authorise({ read: {atome: :wrong_pass,smooth: :read_pass }, write: {smooth: :wrong_write_pass}, destroy: false}  )
+b.authorise({ read: { atome: :wrong_pass, smooth: :read_pass }, write: { smooth: :wrong_write_pass}, destroy: false}  )
 puts "'with send the right password it'll works"
 puts b.smooth
 # authorise has two params the first is the password to authorise the second is used to destroy the password or keep for
@@ -41,7 +41,7 @@ wait 1 do
       b.authorise({write: {smooth: :write_pass}, destroy: false} )
       b.smooth(66)
       wait 1 do
-        b.authorise({write: {smooth: :false_pass, atome: :no_apss, destroy: true}} )
+        b.authorise({write: { smooth: :false_pass, atome: :no_apss, destroy: true}} )
         b.smooth(6)
       end
     end