pug-rails 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2ee6cfa5cb0f403f9915684482372246d0b3738
-  data.tar.gz: a935349991032d68d97798221fa1671a54e4aaf9
+  metadata.gz: b2391f26ad0a9641784adb7a692a7bc057d42db3
+  data.tar.gz: 3b8529acc4f579511a7371662b0f43d41475c822
 SHA512:
-  metadata.gz: a0fcdd3ca76839df19092eae04f27aca116cfeb21648cddc4e5f8000de14fc83c923c71de86060b68be871f3f523082de484341f38799643e5c9bf50a933dd29
-  data.tar.gz: a2f2f9025ccc701f2af8e2d8264a91e0e62ec61e74648b498bf77854e31d028867184ee2a3dbdbf2c17dfc5aafeaca20892dcbe443e8cc2447e338c8891ad103
+  metadata.gz: 62bc6d6bd5882c022a7d2501f3325220b59e0f23c4881a6a57f0572d5d93f74197eb7eaa48149496082e32cfb8be443d2b0340e35e5c1413433ebc11a32f6925
+  data.tar.gz: a4226d6e29f3da4212c6b6821a05e1057757528c45997ca071c02d992ca2307e1b9f5f1929faa909e9e133a749d168b201ff32687852d8bde38aa2365bdb7ddf

data/lib/jade-rails/railtie.rb

@@ -5,12 +5,29 @@ module Jade
     config.jade.pretty        = Rails.env.development?
     config.jade.compile_debug = Rails.env.development?
 
-    config.before_initialize do |app|
-      register_template = -> (env) { (env || app.assets).register_engine('.jade',  Jade::Template) }
-      if app.config.assets.respond_to?(:configure)
-        app.config.assets.configure { |env| register_template.call(env) }
+    def configure_assets(app)
+      if config.respond_to?(:assets) && config.assets.respond_to?(:configure)
+        # Rails 4.x
+        config.assets.configure { |env| yield(env) }
       else
-        register_template.call(nil)
+        # Rails 3.2
+        yield(app.assets)
+      end
+    end
+
+    initializer 'sprockets.jade', group: :all, after: 'sprockets.environment' do |app|
+      configure_assets(app) do |env|
+        # Sprockets 2, 3, and 4
+        if env.respond_to?(:register_transformer)
+          env.register_mime_type 'text/x-jade', extensions: ['.jade']
+          env.register_transformer 'text/x-jade', 'application/javascript', Jade::SprocketsTransformer
+        end
+
+        if env.respond_to?(:register_engine)
+          args = ['.jade', Jade::SprocketsTransformer]
+          args << { mime_type: 'text/x-jade', silence_deprecation: true } if Sprockets::VERSION.start_with?('3')
+          env.register_engine(*args)
+        end
       end
     end
   end

data/lib/jade-rails/template.rb

@@ -1,12 +1,28 @@
 # frozen_string_literal: true
-require 'tilt'
 module Jade
-  class Template < Tilt::Template
-    def prepare
+  # Sprockets 2, 3 & 4 interface
+  # https://github.com/rails/sprockets/blob/master/guides/extending_sprockets.md#registering-all-versions-of-sprockets-in-processors
+  class SprocketsTransformer
+    def initialize(filename, &block)
+      @filename = filename
+      @source   = block.call
     end
 
-    def evaluate(context, locals, &block)
-      Jade.compile(data, filename: file, client: true)
+    def render(context, empty_hash_wtf)
+      self.class.run(@filename, @source, context)
+    end
+
+    def self.run(filename, source, context)
+      Jade.compile(source, filename: filename, client: true)
+    end
+
+    def self.call(input)
+      filename = input[:filename]
+      source   = input[:data]
+      context  = input[:environment].context_class.new(input)
+
+      result = run(filename, source, context)
+      context.metadata.merge(data: result)
     end
   end
 end

data/lib/pug-rails/railtie.rb

@@ -5,12 +5,29 @@ module Pug
     config.pug.pretty        = Rails.env.development?
     config.pug.compile_debug = Rails.env.development?
 
-    config.before_initialize do |app|
-      register_template = -> (env) { (env || app.assets).register_engine('.pug',  Pug::Template) }
-      if app.config.assets.respond_to?(:configure)
-        app.config.assets.configure { |env| register_template.call(env) }
+    def configure_assets(app)
+      if config.respond_to?(:assets) && config.assets.respond_to?(:configure)
+        # Rails 4.x
+        config.assets.configure { |env| yield(env) }
       else
-        register_template.call(nil)
+        # Rails 3.2
+        yield(app.assets)
+      end
+    end
+
+    initializer 'sprockets.pug', group: :all, after: 'sprockets.environment' do |app|
+      configure_assets(app) do |env|
+        # Sprockets 2, 3, and 4
+        if env.respond_to?(:register_transformer)
+          env.register_mime_type 'text/x-pug', extensions: ['.pug']
+          env.register_transformer 'text/x-pug', 'application/javascript+function', Pug::SprocketsTransformer
+        end
+
+        if env.respond_to?(:register_engine)
+          args = ['.pug', Pug::SprocketsTransformer]
+          args << { mime_type: 'text/x-pug', silence_deprecation: true } if Sprockets::VERSION.start_with?('3')
+          env.register_engine(*args)
+        end
       end
     end
   end

data/lib/pug-rails/template.rb

@@ -1,12 +1,28 @@
 # frozen_string_literal: true
-require 'tilt'
 module Pug
-  class Template < Tilt::Template
-    def prepare
+  # Sprockets 2, 3 & 4 interface
+  # https://github.com/rails/sprockets/blob/master/guides/extending_sprockets.md#registering-all-versions-of-sprockets-in-processors
+  class SprocketsTransformer
+    def initialize(filename, &block)
+      @filename = filename
+      @source   = block.call
     end
 
-    def evaluate(context, locals, &block)
-      Pug.compile(data, filename: file, client: true)
+    def render(context, empty_hash_wtf)
+      self.class.run(@filename, @source, context)
+    end
+
+    def self.run(filename, source, context)
+      Pug.compile(source, filename: filename, client: true)
+    end
+
+    def self.call(input)
+      filename = input[:filename]
+      source   = input[:data]
+      context  = input[:environment].context_class.new(input)
+
+      result = run(filename, source, context)
+      context.metadata.merge(data: result)
     end
   end
 end

data/pug-rails.gemspec

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 Gem::Specification.new do |s|
   s.name            = 'pug-rails'
-  s.version         = '2.0.1'
+  s.version         = '2.0.2'
   s.author          = 'Yaroslav Konoplov'
   s.email           = 'eahome00@gmail.com'
   s.summary         = 'Pug/Jade template engine integration with Rails asset pipeline.'
@@ -15,5 +15,4 @@ Gem::Specification.new do |s|
   s.require_paths   = ['lib']
 
   s.add_dependency 'pug-ruby', '~> 1.0'
-  s.add_dependency 'tilt',     '~> 2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pug-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-18 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pug-ruby
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: Pug/Jade template engine integration with Rails asset pipeline.
 email: eahome00@gmail.com
 executables: []