pakyow-assets 1.0.1 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 994e8c28b8152f1355d7d0d5ef87e8ee4c974bf5e828c3f98f5c29e561b0bcd3
-  data.tar.gz: 457cc3641b54e99340175c2126309b84272e801ee6bfe4c81dea79a43b341512
+  metadata.gz: 4d707b98bd1e8b7eb85b4665f9c2c07023b9313c504d00aebc71eedcb3a6bae9
+  data.tar.gz: 2ce1978d448d7279041f39a41b9d196b68e141d7bf73f56024710dc413f62e9c
 SHA512:
-  metadata.gz: 680fb55b55b0462a746af58eb316bfd65e6d444b76dcc0887fbadafc064c501d1679ec8154040fbed1bc8dc7dc85d4d5756e91bcd882c033b6b6ae0449f48b7f
-  data.tar.gz: 2d2c7229731f67d111cab9796a2215339f50ac7e8d5aebaf417df60f6fbd73eb7095a587acf47f457e38f7ec2169e020e72670ee1b99d5978ffb9164c60d6105
+  metadata.gz: e0b3c095e5649fb568e685789191f38009824dbdb13334d732505496df3b9289afedfe6605b3a1d936c485066050695babd2ff2e2d20dd9dc81614e8a553ec52
+  data.tar.gz: 0270d95a8c089cebe17891f1f2dd17e999b09ec75b092b82b8a0cca134e2f205a17d2eb46b2c0daff61a0627c383b2fc1d677be61963feffe4dec1cf40f28d99

data/CHANGELOG.md

@@ -1,5 +1,52 @@
-# UNRELEASED
+# v1.0.6
 
-# 1.0
+  * `chg` **Update mini_racer to v0.3 for improved compatibility with containers.**
+
+     *Related links:*
+     - [Pull Request #514][pr-514]
+
+[pr-514]: https://github.com/pakyow/pakyow/pull/514/
+
+# v1.0.5
+
+  * `fix` **Download external asset content in full.**
+
+    *Related links:*
+    - [Pull Request #415][pr-415]
+
+[pr-415]: https://github.com/pakyow/pakyow/pull/415/
+
+# v1.0.4
+
+  * `fix` **Escape external asset uris so they do not fail on fetch.**
+
+    *Related links:*
+    - [Commit e2d7e2e][e2d7e2e]
+
+[e2d7e2e]: https://github.com/pakyow/pakyow/commit/e2d7e2ea2f36cb0a4c7073c17a692423b5cd1efe
+
+# v1.0.3
+
+  * `fix` **Make `pakyow/assets` compatible with Ruby 2.7.0.**
+    - External assets used the `http` gem, which is failing on Ruby 2.7.0-preview3. We replaced it
+    with the `async-http` gem which is already a dependency of other Pakyow frameworks.
+
+    *Related links:*
+    - [Pull Request #362][pr-362]
+    - [Commit 4278340][4278340]
+
+[pr-362]: https://github.com/pakyow/pakyow/pull/362/commits
+[4278340]: https://github.com/pakyow/pakyow/commit/4278340178abea1dc7891ed02d098c5b747b2d5b
+
+# v1.0.2
+
+  * `fix` **CDN prefix is now correctly added to assets in plugin views.**
+
+    *Related links:*
+    - [Commit 84da911][84da911]
+
+[84da911]: https://github.com/pakyow/pakyow/commit/84da911d78a33e0328bc64a7051f56268f088273
+
+# v1.0.0
 
   * Hello, Web

data/lib/pakyow/application/behavior/assets/externals.rb

@@ -23,10 +23,14 @@ module Pakyow
             )
           end
 
+          private def pakyow_js_version
+            "^1.0.0"
+          end
+
           apply_extension do
             after "boot", "fetch.assets.externals" do
               if config.assets.externals.pakyow
-                external_script :pakyow, "^1.0.0", package: "@pakyow/js", files: [
+                external_script :pakyow, pakyow_js_version, package: "@pakyow/js", files: [
                   "dist/pakyow.js",
                   "dist/components/confirmable.js",
                   "dist/components/form.js",
@@ -48,8 +52,7 @@ module Pakyow
                 end
 
                 if fetched
-                  FileUtils.mkdir_p "./tmp"
-                  FileUtils.touch "./tmp/restart.txt"
+                  touch_restart
                 end
               end
             end

data/lib/pakyow/assets/external.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "http"
-
 require "pakyow/support/cli/runner"
 
 module Pakyow
@@ -58,45 +56,90 @@ module Pakyow
         end
 
         Support::CLI::Runner.new(message: "Fetching #{file_with_version}").run do |runner|
-          begin
-            response = HTTP.follow(true).get(
+          Async do
+            downloader = Downloader.new(
+              File.join(@config.externals.provider, CGI.escape(package_with_version), CGI.escape(file.to_s))
+            ).perform
+
+            FileUtils.mkdir_p(@config.externals.path)
+
+            fetched_version = CGI.unescape(downloader.path.to_s).split(@package.to_s, 2)[1].split("/", 2)[0].split("@", 2)[1]
+            file_basename = File.basename(file.to_s, File.extname(file.to_s))
+
+            local_path = if file && file_basename != name.to_s
               File.join(
-                @config.externals.provider,
-                package_with_version,
-                file.to_s
+                @config.externals.path,
+                "#{name}@#{fetched_version}__#{file_basename}.js"
               )
-            )
+            else
+              File.join(
+                @config.externals.path,
+                "#{name}@#{fetched_version}.js"
+              )
+            end
 
-            if response.code == 200
-              FileUtils.mkdir_p(@config.externals.path)
+            File.open(local_path, "w") do |fp|
+              fp.write(downloader.body.to_s)
+            end
 
-              fetched_version = response.uri.to_s.split(@package.to_s, 2)[1].split("/", 2)[0].split("@", 2)[1]
-              file_basename = File.basename(file.to_s, File.extname(file.to_s))
+            runner.succeeded
+          rescue Downloader::Failed => error
+            runner.failed(error.to_s)
+          end
+        end
+      end
 
-              local_path = if file && file_basename != name.to_s
-                File.join(
-                  @config.externals.path,
-                  "#{name}@#{fetched_version}__#{file_basename}.js"
-                )
-              else
-                File.join(
-                  @config.externals.path,
-                  "#{name}@#{fetched_version}.js"
-                )
-              end
+      require "uri"
 
-              File.open(local_path, "w") do |fp|
-                fp.write(response.body.to_s)
-              end
+      require "async"
+      require "async/http/internet"
 
-              runner.succeeded
-            else
-              runner.failed(response.to_s)
+      # @api private
+      class Downloader
+        attr_reader :status, :body, :path
+
+        def initialize(uri)
+          @uri = URI.parse(uri)
+        end
+
+        def perform
+          get(@uri.path); self
+        end
+
+        private def get(path)
+          @path = path
+          internet = Async::HTTP::Internet.new
+
+          Async do
+            begin
+              response = internet.get(build_uri(path))
+              @status = response.status
+
+              if response.status == 301 || response.status == 302
+                get(response.headers["location"])
+              elsif response.status >= 500
+                raise Failed, "Unexpected response status: #{response.status}"
+              else
+                @body = String.new
+                while body = response.body.read
+                  @body << body
+                end
+              end
+            rescue SocketError => error
+              raise Failed.build(error)
+            ensure
+              response&.close
             end
-          rescue HTTP::ConnectionError => error
-            runner.failed(error.to_s)
-          end
+          end.wait
+        ensure
+          internet&.close
         end
+
+        private def build_uri(path)
+          File.join("#{@uri.scheme}://#{@uri.host}", path)
+        end
+
+        class Failed < Error; end
       end
     end
   end

data/lib/pakyow/assets/types/js.rb

@@ -25,7 +25,7 @@ module Pakyow
 
         def process(content)
           result = if transformable?
-            transformed = Babel.transform(content, @options)
+            transformed = Babel.transform(content, **@options)
             { content: transformed["code"], map: transformed["map"] }
           else
             { content: content, map: "" }

data/lib/pakyow/presenter/renderer/behavior/assets/install_assets.rb

@@ -23,11 +23,11 @@ module Pakyow
                     pack.public_path
                   }.each do |pack|
                     if pack.javascripts?
-                      head.object.append_html("<script src=\"#{File.join(app.config.assets.host, pack.public_path)}.js\"></script>\n")
+                      head.object.append_html("<script src=\"#{File.join(app.top.config.assets.host, pack.public_path)}.js\"></script>\n")
                     end
 
                     if pack.stylesheets?
-                      head.object.append_html("<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"#{File.join(app.config.assets.host, pack.public_path)}.css\">\n")
+                      head.object.append_html("<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"#{File.join(app.top.config.assets.host, pack.public_path)}.css\">\n")
                     end
                   end
                 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-assets
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.6
 platform: ruby
 authors:
 - Bryan Powell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakyow-core
@@ -16,84 +16,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: pakyow-presenter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: pakyow-routing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: pakyow-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
-  name: execjs
+  name: async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 0.49.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 0.49.0
 - !ruby/object:Gem::Dependency
-  name: http
+  name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: mini_mime
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: source_map
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 description: Asset pipeline for Pakyow
 email: bryan@bryanp.org
 executables: []
@@ -204,7 +204,7 @@ homepage: https://pakyow.com
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -219,8 +219,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Pakyow Assets
 test_files: []