attributes_sort 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/attributes_sort.rb

@@ -2,29 +2,34 @@ module AttributesSort
   def self.included(receiver)
     receiver.instance_eval do
       def build_attributes(attributes)
-        "[" + attributes.map!{|attribute| "object.#{attribute}"}.join(",") + "]"
+        "[" << attributes.map!{|attribute| "object.#{attribute}"}.join(",") << "]"
       end
 
       def do_attributes_sort(collection, attributes)
-        attributes = build_attributes(attributes)
-        collection.sort_by{|object| eval(attributes)}
+				attribute_array_string = build_attributes(attributes)
+        collection.sort_by{|object| eval(attribute_array_string)}
       end
     end
     Array.class_eval do
+			def sortable_attributes?
+				self.all? {|object| @attributes.all?{|attribute| object.respond_to?(attribute)}}
+			end
+
       def class_type
         klass = self.first.class
-        is_same = self.all?{|object| object.class == klass}
-        raise "All objects must be of the same class type" unless is_same
+
+        #use duck type check respond to check instead				
+        #is_same = self.all?{|object| object.class == klass}
+				#raise "All objects must be of the same class type" unless is_same
+
+				raise "All objects must respond to sort criteria"unless sortable_attributes?	
         klass
       end
 
       def attr_sort(options = {})
-        raise "You must pass in sort_by criteria" unless attributes = options[:sort_by]
-        begin
-          class_type.do_attributes_sort(self, attributes)
-        rescue NoMethodError
-          raise "You must sort by an attribute that exists in the object that you are sorting"
-        end
+				@attributes = options[:sort_by]
+        raise "You must pass in sort_by criteria" unless @attributes 
+        class_type.do_attributes_sort(self, @attributes)
       end
     end
   end

data/spec/attributes_sort_spec.rb

@@ -67,14 +67,31 @@ describe "AttributesSort" do
     lambda {test_sort(nil, [@p1, @p2, @p5, @p4, @p3])}.should raise_error("You must pass in sort_by criteria")
   end
 
-  it "raise error if criteria is not a valid attribute of class" do
-    lambda {test_sort([:blah], [@p1, @p2, @p5, @p4, @p3])}.should raise_error("You must sort by an attribute that exists in the object that you are sorting")
+  it "raise error object does not respond to method call" do
+    lambda {test_sort([:blah], [@p1, @p2, @p5, @p4, @p3])}.should raise_error("All objects must respond to sort criteria")
   end
 
   it "raise error if objects are not of same class type" do
+		pending "using duck type check instead"
     @people << "some other object"
     lambda {test_sort([:age],[@p1, @p2, @p5, @p4, @p3])}.should raise_error("All objects must be of the same class type")
   end
 
+	class Dog
+		attr_accessor :firstname,:lastname,:age
+
+		def initialize(firstname="",lastname="",age=0)
+			@firstname = firstname
+			@lastname = lastname
+			@age = age
+		end
+	end
+
+	it "duck typed objects can be sorted as long as they all respond to same methods" do
+		dog = Dog.new("fido", "zib", 7)
+		@people << dog    
+		test_sort([:lastname,:firstname,:age], [@p2, @p1, @p5, @p4, @p3, dog])		
+	end
+
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Karmen Blake
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -07:00
+date: 2010-03-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency