roda-sprockets 0.0.11 → 1.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4e53a435d78900ca0aa849736d8a5a50153928d13bb52cd7f84a74f7cc2f459
-  data.tar.gz: dce7df67380f9cd01321f6fa1d348f1caf917428e8cd12ce68742ba2b57a8256
+  metadata.gz: a4a70ad21f0db49bb53cea400c3e90c27e2cae1c1d791f5c6dd471ee89b27621
+  data.tar.gz: 4bb46d275d252145e7406463d9a6fd1e6171eacc1bc59ff45d10e977de3b030e
 SHA512:
-  metadata.gz: eecbbad49fbb0c2e1b7fcd0c67cc3d095e44112871dd954d37aefb6178be0f550bfbe80616dd23853ea79ad1880f0af0b2f9a89d68fe3a3db39c3bbd9f33577e
-  data.tar.gz: ceefc9229041a9d04cd3f7001ce2c5f1f4d77677c09fbcc6eea588b949450575a7405b5a977be081f0e70d14f0253063f4d5c905b580e1a33f2acdb7055a9def
+  metadata.gz: 26eee21ed69f840bc04a1b024bf7d4ce7347a12d917cbfcd3eada64a7b9a76288748e99889a40fe273a150c92702c2a7048c369b1445fc078d888300055458f2
+  data.tar.gz: 839696f0f772909e113c14776eccf09a961723ca2dd2c33aa6edf252b3d3fb3ddd078a5021889ffd292bd3f92d41c0510ec710afbad1af4af2ce9a2034c0a037

data/.gitignore

@@ -11,4 +11,5 @@
 *.so
 *.o
 *.a
+*.gem
 mkmf.log

data/CHANGELOG.md

@@ -0,0 +1,22 @@
+v1.1.0
+
+- Fix the Rack::Lint issue (#1)
+- :public_path argument to receive a default value (#7)
+- Roda::RodaPlugins::Sprockets::Task to superclass SprocketsTask (#6)
+- The debug logic now depends on :debug argument, not environment (#4)
+
+v1.0.2
+
+- :root argument to select a default argument more robustly (#2)
+
+v1.0.1
+
+- New :cache argument to plugin configuration
+
+v1.0.0
+
+- Sprockets 4.0 support
+
+v0.0.11
+
+- Support polyinstantiation, improve Opal support

data/LICENSE.txt

@@ -1,5 +1,5 @@
 Copyright (c) 2015 cj
-Copyright (c) 2020 hmdne
+Copyright (c) 2020-2021 hmdne and opal-sprockets contributors
 
 MIT License
 

data/README.md

@@ -3,15 +3,14 @@
 This Roda plugin provides support for integrating Sprockets with your Roda codebase.
 
 This is a fork of [roda-sprocket_assets](https://github.com/cj/roda-sprocket_assets).
-This release supports Roda 3.x and Sprockets 3.x (in the future, Sprockets 4.x too).
+This release supports Roda 3.x and Sprockets 3.x and 4.x.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'sprockets-helpers', git: 'https://github.com/hmdne/sprockets-helpers'
-gem 'roda-sprockets', git: 'https://github.com/hmdne/roda-sprockets'
+gem 'roda-sprockets'
 ```
 
 And then execute:
@@ -23,7 +22,7 @@ And then execute:
 ```ruby
 class App < Roda
    plugin :sprockets, precompile: %w(site.js site.css),
-                      public_path: 'public/',
+                      public_path: 'public/assets/',
                       opal: true,
                       debug: true
    plugin :public
@@ -42,8 +41,9 @@ end
   but also supports absolute paths) - an array of directories where your
   assets are located, by default: `%w(assets vendor/assets)`.
 * `root` - a filesystem root directory of your app. By default, `app.opts[:root]`.
-* `public_path` - filesystem path to your `public` directory, for all your
-  precompilation needs. (REQUIRED)
+* `public_path` - filesystem path to a place, where precompiled assets will be
+  stored, by default: `public/assets` (it should be a directory from which `:public`
+  plugin takes files + `path_prefix`)
 * `path_prefix` - a Roda prefix of your assets directory. By default: `/assets`
 * `protocol` - either :http (default) or :https.
 * `css_compressor`, `js_compressor` - pick a compressor of your choice.
@@ -51,6 +51,7 @@ end
 * `digest` (bool) - digest your assets for unique filenames, default: true
 * `opal` (bool) - Opal support, default: false
 * `debug` (bool) - debug mode, default: false
+* `cache` - a `Sprockets::Cache` instance
 
 ### Templates:
 

data/examples/opal-doc/Gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "roda-sprockets", path: "../.."
+gem "opal-sprockets"
+gem "puma"
+gem "rake"

data/examples/opal-doc/Gemfile.lock

@@ -0,0 +1,47 @@
+PATH
+  remote: ../..
+  specs:
+    roda-sprockets (1.0.2)
+      roda (~> 3)
+      sprockets (>= 2.2)
+      sprockets-helpers (>= 1.4.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    concurrent-ruby (1.1.9)
+    nio4r (2.5.7)
+    opal (1.2.0)
+      ast (>= 2.3.0)
+      parser (~> 3.0)
+    opal-sprockets (1.0.1)
+      opal (>= 1.0, < 2.0)
+      sprockets (~> 4.0)
+      tilt (>= 1.4)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    puma (5.4.0)
+      nio4r (~> 2.0)
+    rack (2.2.3)
+    rake (13.0.6)
+    roda (3.46.0)
+      rack
+    sprockets (4.0.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-helpers (1.4.0)
+      sprockets (>= 2.2)
+    tilt (2.0.10)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  opal-sprockets
+  puma
+  rake
+  roda-sprockets!
+
+BUNDLED WITH
+   2.1.4

data/examples/opal-doc/README.md

@@ -0,0 +1,4 @@
+This is an example found in `opal` repository in `docs/roda-sprockets.md`.
+
+It describes how to create the simplest application with roda, roda-sprockets
+and opal.

data/examples/opal-doc/Rakefile

@@ -0,0 +1,6 @@
+require "bundler/setup"
+require "roda/plugins/sprockets_task"
+
+require_relative "app"
+
+Roda::RodaPlugins::Sprockets::Task.define!(App)

data/examples/opal-doc/app.rb

@@ -0,0 +1,26 @@
+require 'roda'
+
+class App < Roda
+   plugin :sprockets, precompile: %w(application.js),
+                      prefix: %w(app/),
+                      opal: true,
+                      debug: ENV['RACK_ENV'] != 'production'
+   plugin :public
+
+   route do |r|
+     r.public
+     r.sprockets
+
+     r.root do
+       <<~END
+         <!doctype html>
+         <html>
+           <head>
+             #{ javascript_tag 'application' }
+             #{ opal_require 'application' }
+           </head>
+         </html>
+       END
+     end
+   end     
+end

data/examples/opal-doc/app/application.rb

@@ -0,0 +1,3 @@
+require 'opal'
+
+puts "wow, running ruby!"

data/examples/opal-doc/config.ru

@@ -0,0 +1,3 @@
+require_relative "app"
+
+run App.app

data/lib/roda/plugins/sprockets.rb

@@ -10,7 +10,7 @@ class Roda
         precompile:     %w(app.js app.css *.png *.jpg *.svg *.eot *.ttf *.woff *.woff2),
         prefix:         %w(assets vendor/assets),
         root:           false,
-        public_path:    false,
+        public_path:    "public/assets/",
         path_prefix:    "/assets",
         protocol:       :http,
         css_compressor: nil,
@@ -18,13 +18,10 @@ class Roda
         host:           nil,
         digest:         true,
         opal:           false,
-        debug:          false
+        debug:          false,
+        cache:          nil,
       }.freeze
 
-      def self.load_dependencies(app, _opts = nil)
-        app.plugin :environments
-      end
-
       def self.configure(app, plugin_options = {})
         if app.opts[:sprockets]
           app.opts[:sprockets].merge!(plugin_options)
@@ -34,9 +31,9 @@ class Roda
         options = app.opts[:sprockets].merge! plugin_options
         DEFAULTS.each { |k, v| options[k] = v unless options.key?(k) }
 
-        options[:root] = app.opts[:root] if !options[:root]
-
-        %i(root public_path).each { |type| raise "#{type} needs to be set." unless options[type] }
+        if !options[:root]
+          options[:root] = app.opts[:root] || Dir.pwd
+        end
 
         # opal-sprockets registers engines when required, but if we create Sprockets::Environment before
         # requiring that, they don't get registered
@@ -71,6 +68,10 @@ class Roda
           end
         end
 
+        if options[:cache]
+          options[:sprockets].cache = options[:cache]
+        end
+
         options[:sprockets_helpers] = ::Sprockets::Helpers::Settings.new
 
         options[:sprockets_helpers].environment = options[:sprockets]
@@ -78,12 +79,11 @@ class Roda
         options[:sprockets_helpers].prefix      = options[:path_prefix] unless options[:path_prefix].nil?
         options[:sprockets_helpers].debug       = options[:debug]
 
-        app.configure :staging, :production do
+        unless options[:debug]
           options[:sprockets].css_compressor = options[:css_compressor] unless options[:css_compressor].nil?
           options[:sprockets].js_compressor  = options[:js_compressor] unless options[:js_compressor].nil?
 
           options[:sprockets_helpers].manifest   = ::Sprockets::Manifest.new(options[:sprockets], options[:public_path])
-          options[:sprockets_helpers].prefix     = options[:path_prefix] unless options[:path_prefix].nil?
           options[:sprockets_helpers].protocol   = options[:protocol]
           options[:sprockets_helpers].asset_host = options[:host] unless options[:host].nil?
         end
@@ -119,7 +119,7 @@ class Roda
               Opal.require(#{file.to_json});
             </script>
           END
-          .gsub(/\s+/, ' ')
+          .gsub(/\s+/, ' ').chop
         end
       end
 
@@ -132,15 +132,20 @@ class Roda
 
             status, headers, response = options[:sprockets].call env_sprockets
 
-            # Appease Rack::Lint
-            if (300..399).include? status
-              headers.delete("Content-type")
-            end
-
             scope.response.status = status
             scope.response.headers.merge! headers
 
-            response.is_a?(Array) ? response.join('\n') : response.to_s
+            case response
+            when nil, []
+              # Empty response happens for example when 304 Not Modified happens.
+              # We want to return nil in this case.
+              # (See: https://github.com/hmdne/roda-sprockets/issues/1)
+              nil
+            when Array
+              response.join("\n")
+            else
+              response.to_s
+            end
           end
         end
       end

data/lib/roda/plugins/sprockets_task.rb

@@ -5,20 +5,40 @@ require 'rake/sprocketstask'
 class Roda
   module RodaPlugins
     module Sprockets
-      class Task < Rake::TaskLib
+      class Task < Rake::SprocketsTask
         def initialize(app_klass)
+          @app_klass = app_klass
+          super() { update_values }
+        end
+
+        def update_values
+          @environment = sprockets_options[:sprockets]
+          @output = sprockets_options[:public_path]
+          @assets = sprockets_options[:precompile]
+        end
+
+        def sprockets_options
+          @opts ||= begin
+            opts = @app_klass.sprockets_options.dup
+            opts[:debug] = false
+            opts
+          end
+        end
+
+        def define
           namespace :assets do
             desc "Precompile assets"
             task :precompile do
-              options = app_klass.sprockets_options
-              environment = options[:sprockets]
-              manifest = ::Sprockets::Manifest.new(environment.index, options[:public_path])
-              manifest.compile(options[:precompile])
+              with_logger do
+                manifest.compile(assets)
+              end
             end
 
             desc "Clean assets"
             task :clean do
-              FileUtils.rm_rf(app_klass.sprockets_options[:public_path])
+              with_logger do
+                manifest.clobber
+              end
             end
           end
         end

data/roda-sprockets.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "roda-sprockets"
-  spec.version       = '0.0.11'
+  spec.version       = '1.1.0.rc1'
   spec.authors       = ["cj", "hmdne"]
   spec.email         = ["cjlazell@gmail.com"]
   spec.summary       = %q{Use sprockets to serve assets in roda.}

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: roda-sprockets
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 1.1.0.rc1
 platform: ruby
 authors:
 - cj
 - hmdne
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-19 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda
@@ -89,10 +89,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- examples/opal-doc/Gemfile
+- examples/opal-doc/Gemfile.lock
+- examples/opal-doc/README.md
+- examples/opal-doc/Rakefile
+- examples/opal-doc/app.rb
+- examples/opal-doc/app/application.rb
+- examples/opal-doc/config.ru
 - lib/roda/plugins/sprockets.rb
 - lib/roda/plugins/sprockets_task.rb
 - lib/roda/sprockets.rb
@@ -101,7 +109,7 @@ homepage: https://github.com/hmdne/roda-sprockets
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,12 +120,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Use sprockets to serve assets in roda.
 test_files: []