roda-opal_assets 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c9dcd57976ad4f43162650970c924cc97c7c4c1
-  data.tar.gz: b96333d25cd36f1677bc6abb66aeab6c71a559ad
+  metadata.gz: 4268ec439af85776a734938139a570992e58f4f9
+  data.tar.gz: ce2ad9a1027e4c30ac9f006b3a359af5712f780b
 SHA512:
-  metadata.gz: 677bdf9ba26804fe8064f265299b159223d658e2be766826196831a4afc28dcb41f0509f06421e195cab84751a4dc1226e34b9c6e53ccfa764a90ecbd54afe7c
-  data.tar.gz: d9346711abd39247dd19ace123d9da3150b9f462a299831a43f2b6a9c6fc6202315ea879d9abf1b097bf0ca8bbc231ad2ec04d86e4d95e97245525aabee0fb4c
+  metadata.gz: c1c3bae8afee858877712c60e741582ef5f4db030067968173830b7188cd0f764d96c23441ad96312f7a56636f40c97eec9a4a676fa723aa1fba92e7db9b84e6
+  data.tar.gz: ff8ef11217a7e6869c67062f7bb1a1ce900e039976a6274e60823618e5c1385d4b63bd7468feffadb5e7f261c44052859e650dd5250e71a6ff5a1641e8236a78

data/README.md

@@ -1,8 +1,6 @@
 # Roda::OpalAssets
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/roda/opal_assets`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Simple compilation for Opal apps on the Roda web framework for Ruby.
 
 ## Installation
 
@@ -22,15 +20,37 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+In your Roda app:
 
-## Development
+```ruby
+class App < Roda
+  assets = Roda::OpalAssets.new
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+  route do |r|
+    assets.route r
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+    # Other routes here
+  end
 
-## Contributing
+  define_method(:js)         { |file| assets.js file }
+  define_method(:stylesheet) { |file| assets.stylesheet file }
+end
+```
+
+Then you can put your Ruby and JS assets in `assets/js` and your stylesheets in `assets/css`.
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/roda-opal_assets. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Inside your views, you just need to call the `js` and `stylesheet` methods above. Here is an example `layout.slim` template:
+
+```slim
+doctype 5
+html
+  head
+    title My App
+    == js 'app'
+
+  body= yield
+```
+
+## Contributing
 
+Bug reports and pull requests are welcome on GitHub at https://github.com/clearwater-rb/roda-opal_assets. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/lib/roda/opal_assets.rb

@@ -1,3 +1,4 @@
+require "yaml"
 require "roda/opal_assets/version"
 require "roda"
 require "opal"
@@ -5,45 +6,96 @@ require "uglifier" if ENV['RACK_ENV'] == 'production'
 
 class Roda
   class OpalAssets
-    def initialize env: ENV['RACK_ENV']
-      @env = env
+    def initialize env: ENV.fetch('RACK_ENV') { 'development' }
+      @env = env.to_sym
+      @assets = []
+      @file_cache = {}
 
-      Opal::Config.source_map_enabled = !production?
       sprockets
-      source_maps unless production?
+
+      source_maps
     end
 
     def route r
-      r.on source_map_prefix[1..-1] do
-        r.run source_maps
-      end
-      r.on 'assets/js' do
-        r.run sprockets
-      end
-      r.on 'assets/css' do
-        r.run sprockets
+      unless production?
+        r.on source_map_prefix[1..-1] do
+          r.run source_maps
+        end
+        r.on 'assets/js' do
+          r.run sprockets
+        end
+        r.on 'assets/css' do
+          r.run sprockets
+        end
       end
     end
 
     def js file
-      ::Opal::Sprockets.javascript_include_tag(
-        file,
-        sprockets: sprockets,
-        prefix: '/assets/js',
-        debug: !production?,
-      )
+      file << '.js' unless file.end_with? '.js'
+      scripts = ''
+
+      if production?
+        scripts << %{<script src="/assets/#{manifest[file]}"></script>\n}
+      else
+        asset = sprockets[file]
+
+        asset.to_a.each { |dependency|
+          scripts << %{<script src="/assets/js/#{dependency.digest_path}?body=1"></script>\n}
+        }
+
+        scripts << %{<script>#{opal_boot_code file}</script>}
+      end
+
+      scripts
     end
 
     def stylesheet file, media: :all
-      asset = sprockets["#{file}.css"]
-      if asset.nil?
-        raise "File not found: #{file}.css"
-      end
+      file << '.css' unless file.end_with? '.css'
+
+      path = if production?
+               "/assets/#{manifest[file]}"
+             else
+               asset = sprockets[file]
+
+               if asset.nil?
+                 raise "File not found: #{file}.css"
+               end
+
+               asset.filename.to_s.sub(Dir.pwd, '')
+             end
 
-      path = asset.filename.to_s.sub(Dir.pwd, '')
       %{<link href="#{path}" media="#{media}" rel="stylesheet" />}
     end
 
+    def << asset
+      @assets << asset
+    end
+
+    def build
+      FileUtils.mkdir_p 'public/assets'
+
+      @manifest = @assets.each_with_object({}) do |file, hash|
+        print "Compiling #{file}..."
+        asset = sprockets[file]
+        hash[file] = asset.digest_path
+        compile_file file, "public/assets/#{asset.digest_path}"
+        puts ' done'
+      end
+
+      File.write 'assets.yml', YAML.dump(manifest)
+    end
+
+    def compile_file file, output_filename
+      compiled = sprockets[file].to_s + opal_boot_code(file)
+
+      File.write output_filename, compiled
+      nil
+    end
+
+    def compile file
+      sprockets[file].to_s
+    end
+
     def sprockets
       return @sprockets if defined? @sprockets
 
@@ -66,8 +118,16 @@ class Roda
     def source_maps
       return @source_maps if defined? @source_maps
 
+      source_map_handler = if supports_opal_config?
+                             Opal::Config
+                           else
+                             Opal::Processor
+                           end
+
+      source_map_handler.source_map_enabled = !production? && min_opal_version?('0.8.0')
+
       source_maps = Opal::SourceMapServer.new(sprockets, source_map_prefix)
-      unless production?
+      if !production? && min_opal_version?('0.8.0')
         ::Opal::Sprockets::SourceMapHeaderPatch.inject!(source_map_prefix)
       end
 
@@ -79,8 +139,39 @@ class Roda
       end
     end
 
+    def manifest
+      return @manifest if defined? @manifest
+
+      @manifest = YAML.load_file 'assets.yml'
+      unless @manifest
+        warn 'Assets manifest is broken'
+      end
+
+      @manifest
+    end
+
     def production?
-      @env == 'production'
+      @env == :production
+    end
+
+    def opal_boot_code file
+      if min_opal_version? '0.9.0'
+        Opal::Sprockets.load_asset(file, sprockets)
+      elsif min_opal_version? '0.8.0'
+        Opal::Processor.load_asset_code(sprockets, file)
+      else
+        ''
+      end
+    end
+
+    def supports_opal_config?
+      min_opal_version? '0.8.0'
+    end
+
+    # Check for minimum Opal version, but do it in a weird way because Array
+    # implements <=> but doesn't include Comparable
+    def min_opal_version? version
+      (Opal::VERSION.split('.').map(&:to_i) <=> version.split('.').map(&:to_i)) >= 0
     end
   end
 end

data/lib/roda/opal_assets/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class OpalAssets
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/roda-opal_assets.gemspec

@@ -17,9 +17,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "opal", "~> 0.9", "< 0.12.0"
+  spec.add_runtime_dependency "opal", "~> 0.7", "< 0.11.0"
+  spec.add_runtime_dependency "sprockets", "~> 3.6.0"
   spec.add_runtime_dependency "roda"
   spec.add_runtime_dependency "uglifier", "~> 3.0"
+  spec.add_runtime_dependency "rack", "~> 1.0"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-opal_assets
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-09 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -16,20 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: roda
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement