pakyow-assets 1.0.0.rc5 → 1.0.0

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "pakyow/support/extension"
+
+module Pakyow
+  class Application
+    module Behavior
+      module Assets
+        # Silences asset requests from being logged.
+        #
+        module Silencing
+          extend Support::Extension
+
+          apply_extension do
+            on "load" do
+              if config.assets.silent
+                # silence asset requests
+                Pakyow.silence do |connection|
+                  # TODO: do we need the second check?
+                  connection.path.start_with?(config.assets.prefix) || self.class.asset.instances.any? { |asset|
+                    asset.logical_path == connection.path
+                  }
+                end
+
+                # silence requests to public files
+                Pakyow.silence do |connection|
+                  # TODO: really need an in-memory directory for these files
+                  File.file?(File.join(config.assets.public_path, connection.path))
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "pakyow/support/extension"
+
+module Pakyow
+  class Application
+    module Behavior
+      module Assets
+        module Watching
+          extend Support::Extension
+
+          apply_extension do
+            after "configure" do
+              config.assets.extensions.each do |extension|
+                config.process.watched_paths << File.join(config.presenter.path, "**/*#{extension}")
+
+                # Exclude vendored assets.
+                #
+                config.process.excluded_paths << File.join(config.assets.externals.path, "*#{extension}")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pakyow/{assets/behavior/config.rb → application/config/assets.rb}

@@ -4,9 +4,9 @@ require "pakyow/support/extension"
 require "pakyow/support/path_version"
 
 module Pakyow
-  module Assets
-    module Behavior
-      module Config
+  class Application
+    module Config
+      module Assets
         extend Support::Extension
 
         apply_extension do

data/lib/pakyow/assets.rb

@@ -11,9 +11,9 @@ require "pakyow/assets/types/css"
 require "pakyow/assets/types/sass"
 require "pakyow/assets/types/scss"
 
-require "pakyow/actions/assets/process"
-require "pakyow/actions/assets/public"
+require "pakyow/application/actions/assets/process"
+require "pakyow/application/actions/assets/public"
 
 module Pakyow
-  config.tasks.paths << File.expand_path("../assets/tasks", __FILE__)
+  config.tasks.paths << File.expand_path("../tasks", __FILE__)
 end

data/lib/pakyow/assets/framework.rb

@@ -2,19 +2,19 @@
 
 require "pakyow/framework"
 
-require "pakyow/assets/asset"
-require "pakyow/assets/pack"
+require "pakyow/application/behavior/assets"
+require "pakyow/application/behavior/assets/packs"
+require "pakyow/application/behavior/assets/silencing"
+require "pakyow/application/behavior/assets/externals"
+require "pakyow/application/behavior/assets/watching"
+require "pakyow/application/behavior/assets/prelaunching"
+require "pakyow/application/behavior/assets/processing"
+require "pakyow/application/config/assets"
 
-require "pakyow/assets/behavior/config"
-require "pakyow/assets/behavior/assets"
-require "pakyow/assets/behavior/packs"
-require "pakyow/assets/behavior/silencing"
-require "pakyow/assets/behavior/externals"
-require "pakyow/assets/behavior/watching"
-require "pakyow/assets/behavior/prelaunching"
-require "pakyow/assets/behavior/processing"
+require "pakyow/presenter/renderer/behavior/assets/install_assets"
 
-require "pakyow/assets/behavior/rendering/install_assets"
+require "pakyow/assets/asset"
+require "pakyow/assets/pack"
 
 module Pakyow
   module Assets
@@ -29,20 +29,20 @@ module Pakyow
           #
           stateful :pack, Pack
 
-          include Behavior::Config
-          include Behavior::Assets
-          include Behavior::Packs
-          include Behavior::Silencing
-          include Behavior::Externals
-          include Behavior::Watching
-          include Behavior::Prelaunching
-          include Behavior::Processing
+          include Application::Config::Assets
+          include Application::Behavior::Assets
+          include Application::Behavior::Assets::Packs
+          include Application::Behavior::Assets::Silencing
+          include Application::Behavior::Assets::Externals
+          include Application::Behavior::Assets::Watching
+          include Application::Behavior::Assets::Prelaunching
+          include Application::Behavior::Assets::Processing
 
           after "load" do
             isolated(:Renderer) do
               # Load this one later, in case other actions define components that will load assets.
               #
-              include Assets::Behavior::Rendering::InstallAssets
+              include Presenter::Renderer::Behavior::Assets::InstallAssets
             end
           end
         end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "pakyow/support/extension"
+
+module Pakyow
+  module Presenter
+    class Renderer
+      module Behavior
+        module Assets
+          module InstallAssets
+            extend Support::Extension
+
+            apply_extension do
+              build do |view, app:|
+                if head = view.head
+                  packs = app.packs(view)
+
+                  if app.is_a?(Plugin)
+                    packs = app.parent.packs(view).concat(packs)
+                  end
+
+                  packs.uniq { |pack|
+                    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")
+                    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")
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-assets
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc5
+  version: 1.0.0
 platform: ruby
 authors:
 - Bryan Powell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakyow-core
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc5
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc5
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: pakyow-presenter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc5
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc5
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: pakyow-routing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc5
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc5
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: pakyow-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc5
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc5
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
@@ -165,41 +165,42 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.1'
 description: Asset pipeline for Pakyow
-email: bryan@metabahn.com
+email: bryan@bryanp.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
-- lib/pakyow/actions/assets/process.rb
-- lib/pakyow/actions/assets/public.rb
+- lib/pakyow/application/actions/assets/process.rb
+- lib/pakyow/application/actions/assets/public.rb
+- lib/pakyow/application/behavior/assets.rb
+- lib/pakyow/application/behavior/assets/externals.rb
+- lib/pakyow/application/behavior/assets/packs.rb
+- lib/pakyow/application/behavior/assets/prelaunching.rb
+- lib/pakyow/application/behavior/assets/processing.rb
+- lib/pakyow/application/behavior/assets/silencing.rb
+- lib/pakyow/application/behavior/assets/watching.rb
+- lib/pakyow/application/config/assets.rb
 - lib/pakyow/assets.rb
 - lib/pakyow/assets/asset.rb
 - lib/pakyow/assets/babel.rb
-- lib/pakyow/assets/behavior/assets.rb
-- lib/pakyow/assets/behavior/config.rb
-- lib/pakyow/assets/behavior/externals.rb
-- lib/pakyow/assets/behavior/packs.rb
-- lib/pakyow/assets/behavior/prelaunching.rb
-- lib/pakyow/assets/behavior/processing.rb
-- lib/pakyow/assets/behavior/rendering/install_assets.rb
-- lib/pakyow/assets/behavior/silencing.rb
-- lib/pakyow/assets/behavior/watching.rb
 - lib/pakyow/assets/errors.rb
 - lib/pakyow/assets/external.rb
 - lib/pakyow/assets/framework.rb
 - lib/pakyow/assets/pack.rb
 - lib/pakyow/assets/precompiler.rb
 - lib/pakyow/assets/source_map.rb
-- lib/pakyow/assets/tasks/precompile.rake
-- lib/pakyow/assets/tasks/update.rake
 - lib/pakyow/assets/types/css.rb
 - lib/pakyow/assets/types/js.rb
 - lib/pakyow/assets/types/sass.rb
 - lib/pakyow/assets/types/scss.rb
+- lib/pakyow/presenter/renderer/behavior/assets/install_assets.rb
+- lib/pakyow/tasks/assets/precompile.rake
+- lib/pakyow/tasks/assets/update.rake
 - src/@babel/standalone@7.3.1/babel.min.js
 - src/@babel/standalone@7.4.5/babel.min.js
-homepage: https://pakyow.org
+homepage: https://pakyow.com
 licenses:
 - LGPL-3.0
 metadata: {}
@@ -214,9 +215,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 

data/lib/pakyow/actions/assets/process.rb

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-module Pakyow
-  module Actions
-    module Assets
-      # Pipeline Action that processes assets at request time.
-      #
-      # This is intended for development use, please don't use it in production.
-      # Instead, precompile assets into the public directory.
-      #
-      class Process
-        def call(connection)
-          if connection.app.config.assets.process
-            # TODO: can we short circuit if the request path doesn't match the connection?
-            if asset = find_asset(connection) || find_pack(connection) || find_asset_map(connection) || find_pack_map(connection)
-              connection.set_header("content-type", asset.mime_type)
-              connection.body = asset
-              connection.halt
-            end
-          end
-        end
-
-        private
-
-        def find_asset(connection, path = connection.path)
-          connection.app.state(:asset).find { |asset|
-            asset.public_path == path
-          }
-        end
-
-        def find_pack(connection, path = connection.path)
-          connection.app.state(:pack).lazy.map { |pack|
-            pack.packed(path)
-          }.find { |packed| !packed.nil? && packed.any? }
-        end
-
-        def find_asset_map(connection)
-          if wants_map?(connection)
-            if (asset = find_asset(connection, unmapped(connection))) && asset.source_map?
-              asset.source_map
-            end
-          end
-        end
-
-        def find_pack_map(connection)
-          if (pack = find_pack(connection, unmapped(connection))) && pack.source_map?
-            pack.source_map
-          else
-            nil
-          end
-        end
-
-        def wants_map?(connection)
-          connection.path.end_with?(".map")
-        end
-
-        def unmapped(connection)
-          File.join(File.dirname(connection.path), File.basename(connection.path, ".map"))
-        end
-      end
-    end
-  end
-end

data/lib/pakyow/actions/assets/public.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-require "mini_mime"
-
-require "pakyow/support/core_refinements/string/normalization"
-
-module Pakyow
-  module Actions
-    module Assets
-      class Public
-        using Support::Refinements::String::Normalization
-
-        # Pipeline Action that serves files out of your public directory.
-        #
-        def initialize(app)
-          @asset_paths = app.state(:asset).map(&:public_path) + app.state(:pack).flat_map { |pack|
-            [pack.public_css_path, pack.public_js_path]
-          }
-
-          @prefix = if app.is_a?(Plugin)
-            Pathname.new(app.class.mount_path)
-          else
-            Pathname.new("/")
-          end
-        end
-
-        def call(connection)
-          if connection.app.config.assets.public
-            public_path = public_path(connection)
-
-            if public?(public_path)
-              if mime = MiniMime.lookup_by_filename(public_path)
-                connection.set_header("content-type", mime.content_type)
-              end
-
-              if connection.app.config.assets.cache && asset?(connection)
-                set_cache_headers(connection, public_path)
-              end
-
-              connection.body = File.open(public_path)
-              connection.halt
-            end
-          end
-        end
-
-        private
-
-        def public?(path)
-          File.file?(path)
-        end
-
-        def public_path(connection)
-          File.join(
-            connection.app.config.assets.public_path,
-            String.normalize_path(
-              Pathname.new(connection.path).relative_path_from(@prefix).to_s
-            )
-          )
-        end
-
-        def asset?(connection)
-          @asset_paths.include?(connection.path)
-        end
-
-        def set_cache_headers(connection, public_path)
-          mtime = File.mtime(public_path)
-          connection.set_header("age", (Time.now - mtime).to_i.to_s)
-          connection.set_header("cache-control", "public, max-age=31536000")
-          connection.set_header("vary", "accept-encoding")
-          connection.set_header("last-modified", mtime.httpdate)
-        end
-      end
-    end
-  end
-end