inesita 1.0.pre.3 → 1.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98638990e361feeb9db74c66704f3c9da702399193db805ea4a8b66000479d1a
-  data.tar.gz: c06335212c1197c51e8602b9afd8e229747c2300b37d194787f95b1dd8a5b387
+  metadata.gz: a2f188386e1e6e6434dab38c355238b2a5a170bd79d60455c5062c217fd0fb28
+  data.tar.gz: 1bf771f5d80d1d6ce11b10d60bf7583a887bb9a0c8f4fd224b74d4349bedd74d
 SHA512:
-  metadata.gz: '096ff65d519f71caaf316676fd595dbccacbf93684d7f151f00141688331f0e0be1f015e0f14c9a4759db2a1a1c89e27268adec310b36daad99a0b27948c5d09'
-  data.tar.gz: e905748b8418f7d999a0a7553e4a448746b33bdd8d33cd964d344714cf1020e5288edec8a632d5ec5eeee9a33b8937f3e0e2bd01c832cd87c4df7f34b2fcd820
+  metadata.gz: 4925d863797a030bb3f67482192b83f406906f989a326dc1afc8d3123f697f9d3c4ed58cfedb9dbb88b677e3625458855d333fb22b168a2bfbd1975c4a0ebc97
+  data.tar.gz: b950726eb8e27b371585b32f12f7dfa3c666a7cf607dfdab497d2960aaafeafdc3f845429b0bb3f5a7c816fbe4431f8c418ebd396164a8c40c2d953bc52a1d1a

data/inesita.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'inesita'
-  s.version     = '1.0.pre.3'
+  s.version     = '1.0.pre.4'
   s.authors     = ['Michał Kalbarczyk']
   s.email       = 'fazibear@gmail.com'
   s.homepage    = 'http://github.com/inesita-rb/inesita'
@@ -18,8 +18,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'opal-virtual-dom', '~> 0.6.1'
   s.add_dependency 'thor', '~> 1.2'
   s.add_dependency 'rack', '~> 2.0'
-
-  s.add_dependency 'rack-rewrite', '~> 1.5'
   s.add_dependency 'listen', '~> 3.0'
 
   s.add_development_dependency 'bundler', '~> 2.0'

data/lib/inesita/cli/build.rb

@@ -32,30 +32,25 @@ module Inesita
                   default: Inesita::Config::STATIC_DIR,
                   desc: 'static dir'
 
-    method_option :dist_source_dir,
-                  aliases: :b,
-                  type: :string,
-                  default: Inesita::Config::APP_DIST_DIR,
-                  desc: 'source (app) dir for dist build'
-
     def build
-      assets = assets_server
       empty_directory options[:destination_dir], force: options[:force]
-
+      generate_files
       copy_static
-      create_asset(assets, 'index.html',     ->(s) { Inesita::Minify.html(s) })
-      create_asset(assets, 'application.js', ->(s) { Inesita::Minify.js(s) })
-      create_asset(assets, 'stylesheet.css', ->(s) { Inesita::Minify.css(s) })
     end
 
-    no_commands do
-      def assets_server
-        Inesita::Server.new({
-          dist: true,
-          static_dir: options[:static_dir],
-          app_dir: options[:source_dir],
-          app_dist_dir: options[:app_dist_dir]
-        }).assets_app
+  no_commands do
+    def generate_files
+      rack = Rack::Server.new(config: 'config.ru', Port: options['port'], Host: options['host'])
+      builder = Inesita::Builder.new(app: rack.app, destination_dir: options[:destination_dir])
+
+      [
+        '/index.html',
+        Inesita.assets_code.match(/src="([^\"]*?)[?"]/)[1]
+      ].each do |url|
+          create_file File.join(options[:destination_dir], url),
+            builder.fetch(url),
+            force: options[:force]
+        end
       end
 
       def copy_static
@@ -71,12 +66,6 @@ module Inesita
           end
         end
       end
-
-      def create_asset(assets, name, minify_proc)
-        create_file File.join(options[:destination_dir], name),
-                    minify_proc.call(assets[name].source),
-                    force: options[:force]
-      end
     end
   end
 end

data/lib/inesita/cli/watch.rb

@@ -32,12 +32,6 @@ module Inesita
                   default: Inesita::Config::STATIC_DIR,
                   desc: 'static dir'
 
-    method_option :dist_source_dir,
-                  aliases: :b,
-                  type: :string,
-                  default: Inesita::Config::APP_DIST_DIR,
-                  desc: 'source (app) dir for dist build'
-
     def watch
       puts 'building...'
       safe_build

data/lib/inesita/server.rb

@@ -1,8 +1,8 @@
 module Inesita
   class Server
     def initialize(*args, &block)
-      require 'rack/rewrite'
       server = server(*args, &block)
+
       @rack = Rack::Builder.new do
         use Rack::Static, urls: [Inesita::Config::STATIC_DIR]
         run server

data/lib/inesita.rb

@@ -6,6 +6,7 @@ require 'listen'
 
 require 'inesita/config'
 require 'inesita/server'
+require 'inesita/builder'
 
 module Inesita
   module_function

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inesita
 version: !ruby/object:Gem::Version
-  version: 1.0.pre.3
+  version: 1.0.pre.4
 platform: ruby
 authors:
 - Michał Kalbarczyk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-12 00:00:00.000000000 Z
+date: 2023-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rack-rewrite
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement