slim-rails 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 730249022955562dd8f32bc57713909e0e34e84c
-  data.tar.gz: 4ac7a9296a96b94e8106df5d1bef4423dfbe2e7b
+  metadata.gz: 58702acaa6eeaa618e33f7501f6c8c7b3fef8b1e
+  data.tar.gz: 9198aa4393859365c718113355149193e902c51d
 SHA512:
-  metadata.gz: 20768a544ba036ed3351a9acbcabe7b6fcd18cf7ec50e5f4383f476d42b957b613f96c800e0e1c43d9782f79e228c80127f2b2b6d8842b3e26d8b1b9e34feb6f
-  data.tar.gz: d0b3b687b462254b194daaa07ff77c17ce1104007f74d33ec71bb7d9a30a64958cf3823eaae7c61ca4e4ee1659a5f8ce0782378f5b628196d286c0da3b88adc8
+  metadata.gz: 5f4299a92cb45950dbf44341a3f4914c1d9283162e15a3fb474c9cf0467340f767b8512ec2901e8bd04465ecea05022f869db01e6da5f472be5945d2440740a1
+  data.tar.gz: ffdff25c354ce662d1487e709434945985e83978ac8f3bb79b8ba1b427282dc64988ada6fb9582f6c1171a2fe8afa12edab0e703c0181d783f2d9256109f13da

data/.travis.yml

@@ -3,7 +3,9 @@ before_install:
   - gem install bundler
 rvm:
   - ruby-head
-  - 2.2.2
+  - 2.4.0
+  - 2.3
+  - 2.2
   - 2.1
   - 2.0
 gemfile:
@@ -11,9 +13,21 @@ gemfile:
   - gemfiles/rails_4.gemfile
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.gemfile
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4.2.gemfile
+  exclude:
+    - rvm: 2.1
+      gemfile: gemfiles/rails_5.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails_5.gemfile
 addons:
   code_climate:
     repo_token: 294f0ec8183176c0259b75eb21b38414508616985a7b39fc48fec9dfcf40a52e

data/lib/generators/slim/scaffold/templates/edit.html.slim

@@ -3,6 +3,6 @@ h1 Editing <%= singular_table_name %>
 == render 'form'
 
 = link_to 'Show', @<%= singular_table_name %>
-'|
+'  |
 = link_to 'Back', <%= index_helper %>_path
 

data/lib/generators/slim/scaffold/templates/show.html.slim

@@ -7,5 +7,5 @@ p
 <% end -%>
 
 = link_to 'Edit', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>)
-'|
+'  |
 = link_to 'Back', <%= index_helper %>_path

data/lib/slim-rails/register_engine.rb

@@ -30,7 +30,8 @@ module Slim
         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
+            env.register_preprocessor 'text/slim', RegisterEngine::Transformer
+            env.register_preprocessor 'text/html', RegisterEngine::Transformer
           end
 
           if env.respond_to?(:register_engine)

data/lib/slim-rails/version.rb

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

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

@@ -12,36 +12,59 @@ class Slim::Generators::MailerGeneratorTest < Rails::Generators::TestCase
   test "should invoke template engine" do
     run_generator
 
-    if ::Rails.version.to_s >= '4.2'
+    rails_version = ::Rails.version.to_s
 
-      assert_file "app/views/layouts/mailer.text.slim" do |view|
-        assert_match(/\= yield/, view)
+    if rails_version >= '5.0'
+      assert_file "app/views/notifier_mailer/foo.html.slim" do |view|
+        assert_match %r(app/views/notifier_mailer/foo\.html\.slim), view
+        assert_match(/\= @greeting/, view)
       end
 
-      assert_file "app/views/layouts/mailer.html.slim" do |view|
-        assert_match(/\= yield/, view)
+      assert_file "app/views/notifier_mailer/bar.html.slim" do |view|
+        assert_match %r(app/views/notifier_mailer/bar\.html\.slim), view
+        assert_match(/\= @greeting/, 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_file "app/views/notifier_mailer/foo.text.slim" do |view|
+        assert_match %r(app/views/notifier_mailer/foo\.text\.slim), 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_file "app/views/notifier_mailer/bar.text.slim" do |view|
+        assert_match %r(app/views/notifier_mailer/bar\.text\.slim), view
+        assert_match(/@greeting/, view)
       end
+    else
+      if rails_version >= '4.2'
+        assert_file "app/views/layouts/mailer.text.slim" do |view|
+          assert_match(/\= yield/, view)
+        end
 
-    end
+        assert_file "app/views/layouts/mailer.html.slim" do |view|
+          assert_match(/\= yield/, view)
+        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)
-    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)
+        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_file "app/views/notifier/bar.html.slim" do |view|
+          assert_match %r(app/views/notifier/bar\.html\.slim), 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)
+      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)
+      end
     end
   end
 end

data/test/lib/slim-rails_assets_test.rb

@@ -11,7 +11,8 @@ class Slim::Rails::AssetsTest < ActiveSupport::TestCase
       require 'slim-rails'
       class DummyApp < ::Rails::Application
         config.root = #{dir.inspect}
-        config.assets.enabled = true
+        config.assets.enabled = true if #{use_sprockets}
+        config.eager_load = false
       end
       DummyApp.initialize!
       #{code}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim-rails
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Leonardo Almeida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Slim templates generator for Rails 3+