From 18403cbc29e06968f1cdf8c652ac559377a8456d Mon Sep 17 00:00:00 2001
From: Adrian Short <adrian.short@gmail.com>
Date: Fri, 22 Feb 2013 13:12:34 +0000
Subject: [PATCH] Rename get and get_all methods to fetch and fetch_all

---
 app/controllers/feeds_controller.rb | 4 ++--
 app/models/feed.rb                  | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
index 77573f6..54d2497 100644
--- a/app/controllers/feeds_controller.rb
+++ b/app/controllers/feeds_controller.rb
@@ -87,12 +87,12 @@ class FeedsController < ApplicationController
   
   def fetch
     @feed = Feed.find(params[:id])
-    @feed.get
+    @feed.fetch
     redirect_to :back, notice: 'Feed fetched OK'
   end
   
   def fetch_all
-    Feed.get_all
+    Feed.fetch_all
     redirect_to :back, notice: 'All feeds fetched OK'
   end
 end
diff --git a/app/models/feed.rb b/app/models/feed.rb
index 9271d1f..ab6ee2f 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -5,15 +5,19 @@ class Feed < ActiveRecord::Base
   validates_format_of :feed_url, :with => URI::regexp(%w(http https)), :message => "must be a valid URL"
   
   after_create  :get
+  after_create  :fetch
   
   # Fetch and parse feed contents from web
 
   def self.get_all
     Feed.all.each { |f| f.get }
+  def self.fetch_all
+    Feed.all.each { |f| f.fetch }
   end
 
   def get
     puts "Fetching feed: #{@url}"
+  def fetch
     Feedzirra::Feed.add_common_feed_entry_element('georss:point', :as => :point)
     Feedzirra::Feed.add_common_feed_entry_element('geo:lat', :as => :geo_lat)
     Feedzirra::Feed.add_common_feed_entry_element('geo:long', :as => :geo_long)