slim-rails 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a05eb3d5dfbb4478f0996d2074da8932d0b49ad
-  data.tar.gz: 752a07b4dfbbad30afcaf177d5d733a7421b3c2f
+  metadata.gz: 730249022955562dd8f32bc57713909e0e34e84c
+  data.tar.gz: 4ac7a9296a96b94e8106df5d1bef4423dfbe2e7b
 SHA512:
-  metadata.gz: 767266f4ba84f911190b2581527e40004a83d0728d53f8d9e92f2f9fb160c94640abda95fcffdef0c8788fe6772636f6de6b17d58f0521a643fdb328b0dfddad
-  data.tar.gz: 5b12242cb29337b99c61b86c0eface7a37b3b93f7ea81eb4b8253b5f80a2145082c02107c99c0c2f9aec27fc440254966cb15014ed29f04423d85d13d93b18c7
+  metadata.gz: 20768a544ba036ed3351a9acbcabe7b6fcd18cf7ec50e5f4383f476d42b957b613f96c800e0e1c43d9782f79e228c80127f2b2b6d8842b3e26d8b1b9e34feb6f
+  data.tar.gz: d0b3b687b462254b194daaa07ff77c17ce1104007f74d33ec71bb7d9a30a64958cf3823eaae7c61ca4e4ee1659a5f8ce0782378f5b628196d286c0da3b88adc8

data/.travis.yml

@@ -11,6 +11,9 @@ gemfile:
   - gemfiles/rails_4.gemfile
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 addons:
   code_climate:
     repo_token: 294f0ec8183176c0259b75eb21b38414508616985a7b39fc48fec9dfcf40a52e

data/Appraisals

@@ -17,5 +17,5 @@ appraise "rails-4.2" do
 end
 
 appraise "rails-5" do
- gem "rails", "~> 5.0.0.rc1"
+ gem "rails", "~> 5.0.0"
 end

data/gemfiles/rails_5.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0.0.rc1"
+gem "rails", "~> 5.0.0"
 
 gemspec :path => "../"

data/lib/slim-rails.rb

@@ -1,6 +1,7 @@
 require 'slim-rails/version'
 require 'rails'
 require 'slim'
+require 'slim-rails/register_engine'
 
 module Slim
   module Rails
@@ -8,9 +9,7 @@ module Slim
       config.app_generators.template_engine :slim
 
       initializer 'slim_rails.configure_template_digestor' do |app|
-        if app.assets && app.assets.respond_to?(:register_engine)
-          app.assets.register_engine '.slim', Slim::Template
-        end
+        Slim::Rails::RegisterEngine.register_engine(app, config)
 
         ActiveSupport.on_load(:action_view) do
           ActiveSupport.on_load(:after_initialize) do

data/lib/slim-rails/register_engine.rb

@@ -0,0 +1,45 @@
+module Slim
+  module Rails
+    module RegisterEngine
+      class Transformer
+        def self.call(input)
+          Slim::Template.new(input[:name]) { input[:data] }.render(nil)
+        end
+      end
+
+      def self.register_engine(app, config)
+        if ::Rails::VERSION::MAJOR == 3
+          _register_engine3(app)
+        else
+          _register_engine(config)
+        end
+      end
+
+      private
+
+      def self._register_engine3(app)
+        return unless app.assets
+        return unless app.assets.respond_to?(:register_engine)
+
+        app.assets.register_engine('.slim', Slim::Template)
+      end
+
+      def self._register_engine(config)
+        return unless config.respond_to?(:assets)
+
+        config.assets.configure do |env|
+          if env.respond_to?(:register_transformer)
+            env.register_mime_type 'text/slim', extensions: ['.slim', '.slim.html']#, charset: :html
+            env.register_preprocessor 'text/slim', 'text/html', RegisterEngine::Transformer
+          end
+
+          if env.respond_to?(:register_engine)
+            args = ['.slim', Slim::Template]
+            args << { silence_deprecation: true } if Sprockets::VERSION.start_with?("3")
+            env.register_engine(*args)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/slim-rails/version.rb

@@ -1,5 +1,5 @@
 module Slim
   module Rails
-    VERSION = "3.1.0"
+    VERSION = "3.1.1"
   end
 end

data/slim-rails.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'railties',   ['>= 3.1']
   spec.add_runtime_dependency 'slim',       ['~> 3.0']
 
+  spec.add_development_dependency 'sprockets-rails'
   spec.add_development_dependency 'rocco'
   spec.add_development_dependency 'redcarpet'
   spec.add_development_dependency 'awesome_print'

data/test/fixtures/routes.rb

@@ -1,4 +1,4 @@
-TestApp.routes.draw do |map|
+TestApp.routes.draw do
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

data/test/lib/generators/slim/mailer_generator_test.rb

@@ -15,33 +15,33 @@ class Slim::Generators::MailerGeneratorTest < Rails::Generators::TestCase
     if ::Rails.version.to_s >= '4.2'
 
       assert_file "app/views/layouts/mailer.text.slim" do |view|
-        assert_match /\= yield/, view
+        assert_match(/\= yield/, view)
       end
 
       assert_file "app/views/layouts/mailer.html.slim" do |view|
-        assert_match /\= yield/, view
+        assert_match(/\= yield/, view)
       end
 
       assert_file "app/views/notifier/foo.html.slim" do |view|
         assert_match %r(app/views/notifier/foo\.html\.slim), view
-        assert_match /\= @greeting/, view
+        assert_match(/\= @greeting/, view)
       end
 
       assert_file "app/views/notifier/bar.html.slim" do |view|
         assert_match %r(app/views/notifier/bar\.html\.slim), view
-        assert_match /\= @greeting/, view
+        assert_match(/\= @greeting/, view)
       end
 
     end
 
     assert_file "app/views/notifier/foo.text.slim" do |view|
       assert_match %r(app/views/notifier/foo\.text\.slim), view
-      assert_match /@greeting/, view
+      assert_match(/@greeting/, view)
     end
 
     assert_file "app/views/notifier/bar.text.slim" do |view|
       assert_match %r(app/views/notifier/bar\.text\.slim), view
-      assert_match /@greeting/, view
+      assert_match(/@greeting/, view)
     end
   end
 end

data/test/lib/slim-rails_assets_test.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+require 'tmpdir'
+
+class Slim::Rails::AssetsTest < ActiveSupport::TestCase
+  def with_app(use_sprockets, code)
+    Dir.mktmpdir do |dir|
+      app_path = File.join(dir, 'app.rb')
+      File.write(app_path, <<-APP)
+      require 'rails'
+      require 'sprockets/railtie' if #{use_sprockets}
+      require 'slim-rails'
+      class DummyApp < ::Rails::Application
+        config.root = #{dir.inspect}
+        config.assets.enabled = true
+      end
+      DummyApp.initialize!
+      #{code}
+      APP
+
+      asset_path = File.join(dir, 'app', 'assets', 'html', 'test.slim')
+      FileUtils.mkdir_p(File.dirname(asset_path))
+      File.write(asset_path, ".test\n  | hi")
+
+      `BUNDLE_GEMFILE=#{ENV['BUNDLE_GEMFILE']} bundle exec ruby #{app_path}`
+    end
+  end
+
+  test 'compile slim view' do
+    assert_equal 'ok', with_app(false, 'print DummyApp.assets || "ok"')
+    assert_equal '<div class="test">hi</div>', with_app(true, 'print DummyApp.assets["test.slim"].to_s')
+  end
+end

data/test/test_helper.rb

@@ -1,8 +1,10 @@
 require 'rubygems'
 require 'minitest/autorun'
-require 'rails/all'
+require 'rails'
+require 'rails/test_help'
 require 'rails/generators'
 require 'rails/generators/test_case'
+require 'slim-rails'
 
 class TestApp < Rails::Application
   config.root = File.dirname(__FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim-rails
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Leonardo Almeida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rocco
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +169,7 @@ files:
 - lib/generators/slim/scaffold/templates/new.html.slim
 - lib/generators/slim/scaffold/templates/show.html.slim
 - lib/slim-rails.rb
+- lib/slim-rails/register_engine.rb
 - lib/slim-rails/version.rb
 - slim-rails.gemspec
 - test/fixtures/routes.rb
@@ -162,6 +177,7 @@ files:
 - test/lib/generators/slim/mailer_generator_test.rb
 - test/lib/generators/slim/scaffold_generator_test.rb
 - test/lib/generators/slim/testing_helper.rb
+- test/lib/slim-rails_assets_test.rb
 - test/test_helper.rb
 homepage: https://github.com/slim-template/slim-rails
 licenses:
@@ -193,4 +209,5 @@ test_files:
 - test/lib/generators/slim/mailer_generator_test.rb
 - test/lib/generators/slim/scaffold_generator_test.rb
 - test/lib/generators/slim/testing_helper.rb
+- test/lib/slim-rails_assets_test.rb
 - test/test_helper.rb