Hello community,
here is the log from the commit of package rubygem-haml-rails for
openSUSE:Factory checked in at 2015-03-19 21:17:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-haml-rails (Old)
and /work/SRC/openSUSE:Factory/.rubygem-haml-rails.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-haml-rails"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-haml-rails/rubygem-haml-rails.changes
2015-02-25 02:16:50.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.rubygem-haml-rails.new/rubygem-haml-rails.changes
2015-03-19 21:17:52.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Mar 13 05:30:36 UTC 2015 - [email protected]
+
+- updated to version 0.9.0
+
+-------------------------------------------------------------------
Old:
----
haml-rails-0.8.2.gem
New:
----
gem2rpm.yml
haml-rails-0.9.0.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-haml-rails.spec ++++++
--- /var/tmp/diff_new_pack.FK0i3v/_old 2015-03-19 21:17:53.000000000 +0100
+++ /var/tmp/diff_new_pack.FK0i3v/_new 2015-03-19 21:17:53.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-haml-rails
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,17 +15,26 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
+#
+# This file was generated with a gem2rpm.yml and not just plain gem2rpm.
+# All sections marked as MANUAL, license headers, summaries and descriptions
+# can be maintained in that file. Please consult this file before editing any
+# of those fields
+#
+
Name: rubygem-haml-rails
-Version: 0.8.2
+Version: 0.9.0
Release: 0
%define mod_name haml-rails
%define mod_full_name %{mod_name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: ruby-macros >= 5
-BuildRequires: %{ruby}
BuildRequires: %{rubygem gem2rpm}
+BuildRequires: %{ruby}
+BuildRequires: ruby-macros >= 5
Url: http://github.com/indirect/haml-rails
Source: http://rubygems.org/gems/%{mod_full_name}.gem
+Source1: gem2rpm.yml
Summary: let your Gemfile do the configuring
License: MIT
Group: Development/Languages/Ruby
++++++ gem2rpm.yml ++++++
# ---
# ## used by gem2rpm
# :summary: this is a custom summary
# ## used by gem2rpm
# :description: |-
# this is a custom description
#
# it can be multiline
# ## used by gem2rpm
# :license: MIT or Ruby
# ## used by gem2rpm and gem_packages
# :version_suffix: -x_y
# ## used by gem2rpm and gem_packages
# :disable_docs: true
# ## used by gem2rpm
# :disable_automatic_rdoc_dep: true
# ## used by gem2rpm
# :preamble: |-
# BuildRequires: foobar
# Requires: foobar
# ## used by gem2rpm
# :patches:
# foo.patch: -p1
# bar.patch:
# ## used by gem2rpm
:sources:
# - foo.desktop
# - bar.desktop
# :gem_install_args: '....'
# ## used by gem2rpm
# :pre_install: |-
# %if 0%{?use_system_libev}
# export USE_VENDORED_LIBEV="no"
# %endif
# ## used by gem2rpm
# :post_install: |-
# # delete custom files here or do other fancy stuff
# install -D -m 0644 %{S:1} %{buildroot}%{_bindir}/gem2rpm-opensuse
# ## used by gem2rpm
# :testsuite_command: |-
# (pushd %{buildroot}%{gem_base}/gems/%{mod_full_name} && rake test)
# ## used by gem2rpm
# :filelist: |-
# /usr/bin/gem2rpm-opensuse
# ## used by gem2rpm
# :scripts:
# :post: |-
# /bin/echo foo
# ## used by gem_packages
# :main:
# :preamble: |-
# Requires: util-linux
# Recommends: pwgen
# :filelist: |-
# /usr/bin/gem2rpm-opensuse
# ## used by gem_packages
# :custom:
# apache:
# :preamble: |-
# Requires: .....
# :filelist: |-
# /etc/apache2/conf.d/passenger.conf
# :summary: Custom summary is optional
# :description: |-
# Custom description is optional
#
# bar
# :post: |-
# /bin/echo foo
#
++++++ haml-rails-0.8.2.gem -> haml-rails-0.9.0.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.travis.yml new/.travis.yml
--- old/.travis.yml 2015-01-28 21:20:44.000000000 +0100
+++ new/.travis.yml 2015-03-11 08:21:34.000000000 +0100
@@ -3,12 +3,15 @@
- 1.9.3
- 2.0.0
- 2.1.0
+ - 2.2.0
- jruby-19mode
- rbx
gemfile:
- gemfiles/rails_4_0.gemfile
- gemfiles/rails_4_1.gemfile
+ - gemfiles/rails_4_2.gemfile
matrix:
exclude:
- rvm: 1.9.3
gemfile: gemfiles/rails_4_1.gemfile
+script: "bundle exec rake test"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Appraisals new/Appraisals
--- old/Appraisals 2015-01-28 21:20:44.000000000 +0100
+++ new/Appraisals 2015-03-11 08:21:34.000000000 +0100
@@ -1,13 +1,11 @@
appraise "rails_4_0" do
gem "rails", "~> 4.0.1"
-
- gem 'rubysl', '~> 2.0', platforms: :rbx
- gem 'minitest', platforms: :rbx
end
appraise "rails_4_1" do
- gem "rails", "4.1.0.beta1"
+ gem "rails", "4.1"
+end
- gem 'rubysl', '~> 2.0', platforms: :rbx
- gem 'minitest', platforms: :rbx
+appraise "rails_4_2" do
+ gem "rails", "4.2"
end
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/LICENSE new/LICENSE
--- old/LICENSE 2015-01-28 21:20:44.000000000 +0100
+++ new/LICENSE 2015-03-11 08:21:34.000000000 +0100
@@ -1,4 +1,4 @@
-Copyright (c) 2010 André Arko
+Copyright (c) 2010-2015 André Arko
MIT Licence
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/README.md new/README.md
--- old/README.md 2015-01-28 21:20:44.000000000 +0100
+++ new/README.md 2015-03-11 08:21:34.000000000 +0100
@@ -4,10 +4,11 @@
To use it, add this line to your Gemfile:
- gem "haml-rails"
+ gem "haml-rails", "~> 0.9"
This ensures that:
- * Any time you generate a controller or scaffold, you'll get Haml templates
(instead of ERB)
+
+ * Any time you generate a resource, view, or mailer, you'll get Haml
templates (instead of ERB)
* When your Rails application loads, Haml will be loaded and initialized
automatically
* Haml templates will be respected by the view template cache digestor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Rakefile new/Rakefile
--- old/Rakefile 2015-01-28 21:20:44.000000000 +0100
+++ new/Rakefile 2015-03-11 08:21:34.000000000 +0100
@@ -1,11 +1,7 @@
+require 'rubygems'
require 'bundler'
Bundler::GemHelper.install_tasks
-begin
- require 'appraisal'
-rescue LoadError
-end
-
require 'rake/testtask'
Rake::TestTask.new(:test) do |test|
test.libs << 'lib' << 'test'
Files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gemfiles/rails_4_0.gemfile
new/gemfiles/rails_4_0.gemfile
--- old/gemfiles/rails_4_0.gemfile 2015-01-28 21:20:44.000000000 +0100
+++ new/gemfiles/rails_4_0.gemfile 2015-03-11 08:21:34.000000000 +0100
@@ -2,9 +2,9 @@
source "https://rubygems.org";
+gem "rubysl", "~> 2.0", :platforms => :rbx
+gem "minitest", :platforms => :rbx
+gem "html2haml"
gem "rails", "~> 4.0.1"
-gem 'rubysl', '~> 2.0', platforms: :rbx
-gem 'minitest', platforms: :rbx
-
-gemspec :path=>"../"
+gemspec :path => "../"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gemfiles/rails_4_1.gemfile
new/gemfiles/rails_4_1.gemfile
--- old/gemfiles/rails_4_1.gemfile 2015-01-28 21:20:44.000000000 +0100
+++ new/gemfiles/rails_4_1.gemfile 2015-03-11 08:21:34.000000000 +0100
@@ -2,9 +2,9 @@
source "https://rubygems.org";
-gem "rails", "4.1.0.beta1"
+gem "rubysl", "~> 2.0", :platforms => :rbx
+gem "minitest", :platforms => :rbx
+gem "html2haml"
+gem "rails", "4.1"
-gem 'rubysl', '~> 2.0', platforms: :rbx
-gem 'minitest', platforms: :rbx
-
-gemspec :path=>"../"
\ No newline at end of file
+gemspec :path => "../"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gemfiles/rails_4_2.gemfile
new/gemfiles/rails_4_2.gemfile
--- old/gemfiles/rails_4_2.gemfile 1970-01-01 01:00:00.000000000 +0100
+++ new/gemfiles/rails_4_2.gemfile 2015-03-11 08:21:34.000000000 +0100
@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org";
+
+gem "rubysl", "~> 2.0", :platforms => :rbx
+gem "minitest", :platforms => :rbx
+gem "html2haml"
+gem "rails", "4.2"
+
+gemspec :path => "../"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/haml-rails.gemspec new/haml-rails.gemspec
--- old/haml-rails.gemspec 2015-01-28 21:20:44.000000000 +0100
+++ new/haml-rails.gemspec 2015-03-11 08:21:34.000000000 +0100
@@ -15,16 +15,16 @@
s.rubyforge_project = "haml-rails"
s.required_rubygems_version = ">= 1.3.6"
- s.add_dependency "haml", [">= 3.1", "< 5.0"]
+ s.add_dependency "haml", [">= 4.0.6", "< 5.0"]
s.add_dependency "activesupport", [">= 4.0.1"]
s.add_dependency "actionpack", [">= 4.0.1"]
s.add_dependency "railties", [">= 4.0.1"]
s.add_dependency "html2haml", [">= 1.0.1"]
s.add_development_dependency "rails", [">= 4.0.1"]
- s.add_development_dependency "bundler", "~> 1.2"
+ s.add_development_dependency "bundler", "~> 1.7"
s.add_development_dependency "rake"
- s.add_development_dependency 'appraisal', '>= 0.3.8'
+ s.add_development_dependency 'appraisal', '~> 1.0'
s.files = `git ls-files`.split("\n")
s.executables = `git ls-files`.split("\n").select{|f| f =~ /^bin/}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/generators/haml/mailer/mailer_generator.rb
new/lib/generators/haml/mailer/mailer_generator.rb
--- old/lib/generators/haml/mailer/mailer_generator.rb 2015-01-28
21:20:44.000000000 +0100
+++ new/lib/generators/haml/mailer/mailer_generator.rb 2015-03-11
08:21:34.000000000 +0100
@@ -5,10 +5,30 @@
class MailerGenerator < ControllerGenerator
source_root File.expand_path("../templates", __FILE__)
- protected
+ def copy_view_files
+ view_base_path = File.join("app/views", class_path, file_name)
+ empty_directory view_base_path
+
+ if self.behavior == :invoke
+ formats.each do |format|
+ layout_path = File.join("app/views/layouts",
filename_with_extensions("mailer", format))
+ template filename_with_extensions(:layout, format), layout_path
+ end
+ end
+
+ actions.each do |action|
+ @action = action
- def format
- :text
+ formats.each do |format|
+ @path = File.join(view_base_path, filename_with_extensions(action,
format))
+ template filename_with_extensions(:view, format), @path
+ end
+ end
+ end
+
+ protected
+ def formats
+ [:text, :html]
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lib/generators/haml/mailer/templates/layout.html.haml
new/lib/generators/haml/mailer/templates/layout.html.haml
--- old/lib/generators/haml/mailer/templates/layout.html.haml 1970-01-01
01:00:00.000000000 +0100
+++ new/lib/generators/haml/mailer/templates/layout.html.haml 2015-03-11
08:21:34.000000000 +0100
@@ -0,0 +1,3 @@
+%hmtl
+ %body
+ = yield
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lib/generators/haml/mailer/templates/layout.text.haml
new/lib/generators/haml/mailer/templates/layout.text.haml
--- old/lib/generators/haml/mailer/templates/layout.text.haml 1970-01-01
01:00:00.000000000 +0100
+++ new/lib/generators/haml/mailer/templates/layout.text.haml 2015-03-11
08:21:34.000000000 +0100
@@ -0,0 +1 @@
+= yield
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/generators/haml/mailer/templates/view.html.haml
new/lib/generators/haml/mailer/templates/view.html.haml
--- old/lib/generators/haml/mailer/templates/view.html.haml 1970-01-01
01:00:00.000000000 +0100
+++ new/lib/generators/haml/mailer/templates/view.html.haml 2015-03-11
08:21:34.000000000 +0100
@@ -0,0 +1,4 @@
+%h1= class_name + "#" + @action
+
+%p
+ = @greeting + ", find me in <%= @path %>"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lib/generators/haml/scaffold/templates/index.html.haml
new/lib/generators/haml/scaffold/templates/index.html.haml
--- old/lib/generators/haml/scaffold/templates/index.html.haml 2015-01-28
21:20:44.000000000 +0100
+++ new/lib/generators/haml/scaffold/templates/index.html.haml 2015-03-11
08:21:34.000000000 +0100
@@ -9,7 +9,7 @@
%th
%th
%th
-
+
%tbody
- @<%= plural_table_name %>.each do |<%= singular_table_name %>|
%tr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/haml-rails/version.rb
new/lib/haml-rails/version.rb
--- old/lib/haml-rails/version.rb 2015-01-28 21:20:44.000000000 +0100
+++ new/lib/haml-rails/version.rb 2015-03-11 08:21:34.000000000 +0100
@@ -1,5 +1,5 @@
module Haml
module Rails
- VERSION = "0.8.2"
+ VERSION = "0.9.0"
end
end
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/haml-rails.rb new/lib/haml-rails.rb
--- old/lib/haml-rails.rb 2015-01-28 21:20:44.000000000 +0100
+++ new/lib/haml-rails.rb 2015-03-11 08:21:34.000000000 +0100
@@ -4,15 +4,12 @@
module Haml
module Rails
+ class Engine < ::Rails::Engine
+ end
class Railtie < ::Rails::Railtie
- if ::Rails.version.to_s >= "3.1"
- config.app_generators.template_engine :haml
- else
- config.generators.template_engine :haml
- end
+ config.app_generators.template_engine :haml
config.before_initialize do
- Haml.init_rails(binding)
Haml::Template.options[:format] = :html5
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2015-01-28 21:20:44.000000000 +0100
+++ new/metadata 2015-03-11 08:21:34.000000000 +0100
@@ -1,147 +1,147 @@
--- !ruby/object:Gem::Specification
name: haml-rails
version: !ruby/object:Gem::Version
- version: 0.8.2
+ version: 0.9.0
platform: ruby
authors:
- André Arko
autorequire:
bindir: bin
cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: haml
requirement: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
- version: '3.1'
- - - <
+ version: 4.0.6
+ - - "<"
- !ruby/object:Gem::Version
version: '5.0'
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
- version: '3.1'
- - - <
+ version: 4.0.6
+ - - "<"
- !ruby/object:Gem::Version
version: '5.0'
- !ruby/object:Gem::Dependency
name: activesupport
requirement: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: 4.0.1
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: 4.0.1
- !ruby/object:Gem::Dependency
name: actionpack
requirement: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: 4.0.1
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: 4.0.1
- !ruby/object:Gem::Dependency
name: railties
requirement: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: 4.0.1
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: 4.0.1
- !ruby/object:Gem::Dependency
name: html2haml
requirement: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: 1.0.1
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: 1.0.1
- !ruby/object:Gem::Dependency
name: rails
requirement: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: 4.0.1
type: :development
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: 4.0.1
- !ruby/object:Gem::Dependency
name: bundler
requirement: !ruby/object:Gem::Requirement
requirements:
- - - ~>
+ - - "~>"
- !ruby/object:Gem::Version
- version: '1.2'
+ version: '1.7'
type: :development
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - - ~>
+ - - "~>"
- !ruby/object:Gem::Version
- version: '1.2'
+ version: '1.7'
- !ruby/object:Gem::Dependency
name: rake
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: appraisal
requirement: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - "~>"
- !ruby/object:Gem::Version
- version: 0.3.8
+ version: '1.0'
type: :development
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - "~>"
- !ruby/object:Gem::Version
- version: 0.3.8
+ version: '1.0'
description: Haml-rails provides Haml generators for Rails 4. It also enables
Haml
as the templating engine for you, so you don't have to screw around in your
own
application.rb when your Gemfile already clearly indicated what templating
engine
@@ -152,8 +152,8 @@
extensions: []
extra_rdoc_files: []
files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
- Appraisals
- Gemfile
- LICENSE
@@ -161,10 +161,14 @@
- Rakefile
- gemfiles/rails_4_0.gemfile
- gemfiles/rails_4_1.gemfile
+- gemfiles/rails_4_2.gemfile
- haml-rails.gemspec
- lib/generators/haml/controller/controller_generator.rb
- lib/generators/haml/controller/templates/view.html.haml
- lib/generators/haml/mailer/mailer_generator.rb
+- lib/generators/haml/mailer/templates/layout.html.haml
+- lib/generators/haml/mailer/templates/layout.text.haml
+- lib/generators/haml/mailer/templates/view.html.haml
- lib/generators/haml/mailer/templates/view.text.haml
- lib/generators/haml/scaffold/scaffold_generator.rb
- lib/generators/haml/scaffold/templates/_form.html.haml
@@ -192,17 +196,17 @@
- lib
required_ruby_version: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: '0'
required_rubygems_version: !ruby/object:Gem::Requirement
requirements:
- - - '>='
+ - - ">="
- !ruby/object:Gem::Version
version: 1.3.6
requirements: []
rubyforge_project: haml-rails
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
signing_key:
specification_version: 4
summary: let your Gemfile do the configuring
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/test/lib/generators/haml/controller_generator_test.rb
new/test/lib/generators/haml/controller_generator_test.rb
--- old/test/lib/generators/haml/controller_generator_test.rb 2015-01-28
21:20:44.000000000 +0100
+++ new/test/lib/generators/haml/controller_generator_test.rb 2015-03-11
08:21:34.000000000 +0100
@@ -2,16 +2,17 @@
require 'lib/generators/haml/testing_helper'
class Haml::Generators::ControllerGeneratorTest < Rails::Generators::TestCase
- destination File.join(Rails.root)
+ destination Rails.root
tests Rails::Generators::ControllerGenerator
- arguments %w(Account foo bar --template-engine haml)
setup :prepare_destination
setup :copy_routes
- test "should invoke template engine" do
- run_generator
- assert_file "app/views/account/foo.html.haml",
%r(app/views/account/foo\.html\.haml)
- assert_file "app/views/account/bar.html.haml",
%r(app/views/account/bar\.html\.haml)
- end
+ arguments %w(Account foo bar --template-engine haml)
+
+ test "should invoke haml engine" do
+ run_generator
+ assert_file "app/views/account/foo.html.haml"
+ assert_file "app/views/account/bar.html.haml"
+ end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/lib/generators/haml/mailer_generator_test.rb
new/test/lib/generators/haml/mailer_generator_test.rb
--- old/test/lib/generators/haml/mailer_generator_test.rb 2015-01-28
21:20:44.000000000 +0100
+++ new/test/lib/generators/haml/mailer_generator_test.rb 2015-03-11
08:21:34.000000000 +0100
@@ -11,14 +11,33 @@
test "should invoke template engine" do
run_generator
+
+ assert_file "app/views/layouts/mailer.text.haml" do |view|
+ assert_match /\= yield/, view
+ end
+
+ assert_file "app/views/layouts/mailer.html.haml" do |view|
+ assert_match /\= yield/, view
+ end
+
assert_file "app/views/notifier/foo.text.haml" do |view|
assert_match %r(app/views/notifier/foo\.text\.haml), view
assert_match /\= @greeting/, view
end
+ assert_file "app/views/notifier/foo.html.haml" do |view|
+ assert_match %r(app/views/notifier/foo\.html\.haml), view
+ assert_match /\= @greeting/, view
+ end
+
assert_file "app/views/notifier/bar.text.haml" do |view|
assert_match %r(app/views/notifier/bar\.text\.haml), view
assert_match /\= @greeting/, view
end
+
+ assert_file "app/views/notifier/bar.html.haml" do |view|
+ assert_match %r(app/views/notifier/bar\.html\.haml), view
+ assert_match /\= @greeting/, view
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/test_helper.rb new/test/test_helper.rb
--- old/test/test_helper.rb 2015-01-28 21:20:44.000000000 +0100
+++ new/test/test_helper.rb 2015-03-11 08:21:34.000000000 +0100
@@ -7,26 +7,24 @@
class TestApp < Rails::Application
config.root = File.dirname(__FILE__)
end
-Rails.application = TestApp
module Rails
def self.root
@root ||= File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp',
'rails'))
end
end
-Rails.application.config.root = Rails.root
# Call configure to load the settings from
# Rails.application.config.generators to Rails::Generators
-Rails::Generators.configure! Rails.application.config.generators
+Rails.application.load_generators
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
def copy_routes
- routes = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures',
'routes.rb'))
+ routes = File.join(File.dirname(__FILE__), 'fixtures', 'routes.rb')
destination = File.join(Rails.root, "config")
FileUtils.mkdir_p(destination)
- FileUtils.cp File.expand_path(routes), destination
+ FileUtils.cp File.expand_path(routes), File.expand_path(destination)
end
# Asserts the given class exists in the given content. When a block is given,
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
