Clean up gemspec, refactoring

Author: route

.travis.yml

@@ -1,11 +1,8 @@
-language: ruby
-before_script:
-  - psql -c 'CREATE DATABASE hstore_translate_test;' -U postgres
-env:
-  - RAILS_3_1=true
-  - RAILS_3_2=true
-  - RAILS_4=true
 rvm:
-  - 1.9.3
-  - rbx-19mode
-  - ruby-head
+  - '1.9.3'
+  - '2.0.0'
+  - 'rbx-19mode'
+gemfile:
+  - test/gemfiles/Gemfile.rails-3.1.x
+  - test/gemfiles/Gemfile.rails-3.2.x
+  - test/gemfiles/Gemfile.rails-4.0.x

Gemfile

@@ -1,8 +1,3 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-if ENV["EDGE_RAILS"]
-  gem 'pg'
-  gem 'rails', :git => 'git://github.com/rails/rails'
-else
-  gemspec
-end
+gemspec

Rakefile

@@ -1,12 +1,8 @@
-require 'rake'
 require 'rake/testtask'
 
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the ltree_hierarchy plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.pattern = 'test/*_test.rb'
 end
+
+task :default => :test

hstore_translate.gemspec

@@ -1,32 +1,25 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "hstore_translate/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'hstore_translate/version'
 
 Gem::Specification.new do |s|
   s.name              = 'hstore_translate'
   s.version           = HstoreTranslate::VERSION
   s.summary           = "Rails I18n library for ActiveRecord model/data translation using PostgreSQL's hstore datatype."
   s.description       = "#{s.summary} Translations are stored directly in the model table rather than shadow tables."
-  s.authors           = ["Rob Worley"]
+  s.authors           = ['Rob Worley']
   s.email             = '[email protected]'
-  s.homepage          = "https://github.com/robworley/hstore_translate"
-  s.files             = Dir['{lib/**/*,[A-Z]*}']
+  s.homepage          = 'https://github.com/robworley/hstore_translate'
   s.platform          = Gem::Platform::RUBY
-  s.require_paths     = ["lib"]
-  s.rubyforge_project = '[none]'
 
-  if ENV['RAILS_3_1']
-    s.add_dependency 'activerecord', '~> 3.1.0'
-  elsif ENV['RAILS_3_2']
-    s.add_dependency 'activerecord', '~> 3.2.0'
-  elsif ENV['RAILS_4']
-    s.add_dependency 'activerecord', '4.0.0.rc2'
-  else
-    s.add_dependency 'activerecord', '>= 3.1.0'
-  end
+  s.files             = Dir['lib/**/*.rb', 'README.md', 'MIT-LICENSE']
+  s.test_files        = Dir['test/**/*']
+  s.require_paths     = ['lib']
 
   s.add_dependency 'pg'
+  s.add_dependency 'activerecord', '>= 3.1.0'
   s.add_dependency 'activerecord-postgres-hstore', '~> 0.7.0'
 
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'minitest', '~> 4.0'
+  s.add_development_dependency 'database_cleaner'
 end

lib/hstore_translate.rb

@@ -1,6 +1,6 @@
-require "active_record/connection_adapters/postgresql_adapter"
-require "hstore_translate/translates"
-require "hstore_translate/version"
+require 'active_record'
+require 'active_record/connection_adapters/postgresql_adapter'
+require 'hstore_translate/translates'
 
 module HstoreTranslate
   def self.native_hstore?

test/gemfiles/Gemfile.rails-3.1.x

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec :path => './../..'
+
+gem 'activerecord', '~> 3.1.0'

test/gemfiles/Gemfile.rails-3.2.x

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec :path => './../..'
+
+gem 'activerecord', '~> 3.2.0'

test/gemfiles/Gemfile.rails-4.0.x

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec :path => './../..'
+
+gem 'activerecord', '~> 4.0.0'

test/test_helper.rb

@@ -0,0 +1,69 @@
+require 'minitest/autorun'
+require 'hstore_translate'
+
+require 'database_cleaner'
+DatabaseCleaner.strategy = :transaction
+
+class Post < ActiveRecord::Base
+  translates :title
+end
+
+class HstoreTranslate::Test < MiniTest::Unit::TestCase
+  class << self
+    def prepare_database
+      create_database
+      create_table
+    end
+
+    private
+
+    def db_config
+      @db_config ||= begin
+        filepath = File.join('test', 'database.yml')
+        YAML.load_file(filepath)['test']
+      end
+    end
+
+    def establish_connection(config)
+      ActiveRecord::Base.establish_connection(config)
+      ActiveRecord::Base.connection
+    end
+
+    def create_database
+      system_config = db_config.merge('database' => 'postgres', 'schema_search_path' => 'public')
+      connection = establish_connection(system_config)
+      connection.create_database(db_config['database']) rescue nil
+      enable_extension
+    end
+
+    def enable_extension
+      connection = establish_connection(db_config)
+      unless connection.select_value("SELECT proname FROM pg_proc WHERE proname = 'akeys'")
+        if connection.send(:postgresql_version) < 90100
+          pg_sharedir = `pg_config --sharedir`.strip
+          hstore_script_path = File.join(pg_sharedir, 'contrib', 'hstore.sql')
+          connection.execute(File.read(hstore_script_path))
+        else
+          connection.execute('CREATE EXTENSION IF NOT EXISTS hstore')
+        end
+      end
+    end
+
+    def create_table
+      connection = establish_connection(db_config)
+      connection.create_table(:posts, :force => true) do |t|
+        t.column :title_translations, 'hstore'
+      end
+    end
+  end
+
+  prepare_database
+
+  def setup
+    DatabaseCleaner.start
+  end
+
+  def teardown
+    DatabaseCleaner.clean
+  end
+end

test/translates_test.rb

@@ -1,38 +1,7 @@
 # -*- encoding : utf-8 -*-
+require 'test_helper'
 
-require 'rubygems'
-require 'active_record'
-require 'test/unit'
-
-require 'hstore_translate'
-
-class Post < ActiveRecord::Base
-  translates :title
-end
-
-class TranslatesTest < Test::Unit::TestCase
-  def setup
-    db_config = YAML.load(File.open(File.join(File.dirname(__FILE__), 'database.yml')).read)['test']
-
-    Post.establish_connection(db_config)
-
-    unless Post.connection.select_value("SELECT proname FROM pg_proc WHERE proname = 'akeys'")
-      pgversion = Post.connection.send(:postgresql_version)
-
-      if pgversion < 90100
-        pg_sharedir = `pg_config --sharedir`.strip
-        hstore_script_path = File.join(pg_sharedir, "contrib", "hstore.sql")
-        Post.connection.execute(File.read(hstore_script_path))
-      else
-        Post.connection.execute("CREATE EXTENSION IF NOT EXISTS hstore")
-      end
-    end
-
-    Post.connection.create_table(:posts, :force => true) do |t|
-      t.column :title_translations, 'hstore'
-    end
-  end
-
+class TranslatesTest < HstoreTranslate::Test
   def test_assigns_in_current_locale
     I18n.with_locale(:en) do
       p = Post.new(:title => "English Title")
@@ -115,11 +84,11 @@ def test_retrieves_in_specified_locale_with_fallback_reenabled
   end
 
   def test_method_missing_delegates
-    assert_raise(NoMethodError) { Post.new.nonexistant_method }
+    assert_raises(NoMethodError) { Post.new.nonexistant_method }
   end
 
   def test_method_missing_delegates_non_translated_attributes
-    assert_raise(NoMethodError) { Post.new.other_fr }
+    assert_raises(NoMethodError) { Post.new.other_fr }
   end
 
   def test_persists_translations_assigned_as_hash