atome 0.5.6.2.1 → 0.5.6.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 695be1c2b746dd4a424e74ebb28ff18884fb207fb1de1bd8db9ea732b1fd7574
-  data.tar.gz: 943340100b85b85ebb8c1d1af89801b89204c810452cb16a860ace32b3e47190
+  metadata.gz: 02c478a58bfcce998a040779efdc8970c38a1d5286f8ca942231132493707f7d
+  data.tar.gz: 930ebabe49f5824c66e03b3b1b8b53e1def6ad0ce26ff40f2110c07461970f8b
 SHA512:
-  metadata.gz: 3cb8f32ad5373a51222e70c87261e5c8cc0d05a0038d2087a5e433aeacd08cdeacfb43fc692ac489d18d82a6471ce4bdced8e647cd1e10e97664bcf6c6bbdf4d
-  data.tar.gz: bf36e8c816ebbd99fc36aee7d4dd94bbb324e1b5caf1017731e598e1423a0524ab55b0e13b060c8d6d67ab0c6cdaa0368b0d93e6d9e9479257bfec890788e6b0
+  metadata.gz: 9161e9c2364dd6eb8e85d44d93872ea43f52e241a19aac7f1f4697890b1d638faa0891a94e85d917a2f8e4e75e5e322170e1bbfab1223ea0d26c1ee32ee33797
+  data.tar.gz: 2136de3b80e45cff68ad2c0345baf11d2565473f591c27261c6f2942414ca5d4442338597ee4d29936bb306e707846da991337cd915535a2dce705fd6dc1756a

data/lib/atome/genesis/sparkle.rb

@@ -151,7 +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!!"
+  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] })
@@ -159,12 +159,12 @@ def init_database # this method is call from JS (atome/communication)
 end
 
 def user_login
-  user = Universe.current_user
-  pass = Black_matter.password
-  message({ action: :login, value: user }) do  |msg|
-    puts "-2 #{msg}"
+  # user = Universe.current_user
+  password = Black_matter.password
+  message({ action: :authentication, data: { email: 'jeezs@atome.one' } }) do |email|
+    puts "email received : #{email}"
   end
-  message({ action: :pass, value: pass }) do |msg|
-    puts "-1 #{msg}"
+  message({ action: :authorization, data: { password: password } }) do |p|
+    puts "2 : #{p}"
   end
 end

data/lib/atome/version.rb

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

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# The class Universe is used to  retrieve some data needed for the atome framework
+# The class Universe is used to retrieve some data needed for the atome framework
 # per example you can retrieve the list of all available particles
 puts Universe.particle_list
 # this give at the date 14/11/2023 :

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

@@ -4,18 +4,21 @@ user_password = {global: :all_star, read: { atome: :all_star }, write: { atome:
 
 human({ id: :jeezs, login: true, password: user_password, data: { birthday: '10/05/2016' },selection: [], tag: { system: true } , attach: :user_view })
 
-
-
-
-
-
 c = box({ color: :yellow, left: 333 })
-
 c.touch(true) do
-  c.message({message: 'cd ..;cd server;ls; pwd', action: :terminal })
-  c.message({message: 'capture.rb', action: :file, option: :read })
-  c.message({message: 'tototo.rb', action: :file, option: :write, value: :hello })
-  # b.message({message: 'cd ..;cd server;ls; pwd'})
-  # c = box({ color: :red, left: 333 })
+  c.message({data: 'cd ..;cd server;ls; pwd', action: :terminal }) do |result|
+    puts "shell command return: #{result}"
+  end
+  c.message({data: {source: 'capture.rb',operation: :read  }, action: :file}) do |result|
+
+    puts "file read encoded_content: #{result[:data].gsub('\x23', '#')}"
+  end
+  c.message({ action: :file,data: {source: 'user_created_file.rb', operation: :write, value: :hello }})do |result|
+    puts "file creation result : #{result}"
+  end
+
+  A.message({ action: :terminal , data: 'cd ..;cd server;ls; pwd'}) do |result|
+    puts "result : #{result}"
+  end
 end
-
+#

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

@@ -1,27 +1,6 @@
-# frozen_string_literal: true
+#  frozen_string_literal: true
 
-# If you need to specify another address for the server use A.server_adress
-A.server({ address: 'localhost:9292' , type: 'ws'})
-user_password = {global: :all_star, read: { atome: :all_star }, write: { atome: :all_star } }
-
-human({ id: :jeezs, login: true, password: user_password, data: { birthday: '10/05/2016' },selection: [], tag: { system: true } , attach: :user_view })
-
-
-#
-# b = box({ color: :red, id: :my_box })
-#
-# b.touch(true) do
-#   b.connection('localhost:9292') do |params|
-#     alert " the connection is : #{params}"
-#   end
-# end
-
-b = box({ color: :yellow, left: 333 })
-
-b.touch(true) do
-  b.message({message: 'cd ..;cd server;ls; pwd', action: :terminal })
-  b.message({message: 'capture.rb', action: :file, option: :read })
-  b.message({message: 'tototo.rb', action: :file, option: :write, value: :hello })
-  # b.message({message: 'cd ..;cd server;ls; pwd'})
-  # c = box({ color: :red, left: 333 })
-end
+my_pass = Black_matter.encode('hell')
+puts my_pass
+checker = Black_matter.check_password('hello,', my_pass)
+puts checker

data/vendor/assets/server/atome_server.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 # atome server
+
 require 'em/pure_ruby' if RUBY_PLATFORM == 'x64-mingw32'
 require 'fileutils'
 require '../src/utilities/aui'
@@ -14,301 +15,12 @@ require 'roda'
 require 'rufus-scheduler'
 require 'securerandom'
 require 'sequel'
-
-class EDen
-
-  def self.db_access
-    Database.connect_database
-  end
-
-  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, message_id)
-    { return: 'password received', message_id: message_id }
-  end
-
-  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', message_id: message_id }
-  end
-
-  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}", message_id: message_id }
-  end
-
-  def self.insert(params, option, ws, value, user, pass, message_id)
-    table = params['table'].to_sym
-    particle = params['particle'].to_sym
-    data = params['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.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}", message_id: message_id }
-  end
-
-  # return_message = EDen.safe_send(action_requested, data,option, current_user, user_pass)
-
-  def self.safe_send(method_name, *args)
-    method_sym = method_name.to_sym
-    eden_methods = EDen.singleton_methods(false) - Object.singleton_methods
-    if eden_methods.include?(method_sym)
-      send(method_sym, *args)
-    else
-      { return: "forbidden action:  #{method_name}" }
-    end
-  end
-end
+require './eDen'
+require './database'
+require './extensions'
 
 Faye::WebSocket.load_adapter('puma')
 
-class String
-  def is_json?
-    begin
-      !JSON.parse(self).nil?
-    rescue
-      false
-    end
-  end
-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."
-    else
-      puts "La table suivante :  #{table_name} n'existe pas dans la base de données."
-    end
-
-  end
-
-  # def self.create_table(table_name)
-  def self.connect_database
-    if File.exist?("eden.sqlite3")
-      eden = Sequel.connect("sqlite://eden.sqlite3")
-      # now we test if the table exist
-      table_exists?(:table_name)
-    else
-      eden = Sequel.connect("sqlite://eden.sqlite3")
-      eden.create_table :atome do
-        primary_key :atome_id
-        String :creator
-      end
-
-      eden.create_table :communication do
-        primary_key :communication_id
-        String :connection
-        JSON :data
-        JSON :controller
-      end
-
-      ###################
-
-      Sequel.extension :migration
-
-      Sequel.migration do
-        change do
-          add_column :communication, :jesaispas, String
-        end
-      end.apply(eden, :up)
-
-      ###################
-
-      eden.create_table :effect do
-        primary_key :effect_id
-        Int :smooth
-        Int :blur
-      end
-
-      eden.create_table :event do
-        primary_key :event_id
-        JSON :touch
-        Boolean :play
-        Boolean :pause
-        Int :time
-        Boolean :on
-        Boolean :fullscreen
-        Boolean :mute
-        Boolean :drag
-        Boolean :drop
-        Boolean :over
-        String :targets
-        Boolean :start
-        Boolean :stop
-        Time :begin
-        Time :end
-        Int :duration
-        Int :mass
-        Int :damping
-        Int :stiffness
-        Int :velocity
-        Boolean :repeat
-        Boolean :ease
-        Boolean :keyboard
-        Boolean :resize
-        Boolean :overflow
-      end
-
-      eden.create_table :geometry do
-        primary_key :geometry_id
-        Int :width
-        Int :height
-        Int :size
-      end
-
-      eden.create_table :hierarchy do
-        primary_key :hierarchy_id
-        String :attach
-        String :attached
-        String :apply
-        String :affect
-        String :detached
-        String :collect
-      end
-
-      eden.create_table :identity do
-        primary_key :identity_id
-        String :real
-        String :type
-        Int :id
-        String :name
-        String :firstname
-        String :email
-        String :nickname
-        Boolean :active
-        String :markup
-        String :bundle
-        String :data
-        String :category
-        String :selection
-        Boolean :selected
-        String :format
-        String :alien
-      end
-
-      eden.create_table :material do
-        primary_key :material_id
-        String :component
-        Boolean :edit
-        String :style
-        Boolean :hide
-        Boolean :remove
-        JSON :classes
-        Boolean :remove_classes
-        Int :opacity
-        String :definition
-        Int :gradient
-        Int :border
-      end
-
-      eden.create_table :property do
-        primary_key :property_id
-        String :red
-        String :green
-        String :blue
-        String :alpha
-        String :diffusion
-        Boolean :clean
-        String :insert
-        Boolean :remove
-        Int :sort
-      end
-
-      eden.create_table :security do
-        primary_key :security_id
-        String :password
-      end
-
-      eden.create_table :spatial do
-        primary_key :spatial_id
-        Int :left
-        Int :right
-        Int :top
-        Int :bottom
-        Int :rotate
-        String :direction
-        String :center
-        Int :depth
-        Int :position
-        String :organise
-        String :spacing
-        Boolean :display
-        String :layout
-      end
-
-      eden.create_table :time do
-        primary_key :time_id
-        JSON :markers
-      end
-
-      eden.create_table :utility do
-        primary_key :utility_id
-        String :renderers
-        String :code
-        Boolean :run
-        Boolean :delete
-        Boolean :clear
-        String :path
-        String :schedule
-        String :read
-        String :cursor
-        String :preset
-        JSON :relations
-        JSON :tag
-        String :web
-        JSON :unit
-        String :initialize
-        String :login
-        String :hypertext
-        String :hyperedit
-        String :terminal
-        String :browse
-        String :copies
-        Int :temporary
-        String :atomes
-        String :match
-        Boolean :invert
-        String :option
-        String :duplicate
-        String :copy
-        String :paste
-        String :backup
-        String :import
-        String :compute
-        String :get
-      end
-
-    end
-    eden
-  end
-
-end
-
 class App < Roda
   index_content = File.read("../src/index_server.html")
   opts[:root] = '../src'
@@ -317,7 +29,7 @@ class App < Roda
     r.root do
       if Faye::WebSocket.websocket?(r.env)
         ws = Faye::WebSocket.new(r.env)
-        ws.on :open do |event|
+        ws.on :open do |_event|
           ws.send({ return: 'server ready' }.to_json)
         end
         ws.on(:message) do |event|
@@ -325,15 +37,10 @@ class App < Roda
           full_data = JSON.parse(json_string)
           data = full_data['data']
           action_requested = full_data['action']
-          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, message_id)
+          return_message = EDen.safe_send(action_requested, data, message_id)
           ws.send(return_message.to_json)
         end
-
         ws.on(:close) do |event|
           puts "server closed with status #{event.code}"
         end
@@ -343,4 +50,4 @@ class App < Roda
     end
   end
 
-end
+end

data/vendor/assets/server/database.rb

@@ -0,0 +1,217 @@
+# frozen_string_literal: true
+
+# database handling for eDen Db
+
+class Database
+
+  def self.table_exists?(table_name)
+    eden = Sequel.connect("sqlite://eden.sqlite3")
+    if eden.table_exists?(table_name)
+      puts "La table #{table_name} existe dans la base de données."
+    else
+      puts "La table suivante :  #{table_name} n'existe pas dans la base de données."
+    end
+
+  end
+
+  # def self.create_table(table_name)
+  def self.connect_database
+    if File.exist?("eden.sqlite3")
+      eden = Sequel.connect("sqlite://eden.sqlite3")
+      # now we test if the table exist
+      table_exists?(:table_name)
+    else
+      eden = Sequel.connect("sqlite://eden.sqlite3")
+      eden.create_table :atome do
+        primary_key :atome_id
+        String :creator
+      end
+
+      eden.create_table :communication do
+        primary_key :communication_id
+        String :connection
+        JSON :data
+        JSON :controller
+      end
+
+      ###################
+
+      Sequel.extension :migration
+
+      Sequel.migration do
+        change do
+          add_column :communication, :jesaispas, String
+        end
+      end.apply(eden, :up)
+
+      ###################
+
+      eden.create_table :effect do
+        primary_key :effect_id
+        Int :smooth
+        Int :blur
+      end
+
+      eden.create_table :event do
+        primary_key :event_id
+        JSON :touch
+        Boolean :play
+        Boolean :pause
+        Int :time
+        Boolean :on
+        Boolean :fullscreen
+        Boolean :mute
+        Boolean :drag
+        Boolean :drop
+        Boolean :over
+        String :targets
+        Boolean :start
+        Boolean :stop
+        Time :begin
+        Time :end
+        Int :duration
+        Int :mass
+        Int :damping
+        Int :stiffness
+        Int :velocity
+        Boolean :repeat
+        Boolean :ease
+        Boolean :keyboard
+        Boolean :resize
+        Boolean :overflow
+      end
+
+      eden.create_table :geometry do
+        primary_key :geometry_id
+        Int :width
+        Int :height
+        Int :size
+      end
+
+      eden.create_table :hierarchy do
+        primary_key :hierarchy_id
+        String :attach
+        String :attached
+        String :apply
+        String :affect
+        String :detached
+        String :collect
+      end
+
+      eden.create_table :identity do
+        primary_key :identity_id
+        String :real
+        String :type
+        Int :id
+        String :name
+        String :firstname
+        String :email
+        String :nickname
+        Boolean :active
+        String :markup
+        String :bundle
+        String :data
+        String :category
+        String :selection
+        Boolean :selected
+        String :format
+        String :alien
+      end
+
+      eden.create_table :material do
+        primary_key :material_id
+        String :component
+        Boolean :edit
+        String :style
+        Boolean :hide
+        Boolean :remove
+        JSON :classes
+        Boolean :remove_classes
+        Int :opacity
+        String :definition
+        Int :gradient
+        Int :border
+      end
+
+      eden.create_table :property do
+        primary_key :property_id
+        String :red
+        String :green
+        String :blue
+        String :alpha
+        String :diffusion
+        Boolean :clean
+        String :insert
+        Boolean :remove
+        Int :sort
+      end
+
+      eden.create_table :security do
+        primary_key :security_id
+        String :password
+      end
+
+      eden.create_table :spatial do
+        primary_key :spatial_id
+        Int :left
+        Int :right
+        Int :top
+        Int :bottom
+        Int :rotate
+        String :direction
+        String :center
+        Int :depth
+        Int :position
+        String :organise
+        String :spacing
+        Boolean :display
+        String :layout
+      end
+
+      eden.create_table :time do
+        primary_key :time_id
+        JSON :markers
+      end
+
+      eden.create_table :utility do
+        primary_key :utility_id
+        String :renderers
+        String :code
+        Boolean :run
+        Boolean :delete
+        Boolean :clear
+        String :path
+        String :schedule
+        String :read
+        String :cursor
+        String :preset
+        JSON :relations
+        JSON :tag
+        String :web
+        JSON :unit
+        String :initialize
+        String :login
+        String :hypertext
+        String :hyperedit
+        String :terminal
+        String :browse
+        String :copies
+        Int :temporary
+        String :atomes
+        String :match
+        Boolean :invert
+        String :option
+        String :duplicate
+        String :copy
+        String :paste
+        String :backup
+        String :import
+        String :compute
+        String :get
+      end
+
+    end
+    eden
+  end
+
+end

data/vendor/assets/server/eDen.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+# server utils to handle eDen Db
+
+class EDen
+
+  def self.db_access
+    Database.connect_database
+  end
+
+  def self.terminal(data, message_id)
+    { data: { message: `#{data}` }, message_id: message_id }
+  end
+
+  def self.authorization(_data, message_id)
+    { data: { message: 'password received'}, message_id: message_id }
+  end
+
+  def self.authentication(_data, message_id)
+    { data: { message: 'login received' }, message_id: message_id }
+  end
+
+  def self.init_db(_data, message_id)
+    { data: { message: 'database initialised' }, message_id: message_id }
+  end
+
+  def self.query(data, message_id)
+    identity_table = db_access[data['table'].to_sym]
+    result = identity_table.send(:all).send(:select)
+    { data: { table: data['table'], infos: result }, message_id: message_id }
+  end
+
+  def self.insert(data, message_id)
+    table = data['table'].to_sym
+    particle = data['particle'].to_sym
+    data = data['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)
+        { data: { message: "column : #{particle}, in table : #{table}, updated with : #{data}"}, message_id: message_id }
+      else
+        { data: { message: "column not found: #{particle.class}" }, message_id: message_id }
+      end
+    else
+      { data: { message: "table not found: #{table.class}" }, message_id: message_id }
+
+    end
+  end
+
+  def self.file(data, message_id)
+
+    file_content = File.send(data['operation'], data['source'], data['value']).to_s
+    file_content = file_content.gsub("'", "\"")
+
+    file_content = file_content.gsub('#', '\x23')
+    { data: "=> operation: #{data['operation']}, source: #{data['source']}, content: #{file_content}", message_id: message_id }
+  end
+
+  def self.safe_send(method_name, data, message_id)
+    method_sym = method_name.to_sym
+    send(method_sym, data, message_id)
+  end
+end

data/vendor/assets/server/extensions.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Object  extensions for atome
+
+class String
+  def is_json?
+    begin
+      !JSON.parse(self).nil?
+    rescue
+      false
+    end
+  end
+end

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

@@ -70,6 +70,7 @@ const communication = {
             rubyVMCallback("A.user_login");
         };
         this.websocket.onmessage = function (event) {
+            // console.log(event.data)
             rubyVMCallback("A.server_receiver(" + event.data + ")");
         };
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atome
 version: !ruby/object:Gem::Version
-  version: 0.5.6.2.1
+  version: 0.5.6.2.3
 platform: ruby
 authors:
 - Jean-Eric Godard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2024-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo
@@ -622,6 +622,9 @@ files:
 - vendor/assets/server/atome_server_wasm.rb
 - vendor/assets/server/capture.rb
 - vendor/assets/server/config.ru
+- vendor/assets/server/database.rb
+- vendor/assets/server/eDen.rb
+- vendor/assets/server/extensions.rb
 - vendor/assets/src-tauri/.gitignore
 - vendor/assets/src-tauri/Cargo.toml
 - vendor/assets/src-tauri/build.rs