live 0.11.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41876a4b4870415b70d8e5747dce78f8eeed867b524bad32b9a0146c56296f41
-  data.tar.gz: ba656166a150f8d5a2da0ce37bc358159eb082db4b6340ef751cc2ff3b9f00d1
+  metadata.gz: '08c6f4d6d5b5fc0e7ba635b617256c06ca84c925b528b99e4ab758bf6461af19'
+  data.tar.gz: 69266f1a602d85f9f3d14104a2548304498ed38310f34ffa5dfe9e3e9d48aed6
 SHA512:
-  metadata.gz: 39d76c89db7212a85596ef74630816a88107fc752ac8e932f76b43d5e2d943bbb4e631f4a78a44b7c9e4c6ef2095defce9c5d8da83f9334f171afe20d9a41ad6
-  data.tar.gz: 86484b279c0a6c16f4d46fe2220627ba35a74810413108377bf4f8002c84c95681bea4f1d7c760842b48bdc10e5c5c7cecdc9e3c7723700df3f415e51256d1f4
+  metadata.gz: a4e608d98be19c629dd8cba31cb5be8eeac52de4a5fb007ba4822f0baf8b473e16aa4db604585b8ff481d39292c2986408b2d3977667b77552de1cff31b4a85c
+  data.tar.gz: 1fa963047b5369012f008c57061a585345d98922082d3c744b032ae15c8599a928f7a9c5b12169ac2242cb1f013b55404cce13f4cd4a2763259eda23b8fe06ac

checksums.yaml.gz.sig

@@ -1,4 +1 @@
-b׺ޚW$���;����"V�>��ǣz��6)���K�)�m�N�P1e��5r{� 睷��'�PR���Xr���M�~O�=t�H!ߑ�����ze��&�Pt>��%�Ŕ
-�p��m�j]P�H2��E�
-#�Q��fJF�`��ʹ���Ⱥ2��`
-��"����u�#�E�4-�r�<ހ�O�7�-�Ñ���ĨCqvBB��T�?F�,�����e=��q��X�.43�O�!��O�"y΅="�j��9
+U̦G��x��?l19a!HT��t���4��c>�7�{TݨC���M�f�]�ij2��2�(QM(��	rJ:�
cNG@$�ң���
Ε_T+uǧr�	*	�,(��=+�U�6�U�h/|b�S�}C2�"]�U28$F铄(S5N!�8���@D�a�bsD3�
ƵN��a������O`��;��rd�����3�)�{��EuxrX��w��,���`ۓ�����~�~2��V����z���P�lB+y��#���9z��C���F���cK_�{�$+�}��8*�$ h��g�p�G�b@���é�U����`���~�HK�SB���#k�d�ǥ���,u��@�mw \������(TtBsBo��O%��

data/lib/live/element.rb

@@ -16,13 +16,18 @@ module Live
 			SecureRandom.uuid
 		end
 		
+		def self.mount(parent, id, data = {})
+			full_id = parent.id + ":" + id
+			
+			self.new(full_id, data)
+		end
+		
 		# @parameter id [String] The unique identifier within the page.
 		# @parameter data [Hash] The data associated with the element, typically stored as `data-` attributes.
-		def initialize(id = Element.unique_id, **data)
+		def initialize(id = Element.unique_id, data = {})
 			@id = id
 			@data = data
 			@data[:class] ||= self.class.name
-			
 			@page = nil
 		end
 		
@@ -32,6 +37,9 @@ module Live
 		# The data associated with the element.
 		attr :data
 		
+		# @attribute [Page | Nil] The page this elemenet is bound to.
+		attr :page
+		
 		# Generate a JavaScript string which forwards the specified event to the server.
 		# @parameter detail [Hash] The detail associated with the forwarded event.
 		def forward_event(detail = nil)
@@ -77,5 +85,70 @@ module Live
 				raise PageError, "Element is not bound to a page, make sure to implement #close!"
 			end
 		end
+		
+		def script(code, **options)
+			rpc(:script, @id, code, options)
+		end
+		
+		# Update the content of the client-side element by rendering this view.
+		def update!(**options)
+			rpc(:update, @id, self.to_html, options)
+		end
+		
+		# Replace the content of the client-side element by rendering this view.
+		# @parameter selector [String] The CSS selector to replace.
+		# @parameter node [String] The HTML to replace.
+		def replace(selector, fragment = nil, **options, &block)
+			fragment ||= XRB::Builder.fragment(&block)
+			
+			rpc(:replace, selector, fragment.to_s, options)
+		end
+		
+		# Prepend to the content of the client-side element by appending the specified element.
+		# @parameter selector [String] The CSS selector to prepend to.
+		# @parameter node [String] The HTML to prepend.
+		def prepend(selector, fragment = nil, **options, &block)
+			fragment ||= XRB::Builder.fragment(&block)
+			
+			rpc(:prepend, selector, fragment.to_s, options)
+		end
+		
+		# Append to the content of the client-side element by appending the specified element.
+		# @parameter selector [String] The CSS selector to append to.
+		# @parameter node [String] The HTML to prepend.
+		def append(selector, fragment = nil, **options, &block)
+			fragment ||= XRB::Builder.fragment(&block)
+			
+			rpc(:append, selector, fragment.to_s, options)
+		end
+		
+		# Remove the specified element from the client-side element.
+		# @parameter selector [String] The CSS selector to remove.
+		def remove(selector, **options)
+			rpc(:remove, selector, options)
+		end
+		
+		def dispatch_event(selector, type, **options)
+			rpc(:dispatch_event, selector, event, options)
+		end
+		
+		# Render the element.
+		# @parameter builder [XRB::Builder] The HTML builder.
+		def render(builder)
+			builder.text(self.class.name)
+		end
+		
+		# @returns [Object] The generated HTML.
+		def to_html
+			XRB::Builder.fragment do |builder|
+				render(builder)
+			end
+		end
+		
+		# Convenience method for rendering the view as a string.
+		# @returns [String] The generated HTML.
+		def to_s
+			to_html.to_s
+		end
 	end
 end

data/lib/live/page.rb

@@ -9,7 +9,8 @@ require_relative 'resolver'
 require 'async'
 require 'async/queue'
 
-require 'protocol/websocket/json_message'
+require 'protocol/websocket'
+require 'protocol/websocket/message'
 
 module Live
 	# Represents a connected client page with bound dynamic content areas.
@@ -19,6 +20,8 @@ module Live
 			@resolver = resolver
 			
 			@elements = {}
+			@attached = {}
+			
 			@updates = Async::Queue.new
 		end
 		
@@ -33,11 +36,25 @@ module Live
 			element.bind(self)
 		end
 		
+		# Attach a pre-existing element to the page, so that it may later be bound to this exact instance.
+		# You must later detach the element when it is no longer needed.
+		def attach(element)
+			@attached[element.id] = element
+		end
+		
+		def detach(element)
+			if @attached.delete(element.id)
+				element.close
+			end
+		end
+		
 		# Resolve a client-side element to a server side instance.
 		# @parameter id [String] The unique identifier within the page.
 		# @parameter data [Hash] The data associated with the element, typically stored as `data-` attributes.
-		def resolve(id, data)
-			@resolver.call(id, data)
+		def resolve(id, data = {})
+			@attached.fetch(id) do
+				@resolver.call(id, data)
+			end
 		end
 		
 		# Handle an event from the client. If the element could not be found, it is silently ignored.
@@ -75,7 +92,7 @@ module Live
 			when 'unbind'
 				# Unbind a client-side element from a server-side element.
 				if element = @elements.delete(message[1])
-					element.close
+					element.close unless @attached.key?(message[1])
 				else
 					Console.warn(self, "Could not unbind element:", message)
 					@updates.enqueue(['error', message[1], "Could not unbind element!"])
@@ -91,27 +108,23 @@ module Live
 		# Run the event handling loop with the given websocket connection.
 		# @parameter connection [Async::WebSocket::Connection]
 		def run(connection)
-			queue_task = Async do
-				while update = @updates.dequeue
-					Console.debug(self, "Sending update:", update)
-					
-					connection.write(::Protocol::WebSocket::JSONMessage.generate(update))
-					connection.flush if @updates.empty?
+			Sync do |task|
+				queue_task = task.async do
+					while update = @updates.dequeue
+						Console.debug(self, "Sending update:", update)
+						::Protocol::WebSocket::TextMessage.generate(update).send(connection)
+						connection.flush if @updates.empty?
+					end
 				end
-			end
-			
-			while message = connection.read
-				Console.debug(self, "Reading message:", message)
 				
-				if json_message = ::Protocol::WebSocket::JSONMessage.wrap(message)
-					process_message(json_message.parse)
-				else
-					Console.warn(self, "Unhandled message:", message)
+				while message = connection.read
+					Console.debug(self, "Reading message:", message)
+					process_message(message.parse)
 				end
+			ensure
+				self.close
+				queue_task&.stop
 			end
-		ensure
-			self.close
-			queue_task&.stop
 		end
 	end
 end

data/lib/live/resolver.rb

@@ -43,7 +43,7 @@ module Live
 		# @returns [Element] The element instance if it was allowed.
 		def call(id, data)
 			if klass = @allowed[data[:class]]
-				return klass.new(id, **data)
+				return klass.new(id, data)
 			end
 		end
 	end

data/lib/live/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2021-2024, by Samuel Williams.
 
 module Live
-  VERSION = "0.11.0"
+  VERSION = "0.13.0"
 end

data/lib/live/view.rb

@@ -9,70 +9,13 @@ require 'xrb/builder'
 module Live
 	# Represents a single division of content on the page an provides helpers for rendering the content.
 	class View < Element
-		def script(code, **options)
-			rpc(:script, @id, code, options)
-		end
-		
-		# Update the content of the client-side element by rendering this view.
-		def update!(**options)
-			rpc(:update, @id, self.to_html, options)
-		end
-		
-		# Replace the content of the client-side element by rendering this view.
-		# @parameter selector [String] The CSS selector to replace.
-		# @parameter node [String] The HTML to replace.
-		def replace(selector, fragment = nil, **options, &block)
-			fragment ||= XRB::Builder.fragment(&block)
-			
-			rpc(:replace, selector, fragment.to_s, options)
-		end
-		
-		# Prepend to the content of the client-side element by appending the specified element.
-		# @parameter selector [String] The CSS selector to prepend to.
-		# @parameter node [String] The HTML to prepend.
-		def prepend(selector, fragment = nil, **options, &block)
-			fragment ||= XRB::Builder.fragment(&block)
-			
-			rpc(:prepend, selector, fragment.to_s, options)
-		end
-		
-		# Append to the content of the client-side element by appending the specified element.
-		# @parameter selector [String] The CSS selector to append to.
-		# @parameter node [String] The HTML to prepend.
-		def append(selector, fragment = nil, **options, &block)
-			fragment ||= XRB::Builder.fragment(&block)
-			
-			rpc(:append, selector, fragment.to_s, options)
-		end
-		
-		# Remove the specified element from the client-side element.
-		# @parameter selector [String] The CSS selector to remove.
-		def remove(selector, **options)
-			rpc(:remove, selector, options)
-		end
-		
-		def dispatch_event(selector, type, **options)
-			rpc(:dispatch_event, selector, event, options)
-		end
-		
-		# Render the element.
-		# @parameter builder [XRB::Builder] The HTML builder.
-		def render(builder)
-		end
-		
 		# @returns [Object] The generated HTML.
 		def to_html
 			XRB::Builder.fragment do |builder|
-				builder.tag :div, id: @id, class: 'live', data: @data do
+				builder.inline_tag :div, id: @id, class: 'live', data: @data do
 					render(builder)
 				end
 			end
 		end
-		
-		# Convenience method for rendering the view as a string.
-		# @returns [String] The generated HTML.
-		def to_s
-			to_html.to_s
-		end
 	end
 end

data/license.md

@@ -2,6 +2,7 @@
 
 Copyright, 2021-2024, by Samuel Williams.  
 Copyright, 2023, by Olle Jonsson.  
+Copyright, 2024, by Tatsuhiro Ujihisa.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/readme.md

@@ -30,14 +30,18 @@ We welcome contributions to this project.
 
 ### Developer Certificate of Origin
 
-This project uses the [Developer Certificate of Origin](https://developercertificate.org/). All contributors to this project must agree to this document to have their contributions accepted.
+In order to protect users of this project, we require all contributors to comply with the [Developer Certificate of Origin](https://developercertificate.org/). This ensures that all contributions are properly licensed and attributed.
 
-### Contributor Covenant
+### Community Guidelines
 
-This project is governed by the [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
+This project is best served by a collaborative and respectful environment. Treat each other professionally, respect differing viewpoints, and engage constructively. Harassment, discrimination, or harmful behavior is not tolerated. Communicate clearly, listen actively, and support one another. If any issues arise, please inform the project maintainers.
 
 ## See Also
 
-  - [live-js](https://github.com/socketry/live-js) — The client-side JavaScript library.
-  - [morphdom](https://github.com/patrick-steele-idem/morphdom) — Efficiently update the client-side HTML.
+  - [live-js](https://github.com/socketry/live-js) – The client-side JavaScript library.
+  - [morphdom](https://github.com/patrick-steele-idem/morphdom) – Efficiently update the client-side HTML.
   - [stimulus-reflex](https://github.com/hopsoft/stimulus_reflex) — An alternative framework which provides similar functionality.
+
+### Examples
+
+  - [Flappy Bird](https://github.com/socketry/flappy-bird) – A clone of the classic Flappy Bird game.

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: live
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Samuel Williams
 - Olle Jonsson
+- Tatsuhiro Ujihisa
 autorequire:
 bindir: bin
 cert_chain:
@@ -38,7 +39,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-05-12 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-websocket
@@ -46,14 +47,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.27'
 - !ruby/object:Gem::Dependency
   name: xrb
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Live HTML tags updated via a WebSocket.