Lazy-load category members

lib/riki/category.rb

@@ -10,34 +10,20 @@ def find_by_title(titles)
         result = []
         Array(titles).each do |title|
           cat = Category.new(title)
-
-          # Group results by type so we can call the finders coarse-grained
-          retrieve_categories(title).find('m:categorymembers/m:cm').group_by{|cm| cm['type']}.each do |type, members|
-            # TODO Store proxies instead of full-fledged objects in order to keep them lighweight
-            cat.members.concat(members.map{|cm| cm['title']})
-          end
-
-          result << cat          
+          cat.members = retrieve_categories(title).find('m:categorymembers/m:cm')
+          result << cat
         end
-        
+
         result
       end
 
       private
-
-      CLASS_MAP = {
-        'subcat' => Category
-      }
-
-      def class_for(type)
-        CLASS_MAP[type] || Riki.const_get(type.classify)
-      end
-
-      def retrieve_categories(title)        
+
+      def retrieve_categories(title)
         parms = {'action'  => 'query',
                  'list'    => 'categorymembers',
                  'cmtitle' => title["Category:"] ? title : "Category:#{title}",
-                 'cmprop'  => ['title', 'type'].join('|'),
+                 'cmprop'  => ['title', 'type', 'timestamp'].join('|'),
                  'cmlimit' => 100,
                 }
         api_request(parms).first.find_first('/m:api/m:query')
@@ -53,8 +39,23 @@ def initialize(title)
     end
 
     def members
-      # TODO Resolve category and page proxies
-      @members
+      result = []
+
+      @members.group_by{|cm| cm['type']}.each do |type, members|
+        result.concat(class_for(type).find_by_title(members.map{|cm| cm['title']}))
+      end
+
+      result
+    end
+
+    private
+
+    CLASS_MAP = {
+      'subcat' => Category
+    }
+
+    def class_for(type)
+      CLASS_MAP[type] || Riki.const_get(type.classify)
     end
   end
 end