Merge pull request #651 from ignat-zakrevsky/minor-candidates-each-up…

…date

Make Candidates#each iterable without block.

lib/friendly_id/candidates.rb

@@ -23,6 +23,9 @@ def each(*args, &block)
       unless pre_candidates.all? {|x| reserved?(x)}
         pre_candidates.reject! {|x| reserved?(x)}
       end
+
+      return pre_candidates unless block_given?
+
       pre_candidates.each {|x| yield x}
     end
 

test/candidates_test.rb

@@ -114,4 +114,30 @@ def slug_candidates
     end
   end
 
+  test "allows to iterate through candidates without passing block" do
+    klass = Class.new model_class do
+      def slug_candidates
+        :name
+      end
+    end
+    with_instances_of klass do |_, city|
+      candidates = FriendlyId::Candidates.new(city, city.slug_candidates)
+      assert_equal candidates.each, ['new-york']
+    end
+  end
+
+  test "iterates through candidates with passed block" do
+    klass = Class.new model_class do
+      def slug_candidates
+        :name
+      end
+    end
+    with_instances_of klass do |_, city|
+      collected_candidates = []
+      candidates = FriendlyId::Candidates.new(city, city.slug_candidates)
+      candidates.each { |candidate| collected_candidates << candidate }
+      assert_equal collected_candidates, ['new-york']
+    end
+  end
+
 end