capsium 0.1.1 → 0.1.2

data/lib/capsium/reactor.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# lib/capsium/reactor.rb
 require "webrick"
 require "json"
 require "listen"
@@ -9,14 +8,16 @@ require "capsium/package"
 module Capsium
   class Reactor
     DEFAULT_PORT = 8864
-    attr_accessor :package, :package_path, :routes, :port, :server, :server_thread
 
-    def initialize(package, port = DEFAULT_PORT)
-      @package = package
-      @package_path = package.path
+    attr_accessor :package, :package_path, :routes, :port, :server,
+                  :server_thread
+
+    def initialize(package:, port: DEFAULT_PORT, do_not_listen: false)
+      @package = package.is_a?(String) ? Package.new(package) : package
+      @package_path = @package.path
       @port = port
-      @server = WEBrick::HTTPServer.new(Port: @port)
-      load_routes
+      setup_server(do_not_listen)
+      @routes = @package.routes
       mount_routes
     end
 
@@ -25,45 +26,65 @@ module Capsium
       start_listener
     end
 
+    def handle_request(request, response)
+      route = @routes.resolve(request.path)
+      if route
+        target = route.target
+        content_path = target.fs_path(@package.manifest)
+        if File.exist?(content_path)
+          response.status = 200
+          response["Content-Type"] = target.mime(@package.manifest)
+          response.body = File.read(content_path)
+        else
+          response.status = 404
+          response["Content-Type"] = "text/plain"
+          response.body = "Not Found"
+        end
+      else
+        response.status = 404
+        response["Content-Type"] = "text/plain"
+        response.body = "Not Found"
+      end
+    end
+
     private
 
-    def load_routes
-      @routes = @package.routes.data.routes
+    def setup_server(do_not_listen)
+      server_options = { Port: @port }
+      server_options[:DoNotListen] = true if do_not_listen
+      @server = WEBrick::HTTPServer.new(server_options)
     end
 
     def mount_routes
-      @routes.each do |route|
+      @routes.config.routes.each do |route|
         path = route.path
-        target = route.target
-        content_path = target.fs_path(@package.manifest)
-        puts "mounting route: #{path} => #{content_path}"
-        @server.mount_proc(path.to_s) do |_req, res|
-          res.body = File.read(content_path)
-          res.content_type = target.mime(@package.manifest)
+        @server.mount_proc(path.to_s) do |req, res|
+          handle_request(req, res)
         end
       end
     end
 
     def start_server
-      @server_thread = Thread.new do
-        trap("INT") do
-          puts "\nShutting down server..."
-          @server.shutdown
-          exit
-        end
-
+      Thread.new do
+        trap("INT") { shutdown_server }
         puts "Starting server on http://localhost:#{@port}"
         @server.start
       end
     end
 
+    def shutdown_server
+      puts "\nShutting down server..."
+      @server.shutdown
+      exit
+    end
+
     def restart_server
       @server.shutdown
-      # @server_thread.kill
+      @server_thread&.join
       load_package
-      @server = WEBrick::HTTPServer.new(Port: @port)
+      setup_server(false)
       mount_routes
-      start_server
+      @server_thread = start_server
     end
 
     def start_listener
@@ -74,9 +95,12 @@ module Capsium
 
       listener.start
       puts "Listening for changes in #{@package_path}..."
-
-      # Wait for the server thread to finish
       @server_thread.join
     end
+
+    def load_package
+      @package = Package.new(@package_path)
+      @routes = @package.routes
+    end
   end
 end

data/lib/capsium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capsium
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capsium
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cssminify
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jekyll
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -224,16 +252,30 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -276,9 +318,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.58'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Capsium
 email:
-- open.source@ribose.com'
+- open.source@ribose.com
 executables:
 - capsium
 extensions: []
@@ -297,41 +353,33 @@ files:
 - bin/setup
 - capsium.gemspec
 - exe/capsium
-- images/005df7415a331c466ad2d9a42efdd212b6f42fe50b5fd3b3174c86c706f58244.png
-- images/0374025b3af99b8a473282c8cbbf9fcd29573cf41e586982f328f86c0690f43d.png
-- images/0bb4da785be40ef58e219470ebccb979325928b75453dc46bac23c6ee8a7a7cb.png
-- images/6aa294dccc81af594aacbe804e7ddffdc17eacc28357338108aea5d021d831ff.png
-- images/72dd3fbf3f4b475e27a0e7fb8137c475c32c41f8d222bcf62d6a9ccf102d9532.png
-- images/8772b6961d169738d7b0fa0b669b06fc2f40632d4c62586c7634fc17b93182a3.png
-- images/a998d842405933d45723606ff3f70162ec95b4ef30db25464a366184fd08fb9b.png
-- images/aa8980547e8c003d33273ab4d80e62da7f317bd7581b293c06d67f5331f24f31.png
-- images/bb78a872b539e0e9b2d80dee58acbb688f3f2727b324a5bf8bf417a69d94a166.png
-- images/c48fc83b17725d85fbb64d971196ebfccd8c5c757fe6aa5845303f6e315879b6.png
-- images/f08ef07308d08119ac2124bb7428c8bef17ef1ca70045696604d6e83015a9b91.png
-- images/f7514206111b695647eae9adfcf498ba3e0ff83ecfe25f3fc3ed8e9f04c5c726-1.png
-- images/f7514206111b695647eae9adfcf498ba3e0ff83ecfe25f3fc3ed8e9f04c5c726.png
 - lib/capsium.rb
 - lib/capsium/cli.rb
 - lib/capsium/converters/jekyll.rb
 - lib/capsium/package.rb
 - lib/capsium/package/dataset.rb
+- lib/capsium/package/dataset_config.rb
 - lib/capsium/package/manifest.rb
+- lib/capsium/package/manifest_config.rb
 - lib/capsium/package/metadata.rb
+- lib/capsium/package/metadata_config.rb
 - lib/capsium/package/routes.rb
+- lib/capsium/package/routes_config.rb
 - lib/capsium/package/storage.rb
+- lib/capsium/package/storage_config.rb
 - lib/capsium/packager.rb
 - lib/capsium/protector.rb
 - lib/capsium/reactor.rb
 - lib/capsium/thor_ext.rb
 - lib/capsium/version.rb
 - sig/capsium.rbs
-homepage: https://github.com/metanorma/capsium
+homepage: https://github.com/capsiums/capsium
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/metanorma/capsium
-  source_code_uri: https://github.com/metanorma/capsium
-  changelog_uri: https://github.com/metanorma/capsium/releases
+  homepage_uri: https://github.com/capsiums/capsium
+  source_code_uri: https://github.com/capsiums/capsium
+  changelog_uri: https://github.com/capsiums/capsium/releases
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -347,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Capsium