@@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = "from_param" - s.version = "1.0.2" - s.date = "2008-10-18" + s.version = "1.0.3" + s.date = "2008-10-21" s.summary = "Better convention for finding records based on parameters" s.homepage = "http://github.com/mbleigh/from_param/tree/master" s.description = "This plugin is an addition to ActiveRecord::Base that establishes a better from_param.gemspec @@ -53,8 +53,9 @@ class ActiveRecord::Base base_value = send "#{param_column}" send "#{param_column}=", "#{base_value}-#{i}" while(self.class.param_taken?(self)) - base_value = send "#{param_column}" - send "#{param_column}=", base_value.chop + (i+=1).to_s + # base_value = send "#{param_column}" + # send "#{param_column}=", base_value.chop + (i+=1).to_s + send "#{param_column}=", "#{base_value}-#{i+=1}" end end end lib/from_param.rb @@ -60,6 +60,7 @@ describe ActiveRecord::Base, "with from_param" do end it "should serialize the name as necessary to avoid collisions" do + ParameteredModel.destroy_all @paramed.name = "Dennis" @paramed.save @paramed2 = ParameteredModel.new @@ -74,4 +75,44 @@ describe ActiveRecord::Base, "with from_param" do @paramed4.param.should == "dennis-4" end + it "should serialize the name as necessary to avoid collisions" do + ParameteredModel.destroy_all + @paramed.name = "Dennis" + @paramed.save + @paramed2 = ParameteredModel.new + @paramed2.name = "Dennis" + @paramed2.save + @paramed3 = ParameteredModel.new + @paramed3.name = "Dennis" + @paramed3.save + @paramed4 = ParameteredModel.new + @paramed4.name = "Dennis" + @paramed4.save + @paramed5 = ParameteredModel.new + @paramed5.name = "Dennis" + @paramed5.save + @paramed6 = ParameteredModel.new + @paramed6.name = "Dennis" + @paramed6.save + @paramed7 = ParameteredModel.new + @paramed7.name = "Dennis" + @paramed7.save + @paramed8 = ParameteredModel.new + @paramed8.name = "Dennis" + @paramed8.save + @paramed9 = ParameteredModel.new + @paramed9.name = "Dennis" + @paramed9.save + @paramed10 = ParameteredModel.new + @paramed10.name = "Dennis" + @paramed10.save + @paramed11 = ParameteredModel.new + @paramed11.name = "Dennis" + @paramed11.save + @paramed12 = ParameteredModel.new + @paramed12.name = "Dennis" + @paramed12.save + @paramed12.param.should == "dennis-12" + end + end \ No newline at end of file spec/from_param_spec.rb 187a65224fc102626cdb86b1e0e3441951e15e2d Mike Gunderloy MikeG1@larkfarm.com http://github.com/ffmike/from_param/commit/1032d0ad47c6bc4ee499d22f2539a3d5ad15d28b 1032d0ad47c6bc4ee499d22f2539a3d5ad15d28b 2008-10-21T05:36:33-07:00 2008-10-21T05:36:33-07:00 Fix bug in serialization code used in case of parameter collision. 1eaed96ca8b5091cd77e18611217ca6e6a05585f Mike Gunderloy MikeG1@larkfarm.com