refactor out User object until i figure out a better solution

Author: Austin Schneider

Gemfile

@@ -6,7 +6,6 @@ gem 'haml-rails', '0.3.4'
 gem 'jquery-rails', '1.0.16'
 gem 'formalize-rails', '0.0.5'
 gem 'httparty', '0.8.1'
-gem 'decent_exposure', '1.0.1'
 gem 'squeel', '0.9.3'
 gem 'resque', git: 'git://github.com/defunkt/resque.git' # waiting for 1.19.1
 gem 'resque-scheduler', '1.9.9'

Gemfile.lock

@@ -75,7 +75,6 @@ GEM
       cucumber (>= 1.1.1)
       nokogiri (>= 1.5.0)
     database_cleaner (0.6.7)
-    decent_exposure (1.0.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     execjs (1.2.9)
@@ -248,7 +247,6 @@ DEPENDENCIES
   coffee-rails (~> 3.1.1)
   cucumber-rails (~> 1.2.0)
   database_cleaner (~> 0.6.7)
-  decent_exposure (= 1.0.1)
   factory_girl_rails (~> 1.3.0)
   faker (~> 1.0.1)
   foreman (>= 0.25.0)

app/controllers/alerts_controller.rb

@@ -9,9 +9,15 @@ def create
     respond_with alert, location: alerts_url
   end
 
+##################################################
+
   # TODO: test
   def alert
-    @alert ||= current_user.build_alert(params)
+    @alert ||= begin
+      attrs = params[:alert] || {}
+      attrs[:location_id] = params[:location_id] if params[:location_id].present?
+      Alert.new attrs
+    end
   end
 
 end

app/controllers/application_controller.rb

@@ -2,6 +2,4 @@ class ApplicationController < ActionController::Base
 
   protect_from_forgery
 
-  expose(:current_user) { User.new }
-
 end

app/controllers/email_callbacks_controller.rb

@@ -2,16 +2,16 @@ class EmailCallbacksController < ApplicationController
 
   respond_to :html
 
-  expose :email_callback
+  helper_method :email_callback
 
   def create
-    current_user.save_email_callback email_callback
+    email_callback.save
     respond_with email_callback, location: email_callbacks_url
   end
 
   def update
     email_callback.attributes = params[:email_callback]
-    current_user.save_email_callback email_callback
+    email_callback.save
     respond_with email_callback, location: email_callbacks_url
   end
 
@@ -20,4 +20,17 @@ def destroy
     respond_with email_callback
   end
 
+##################################################
+
+  # TODO: test
+  def email_callback
+    @email_callback ||= begin
+      if params[:id]
+        EmailCallback.find params[:id]
+      else
+        EmailCallback.new params[:email_callback]
+      end
+    end
+  end
+
 end

app/controllers/locations_controller.rb

@@ -2,16 +2,16 @@ class LocationsController < ApplicationController
 
   respond_to :html
 
-  expose :location
+  helper_method :location
 
   def create
-    current_user.save_location location
+    location.save_and_schedule_ping!
     respond_with location
   end
 
   def update
     location.attributes = params[:location]
-    current_user.save_location location
+    location.save_and_schedule_ping!
     respond_with location
   end
 
@@ -20,4 +20,17 @@ def destroy
     respond_with location
   end
 
+##################################################
+
+  # TODO: test
+  def location
+    @location ||= begin
+      if params[:id]
+        Location.find params[:id]
+      else
+        Location.new params[:location]
+      end
+    end
+  end
+
 end

lib/pinger/location.rb

@@ -34,6 +34,11 @@ def http_method=(value)
     self[:http_method] = value ? value.to_s.downcase : nil
   end
 
+  # TODO: test
+  def save_and_schedule_ping!
+    transaction { schedule_ping! if save }
+  end
+
   def schedule_ping!
     last_ping_at = pings.order { performed_at.desc }.first.try :performed_at
     next_ping_to_schedule.schedule! ((last_ping_at || Time.now) + seconds)

lib/pinger/user.rb

@@ -2,18 +2,47 @@
 
 describe AlertsController do
 
-  describe "POST create" do
-    before { controller.stub(:respond_with) { controller.render text: '' } }
+  describe "collection actions" do
+    subject { controller }
 
-    it "saves the alert" do
-      controller.alert.should_receive(:save)
-      post :create
+    describe "POST create" do
+      before { subject.stub(:respond_with) { subject.render text: '' } }
+
+      it "saves the alert" do
+        subject.alert.should_receive(:save)
+        post :create
+      end
+
+      it "tells the controller to respond with the alert" do
+        subject.should_receive(:respond_with).with subject.alert,
+          location: alerts_url
+        post :create
+      end
     end
+  end
+
+  describe "instance methods" do
+    subject { controller }
+
+    describe "alert" do
+      [
+        [{:location_id => '234'}, {:location_id => '234'}],
+        [{:location_id => ''}, {}],
+        [{:location_id => nil}, {}],
+        [{}, {}],
+        [{:alert => {:foo => 'bar'}}, {:foo => 'bar'}],
+        [{:alert => {:foo => 'bar'}, :location_id => 'foo'}, {:foo => 'bar', :location_id => 'foo'}]
+      ].each do |params, attrs|
+        context "when the params is #{params.inspect}" do
+          before do
+            @alert = mock(Alert)
+            subject.stub(:params) { params }
+            Alert.stub(:new) { |args| @alert if args == attrs }
+          end
 
-    it "tells the controller to respond with the alert" do
-      controller.should_receive(:respond_with).with controller.alert,
-        location: alerts_url
-      post :create
+          it { subject.alert.should == @alert }
+        end
+      end
     end
   end
 

spec/controllers/alerts_controller_spec.rb

@@ -5,8 +5,8 @@
   describe "POST create" do
     before { controller.stub(:respond_with) { controller.render text: '' } }
 
-    it "tells the user to save the email callback" do
-      controller.current_user.should_receive(:save_email_callback).with controller.email_callback
+    it "tells the email callback to save" do
+      controller.email_callback.should_receive(:save)
       post :create
     end
 
@@ -32,8 +32,8 @@
         put :update, @params
       end
 
-      it "tells the current_user to save the email callback" do
-        subject.current_user.should_receive(:save_email_callback).with @email_callback
+      it "tells the email callback to save" do
+        subject.email_callback.should_receive(:save)
         put :update, @params
       end
 

spec/controllers/email_callbacks_controller_spec.rb

@@ -11,8 +11,8 @@
       subject.stub(:location) { @location }
     end
 
-    it "tells the current_user to save the location" do
-      subject.current_user.should_receive(:save_location).with @location
+    it "tells the location to save and schedule a ping" do
+      subject.location.should_receive :save_and_schedule_ping!
       post :create, @params
     end
 

spec/controllers/locations_controller/collection_actions_spec.rb

@@ -17,8 +17,8 @@
       put :update, @params
     end
 
-    it "tells the current_user to save the location" do
-      subject.current_user.should_receive(:save_location).with @location
+    it "tells the location to save and schedule a ping" do
+      subject.location.should_receive(:save_and_schedule_ping!)
       put :update, @params
     end