@@ -1,5 +1,7 @@ == master +* Update to enumerate_by 0.4.1's #fast_bootstrap for speed boost + == 0.5.0 / 2009-04-30 * Replace acts_as_enumeration with enumerate_by CHANGELOG.rdoc @@ -60,4 +60,4 @@ To run against a specific version of Rails: == Dependencies * Rails 2.3 or later -* enumerate_by[http://github.com/pluginaweek/enumerate_by] +* enumerate_by[http://github.com/pluginaweek/enumerate_by] 0.4.1 or later README.rdoc @@ -13,7 +13,7 @@ spec = Gem::Specification.new do |s| s.require_path = 'lib' s.has_rdoc = true s.test_files = Dir['test/**/*_test.rb'] - s.add_dependency 'enumerate_by', '>= 0.4.0' + s.add_dependency 'enumerate_by', '>= 0.4.1' s.author = 'Aaron Pfeifer' s.email = 'aaron@pluginaweek.org' Rakefile @@ -45,11 +45,18 @@ class Country < ActiveRecord::Base alias_attribute :abbreviation_3, :alpha_3_code def initialize(attributes = nil) #:nodoc: - super - self.official_name ||= name unless attributes && attributes.include?(:official_name) + super(self.class.with_defaults(attributes)) end - fast_bootstrap( + # Adds the default attributes for the given country attributes + def self.with_defaults(attributes = nil) + attributes ||= {} + attributes.symbolize_keys! + attributes[:official_name] = attributes[:name] unless attributes.include?(:official_name) + attributes + end + + fast_bootstrap([ {:id => 4, :name => "Afghanistan", :official_name => "Islamic Republic of Afghanistan", :alpha_2_code => 'AF', :alpha_3_code => 'AFG'}, {:id => 8, :name => "Albania", :official_name => "Republic of Albania", :alpha_2_code => 'AL', :alpha_3_code => 'ALB'}, {:id => 10, :name => "Antarctica", :alpha_2_code => 'AQ', :alpha_3_code => 'ATA'}, @@ -296,5 +303,5 @@ class Country < ActiveRecord::Base {:id => 882, :name => "Samoa", :official_name => "Independent State of Samoa", :alpha_2_code => 'WS', :alpha_3_code => 'WSM'}, {:id => 887, :name => "Yemen", :official_name => "Republic of Yemen", :alpha_2_code => 'YE', :alpha_3_code => 'YEM'}, {:id => 894, :name => "Zambia", :official_name => "Republic of Zambia", :alpha_2_code => 'ZM', :alpha_3_code => 'ZMB'} - ) + ].map {|attributes| with_defaults(attributes)}) end app/models/country.rb @@ -43,13 +43,25 @@ class Region < ActiveRecord::Base validates_length_of :abbreviation, :within => 1..5 def initialize(attributes = nil) #:nodoc: - super + super(self.class.with_defaults(attributes)) + end + + # Adds the default attributes for the given country attributes + def self.with_defaults(attributes = nil) + attributes ||= {} + attributes.symbolize_keys! + + country = attributes.delete(:country) + attributes[:country_id] = country.id if country + attributes[:abbreviation] = "%03d" % (attributes[:id] % 1000) if !attributes.include?(:abbreviation) && attributes[:id] + + country ||= attributes[:country_id] && Country.find(attributes[:country_id]) + attributes[:code] = "#{country}-#{attributes[:abbreviation]}" - self.abbreviation = "%03d" % (attributes[:id] % 1000) if attributes && !attributes.include?(:abbreviation) && attributes[:id] - self.code = "#{country}-#{abbreviation}" + attributes end - fast_bootstrap( + fast_bootstrap([ # Andorra [{:country => Country['AD']}].map {|r| [ r.merge(:id => 20002, :name => "Canillo"), @@ -5380,5 +5392,5 @@ class Region < ActiveRecord::Base r.merge(:id => 716009, :name => "Matabeleland South", :abbreviation => 'MS'), r.merge(:id => 716010, :name => "Midlands", :abbreviation => 'MI') ]} - ) + ].flatten.map {|attributes| with_defaults(attributes)}) end app/models/region.rb @@ -44,9 +44,10 @@ class CountryTest < ActiveRecord::TestCase assert country.errors.invalid?(:name) end - def test_should_not_require_an_official_name + def test_should_require_an_official_name country = new_country(:official_name => nil) - assert country.valid? + assert !country.valid? + assert country.errors.invalid?(:official_name) end def test_should_require_an_alpha_2_code test/unit/country_test.rb b20f9d13e3fa1868f8098e206bfebfac5c303086 Aaron Pfeifer aaron.pfeifer@gmail.com http://github.com/pluginaweek/has_addresses/commit/1809b97fa1d95578e06905dcb15e3acc94492426 1809b97fa1d95578e06905dcb15e3acc94492426 2009-05-01T17:59:14-07:00 2009-05-01T17:59:14-07:00 Update to enumerate_by 0.4.1's #fast_bootstrap for speed boost 2e2eabe145eed6f66aae8ad616ba04384ec6a0dd Aaron Pfeifer aaron.pfeifer@gmail.com