jade-rails 1.9.2.0 → 1.9.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 696efa36a4f79013cd5a7f3ad58e06fafc8d3030
4
- data.tar.gz: 123431b4eefafe0970a39518040a132df4ce9a91
3
+ metadata.gz: b6ac34e8e28b35ce4833b71268592d3555ea3f60
4
+ data.tar.gz: b2dff8350d93adee965efd14c6cc3b1515d24000
5
5
  SHA512:
6
- metadata.gz: b3bce3121c8d27d34a90a5a5b2f51d3c3c82df5a0dbb0362491c862cf8bf7b01fdc6d63d8b058974ba7ba5b2eeade611297029ed1b643a57c1129608e98f8f80
7
- data.tar.gz: 7cc4e08918c0b70cbec3cfc1be01fe23c409c6075dbfd825deb2e680209784db544f35b3cd34a8fbe6a53d4c3a95e728c4e396a695e1d259f6c410570fb23860
6
+ metadata.gz: 9afcf35e51dc10f1a06b7d6142db1da22b243879f44cdd04489099963611cf4ecdc627ca023ab39a84f77a7286df56d3794247c7bae34beeba24db07a5793d75
7
+ data.tar.gz: b82468e42d771747237e3b6e468ac42a9f02c4b17b0b1be162490ededad2bd18cce1e9672545b1714983305544486089535a213b6bfb4b5d2ef33fdf453b3390
@@ -31,7 +31,14 @@ module Jade
31
31
  options = { }
32
32
  options[:filename] = eval_file
33
33
 
34
- jade_config = context.environment.context_class.jade_config.merge(options)
34
+ # For Rails 4.0.x and 4.1.x, the app-level config is on context.environment.
35
+ # For Rails 4.2.x, it's on context.assets instead.
36
+ app_level_config = context.environment.context_class.jade_config
37
+ if app_level_config.nil?
38
+ app_level_config = context.assets.context_class.jade_config
39
+ end
40
+ jade_config = app_level_config.merge(options)
41
+
35
42
  # Manually camelize the one option key that needs to be camelized.
36
43
  jade_config[:compileDebug] = jade_config.delete(:compile_debug) { false }
37
44
 
@@ -1,3 +1,3 @@
1
1
  module Jade
2
- VERSION = '1.9.2.0'
2
+ VERSION = '1.9.2.1'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jade-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.9.2.0
4
+ version: 1.9.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Paul Raythattha
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-02-15 00:00:00.000000000 Z
11
+ date: 2015-12-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: execjs