0
@@ -150,10 +150,13 @@ class Flickr
0
 
0
   # Implements flickr.groups.search
0
   def groups(group_name, options={})
0
-    groups_search({"text" => group_name}.merge(options))['groups']['group'].collect { |group| Group.new( "id" => group['nsid'], 
0
-                                                                                                         "name" => group['name'], 
0
-                                                                                                         "eighteenplus" => group['eighteenplus'],
0
-                                                                                                         "client" => self) }
0
+    collection = groups_search({"text" => group_name}.merge(options))['groups']['group']
0
+    collection = [collection] if collection.is_a? Hash
0
+    
0
+    collection.collect { |group| Group.new( "id" => group['nsid'], 
0
+                                            "name" => group['name'], 
0
+                                            "eighteenplus" => group['eighteenplus'],
0
+                                            "client" => self) }
0
   end
0
   
0
   # Implements flickr.tags.getRelated
0
@@ -283,10 +286,12 @@ class Flickr
0
         
0
     # Implements flickr.people.getPublicGroups
0
     def groups
0
-      @client.people_getPublicGroups('user_id'=>@id)['groups']['group'].collect { |group| Group.new( "id" => group['nsid'], 
0
-                                                                                                     "name" => group['name'],
0
-                                                                                                     "eighteenplus" => group['eighteenplus'],
0
-                                                                                                     "client" => @client) }
0
+      collection = @client.people_getPublicGroups('user_id'=>@id)['groups']['group']
0
+      collection = [collection] if collection.is_a? Hash
0
+      collection.collect { |group| Group.new( "id" => group['nsid'], 
0
+                                           "name" => group['name'],
0
+                                           "eighteenplus" => group['eighteenplus'],
0
+                                           "client" => @client) }
0
     end
0
     
0
     # Implements flickr.people.getPublicPhotos. Options hash allows you to add

0
@@ -235,6 +235,14 @@ class TestFlickr < Test::Unit::TestCase
0
     assert_equal f, group.client
0
   end
0
   
0
+  def test_should_instantiate_groups_from_search_response_with_single_group_returned
0
+    f = flickr_client
0
+    f.stubs(:request).returns(dummy_single_group_response)
0
+    assert_kind_of Array, groups = f.groups("foo")
0
+    assert_equal 1, groups.size
0
+    assert_equal "group1", groups.first.id
0
+  end
0
+  
0
   # ##### DIRECT MODE
0
   # 
0
   # def test_test_echo
0
@@ -329,6 +337,13 @@ class TestFlickr < Test::Unit::TestCase
0
     assert_equal f, group.client
0
   end
0
   
0
+  def test_should_instantiate_users_public_groups_when_only_one_returned
0
+    f = flickr_client
0
+    f.stubs(:request).returns(dummy_single_group_response)
0
+    user = new_user( 'client' => f )
0
+    groups = user.groups
0
+    assert_equal 1, groups.size
0
+  end
0
   # def test_getInfo
0
   #   @u.getInfo
0
   #   assert_equal @username, @u.username
0
@@ -774,6 +789,14 @@ class TestFlickr < Test::Unit::TestCase
0
            "eighteenplus" => "1"}] } }
0
   end
0
   
0
+  def dummy_single_group_response
0
+    { "groups" => 
0
+      { "group" => 
0
+        { "nsid" => "group1", 
0
+           "name" => "Group One", 
0
+           "eighteenplus" => "0" } } }
0
+  end
0
+  
0
   def successful_xml_response
0
     <<-EOF
0
       <?xml version="1.0" encoding="utf-8" ?>