atome 0.5.6.2.0 → 0.5.6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc8ade696d1fa0d4ebc29a7ffbb336e1537d1f2b5c83c7772a6651f2b4558d0d
-  data.tar.gz: 0b849380beee8851a6e3571bb4f9df756524b0dab2746e146c5f35dc1b545ea3
+  metadata.gz: 695be1c2b746dd4a424e74ebb28ff18884fb207fb1de1bd8db9ea732b1fd7574
+  data.tar.gz: 943340100b85b85ebb8c1d1af89801b89204c810452cb16a860ace32b3e47190
 SHA512:
-  metadata.gz: 16319a956d2d2221eeb0b19ad60c305e811ae2fdec974e99ec33db58f6d1a11e3d71ea08bd73c1cfae4fb19c81aa3170c39ba64435fa155054bdea212e9bc908
-  data.tar.gz: 01df5f2b3923c04e05028ba711b9c83fdf431755685507dab92072eba959b1ee37e50a14dfe0c373f55f277def9c349e41fe76727f4b9828fcda389cc345b4f9
+  metadata.gz: 3cb8f32ad5373a51222e70c87261e5c8cc0d05a0038d2087a5e433aeacd08cdeacfb43fc692ac489d18d82a6471ce4bdced8e647cd1e10e97664bcf6c6bbdf4d
+  data.tar.gz: bf36e8c816ebbd99fc36aee7d4dd94bbb324e1b5caf1017731e598e1423a0524ab55b0e13b060c8d6d67ab0c6cdaa0368b0d93e6d9e9479257bfec890788e6b0

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

@@ -10,10 +10,12 @@ new({ particle: :message, category: :communication, type: :hash }) do |params, b
   params = { data: params } unless params.instance_of? Hash
   params[:user] = 'dfghg4df5gdfgh654'
   params[:pass] = 'gfhkzrhgzr4h98948'
- instance_variable_set('@message_code', {}) unless instance_variable_get('@message_code')
-  store_proc= instance_variable_get('@message_code')
-  mmessage_id= "msg_#{store_proc.length}"
-  store_proc[mmessage_id]=bloc
+ # instance_variable_set('@message_code', {}) unless instance_variable_get('@message_code')
+ #  store_proc= instance_variable_get('@message_code')
+  message_id= "msg_#{Universe.messages.length}"
+   params[:message_id]=message_id
+ #  store_proc[mmessage_id]=bloc
+  Universe.store_messages({msg_nb:message_id, proc: bloc })
   html.send_message(params)
 
 end

data/lib/atome/genesis/sparkle.rb

@@ -141,7 +141,9 @@ end
 def atome_genesis
   atome_infos
   A.server({ address: 'localhost:9292', type: 'ws' })
-  A.init_websocket
+  A.init_websocket do |msg|
+    puts "-3 #{msg}"
+  end
 end
 
 def init_database # this method is call from JS (atome/communication)
@@ -149,6 +151,7 @@ def init_database # this method is call from JS (atome/communication)
   particles = Universe.particle_list
   categories = Universe.categories
   atomes = Universe.atomes
+  # puts "we are here!!"
   # particles.each do |particle, value|
   #   value[:category] = :undefined if value[:category].nil?
   #   A.message({ action: :init_db, particle: particle, type: value[:type], category: value[:category] })
@@ -158,6 +161,10 @@ end
 def user_login
   user = Universe.current_user
   pass = Black_matter.password
-  message({ action: :login, value: user })
-  message({ action: :pass, value: pass })
+  message({ action: :login, value: user }) do  |msg|
+    puts "-2 #{msg}"
+  end
+  message({ action: :pass, value: pass }) do |msg|
+    puts "-1 #{msg}"
+  end
 end

data/lib/atome/helpers/utilities.rb

@@ -177,13 +177,13 @@ class Atome
     new_atome
   end
 
-  def store(params)
-    params.each do |particle_to_save, data|
-      # @!atome[particle_to_save]=data
-      # instance_variable_set(particle_to_save,data)
-    end
-
-  end
+  # def store(params)
+  #   params.each do |particle_to_save, data|
+  #     # @!atome[particle_to_save]=data
+  #     # instance_variable_set(particle_to_save,data)
+  #   end
+  #
+  # end
 
   def history(filter = {})
     filter[:id] = @id
@@ -210,7 +210,7 @@ class Atome
     #   option_found = params.values[0]
     #   instance_variable_get(elem_code)["#{option_found}_code"] = user_proc
     # else
-      instance_variable_get(elem_code)[element] = user_proc
+    instance_variable_get(elem_code)[element] = user_proc
     # end
   end
 
@@ -251,9 +251,9 @@ class Atome
                    else
                      instance_variable_get("@#{element}_code")[element]
                      # instance_exec(@callback[element], proc_found)if proc_found.is_a? Proc
-                            end
+                   end
       # array_of_proc_found.each do |proc_found|
-        proc_found.call(return_params) if proc_found.is_a? Proc
+      proc_found.call(return_params) if proc_found.is_a? Proc
       # end if array_of_proc_found
 
       # if array_of_proc_found
@@ -381,26 +381,14 @@ class Atome
   end
 
   def server_receiver(params)
-    # alert params
-    # alert message_code
-    calllbacks_found= instance_variable_get('@message_code')
-    # we delete the default message created by atome
-    calllbacks_found.delete(:message)
-    # we get the oldest available callback, to treat it
-    oldest_callback = calllbacks_found.delete(calllbacks_found.keys.first)
-    params=params[:return] #TODO : format retrun data correctly instead of this line
-    oldest_callback.call(params) if oldest_callback.is_a? Proc
-    # callback(:message, params)
+    callback_found = Universe.messages[params[:message_id]]
+    callback_found.call(params) if callback_found.is_a? Proc
   end
 
   def init_websocket
-    instance_variable_set('@message_code', {})
-    # connection is particle (communication.rb)
     connection(@current_server)
   end
 
-
-
   def encrypt(string)
     # if RUBY_ENGINE.downcase == 'opal' || 'wasm32-wasi'
     # `sha256(#{string})`

data/lib/atome/kernel/universe.rb

@@ -9,6 +9,7 @@ class Universe
   @renderer_list = %i[html browser headless server log]
   @sanitizers = {}
   @specificities = {}
+  @messages = {}
 
   @categories = %w[ communication effect event geometry hierarchy identity material
                   property security spatial time utility ]
@@ -20,6 +21,18 @@ class Universe
   class << self
     attr_reader :atomes, :renderer_list, :atome_list, :particle_list, :classes, :counter, :atomes_specificities
 
+    def messages
+      @messages
+    end
+
+    def store_messages(new_msg)
+      @messages[new_msg[:msg_nb]] = new_msg[:proc]
+    end
+
+    def delete_messages(msg_to_del)
+      @messages.delete(msg_to_del)
+    end
+
     def set_help(particle, &doc)
       @help[particle] = doc
     end

data/lib/atome/version.rb

@@ -2,6 +2,6 @@
 
 #  return atome version
 class Atome
-  VERSION =    '0.5.6.2.0'
+  VERSION =    '0.5.6.2.1'
 end
 

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

@@ -1,23 +1,39 @@
-# # frozen_string_literal: true
-#
-A.message({ action: :insert, data: { table: :security, particle: :password, data: 'my_pass'} })
+# frozen_string_literal: true
+
+A.message({ action: :insert, data: { table: :security, particle: :password, data: 'my_pass'} }) do |datas|
+  puts "0 data received:  #{datas}"
+end
 
 A.message({ action: :insert, data: { table: :identity, particle: :name, data: 'jeezs' } }) do |data_received_from_server|
-  puts "my first insert #{data_received_from_server}"
+  puts "1 my first insert #{data_received_from_server}"
 end
 
+A.message({ action: :insert, data: { table: :identity, particle: :name, data: 'jeezs2' } })
+
 A.message({ action: :query, data: { table: :identity } }) do |data_received_from_server|
-  puts "another insert  : #{data_received_from_server}"
+  puts "2 another insert  : #{data_received_from_server}"
 end
 
 A.message({ action: :query, data: { table: :identity } }) do |data_received|
-  puts "received : #{data_received}"
+  puts "3 received : #{data_received}"
+end
+
+A.message({ action: :insert, data: { table: :identity, particle: :name, data: 'jeezs3' } }) do |result|
+  puts "4 insert done : #{result}"
+end
+
+A.message({ action: :insert, data: { table: :identity, particle: :name, data: 'jeezs4' } }) do |result|
+  puts "5 last message received: #{result}"
 end
 
-A.message({ action: :insert, data: { table: :identity, particle: :name, data: 'jeezs' } }) do |result|
-  puts "insert done : #{result}"
+A.message({ action: :insert, data: { table: :security, particle: :name, data: 'john doe' } }) do |data_received_from_server|
+  puts "6 test 1 : #{data_received_from_server}"
 end
 
-A.message({ action: :insert, data: { table: :identity, particle: :name, data: 'jeezs' } }) do |result|
-  puts "last message received: #{result}"
+A.message({ action: :insert, data: { table: :identity, particle: :tit, data: 'dummy' } }) do |data_received_from_server|
+  puts "7 test 2 :  #{data_received_from_server}"
 end
+
+A.message({ action: :insert, data: { table: :unknown, particle: :name, data: 'dummy2' } }) do |data_received_from_server|
+  puts "test 3 :  #{data_received_from_server}"
+end

data/vendor/assets/server/atome_server.rb

@@ -21,79 +21,52 @@ class EDen
     Database.connect_database
   end
 
-  def self.terminal(cmd, option, ws, value, user, pass)
-    { return: `#{cmd}` }
+  def self.terminal(cmd, option, ws, value, user, pass, message_id)
+    { return: `#{cmd}`, message_id: message_id }
   end
 
-  def self.pass(cmd, option, ws, value, user, pass)
-    { return: 'pass received' }
+  def self.pass(cmd, option, ws, value, user, pass, message_id)
+    { return: 'password received', message_id: message_id }
   end
 
-  def self.init_db(cmd, option, ws, value, user, pass)
+  def self.login(cmd, option, ws, value, user, pass, message_id)
+    { return: 'login received', message_id: message_id }
+  end
+
+  def self.init_db(cmd, option, ws, value, user, pass, message_id)
     # Database.
-    { return: 'database initialised' }
+    { return: 'database initialised', message_id: message_id }
   end
 
-  def self.query(cmd, option, ws, value, user, pass)
+  def self.query(cmd, option, ws, value, user, pass, message_id)
     identity_table = db_access[cmd['table'].to_sym]
     result = identity_table.send(:all).send(:select)
-    { action: :query, data: cmd['table'], return: result }
+    { action: :query, data: cmd['table'], return: "==> #{result}", message_id: message_id }
   end
 
-  # def self.insert(cmd, option, ws, value, user, pass)
-  #   identity_table = db_access[:identity]
-  #   identity_table.insert(email: 'tre@tre')
-  #   { action: :insert, data: cmd, return: { email: 'tre@tre' } }
-  # end
-
-  def self.insert(params, option, ws, value, user, pass)
-    table = params['table']
-    particle = params['particle']
+  def self.insert(params, option, ws, value, user, pass, message_id)
+    table = params['table'].to_sym
+    particle = params['particle'].to_sym
     data = params['data']
-    identity_table = db_access[table.to_sym]
-    # identity_table = db_access[:identity]
-    #######
-    identity_table.insert(particle => data )
-      # identity_table.insert(email: 'tre@tre')
-    #
-    { return: "column : #{particle},  in table : #{table}, updated with : #{data}" }
+    if db_access.table_exists?(table)
+      schema = db_access.schema(table)
+      if schema.any? { |col_def| col_def.first == particle }
+        identity_table = db_access[table.to_sym]
+        identity_table.insert(particle => data)
+        { action: :insert, return: "column : #{particle}, in table : #{table}, updated with : #{data}", message_id: message_id }
+      else
+        { action: :insert, return: "column not found: #{particle.class}", message_id: message_id }
+      end
+    else
+      { action: :insert, return: "table not found: #{table.class}", message_id: message_id }
+
+    end
   end
 
-  # def self.authentification(cmd, option, ws, value, user, pass)
-  #   db = Database.connect_database
-  #   identity_items = db[:identity]
-  #   security_items = db[:security]
-  #
-  #   identity_items.insert(email: 'tre@tre')
-  #   security_items.insert(password: 'poipoi')
-  #   # testtest= "Mails count: #{identity_items.count}"
-  #
-  #   user_email = value["mail"]
-  #   user_password = value["pass"]
-  #
-  #   # user_exists = identity_items.all.select{|item| item[:email]==user_email}
-  #   user_exists = identity_items.send(:all).send(:select) do |item|
-  #     item[:email] == user_email
-  #   end
-  #
-  #   if user_exists.empty?
-  #     # "Mails count: #{identity_items.count}"
-  #     # "Mails count: #{identity_items.all}"
-  #     "Email non trouvé, erreur"
-  #     # Ask to the user if he wants to subscribe
-  #     # Send the basic template
-  #   else
-  #     "Email trouvé, cherche mdp"
-  #     # Verify password
-  #     # If password isn't ok, send error
-  #     # If the password is ok, send the user account template
-  #   end
-  # end
-
-  def self.file(source, operation, ws, value, user, pass)
+  def self.file(source, operation, ws, value, user, pass, message_id)
     file_content = File.send(operation, source, value).to_s
     file_content = file_content.gsub("'", "\"")
-    { return: "=> operation: #{operation}, source:  #{source} , content : #{file_content}" }
+    { return: "=> operation: #{operation}, source:  #{source} , content : #{file_content}", message_id: message_id }
   end
 
   # return_message = EDen.safe_send(action_requested, data,option, current_user, user_pass)
@@ -124,6 +97,7 @@ end
 class Database
 
   def self.table_exists?(table_name)
+    # code below must be removed but not fpr now
     eden = Sequel.connect("sqlite://eden.sqlite3")
     if eden.table_exists?(table_name)
       puts "La table #{table_name} existe dans la base de données."
@@ -336,19 +310,6 @@ class Database
 end
 
 class App < Roda
-
-  # comment below when test will be done
-  # File.delete("./eden.sqlite3") if File.exist?("./eden.sqlite3")
-  eden = Database.connect_database
-  items = eden[:atome]
-
-  # populate the table
-  items.insert(creator: 'moi')
-  items.insert(creator: 'toi')
-  items.insert(creator: 'vous')
-  puts "Item count: #{items.count}"
-  test = "Item count: #{items.count}"
-  # puts "My name is: #{items(:creator)}"
   index_content = File.read("../src/index_server.html")
   opts[:root] = '../src'
   plugin :static, %w[/css /js /medias], root: '../src'
@@ -358,9 +319,7 @@ class App < Roda
         ws = Faye::WebSocket.new(r.env)
         ws.on :open do |event|
           ws.send({ return: 'server ready' }.to_json)
-          # ws.send('asking for synchro data'.to_json)
         end
-
         ws.on(:message) do |event|
           json_string = event.data.gsub(/(\w+):/) { "\"#{$1}\":" }.gsub('=>', ':')
           full_data = JSON.parse(json_string)
@@ -369,9 +328,9 @@ class App < Roda
           value = full_data['value']
           option = full_data['option']
           current_user = full_data['user']
+          message_id = full_data['message_id']
           user_pass = full_data['pass']['global']
-          # return_message = EDen.safe_send(action_requested, data, option, ws, value, current_user, user_pass)
-          return_message = EDen.safe_send(action_requested, data, option, ws, value, current_user, user_pass)
+          return_message = EDen.safe_send(action_requested, data, option, ws, value, current_user, user_pass, message_id)
           ws.send(return_message.to_json)
         end
 
@@ -380,10 +339,8 @@ class App < Roda
         end
         ws.rack_response
       end
-
       index_content
     end
-
   end
 
 end

data/vendor/assets/src/js/atome/atome_helpers/communication.js

@@ -1,5 +1,4 @@
 const communication = {
-    // websocket: new WebSocket('ws://localhost:9292'),
     websocket: null,
     initialize: function () {
         this.websocket = new WebSocket('ws://localhost:9292')
@@ -10,9 +9,7 @@ const communication = {
         };
 
         this.websocket.onmessage = function (event) {
-            rubyVMCallback('message', "('" + event.data  + "')")
-
-            // rubyVMCallback("puts 'object ruby callback : " + event.data + "'")
+            rubyVMCallback('message', "('" + event.data + "')")
         };
 
         this.websocket.onclose = function (event) {
@@ -65,22 +62,15 @@ const communication = {
         }
     },
     connect: function (type, server, user, pass, atomes, particles) {
-        this.websocket = new WebSocket(type+'://'+server);
+        this.websocket = new WebSocket(type + '://' + server);
         this.websocket.onopen = function (event) {
 
-            // Opal.eval('A.init_database');
- // now new can exec user code : loadApplicationJs in index.html
- //            rubyVMCallback("A.init_database");
+            // now new can exec user code : loadApplicationJs in index.html
             loadApplicationJs();
             rubyVMCallback("A.user_login");
-            // rubyVMCallback("A.init_database");
         };
         this.websocket.onmessage = function (event) {
-            // rubyVMCallback("puts 'object ruby callback : " + event.data + "'")
-            // rubyVMCallback('message', "('" + event.data  + "')")
-            // rubyVMCallback("A.callback({ touch: '" + event.data  + "' })");
-            rubyVMCallback("A.server_receiver(" + event.data  + ")");
-            // alert(event.data)
+            rubyVMCallback("A.server_receiver(" + event.data + ")");
         };
 
         this.websocket.onclose = function (event) {
@@ -97,6 +87,7 @@ const communication = {
     },
     ws_sender: function (message) {
         // now we send the data to the server
+        // puts "--> message : #{message}"
         this.websocket.send(message)
     },
 }
@@ -130,8 +121,7 @@ const communication = {
 // }
 
 
-
-function controller_message(msg){
+function controller_message(msg) {
     // message receiver from controller (Vie)
     console.log(msg)
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atome
 version: !ruby/object:Gem::Version
-  version: 0.5.6.2.0
+  version: 0.5.6.2.1
 platform: ruby
 authors:
 - Jean-Eric Godard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-12 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo