ruflet_rails 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 314ea2aafb0153d3d6f5d4b0b37d3f24761b9cf1d54e1b0af4f82cfd54034c3b
-  data.tar.gz: 593cbbfbf58d8cdd12fa0c01e2d5033b6f66a26f28298a0682a241a4bc407645
+  metadata.gz: 2ffd81f0143fcba01b93a6d0f773d1d0e4aa983a01c4bf282ed383a631273b13
+  data.tar.gz: 8840d1be44c36b8d82789f9a9d8055bd2ab0f8e893bafe1fc2ab6f8f082f90d0
 SHA512:
-  metadata.gz: 8757f1cbd09bee0c205f638714777e2a96626a9836af535d6ff9a9b4734e0968b0943ee24109016058ff3801635c56801db2dbd5fd7a348c00cdddbadd0b12c3
-  data.tar.gz: f5c74694f0073a7e69e1608767ccbbf6920795bead5c43549fe99d5ecf349d9c9eb53615fc026f73ea7fde5384c516e4cb51df758550911ed2a17279160a0a93
+  metadata.gz: 456e8aaf3966f272a7b5b0945163a8f96955c240577fb5a1f4f5023ec635260eb531872505e03d552199f6d52c5a68839cbb3a2a4115d82d25f3e1c0bcf95765
+  data.tar.gz: a63099e903e698ceb130f8b678deaa8a2cb238335266615704fdac47b41f1775fc8e1d677789bab3c6a3961034173d323719325ac159d1b679b4dfd772636a03

data/lib/generators/ruflet/install/install_generator.rb

@@ -6,10 +6,8 @@ require "ruflet/rails/install_support"
 module Ruflet
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
-      class_option :frontend, type: :boolean, default: false, desc: "Install the Rails-hosted Ruflet web client"
-      class_option :web, type: :boolean, default: false, desc: "Install the Rails-hosted Ruflet web client"
       class_option :desktop, type: :boolean, default: false, desc: "Download the server-driven desktop Ruflet client"
-      class_option :client, type: :string, default: nil, desc: "Download prebuilt client from GitHub releases: web, desktop, all, or none"
+      class_option :client, type: :string, default: nil, desc: "Download prebuilt client from GitHub releases: desktop or none"
 
       desc "Install Ruflet into a Rails app."
 
@@ -32,7 +30,8 @@ module Ruflet
         return unless File.file?(target)
 
         route = Ruflet::Rails::InstallSupport.route_snippet(entrypoint: entrypoint_path)
-        return if File.read(target).include?(route)
+        source = File.read(target)
+        return if source.include?(route)
 
         insert_into_file target, "  #{route}\n", after: /Rails\.application\.routes\.draw do\s*\n/
       end
@@ -46,17 +45,8 @@ module Ruflet
 
       def download_prebuilt_client
         client = requested_client
-        @web_client_published = false
         return if client == "none"
 
-        if %w[web all].include?(client)
-          @web_client_published = Ruflet::Rails::InstallSupport.publish_web_build(destination_root)
-          if @web_client_published
-            say "Ruflet web build copied from build/web to public/#{Ruflet::Rails::InstallSupport.default_web_public_path}"
-            return if client == "web"
-          end
-        end
-
         require "ruflet/cli"
         exit_code = Dir.chdir(destination_root) do
           Ruflet::CLI.command_update([client])
@@ -64,17 +54,6 @@ module Ruflet
         unless exit_code.to_i.zero?
           @client_download_failed = true
           say_status(:warn, "Ruflet client download failed; install files were generated and build/update steps are printed below", :yellow)
-          return
-        end
-
-        return unless %w[web all].include?(client)
-
-        published = Ruflet::Rails::InstallSupport.publish_prebuilt_web_client(destination_root)
-        @web_client_published = published
-        if published
-          say "Ruflet web client published at /#{Ruflet::Rails::InstallSupport.default_web_public_path}/"
-        else
-          say_status(:warn, "Ruflet web client downloaded, but no prebuilt web index.html was found to publish", :yellow)
         end
       rescue StandardError => e
         @client_download_failed = true
@@ -85,8 +64,7 @@ module Ruflet
         Ruflet::Rails::InstallSupport.install_next_steps(
           target: install_target,
           entrypoint: entrypoint_path,
-          client: requested_client,
-          web_published: !!@web_client_published
+          client: requested_client
         ).each { |line| say line }
       end
 
@@ -103,22 +81,18 @@ module Ruflet
       def requested_client
         explicit = options[:client].to_s.strip.downcase
         unless explicit.empty?
-          raise Thor::Error, "--client must be web, desktop, all, or none" unless %w[web desktop all none].include?(explicit)
+          raise Thor::Error, "--client must be desktop or none" unless %w[desktop none].include?(explicit)
 
           return explicit
         end
 
-        wants_web = options[:frontend] || options[:web]
-        wants_desktop = options[:desktop]
-        return "all" if wants_web && wants_desktop
-        return "web" if wants_web
-        return "desktop" if wants_desktop
+        return "desktop" if options[:desktop]
 
         "none"
       end
 
       def desktop_requested?
-        %w[desktop all].include?(requested_client)
+        requested_client == "desktop"
       end
 
       def install_target

data/lib/ruflet/rails/install_support.rb

@@ -831,9 +831,7 @@ module Ruflet
         normalized = normalize_build_platform(platform)
         return [] if normalized.to_s.empty?
 
-        args = [normalized]
-        args += ["--base-href", web_base_href] if normalized == "web"
-        args
+        [normalized]
       end
 
       def default_entrypoint_path
@@ -844,128 +842,17 @@ module Ruflet
         %(match "#{mount_path}", to: Ruflet::Rails.#{helper}(Rails.root.join("#{entrypoint}")), via: :all)
       end
 
-      def default_web_public_path
-        "app"
-      end
-
-      def web_base_href(public_path = default_web_public_path)
-        normalized = public_path.to_s.strip.gsub(%r{\A/+|/+\z}, "")
-        normalized.empty? ? "/" : "/#{normalized}/"
-      end
-
-      def publish_web_build(root, public_path: default_web_public_path)
-        publish_web_client(root, source: File.join(root, "build", "web"), public_path: public_path)
-      end
-
-      def publish_prebuilt_web_client(root, platform: host_desktop_platform, public_path: default_web_public_path)
-        source = prebuilt_web_client_path(platform: platform)
-        return false unless source
-
-        publish_web_client(root, source: source, public_path: public_path)
-      end
-
-      def prebuilt_web_client_path(platform: host_desktop_platform)
-        return nil if platform.to_s.empty?
-
-        source = File.join(prebuilt_client_cache_root(platform: platform), "web")
-        return nil unless Dir.exist?(source)
-        return nil unless File.file?(File.join(source, "index.html"))
-
-        source
-      end
-
-      def prebuilt_client_cache_root(platform: host_desktop_platform)
-        require "ruflet/cli"
-
-        if Ruflet::CLI.respond_to?(:client_cache_root_for, true)
-          Ruflet::CLI.send(:client_cache_root_for, platform)
-        else
-          File.join(Dir.home, ".ruflet", "client", Ruflet::VERSION, platform.to_s)
-        end
-      end
-
-      def publish_web_client(root, source:, public_path: default_web_public_path)
-        return false unless Dir.exist?(source)
-        return false unless File.file?(File.join(source, "index.html"))
-
-        target = File.join(root, "public", public_path.to_s.gsub(%r{\A/+|/+\z}, ""))
-        FileUtils.rm_rf(target)
-        FileUtils.mkdir_p(File.dirname(target))
-        FileUtils.cp_r(source, target)
-        rewrite_web_base_href(target, public_path: public_path)
-        inject_web_client_bootstrap(target)
-        true
-      end
-
-      def rewrite_web_base_href(target, public_path:)
-        index_path = File.join(target, "index.html")
-        return unless File.file?(index_path)
-
-        content = File.read(index_path)
-        base_href = web_base_href(public_path)
-        updated =
-          if content.match?(%r{<base\s+href=["'][^"']*["']\s*/?>}i)
-            content.sub(%r{<base\s+href=["'][^"']*["']\s*/?>}i, %(<base href="#{base_href}">))
-          else
-            content.sub(%r{<head([^>]*)>}i, %(<head\\1>\n  <base href="#{base_href}">))
-          end
-        File.write(index_path, updated)
-      end
-
-      def inject_web_client_bootstrap(target)
-        index_path = File.join(target, "index.html")
-        return unless File.file?(index_path)
-
-        content = File.read(index_path)
-        return if content.include?('id="ruflet-rails-bootstrap"')
-
-        script = <<~HTML
-          <script id="ruflet-rails-bootstrap">
-            if (window.location.search === "" && window.location.hash === "") {
-              const rufletServerUrl = window.location.origin + "/";
-              window.history.replaceState(
-                null,
-                document.title,
-                window.location.pathname + "?url=" + encodeURIComponent(rufletServerUrl)
-              );
-            }
-          </script>
-        HTML
-
-        updated =
-          if content.include?('<script src="flutter_bootstrap.js"')
-            content.sub(%r{<script src="flutter_bootstrap\.js"[^>]*></script>}i) { |match| "#{script}  #{match}" }
-          else
-            content.sub(%r{</body>}i, "#{script}</body>")
-          end
-        File.write(index_path, updated)
-      end
-
-      def install_next_steps(target:, entrypoint:, client:, web_published:, mount_path: "/ws")
-        web_path = default_web_public_path
+      def install_next_steps(target:, entrypoint:, client:, mount_path: "/ws")
         lines = [
           "Ruflet Rails installed.",
           "Generated entrypoint: #{entrypoint}",
           "Mounted websocket: #{mount_path}",
           "Next steps:",
           "  1. Start Rails: bin/rails server",
-          "  2. Open the Ruflet web client: /#{web_path}/"
+          "  2. Connect your Ruflet app to ws://localhost:3000#{mount_path}"
         ]
 
-        if web_published
-          lines << "Web client copied to public/#{web_path}."
-        elsif target.to_s == "ruflet" || %w[web all].include?(client.to_s)
-          lines += [
-            "Web client was not copied because no built/prebuilt web index.html was found.",
-            "To download the prebuilt client from GitHub: bin/rails ruflet:update[web]",
-            "To build the WASM web client yourself, install the ruflet CLI globally first:",
-            "  gem install ruflet",
-            "Then build and copy build/web into public/#{web_path}:",
-            "  bin/rails ruflet:build[web]"
-          ]
-        end
-
-        if %w[desktop all].include?(client.to_s)
+        if client.to_s == "desktop"
           lines += [
             "Desktop clients are server-driven and connect to this Rails app.",
             "Plain bin/dev, bin/rails server, and bin/rails s do not launch desktop.",

data/lib/ruflet/rails/railtie.rb

@@ -15,10 +15,12 @@ module Ruflet
 
       rake_tasks do
         namespace :ruflet do
-          desc "Build Ruflet client for this Rails app. Usage: rake ruflet:build[web]"
-          task :build, [:platform] do |_task, args|
+          desc "Build Ruflet client for this Rails app. Usage: rake ruflet:build[web,app]"
+          task :build, [:platform, :web_path] do |_task, args|
             requested_platform = args[:platform].to_s.strip.downcase
-            build_args = Ruflet::Rails::InstallSupport.build_args_for_platform(requested_platform)
+            web_path = args[:web_path].to_s.strip
+            public_path = web_path.empty? ? Ruflet::Rails::InstallSupport.default_web_public_path : web_path
+            build_args = Ruflet::Rails::InstallSupport.build_args_for_platform(requested_platform, public_path: public_path)
             platform = build_args.first
             if platform.to_s.empty?
               warn "Usage: rake ruflet:build[apk|android|ios|aab|web|desktop|macos|windows|linux]"
@@ -32,17 +34,17 @@ module Ruflet
             raise SystemExit, exit_code unless exit_code.to_i.zero?
 
             if platform == "web"
-              published = Ruflet::Rails::InstallSupport.publish_web_build(::Rails.root.to_s)
+              published = Ruflet::Rails::InstallSupport.publish_web_build(::Rails.root.to_s, public_path: public_path)
               if published
-                puts "Ruflet web client published at /#{Ruflet::Rails::InstallSupport.default_web_public_path}/"
+                puts "Ruflet web client published at #{Ruflet::Rails::InstallSupport.web_base_href(public_path)}"
               else
                 warn "Ruflet web build completed, but build/web was not found to publish."
               end
             end
           end
 
-          desc "Download/update prebuilt Ruflet clients from GitHub releases. Usage: rake ruflet:update[web|desktop|all]"
-          task :update, [:target] do |_task, args|
+          desc "Download/update prebuilt Ruflet clients from GitHub releases. Usage: rake ruflet:update[web,app]"
+          task :update, [:target, :web_path] do |_task, args|
             target = args[:target].to_s.strip
             if target.empty?
               warn "Usage: rake ruflet:update[web|desktop|all]"
@@ -50,6 +52,8 @@ module Ruflet
             end
             normalized_target = target.downcase
             platform = Ruflet::Rails::InstallSupport.host_desktop_platform
+            web_path = args[:web_path].to_s.strip
+            public_path = web_path.empty? ? Ruflet::Rails::InstallSupport.default_web_public_path : web_path
 
             require "ruflet/cli"
             exit_code = Dir.chdir(::Rails.root) do
@@ -60,10 +64,11 @@ module Ruflet
             if %w[web all].include?(normalized_target)
               published = Ruflet::Rails::InstallSupport.publish_prebuilt_web_client(
                 ::Rails.root.to_s,
-                platform: platform
+                platform: platform,
+                public_path: public_path
               )
               if published
-                puts "Ruflet web client published at /#{Ruflet::Rails::InstallSupport.default_web_public_path}/"
+                puts "Ruflet web client published at #{Ruflet::Rails::InstallSupport.web_base_href(public_path)}"
               else
                 warn "Ruflet web client downloaded, but no prebuilt web index.html was found to publish."
               end

data/lib/ruflet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ruflet
-  VERSION = "0.0.9" unless const_defined?(:VERSION)
+  VERSION = "0.0.10" unless const_defined?(:VERSION)
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: ruflet_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
-- AdamMusa
+- Adam Moussa Ali
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
@@ -51,10 +51,24 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.14
-description: Rails-first integration package for mounting Ruflet mobile apps in Rails
-  routes.
+- !ruby/object:Gem::Dependency
+  name: ruflet_server
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.14
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.14
+description: Build cross-platform mobile and desktop apps with Ruby on Rails using
+  Ruflet.
 email:
-- adammusa2222@gmail.com
+- adammusaaly@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []