From e7929e89b7fb88887de2685501b99b0bd379ab86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 7 Feb 2010 09:44:23 +0100
Subject: [PATCH] Copy files is more useful than setting them as default
 internally.

---
 .../simple_form_install_generator.rb                 | 12 ++++++++++--
 .../simple_form_install/templates}/_form.html.erb    |  0
 .../simple_form_install/templates}/en.yml            |  0
 lib/simple_form.rb                                   |  9 ---------
 simple_form.gemspec                                  | 11 ++++++-----
 test/test_helper.rb                                  |  2 --
 6 files changed, 16 insertions(+), 18 deletions(-)
 rename lib/{templates/erb/scaffold => generators/simple_form_install/templates}/_form.html.erb (100%)
 rename lib/{locales => generators/simple_form_install/templates}/en.yml (100%)

diff --git a/lib/generators/simple_form_install/simple_form_install_generator.rb b/lib/generators/simple_form_install/simple_form_install_generator.rb
index 99018989..2f8a1c15 100644
--- a/lib/generators/simple_form_install/simple_form_install_generator.rb
+++ b/lib/generators/simple_form_install/simple_form_install_generator.rb
@@ -1,9 +1,17 @@
 class SimpleFormInstallGenerator < Rails::Generators::Base
+  def self.source_root
+    @_source_root = File.expand_path('../templates', __FILE__)
+  end
+
   def copy_initializers
-    template 'simple_form.rb', 'config/initializers/simple_form.rb'
+    copy_file 'simple_form.rb', 'config/initializers/simple_form.rb'
   end
 
   def copy_locale_file
-    template '../../locale/en.yml', 'config/locales/simple_form.en.yml'
+    copy_file 'en.yml', 'config/locales/simple_form.en.yml'
+  end
+
+  def copy_scaffold_template
+    copy_file '_form.html.erb', 'lib/templates/erb/scaffold/_form.html.erb'
   end
 end
diff --git a/lib/templates/erb/scaffold/_form.html.erb b/lib/generators/simple_form_install/templates/_form.html.erb
similarity index 100%
rename from lib/templates/erb/scaffold/_form.html.erb
rename to lib/generators/simple_form_install/templates/_form.html.erb
diff --git a/lib/locales/en.yml b/lib/generators/simple_form_install/templates/en.yml
similarity index 100%
rename from lib/locales/en.yml
rename to lib/generators/simple_form_install/templates/en.yml
diff --git a/lib/simple_form.rb b/lib/simple_form.rb
index 9fe04443..6667aa6f 100644
--- a/lib/simple_form.rb
+++ b/lib/simple_form.rb
@@ -62,15 +62,6 @@ module SimpleForm
   class Railtie < ::Rails::Railtie
     railtie_name :simple_form
 
-    # Add load paths straight to I18n, so engines and application can overwrite it.
-    require 'active_support/i18n'
-    I18n.load_path << File.expand_path('../locales/en.yml', __FILE__)
-
-    # Remove this conditional on next Rails beta
-    if config.generators.respond_to?(:templates)
-      config.generators.templates << File.expand_path('../templates', __FILE__)
-    end
-
     initializer "simple_form.initialize_values" do |app|
       config.simple_form.each do |setting, value|
         SimpleForm.send("#{setting}=", value)
diff --git a/simple_form.gemspec b/simple_form.gemspec
index d515aac9..b90eda86 100644
--- a/simple_form.gemspec
+++ b/simple_form.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jos\303\251 Valim", "Carlos Ant\303\264nio"]
-  s.date = %q{2010-02-06}
+  s.date = %q{2010-02-07}
   s.description = %q{Forms made easy!}
   s.email = %q{contact@plataformatec.com.br}
   s.extra_rdoc_files = [
@@ -18,8 +18,9 @@ Gem::Specification.new do |s|
   s.files = [
     "lib/generators/simple_form_install/USAGE",
      "lib/generators/simple_form_install/simple_form_install_generator.rb",
+     "lib/generators/simple_form_install/templates/_form.html.erb",
+     "lib/generators/simple_form_install/templates/en.yml",
      "lib/generators/simple_form_install/templates/simple_form.rb",
-     "lib/locales/en.yml",
      "lib/simple_form.rb",
      "lib/simple_form/action_view_extensions/builder.rb",
      "lib/simple_form/action_view_extensions/form_helper.rb",
@@ -37,11 +38,11 @@ Gem::Specification.new do |s|
      "lib/simple_form/inputs/date_time_input.rb",
      "lib/simple_form/inputs/hidden_input.rb",
      "lib/simple_form/inputs/mapping_input.rb",
+     "lib/simple_form/inputs/numeric_input.rb",
      "lib/simple_form/inputs/priority_input.rb",
-     "lib/simple_form/inputs/text_field_input.rb",
+     "lib/simple_form/inputs/string_input.rb",
      "lib/simple_form/map_type.rb",
-     "lib/simple_form/version.rb",
-     "lib/templates/erb/scaffold/_form.html.erb"
+     "lib/simple_form/version.rb"
   ]
   s.homepage = %q{http://github.com/plataformatec/simple_form}
   s.rdoc_options = ["--charset=UTF-8"]
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 6b541b01..e54710cf 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -6,7 +6,6 @@ require 'action_controller'
 require 'action_view/test_case'
 
 require 'rails/railtie'
-require 'rails/backtrace_cleaner'
 
 begin
   require 'ruby-debug'
@@ -17,7 +16,6 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib', 'simple_form')
 require 'simple_form'
 
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each { |f| require f }
-I18n.load_path.pop
 I18n.default_locale = :en
 
 $:.unshift "#{File.dirname(__FILE__)}/support/country_select/lib"