Permalink
Browse files

Cleaning up the 3.1 series.

  • Loading branch information...
cfis committed May 27, 2011
1 parent 8a57777 commit 280cee01caf0bc5a79b9daca118b08e6e594c152
View
@@ -1,7 +1,7 @@
-== 3.1.7 2011-05-26
+== 3.1.8 2011-05-26
* Fix calling clear on a HABTM associate (David Rueck)
-== 3.1.7 2011-05-?
+== 3.1.7 2011-05-26
* Support regular AR models having one or many composite models (Jacques Fuentes)
* Minor test cleanup
* Make version requirements more explicit
@@ -26,6 +26,5 @@ Gem::Specification.new do |s|
# Dependencies
s.required_ruby_version = '>= 1.8.7'
s.add_dependency('activerecord', '~> 3.0.0', '>= 3.0.5')
- s.add_dependency('activerecord', '>= 3.0.5', '~> 3.0.0')
s.add_development_dependency "rspec"
end
@@ -24,12 +24,11 @@
$:.unshift(File.dirname(__FILE__)) unless
$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
- gem 'arel', '~> 2.0.0'
+unless defined?(ActiveRecord)
+ require 'rubygems'
gem 'activerecord', '>= 3.0.5', '~> 3.0.0'
require 'active_record'
-require 'rubygems'
-gem 'activerecord', '~> 3.0.0', '>= 3.0.5'
-require 'active_record'
+end
require 'active_record/associations.rb'
require 'active_record/associations/association_proxy.rb'
@@ -2,7 +2,7 @@ module CompositePrimaryKeys
module VERSION #:nodoc:
MAJOR = 3
MINOR = 1
- TINY = 7
+ TINY = 8
STRING = [MAJOR, MINOR, TINY].join('.')
end
end
@@ -160,7 +160,7 @@ def test_has_and_belongs_to_many
assert_equal 2, @restaurant.suburbs.size
end
- def test_hbtm_clear
+ def test_habtm_clear
@restaurant = Restaurant.find([1,1])
assert_equal 2, @restaurant.suburbs.size
@restaurant.suburbs.clear

0 comments on commit 280cee0

Please sign in to comment.