.gitignore @@ -8,10 +8,10 @@ module ActiveAttributes #:nodoc: def attr_order(*attributes) class << self - attr_accessor :original_ordered_attributes + attr_accessor :default_ordered_attributes - def ordered_attributes(custom_attributes = nil) - ordered_attributes = custom_attributes || self.original_ordered_attributes + def ordered_attributes(*custom_attributes) + ordered_attributes = custom_attributes.empty? ? self.default_ordered_attributes : custom_attributes.flatten attributes = [] ordered_attributes.each do |attribute| if self.respond_to?(:attribute_groups) && childs = self.attribute_groups[attribute] @@ -24,7 +24,7 @@ module ActiveAttributes #:nodoc: end end - self.original_ordered_attributes = attributes + self.default_ordered_attributes = attributes end lib/ordinary_attributes.rb @@ -30,9 +30,13 @@ describe Company, ".ordered_attributes" do Company.ordered_attributes.should == [:name, :street, :zip, :city] end - it "should return custom attributes" do + it "should return custom attributes, when passed as array" do Company.ordered_attributes([:street, :zip, :city]).should == [:street, :zip, :city] end + + it "should return custom attributes, when passed as arguments" do + Company.ordered_attributes(:street, :zip, :city).should == [:street, :zip, :city] + end end @@ -62,8 +66,12 @@ describe Person, ".ordered_attributes with group in group" do Person.ordered_attributes([:address]).should == [:street, :zip, :city] end - it "should return group in group attributes" do + it "should return group in group attributes, when passed as array" do Person.ordered_attributes([:all]).should == [:street, :zip, :city, :name] end + + it "should return group in group attributes, when passed as argument" do + Person.ordered_attributes(:all).should == [:street, :zip, :city, :name] + end end \ No newline at end of file spec/attr_order_spec.rb spec/debug.log aea10859dfeec95e5560147914c7e1817c16d0e6 Steffen Hiller shiller@local.(none) http://github.com/steffen/ordered_attributes/commit/8812450365ca0cb2800648f06129b1ad62b20d26 8812450365ca0cb2800648f06129b1ad62b20d26 2008-04-29T07:17:40-07:00 2008-04-29T07:17:40-07:00 Added feature that allows passing custom attributes as arguments instead as an array. Also added .gitignore file to ignore spec/debug.log 7acd9874063eebe58b072cf851c519b9c65d6074 Steffen Hiller shiller@local.(none)