Permalink
Browse files

Remove backports with its extremely slow require_relative magic, alon…

…g with other misc cleanups.
  • Loading branch information...
1 parent b45aabd commit b923c9e975d3b6292f17387e679540b4be766ebc @mperham mperham committed Apr 18, 2012
Showing with 4 additions and 53 deletions.
  1. +1 −1 .rvmrc
  2. +0 −41 Gemfile.lock
  3. +1 −1 Rakefile
  4. +2 −2 lib/active_record/transitions.rb
  5. +0 −1 lib/transitions.rb
  6. +0 −6 test/helper.rb
  7. +0 −1 transitions.gemspec
View
2 .rvmrc
@@ -1 +1 @@
-rvm ruby-1.9.2-p290@transitions
+rvm ruby-1.9.2-p290@transitions --create
View
41 Gemfile.lock
@@ -1,41 +0,0 @@
-PATH
- remote: .
- specs:
- transitions (0.0.15)
- backports
-
-GEM
- remote: http://rubygems.org/
- specs:
- activemodel (3.0.0)
- activesupport (= 3.0.0)
- builder (~> 2.1.2)
- i18n (~> 0.4.1)
- activerecord (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
- arel (~> 1.0.0)
- tzinfo (~> 0.3.23)
- activesupport (3.0.0)
- arel (1.0.1)
- activesupport (~> 3.0.0)
- backports (2.5.1)
- builder (2.1.2)
- i18n (0.4.1)
- mocha (0.9.8)
- rake
- rake (0.8.7)
- sqlite3-ruby (1.3.1)
- test-unit (2.4.1)
- tzinfo (0.3.23)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- activerecord (~> 3)
- bundler (~> 1)
- mocha
- sqlite3-ruby
- test-unit (~> 2.2)
- transitions!
View
2 Rakefile
@@ -4,7 +4,7 @@ Bundler.setup
require "rake/testtask"
Rake::TestTask.new(:test) do |test|
- test.libs << "lib" << "test"
+ test.libs = %w(lib test)
test.pattern = "test/**/test_*.rb"
test.verbose = true
end
View
4 lib/active_record/transitions.rb
@@ -1,5 +1,5 @@
-require_relative '../active_model/transitions'
+require 'active_model/transitions'
module ActiveRecord
Transitions = ActiveModel::Transitions
-end
+end
View
1 lib/transitions.rb
@@ -20,7 +20,6 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-require 'backports'
require "transitions/event"
require "transitions/machine"
require "transitions/state"
View
6 test/helper.rb
@@ -5,15 +5,9 @@
require "mocha"
require "db/create_db"
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
require "transitions"
require "active_model/transitions"
-class Test::Unit::TestCase
-
-end
-
def create_database
ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
ActiveRecord::Migration.verbose = false
View
1 transitions.gemspec
@@ -14,7 +14,6 @@ Gem::Specification.new do |s|
s.required_rubygems_version = ">= 1.3.6"
s.rubyforge_project = "transitions"
- s.add_dependency "backports"
s.add_development_dependency "bundler", "~> 1"
s.add_development_dependency "test-unit", "~> 2.2"
s.add_development_dependency "mocha"

0 comments on commit b923c9e

Please sign in to comment.