improved api

Author: Simon Funke

app/controllers/country_maps_controller.rb

@@ -2,7 +2,7 @@ class CountryMapsController < ApplicationController
   # GET /country_maps
   # GET /country_maps.json
   def index
-    @country_maps = CountryMap.all
+    @country_maps = CountryMap.select([:name]).all
 
     respond_to do |format|
       format.html # index.html.erb

app/controllers/country_measurements_controller.rb

@@ -2,7 +2,16 @@ class CountryMeasurementsController < ApplicationController
   # GET /country_measurements
   # GET /country_measurements.json
   def index
-    @country_measurements = CountryMeasurement.where(:country => params["country_map_id"])
+    if params["country"].nil?
+      @country_measurements = CountryMeasurement.select([:month, :NumberOfClientsSplitByClientAndByServer]).all
+    else
+      country = CountryMap.find_by_name(params["country"])
+      if country.nil?
+        @country_measurements = []
+      else 
+        @country_measurements = CountryMeasurement.select([:month, :NumberOfClientsSplitByClientAndByServer]).where(:country => country.id)
+      end
+    end
 
     respond_to do |format|
       format.html # index.html.erb