use Rails 1.8-style hash keys instead of 1.9

Robert Lail
1 parent b5d4395b
Showing 3 changed files with 17 additions and 17 deletions Show diff stats
app/controllers/api/v1/notices_controller.rb
app/controllers/api/v1/problems_controller.rb
spec/controllers/api/v1/problems_controller_spec.rb
@@ -11,12 +11,12 @@ class Api::V1::NoticesController &lt; ApplicationController
       query = {:created_at => {"$lte" => end_date, "$gte" => start_date}}
     end
-    results = benchmark("[api/v1/notices_controller] query time") { Mongoid.master["notices"].find(query, fields: fields).to_a }
+    results = benchmark("[api/v1/notices_controller] query time") { Mongoid.master["notices"].find(query, :fields => fields).to_a }
     respond_to do |format|
-      format.html { render json: Yajl.dump(results) } # render JSON if no extension specified on path
-      format.json { render json: Yajl.dump(results) }
-      format.xml  { render xml:  results }
+      format.html { render :json => Yajl.dump(results) } # render JSON if no extension specified on path
+      format.json { render :json => Yajl.dump(results) }
+      format.xml  { render :xml  => results }
     end
   end
@@ -11,12 +11,12 @@ class Api::V1::ProblemsController &lt; ApplicationController
       query = {:first_notice_at=>{"$lte"=>end_date}, "$or"=>[{:resolved_at=>nil}, {:resolved_at=>{"$gte"=>start_date}}]}
     end
-    results = benchmark("[api/v1/problems_controller] query time") { Mongoid.master["problems"].find(query, fields: fields).to_a }
+    results = benchmark("[api/v1/problems_controller] query time") { Mongoid.master["problems"].find(query, :fields => fields).to_a }
     respond_to do |format|
-      format.html { render json: Yajl.dump(results) } # render JSON if no extension specified on path
-      format.json { render json: Yajl.dump(results) }
-      format.xml  { render xml:  results }
+      format.html { render :json => Yajl.dump(results) } # render JSON if no extension specified on path
+      format.json { render :json => Yajl.dump(results) }
+      format.xml  { render :xml  => results }
     end
   end
@@ -9,26 +9,26 @@ describe Api::V1::ProblemsController do
     describe "GET /api/v1/problems" do
       before do
-        Fabricate(:problem, first_notice_at: Date.new(2012, 8, 01), resolved_at: Date.new(2012, 8, 02))
-        Fabricate(:problem, first_notice_at: Date.new(2012, 8, 01), resolved_at: Date.new(2012, 8, 21))
-        Fabricate(:problem, first_notice_at: Date.new(2012, 8, 21))
-        Fabricate(:problem, first_notice_at: Date.new(2012, 8, 30))
+        Fabricate(:problem, :first_notice_at => Date.new(2012, 8, 01), :resolved_at => Date.new(2012, 8, 02))
+        Fabricate(:problem, :first_notice_at => Date.new(2012, 8, 01), :resolved_at => Date.new(2012, 8, 21))
+        Fabricate(:problem, :first_notice_at => Date.new(2012, 8, 21))
+        Fabricate(:problem, :first_notice_at => Date.new(2012, 8, 30))
       end
       it "should return JSON if JSON is requested" do
-        get :index, auth_token: @user.authentication_token, format: "json"
+        get :index, :auth_token => @user.authentication_token, :format => "json"
         lambda { JSON.load(response.body) }.should_not raise_error(JSON::ParserError)
       end
       it "should return XML if XML is requested" do
-        get :index, auth_token: @user.authentication_token, format: "xml"
+        get :index, :auth_token => @user.authentication_token, :format => "xml"
         lambda { XML::Parser.string(response.body).parse }.should_not raise_error
       end
       it "should return JSON by default" do
-        get :index, auth_token: @user.authentication_token
+        get :index, :auth_token => @user.authentication_token
         lambda { JSON.load(response.body) }.should_not raise_error(JSON::ParserError)
       end
@@ -37,7 +37,7 @@ describe Api::V1::ProblemsController do
       describe "given a date range" do
         it "should return only the problems open during the date range" do
-          get :index, {auth_token: @user.authentication_token, start_date: "2012-08-20", end_date: "2012-08-27"}
+          get :index, {:auth_token => @user.authentication_token, :start_date => "2012-08-20", :end_date => "2012-08-27"}
           response.should be_success
           problems = JSON.load response.body
           problems.length.should == 2
@@ -46,7 +46,7 @@ describe Api::V1::ProblemsController do
       end
       it "should return all problems" do
-        get :index, {auth_token: @user.authentication_token}
+        get :index, {:auth_token => @user.authentication_token}
         response.should be_success
         problems = JSON.load response.body
         problems.length.should == 4