contact_us 0.0.8 → 0.1.0

data/README.md

@@ -1,6 +1,8 @@
 # Contact Us
 
-A Rails 3 Engine providing a basic contact form.  I used Formtastic to keep things simple, and to hook into your apps custom Formtastic stylesheets.
+A Rails 3+ Engine providing a basic contact form.  I used Formtastic to keep things simple, and to hook into your apps custom Formtastic stylesheets.
+
+[![Build Status](https://secure.travis-ci.org/jdutil/contact_us.png)](http://travis-ci.org/jdutil/contact_us)
 
 ## REQUIREMENTS
 
@@ -10,12 +12,12 @@ Contact Us requires the Formtastic Gem.  Read more about Formtastic @ https://gi
 
 In your `Gemfile`, add the following dependencies:
 
-    gem 'contact_us', '~> 0.0.8'
+    gem 'contact_us', '~> 0.1.0'
 
 From `Rails.root` run:
 
     $ bundle
-    $ rake contact_us:install
+    $ bundle exec rake contact_us:install
 
 In `config/initializers/contact_us.rb` modify:
 
@@ -58,7 +60,6 @@ Here are some ways *you* can contribute:
 
 ## TODO
 
-* Installation tests
 * Add new language translations
 
 Copyright (c) 2011 Jeff Dutil, released under the [MIT license](https://github.com/jdutil/contact_us/tree/master/MIT-LICENSE).

data/lib/contact_us/tasks/install.rb

@@ -0,0 +1,74 @@
+require 'rails/generators'
+
+module ContactUs
+  module Tasks
+    class Install
+      class << self
+
+        def run
+          copy_initializer_file
+          copy_locales_files
+          copy_view_files
+          puts "Done!"
+        end
+
+        def copy_initializer_file
+          print "Copying initializer file...\n"
+          app_path = Rails.root.join("config/initializers")
+          copier.copy_file File.join(gem_path, 'lib/templates/contact_us.rb'), File.join(app_path, 'contact_us.rb')
+        end
+
+        def copy_locales_files
+          print "Copying locales files...\n"
+          locales_path = gem_path + "/config/locales/*.yml"
+          app_path = Rails.root.join("config/locales")
+
+          unless File.directory?(app_path)
+            app_path.mkdir
+          end
+
+          Dir.glob(locales_path).each do |file|
+            copier.copy_file file, File.join(app_path, File.basename(file))
+          end
+        end
+
+        def copy_view_files
+          print "Copying view files...\n"
+          origin = File.join(gem_path, 'app/views')
+          destination = Rails.root.join('app/views')
+          copy_files(['.'], origin, destination)
+        end
+
+        private
+
+        def copy_files(directories, origin, destination)
+          directories.each do |directory|
+            Dir[File.join(origin, directory, 'contact_us', '**/*')].each do |file|
+              relative  = file.gsub(/^#{origin}\//, '')
+              dest_file = File.join(destination, relative)
+              dest_dir  = File.dirname(dest_file)
+
+              if !File.exist?(dest_dir)
+                FileUtils.mkdir_p(dest_dir)
+              end
+
+              copier.copy_file(file, dest_file) unless File.directory?(file)
+            end
+          end
+        end
+
+        def gem_path
+          File.expand_path('../../..', File.dirname(__FILE__))
+        end
+
+        def copier
+          unless @copier
+            Rails::Generators::Base.source_root(gem_path)
+            @copier = Rails::Generators::Base.new
+          end
+          @copier
+        end
+      end
+    end
+  end
+end

data/lib/contact_us/version.rb

@@ -1,3 +1,3 @@
 module ContactUs
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

data/lib/tasks/install.rake

@@ -1,61 +1,18 @@
-require 'rails/generators'
+require File.expand_path('../../contact_us/tasks/install', __FILE__)
 
 namespace :contact_us do
-  desc "Install ContactUs"
+  desc "Install contact_us"
   task :install do
-    gem_path = __FILE__
-    gem_path = gem_path.split("/")
-
-    gem_path = gem_path[0..-4]
-    gem_path = gem_path.join("/")
-
-    Rails::Generators::Base.source_root(gem_path)
-    copier = Rails::Generators::Base.new
-
-    unless File.exists?(Rails.root.join("config/initializers/contact_us.rb"))
-      print "Now copying initializer!\n"
-
-      locales_path = gem_path + "/lib/templates/*"
-      app_path = Rails.root.join("config/initializers")
-      unless File.directory?(app_path)
-        app_path.mkdir
-      end
-      Dir.glob(locales_path).each do |file|
-        copier.copy_file file, File.join(app_path, File.basename(file))
-      end
-    end
-    
-    print "Now copying locales files!\n"
+    ContactUs::Tasks::Install.run
+  end
 
-    locales_path = gem_path + "/config/locales/*.yml"
-    app_path = Rails.root.join("config/locales")
-    unless File.directory?(app_path)
-      app_path.mkdir
-    end
-    Dir.glob(locales_path).each do |file|
-      copier.copy_file file, File.join(app_path, File.basename(file))
-    end
+  desc "Copy only locale files (part of install, but useful for updates when only assets are needed)"
+  task :copy_locales do
+    ContactUs::Tasks::Install.copy_locales_files
+  end
 
-    print "Now copying view files for customization!\n"
-    unless File.directory?(Rails.root.join('app/views/contact_us'))
-      Rails.root.join('app/views/contact_us').mkdir
-    end
-    locales_path = gem_path + "/app/views/contact_us/contact_mailer/*"
-    app_path = Rails.root.join("app/views/contact_us/contact_mailer")
-    unless File.directory?(app_path)
-      app_path.mkdir
-    end
-    Dir.glob(locales_path).each do |file|
-      copier.copy_file file, File.join(app_path, File.basename(file))
-    end
-    
-    locales_path = gem_path + "/app/views/contact_us/contacts/*"
-    app_path = Rails.root.join("app/views/contact_us/contacts")
-    unless File.directory?(app_path)
-      app_path.mkdir
-    end
-    Dir.glob(locales_path).each do |file|
-      copier.copy_file file, File.join(app_path, File.basename(file))
-    end    
+  desc "Copy only view files (part of install, but useful for updates when only assets are needed)"
+  task :copy_views do
+    ContactUs::Tasks::Install.copy_view_files
   end
 end

data/spec/dummy/config/database.yml

@@ -1,22 +1,11 @@
 # SQLite version 3.x
 #   gem install sqlite3
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
-test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
 
-production:
+test:
   adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
+  database: ":memory:"
+  timeout: 500