slim-rails 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 319c67fbbeae663c591f1bf657897b2d1f9e77b0
-  data.tar.gz: 4b6e7026b445ed217ca544cb4e5c73d1249f2f89
+  metadata.gz: 0a05eb3d5dfbb4478f0996d2074da8932d0b49ad
+  data.tar.gz: 752a07b4dfbbad30afcaf177d5d733a7421b3c2f
 SHA512:
-  metadata.gz: 71a3901d4848a6e15842f790c67485ef8811e9acb74b66d220cd4b9bf33618aef608bd659a7b9af3e1d25b8a0da141f6835e11c7b3a75ffca46d2a09c47a00a6
-  data.tar.gz: 99b27eb2a258fca8fba0fa978f95823aacaab687779d8349a0dbf9af96c0d81c83512a54948d981acf22e38941fafa0446f66d574e345655c690ced06da9303d
+  metadata.gz: 767266f4ba84f911190b2581527e40004a83d0728d53f8d9e92f2f9fb160c94640abda95fcffdef0c8788fe6772636f6de6b17d58f0521a643fdb328b0dfddad
+  data.tar.gz: 5b12242cb29337b99c61b86c0eface7a37b3b93f7ea81eb4b8253b5f80a2145082c02107c99c0c2f9aec27fc440254966cb15014ed29f04423d85d13d93b18c7

data/.gitignore

@@ -15,3 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp/
+.ruby-version
+.ruby-gemset
+gemfiles/*.gemfile.lock

data/.travis.yml

@@ -1,5 +1,16 @@
-- 2.2
-- 2.1
-- 2.0.0
-- 1.9.3
-- 1.9.2
+language: ruby
+before_install:
+  - gem install bundler
+rvm:
+  - ruby-head
+  - 2.2.2
+  - 2.1
+  - 2.0
+gemfile:
+  - gemfiles/rails_3.gemfile
+  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_4.1.gemfile
+  - gemfiles/rails_4.2.gemfile
+addons:
+  code_climate:
+    repo_token: 294f0ec8183176c0259b75eb21b38414508616985a7b39fc48fec9dfcf40a52e

data/Appraisals

@@ -0,0 +1,21 @@
+appraise "rails-3" do
+  gem "rails", "~> 3.2"
+  gem 'minitest'
+  gem 'test-unit', '~> 3.0'
+end
+
+appraise "rails-4" do
+  gem "rails", "~> 4.0.0"
+end
+
+appraise "rails-4.1" do
+  gem "rails", "~> 4.1.0"
+end
+
+appraise "rails-4.2" do
+  gem "rails", "~> 4.2.0"
+end
+
+appraise "rails-5" do
+ gem "rails", "~> 5.0.0.rc1"
+end

data/README.md

@@ -1,6 +1,6 @@
-# slim-rails
+# slim-rails [![Build Status](https://travis-ci.org/slim-template/slim-rails.png?branch=master)](https://travis-ci.org/slim-template/slim-rails) [![Code Climate](https://codeclimate.com/github/slim-template/slim-rails/badges/gpa.svg)](https://codeclimate.com/github/slim-template/slim-rails)
 
-slim-rails provides Slim generators for Rails 3 and 4. It was based on
+slim-rails provides Slim generators for Rails 3+. It was based on
 [haml-rails](http://github.com/indirect/haml-rails) and it does basically the
 same:
 

data/gemfiles/rails_3.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.2"
+gem "minitest"
+gem "test-unit", "~> 3.0"
+
+gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+
+gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+
+gemspec :path => "../"

data/gemfiles/rails_4.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+
+gemspec :path => "../"

data/gemfiles/rails_5.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0.0.rc1"
+
+gemspec :path => "../"

data/lib/generators/slim/mailer/mailer_generator.rb

@@ -1,8 +1,8 @@
-require 'generators/slim/controller/controller_generator'
+require 'rails/generators/erb/mailer/mailer_generator'
 
 module Slim
   module Generators
-    class MailerGenerator < ControllerGenerator
+    class MailerGenerator < Erb::Generators::MailerGenerator
       source_root File.expand_path(File.join('..', 'templates'), __FILE__)
 
       protected
@@ -10,6 +10,13 @@ module Slim
         :text
       end
 
+      def formats
+        [:text, :html]
+      end
+
+      def handler
+        :slim
+      end
     end
   end
 end

data/lib/generators/slim/mailer/templates/layout.html.slim

@@ -0,0 +1,3 @@
+html
+  body
+    = yield

data/lib/generators/slim/mailer/templates/layout.text.slim

@@ -0,0 +1 @@
+= yield

data/lib/generators/slim/mailer/templates/view.html.slim

@@ -0,0 +1,2 @@
+h1 <%= class_name %>#<%= @action %>
+p = @greeting + ", find me in <%= @path %>"

data/lib/generators/slim/mailer/templates/view.text.slim

@@ -1,3 +1,3 @@
-<%= class_name %>#<%= @action %>
-
-= @greeting + ", find me in <%= @path %>"
+' <%= class_name %>#<%= @action %>
+= "\r\n" * 2
+' #{@greeting + ", find me in <%= @path %>"}

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

@@ -18,7 +18,7 @@ table
 <% end -%>
         td = link_to 'Show', <%= singular_table_name %>
         td = link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>)
-        td = link_to 'Destroy', <%= singular_table_name %>, data: {:confirm => 'Are you sure?'}, :method => :delete
+        td = link_to 'Destroy', <%= singular_table_name %>, data: { confirm: 'Are you sure?' }, method: :delete
 
 br
 

data/lib/slim-rails.rb

@@ -27,7 +27,6 @@ module Slim
                 # will only apply if Rails 4, which includes 'action_view/dependency_tracker'
                 require 'action_view/dependency_tracker'
                 ActionView::DependencyTracker.register_tracker :slim, ActionView::DependencyTracker::ERBTracker
-                ActionView::Base.cache_template_loading = false if ::Rails.env.development?
               end
             rescue
               # likely this version of Rails doesn't support dependency tracking
@@ -38,6 +37,3 @@ module Slim
     end
   end
 end
-
-Slim::Engine.set_options pretty: Rails.env.development?
-

data/lib/slim-rails/version.rb

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

data/slim-rails.gemspec

@@ -1,32 +1,33 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/slim-rails/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'slim-rails/version'
 
-Gem::Specification.new do |gem|
-  gem.authors       = ["Leonardo Almeida"]
-  gem.email         = ["lalmeida08@gmail.com"]
-  gem.description   = 'Provides the generator settings required for Rails 3 and 4 to use Slim'
-  gem.summary       = 'Slim templates generator for Rails 3 and 4'
-  gem.homepage      = 'https://github.com/slim-template/slim-rails'
-  gem.license       = 'MIT'
+Gem::Specification.new do |spec|
+  spec.name          = 'slim-rails'
+  spec.version       = Slim::Rails::VERSION
+  spec.authors       = ["Leonardo Almeida"]
+  spec.email         = ["lalmeida08@gmail.com"]
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = 'slim-rails'
-  gem.require_paths = ['lib']
-  gem.version       = Slim::Rails::VERSION
+  spec.summary       = 'Slim templates generator for Rails 3+'
+  spec.description   = 'Provides the generator settings required for Rails 3+ to use Slim'
+  spec.homepage      = 'https://github.com/slim-template/slim-rails'
+  spec.license       = 'MIT'
 
-  gem.add_development_dependency 'rake', '~> 10.4'
-  gem.add_development_dependency 'rocco', '~> 0.8'
-  gem.add_development_dependency 'redcarpet', '~> 3.2'
-  gem.add_development_dependency 'awesome_print', '~> 1.2'
-  gem.add_development_dependency 'guard', '~> 2.10'
-  gem.add_development_dependency 'guard-minitest', '~> 2.3'
-  gem.add_development_dependency 'guard-rocco', ['>= 0.0.3', '< 1.0.0']
-  gem.add_runtime_dependency 'activesupport', ['>= 3.1', '< 5.0']
-  gem.add_runtime_dependency 'actionpack',    ['>= 3.1', '< 5.0']
-  gem.add_runtime_dependency 'actionmailer',  ['>= 3.1', '< 5.0']
-  gem.add_runtime_dependency 'railties',      ['>= 3.1', '< 5.0']
-  gem.add_runtime_dependency 'slim',          '~> 3.0'
-end
+  spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  spec.files         = `git ls-files`.split("\n")
+  spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  spec.require_paths = ['lib']
+
+  spec.required_ruby_version = '>= 2.0.0'
 
+  spec.add_runtime_dependency 'actionpack', ['>= 3.1']
+  spec.add_runtime_dependency 'railties',   ['>= 3.1']
+  spec.add_runtime_dependency 'slim',       ['~> 3.0']
+
+  spec.add_development_dependency 'rocco'
+  spec.add_development_dependency 'redcarpet'
+  spec.add_development_dependency 'awesome_print'
+  spec.add_development_dependency 'actionmailer', ['>= 3.1']
+  spec.add_development_dependency 'appraisal'
+end

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

@@ -11,14 +11,37 @@ class Slim::Generators::MailerGeneratorTest < Rails::Generators::TestCase
 
   test "should invoke template engine" do
     run_generator
-    assert_file File.join "app", "views", "notifier", "foo.text.slim" do |view|
+
+    if ::Rails.version.to_s >= '4.2'
+
+      assert_file "app/views/layouts/mailer.text.slim" do |view|
+        assert_match /\= yield/, view
+      end
+
+      assert_file "app/views/layouts/mailer.html.slim" do |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
+      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
+      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 File.join "app", "views", "notifier", "bar.text.slim" do |view|
+    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

metadata

@@ -1,159 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: slim-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Leonardo Almeida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-26 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.4'
-- !ruby/object:Gem::Dependency
-  name: rocco
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
+        version: '3.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.10'
-  type: :development
+        version: '3.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
+        version: '3.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: guard-rocco
+  name: rocco
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
@@ -161,54 +101,28 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: slim
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-description: Provides the generator settings required for Rails 3 and 4 to use Slim
+        version: '0'
+description: Provides the generator settings required for Rails 3+ to use Slim
 email:
 - lalmeida08@gmail.com
 executables: []
@@ -216,17 +130,23 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
 - ".travis.yml"
+- Appraisals
 - Gemfile
-- Guardfile
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/rails_3.gemfile
+- gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_4.gemfile
+- gemfiles/rails_5.gemfile
 - lib/generators/slim/controller/controller_generator.rb
 - lib/generators/slim/controller/templates/view.html.slim
 - lib/generators/slim/mailer/mailer_generator.rb
+- lib/generators/slim/mailer/templates/layout.html.slim
+- lib/generators/slim/mailer/templates/layout.text.slim
+- lib/generators/slim/mailer/templates/view.html.slim
 - lib/generators/slim/mailer/templates/view.text.slim
 - lib/generators/slim/scaffold/scaffold_generator.rb
 - lib/generators/slim/scaffold/templates/_form.html.slim
@@ -255,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -263,8 +183,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
-summary: Slim templates generator for Rails 3 and 4
-test_files: []
+summary: Slim templates generator for Rails 3+
+test_files:
+- test/fixtures/routes.rb
+- test/lib/generators/slim/controller_generator_test.rb
+- test/lib/generators/slim/mailer_generator_test.rb
+- test/lib/generators/slim/scaffold_generator_test.rb
+- test/lib/generators/slim/testing_helper.rb
+- test/test_helper.rb

data/.ruby-gemset

@@ -1 +0,0 @@
-slim-rails

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.1

data/Guardfile

@@ -1,20 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'minitest' do
-  # with Minitest::Unit
-  watch(%r|^test/test_(.*)\.rb|)
-  watch(%r|^lib/(.*)\.rb|)            { |m| "test/test_#{m[1]}.rb" }
-  watch(%r|^test/test_helper\.rb|)    { "test" }
-
-  # with Minitest::Spec
-  # watch(%r|^spec/(.*)_spec\.rb|)
-  # watch(%r|^lib/(.*)\.rb|)            { |m| "spec/#{m[1]}_spec.rb" }
-  # watch(%r|^spec/spec_helper\.rb|)    { "spec" }
-end
-
-guard 'rocco' do
-  watch(%r{^lib/.*\.rb$})
-end
-
-watch(%r|^benchmarks/(.*)\.rb$|)     { |m| eval File.read "benchmarks/#{m[1]}.rb" }