livescript-rails 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a90a71958b8258974bf0da8b5d04352d27a959b
-  data.tar.gz: e5f82cad0ac3de2299f9e55cc3793bc994ae1906
+  metadata.gz: 784cb9156ad6e834d25a11f209aa802767332541
+  data.tar.gz: 28dcdca43b5ac9d97c5bba180b639df144d8db22
 SHA512:
-  metadata.gz: 7ce950a5215e4186c2e27b4603b9c672a1695e31d82d1dc7030163a32634e78e3fab16f69a93a262d42099d3131809cfaf733a9ab8f6970341a335e5027d13af
-  data.tar.gz: 42a6c2916a217c253620ead1355f5d24dbe3c25af748c90b49dbc7b00fa4c35bfae49201833fba0b0fe58f91c157cb72cc52fa79c28f73d47b0e62d52412995b
+  metadata.gz: 52605b2a5dfa6a32980e9a09dc616735a6d7e73d06f9fbd8fea0a9b246a59b5290847348431bddafce67d89670519c1408c0bae28ce8fddedadfe48ec142c3c7
+  data.tar.gz: 40131073d579f1d428b588267946b077e7e6b71a4b3f366d33e02be9382884be9c1b5021167ac264c870008bf54fb812688d6a869b8bdf1c022ecab52221b55d

data/README.md

@@ -4,6 +4,8 @@ LiveScript adapter for the Rails asset pipeline.
 
 Depends on [Roonin-mx/livescript-ruby](https://github.com/Roonin-mx/livescript-ruby) to compile LiveScript to javascript.
 
+Source map is available if `Sprockets` >= 4.0.
+
 ## Installation
 
 Add the following lines to your `Gemfile`:
@@ -25,16 +27,20 @@ end
 You can set compile options in `config/initializers/assets.rb`:
 
 ```
-# These are default options. User set options will override default options
 Rails.application.config.assets.livescript = {
-  bare: true,
   header: false,
-  map: 'linked-src',
 }
 ```
 
 See [Roonin-mx/livescript-ruby](https://github.com/Roonin-mx/livescript-ruby) for more options.
 
+Default options:
+
+* bare: true (for backward compatibility)
+* header: true
+
+`filename` and `map` options are set internally and not allowed to change.
+
 ## License
 
 MIT

data/lib/livescript/rails/processor.rb

@@ -1,6 +1,11 @@
+require 'sprockets'
+
 module LiveScript
   module Rails
     module SprocketsProcessor
+      # only enable source map when sprockets >= 4.0
+      ENABLE_SOURCE_MAP = Sprockets::VERSION >= '4.0'
+
       def self.cache_key
         @cache_key ||= "#{name}:#{LiveScript::Source::VERSION}:#{LiveScript::VERSION}:#{LiveScript::Rails::VERSION}".freeze
       end
@@ -9,20 +14,23 @@ module LiveScript
         data = input[:data]
         options = {
           bare: true,
-          header: false,
-          map: 'linked-src',
-          filename: input[:source_path] || input[:filename],
+          header: true,
         }.merge(::Rails.application.config.assets.livescript || {})
 
+        options.merge!({
+          filename: input[:source_path] || input[:filename],
+          map: ENABLE_SOURCE_MAP ? 'linked-src' : 'none',
+        })
+
         result = input[:cache].fetch([self.cache_key, data]) do
           LiveScript.compile(data, options)
         end
 
-        # when map: none, result is String; otherwise, result is Hash
-        if result.kind_of? Hash
+        if ENABLE_SOURCE_MAP
+          map = Sprockets::SourceMapUtils.decode_vlq_mappings(result['map']['mappings'], sources: result['map']['sources'], names: result['map']['names'])
           {
             data: result['code'],
-            map: result['map'],
+            map: Sprockets::SourceMapUtils.combine_source_maps(input[:metadata][:map], map),
           }
         else
           result

data/lib/livescript/rails/version.rb

@@ -1,5 +1,5 @@
 module LiveScript
   module Rails
-    VERSION = '2.0.1'
+    VERSION = '2.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livescript-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Victor Hugo Borja
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-23 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs