pakyow-assets 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 746e7e7c48cda01bc9af5c39046555a2edfa84ecc1630a6db45188dbea309e41
-  data.tar.gz: d987738e7acfe4e33561a0184ef7ca6d72b5b57e26c4bf8f941e64767bd1c4ee
+  metadata.gz: 6d835e94d5a1dc792fb8e3f0f943780e6ae6e9d477742b4a03c470a0afa664d5
+  data.tar.gz: 6b9c1c1f17ad8a054d91c1e37940d6cefbc88f9d7e2a76439bd40edce7f0dd98
 SHA512:
-  metadata.gz: 218fa281e07d4186efdb00dbbfb0cb3ca50aa0e30d9b0acc27c5b721e1742bbe6e421bdaa7d32d15639908102c6a4ecda96423d6e9e4f6d0cb0fe04c70b2e250
-  data.tar.gz: 0c1e437823e6bd50f8144b9dde7b2717ebc68551883d5cd880580191a8199a3698f4fa2eea2f44df0b646583674c16ee2410b6e483bca1fb9f47e9530170d2a9
+  metadata.gz: 39a751d90c7d04f47e2c88be8dcce709c4a809caad1c62c5e7a0df2859e7ad17f314f723e9202d087426406d6f58aa0d01d29bd17aec83eeaf56de8e0a011ee7
+  data.tar.gz: 23252b5168d08e7cbc0c8d038e21219bd81e777b3f7d2fa5ee0826f0508ecbe3bf9073d111a35a73bc37052d6cea0d78a4fc60fa4aa30fb9f097a9ff33fa0620

data/CHANGELOG.md

@@ -1,4 +1,17 @@
-# v1.0.2 (unreleased)
+# v1.0.3 (unreleased)
+
+  * `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.**
 

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

@@ -52,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,46 +56,82 @@ 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, package_with_version, file.to_s)
+            ).perform
+
+            FileUtils.mkdir_p(@config.externals.path)
+
+            fetched_version = 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"
               )
-            )
-
-            if response.code == 200
-              FileUtils.mkdir_p(@config.externals.path)
-
-              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))
-
-              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
-
-              File.open(local_path, "w") do |fp|
-                fp.write(response.body.to_s)
-              end
-
-              runner.succeeded
             else
-              runner.failed(response.to_s)
+              File.join(
+                @config.externals.path,
+                "#{name}@#{fetched_version}.js"
+              )
             end
-          rescue HTTP::ConnectionError => error
+
+            File.open(local_path, "w") do |fp|
+              fp.write(downloader.body.to_s)
+            end
+
+            runner.succeeded
+          rescue Downloader::Failed => error
             runner.failed(error.to_s)
           end
         end
       end
+
+      require "uri"
+
+      require "async"
+      require "async/http/internet"
+
+      # @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
+          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 = response.body.read
+          end
+        rescue SocketError => error
+          raise Failed.build(error)
+        ensure
+          response&.close
+          internet&.close
+        end
+
+        private def build_uri(path)
+          File.join("#{@uri.scheme}://#{@uri.host}", path)
+        end
+
+        class Failed < Error; end
+      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: "" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-assets
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Bryan Powell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2019-12-15 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.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: pakyow-presenter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: pakyow-routing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: pakyow-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 - !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.2'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: mini_mime
   requirement: !ruby/object:Gem::Requirement