Extract method to build a data source

app/models/ahoy/chart.rb

@@ -26,19 +26,17 @@ module Ahoy
     end
 
     def self.active_events_data_points
-      ds = Ahoy::DataSource.new
+      Ahoy::DataSource.build do |data_source|
-
+        active_event_names.map { |event_name| new(event_name) }.each do |chart|
-      active_event_names.map { |event_name| new(event_name) }.each do |chart|
+          data_source.add chart.title, chart.data
-        ds.add chart.title, chart.data
+        end
       end
-
-      ds.build
     end
 
     def data_points
-      ds = Ahoy::DataSource.new
+      Ahoy::DataSource.build do |data_source|
-      ds.add title, data
+        data_source.add title, data
-      ds.build
+      end
     end
 
     def title

app/models/ahoy/data_source.rb

@@ -4,6 +4,10 @@
 
 module Ahoy
   class DataSource
+    def self.build(&block)
+      new.tap { |data_source| block.call(data_source) }.build
+    end
+
     # Adds a collection with the datasource
     # Name is the name of the collection and will be showed in the
     # chart