add expiry parameter

app/controllers/artists_controller.rb

@@ -44,7 +44,7 @@ class ArtistsController < ApplicationController
       end
       format.json do
         render :json => @artists.to_json(:include => [:urls])
-        expires_in 7.days
+        expires_in params[:expiry].to_i.days if params[:expiry]
       end
     end
   end
@@ -109,7 +109,7 @@ class ArtistsController < ApplicationController
       end
       format.json do
         render :json => @artists.to_json(:include => [:sorted_urls])
-        expires_in 7.days
+        expires_in params[:expiry].to_i.days if params[:expiry]
       end
     end
   end

app/controllers/pools_controller.rb

@@ -24,7 +24,7 @@ class PoolsController < ApplicationController
       end
       format.json do
         render json: @pool.to_json
-        expires_in 7.days
+        expires_in params[:expiry].to_i.days if params[:expiry]
       end
     end
   end

app/controllers/users_controller.rb

@@ -28,8 +28,8 @@ class UsersController < ApplicationController
           render :xml => @users.to_xml(:root => "users")
         end
         format.json do
-          render json: @user.to_json
-          expires_in 7.days
+          render json: @users.to_json
+          expires_in params[:expiry].to_i.days if params[:expiry]
         end
       end
     end

app/controllers/wiki_pages_controller.rb

@@ -31,7 +31,7 @@ class WikiPagesController < ApplicationController
       end
       format.json do
         render json: @wiki_pages.to_json
-        expires_in 7.days
+        expires_in params[:expiry].to_i.days if params[:expiry]
       end
     end
   end