feed_us_grabber 0.1.14 → 0.1.15

data/README.rdoc

@@ -1,3 +1,4 @@
+=begin
 = feed_us_grabber
 
 == ENVIRONEMNT
@@ -56,15 +57,20 @@ Follow these steps to download and install the feed_us_grabber gem:
 		</table>
 
 == CLEARING CACHE
-		To clear cache goto following url
-			http://rails_app/FeedUsGrabber
-		1. Clear a specific cache group
-			http://rails_app/FeedUsGrabber?cachecommand=clear&group=demo
-												OR
+To clear cache goto following url
+	http://rails_app/FeedUsGrabber
+* Clear a specific cache group
+	http://rails_app/FeedUsGrabber?cachecommand=clear&group=demo
+										OR
 
-			http://rails_app/FeedUsGrabber?group=demo
-		2. Clear entire cache
-			http://rails_app/FeedUsGrabber?cachecommand=clearall
+	http://rails_app/FeedUsGrabber?group=demo
+* Clear entire cache
+	http://rails_app/FeedUsGrabber?cachecommand=clearall
+
+:Note that if you receive a failure message that your IP is not authorized to clear the cache, add your IP to the ClientWhiteList in your controller (replace 127.0.0.0 with your IP, visit http://whatismyip.com/)
+def index
+	@grabber = feedUsGrabber(:FeedUsURL => 'http://render.feed.us/Feed.aspx?g=00767d50-bde8-e111-9875-4040419a7f04', :ClientWhiteList => '127.0.0.1')
+end
 
 == LOCATION OF CACHE
 		Cache is maintained under RAILS_ROOT/tmp
@@ -86,4 +92,4 @@ Follow these steps to download and install the feed_us_grabber gem:
 
 Copyright (c) 2012 Cliff G. See LICENSE.txt for
 further details.
-
+=end

data/lib/app/controllers/feed_us_grabber_controller.rb

@@ -5,63 +5,76 @@ include FeedUsGrabberHelper
 
 class FeedUsGrabberController < ActionController::Base
 	def index
-	  def initialize
-        # Client ip check. Can remove all ip's to turn off the check. 
-		# ! IMPORTANT: TO DISABLE THIS CHECK SET BOTH ARRAYS TO nil 
-	    @mClientWhiteList = [ "75.126.108.226", "75.126.107.10", "127.0.0.1", "50.56.95.92" ]		
-	    @mClientHostNameWhileList = [ "app.feed.us", "request.feed.us", "feed.us", "classic.syndication.feed.us", "render.feed.us", "dev.feed.us", "stage.feed.us", "localhost"]  
-		@mClientIp
-	  end
-	
-	  args = {}
-	  
-	  # URL that will be checked for connectivity before clearing the cache (phone home)
-	  args[:FeedUsURL] = 'http://render.feed.us/grabberdefault.htm?phonehome=true'	 	
-	  
-	  unless params[:cachecommand].nil?
-	    args[:CacheCommand] = params[:cachecommand]
-	  end
-	  unless params[:group].nil?
-	    args[:FeedUsCacheGroup] = params[:group]
-	  end
-	  
-	  if args[:FeedUsCacheGroup]  && args[:CacheCommand].nil?
-	    args[:CacheCommand] = 'clear'
-	  end
-    
-    if args[:CacheCommand].nil?
-      args[:CacheCommand] = 'clearall'
-    end
+		def initialize
+			# Client ip check. Can remove all ip's to turn off the check. 
+			# ! IMPORTANT: TO DISABLE THIS CHECK SET BOTH ARRAYS TO nil 
+			@mClientWhiteList = [ "75.126.108.226", "75.126.107.10", "127.0.0.1", "50.56.95.92" ]		
+			@mClientHostNameWhileList = [ "app.feed.us", "request.feed.us", "feed.us", "classic.syndication.feed.us", "render.feed.us", "dev.feed.us", "stage.feed.us", "localhost"]  
+			@mClientIp
+		end
+
+		args = {}
+
+		# URL that will be checked for connectivity before clearing the cache (phone home)
+		args[:FeedUsURL] = 'http://render.feed.us/grabberdefault.htm?phonehome=true'	 			
+
+		unless params[:cachecommand].nil?
+			args[:CacheCommand] = params[:cachecommand]
+		end
+		unless params[:group].nil?
+			args[:FeedUsCacheGroup] = params[:group]
+		end
+		args[:DebugOutput] = ""
+		args[:Debug] = false
+		unless params[:debug].nil?
+			args[:Debug] = params[:debug] == "1"
+		end	  
+
+		if args[:FeedUsCacheGroup]  && args[:CacheCommand].nil?
+			args[:CacheCommand] = 'clear'
+		end
     
-    if args[:CacheCommand] == 'clear' && args[:FeedUsCacheGroup]
-      fetch = true
-    else
-      fetch = false
-    end
-    if args[:CacheCommand] == 'clearall' || args[:CacheCommand] == CACHE_COMMAND_FORCE
-      fetch = true
-    end
-	
-	# Client ip check
-	isPermittedToProceed = IsPermittedToProceed()
-	
-	if isPermittedToProceed == false
-		render :text=> "<img src=\"http://feed.us/images/feedus_logo_people.png\"><br />
-				<p style=\"font-family:arial;\"> IP " + @mClientIp + " is not authorized.  Modify the feed_us_grabber_controller @mClientWhiteList array if this IP should have access."
-	else	
-		if fetch == true 
-		  feedUsGrabber(args)
-			  render :text => "<img src=\"http://feed.us/images/feedus_logo_people.png\"><br />
-			<p style=\"font-family:arial;\">Congratulations!  You have successfully refreshed your content.</p>
-				<p style=\"font-family:arial;\"><a href=\"/\">Home</a></p>"
+		if args[:CacheCommand].nil?
+		  args[:CacheCommand] = 'clearall'
+		end
+		
+		if args[:CacheCommand] == 'clear' && args[:FeedUsCacheGroup]
+		  fetch = true
+		else
+		  fetch = false
+		end
+		if args[:CacheCommand] == 'clearall' || args[:CacheCommand] == CACHE_COMMAND_FORCE
+		  fetch = true
+		end
+		
+		# Client ip check
+		isPermittedToProceed = IsPermittedToProceed(args)
+		
+		renderText = ""
+		if isPermittedToProceed == false
+			renderText = "<img src=\"http://feed.us/images/feedus_logo_people.png\"><br />
+					<p style=\"font-family:arial;\"> IP " + @mClientIp + " is not authorized.  Modify the feed_us_grabber_controller @mClientWhiteList array if this IP should have access. "				
+		else	
+			if fetch == true 
+				feedUsGrabber(args)
+				renderText = "<img src=\"http://feed.us/images/feedus_logo_people.png\"><br />
+				<p style=\"font-family:arial;\">Congratulations!  You have successfully refreshed your content.</p>
+				<p style=\"font-family:arial;\"><a href=\"/\">Home</a></p> "
 			else
-			  render :text=> "<img src=\"http://feed.us/images/feedus_logo_people.png\"><br />
-				<p style=\"font-family:arial;\"> Please specify cachecommand=clear&group=GROUPNAME or cachecommand=clearall or cachecommand=force_clear_all in the URL"
+				renderText = "<img src=\"http://feed.us/images/feedus_logo_people.png\"><br />
+				<p style=\"font-family:arial;\"> Please specify cachecommand=clear&group=GROUPNAME or cachecommand=clearall or cachecommand=force_clear_all in the URL</p> "
 			end
 		end
+		
+		if args[:Debug] == true
+			renderText << args[:DebugOutput]
+			renderText << @mClientWhiteList.to_s	
+		end
+		
+		render :text=> renderText
 	end
 	
-	def IsPermittedToProceed()				
+	def IsPermittedToProceed(args)			
 		isPermitted = false
 		@mClientIp = request.remote_addr	
 		
@@ -69,7 +82,7 @@ class FeedUsGrabberController < ActionController::Base
 			@mClientIp = request.env["HTTP_X_FORWARDED_FOR"]
 		end
 				
-		isPermitted = IsClientIpInWhiteList()
+		isPermitted = IsClientIpInWhiteList(args)
 		
 		if isPermitted == false
 			if @mClientHostNameWhileList.nil? == false
@@ -93,25 +106,37 @@ class FeedUsGrabberController < ActionController::Base
 			if @mClientIp == "" || @mClientIp.nil?
 				@mClientIp = request.env["X-Forwarded-For"]
 			end			
-			isPermitted = IsClientIpInWhiteList()
+			isPermitted = IsClientIpInWhiteList(args)
 			puts "Trace: Try to use fwd header = #{@mClientIp}"	
 			puts "Trace: using fwd header isPermitted = #{isPermitted}"	
 		end
 		
+		# Set the Debug flag - do not want to output Debug info if not permitted
+		if isPermitted == false
+			args[:Debug] = false
+		end
+		
 		puts "Trace: mClientIp = #{@mClientIp}"		
 		puts "Trace: returning is permitted true"
-		# TODO: temp code that always returns true
-		return true
-		
-		#return isPermitted
+		args[:DebugOutput] << "Debug: mClientIp = #{@mClientIp}"
+
+		return isPermitted
 	end
 	
-	def IsClientIpInWhiteList()
-		included = false
+	def IsClientIpInWhiteList(args)
+		included = false		
 		if @mClientWhiteList.nil? && @mClientHostNameWhileList.nil?
 			included = true
-		elsif @mClientWhiteList.nil? == false && @mClientWhiteList.include?(@mClientIp) == true
-			included = true
+		else	
+			# User can specify additional IP's to add to whitelist				
+			configuredClientWhiteList = FeedUsGrabber.new.getClientWhiteList
+			unless configuredClientWhiteList.nil? || configuredClientWhiteList.empty?			
+				@mClientWhiteList.push(configuredClientWhiteList)
+			end
+
+			if @mClientWhiteList.nil? == false && @mClientWhiteList.include?(@mClientIp) == true
+				included = true
+			end
 		end
 		return included
 	end

data/lib/app/helpers/feed_us_grabber_helper.rb

@@ -1,12 +1,12 @@
 module FeedUsGrabberHelper
-	def feedUsGrabber(params)
+  def feedUsGrabber(params)
     grabber = FeedUsGrabber.new
-    
+
     unless params[:CacheCommand].nil?
       grabber.setCacheCommand(params[:CacheCommand])
     end
-   unless params[:FeedUsCacheGroup].nil?
-      grabber.setCacheGroup(params[:FeedUsCacheGroup])      
+    unless params[:FeedUsCacheGroup].nil?
+      grabber.setCacheGroup(params[:FeedUsCacheGroup])
     end
     unless params[:FeedUsCacheFolder].nil?
       grabber.setCacheFolder(params[:FeedUsCacheFolder])
@@ -21,17 +21,21 @@ module FeedUsGrabberHelper
     unless params[:FeedUsURL].nil?
       grabber.setDynURL(params[:FeedUsURL])
       if params[:includeFlag] == true
-  			grabber.setIncludeFlag(true)
-  		else
-  			grabber.setIncludeFlag(false)
-  		end
+        grabber.setIncludeFlag(true)
+      else
+        grabber.setIncludeFlag(false)
+      end
+    end
+
+    unless params[:ClientWhiteList].nil?
+      grabber.setClientWhiteList(params[:ClientWhiteList])
     end
-    
+
     grabber.autoCacheToFile()
     grabber
-	end
-	
-	def feedUsGrabberRender(grabber)
-	    grabber.renderCacheFromFile.to_s.html_safe
-	end
+  end
+
+  def feedUsGrabberRender(grabber)
+    grabber.renderCacheFromFile.to_s.html_safe
+  end
 end

data/lib/app/models/feed_us_grabber.rb

@@ -11,186 +11,224 @@ require 'fileutils'
 
 
 class FeedUsGrabber
-  def initialize
-    @mintCacheIntervalUnit = CI_FOREVER
-    @mstrCacheFolder = File.join(Rails.root.to_s,'tmp','CachedWebContent')
-    @mstrCacheFileExt = ".cache"
-	@mstrCacheGroup = ""	
-  end
-  
-  def setCacheGroup(param)
-    @mstrCacheGroup = param
-  end
-  
-  
-  
-  def setCacheFolder(param) 
+	def initialize
+		@mintCacheIntervalUnit = CI_FOREVER
+		@mstrCacheFolder = File.join(Rails.root.to_s,'tmp','CachedWebContent')
+		@mstrCacheFileExt = ".cache"
+		@mstrCacheGroup = ""
+		@mstrStateFile = File.join(Rails.root.to_s,'tmp','FeedUsGrabberState')
+		@mstrClientWhiteList = ""
+	end
+
+	def setCacheGroup(param)
+		@mstrCacheGroup = param
+	end
+
+	def setCacheFolder(param)
 		@mstrCacheFolder = param
-  end
-  
-  
-  
-  def setCacheIntervalUnit(param) 
+	end
+
+	def setCacheIntervalUnit(param)
 		@mintCacheIntervalUnit = param
-  end
-	
-	
-	
+	end
+
 	def getCacheIntervalUnit
 		@mintCacheIntervalUnit
 	end
-	
-	def setCacheFileExt(strNewValue) 
-    @mstrCacheFileExt = strNewValue
-  end
-	
-	def setCacheCommand(strNewValue) 
-	  @mstrCacheCommand = strNewValue
-  end
-  
-  def getCacheCommand
+
+	def setCacheFileExt(strNewValue)
+		@mstrCacheFileExt = strNewValue
+	end
+
+	def setCacheCommand(strNewValue)
+		@mstrCacheCommand = strNewValue
+	end
+
+	def getCacheCommand
 		@mstrCacheCommand
 	end
-	
+
 	def getCacheFolder
 		@mstrCacheFolder
 	end
-	
-	def setIncludeFlag(strNewValue) 
+
+	def setIncludeFlag(strNewValue)
 		@mblnInclude = $strNewValue
 	end
-	
-  def getIncludeFlag
+
+	def getIncludeFlag
 		@mblnInclude
 	end
-	
+
 	def getCacheGroup
 		@mstrCacheGroup
 	end
 	def getCachedFileName
-	  @getCachedFileName
+		@getCachedFileName
 	end
-	
-	def setCacheIntervalLength(param) 
+
+	def setCacheIntervalLength(param)
 		@mintCacheIntervalLength = param
-  end
-	
+	end
+
 	def getCacheIntervalLength
-    @mintCacheIntervalLength
+		@mintCacheIntervalLength
 	end
-	
-	def setDynURL(param) 
-			@mstrDynURL = param
-			self.getCacheNames(param)
-  end
-  
-  def getDynURL
-			@mstrDynURL
-	end
-  
-  def getCacheNames(sURL) 
-    if (sURL =~ /\?/) > 0
-      base = sURL.split('?')[0]
-      params = sURL.split('?')[1]
-    else
-      base = sURL
-      params = ''
-    end
-		#strip off the file extension	
+
+	def setDynURL(param)
+		@mstrDynURL = param
+		self.getCacheNames(param)
+	end
+
+	def setClientWhiteList(param)
+		# Use file to store state across requests
+		@mstrClientWhiteList = param
+		self.saveState
+	end
+
+	def getClientWhiteList
+		self.readState
+		@mstrClientWhiteList
+	end
+
+	def getDynURL
+		@mstrDynURL
+	end
+
+	def getCacheNames(sURL)
+		if (sURL =~ /\?/) > 0
+			base = sURL.split('?')[0]
+			params = sURL.split('?')[1]
+		else
+			base = sURL
+			params = ''
+		end
+		#strip off the file extension
 		base = base.chomp(File.extname(base))
-    base.sub!('http://','')
-    base.gsub!(/[\?:\/\.]/,'_')
+		base.sub!('http://','')
+		base.gsub!(/[\?:\/\.]/,'_')
 		@mstrScriptBaseName = base
-    @mstrCacheFileQualifiers = self.getCacheFileQualifiers(params)
+		@mstrCacheFileQualifiers = self.getCacheFileQualifiers(params)
 		@mstrCachedFileName =File.join( @mstrCacheFolder,
-		                                @mstrCacheGroup,
-		                                @mstrScriptBaseName + "_" + @mstrCacheFileQualifiers + @mstrCacheFileExt)
+		@mstrCacheGroup,
+		@mstrScriptBaseName + "_" + @mstrCacheFileQualifiers + @mstrCacheFileExt)
 		@mstrCachedFileNameShort = @mstrScriptBaseName + "_" + @mstrCacheFileQualifiers + @mstrCacheFileExt
 	end
-	
-	def getCacheFileQualifiers(strURLParams)		
-		strResults = nil
-		strSeparator = "_"
-    strResults  = '_' + strURLParams.gsub(/[=&%\.\/:]+/,'_')
+
+	def getCacheFileQualifiers(strURLParams)
+		strResults = nil		
+		strResults  = '_' + strURLParams.gsub(/[=&%\.\/:]+/,'_')
 		strResults
 	end
-	
-	def autoCacheToFile	
+
+	def autoCacheToFile
 		puts "trace: start autoCacheToFile.  bIsPostBack = #{@bIsPostBack}"
 		if @bIsPostBack
-		  return
+			return
 		end
-		
+
 		puts "trace: mstrCacheCommand = #{@mstrCacheCommand}"
 		if @mstrCacheCommand.nil? || @mstrCacheCommand == ''
-		  if (!self.cachedFileExists) or self.cacheFileIsExpired
-		    self.createCacheFile
-		  end
+			if (!self.cachedFileExists) or self.cacheFileIsExpired
+				self.createCacheFile
+			end
 		else
-		  if @mstrCacheCommand == "clear"
-			if @mstrCacheGroup != ''
-				self.clearCacheGroupFiles(@mstrCacheGroup)
+			if @mstrCacheCommand == "clear"
+				if @mstrCacheGroup != ''
+					self.clearCacheGroupFiles(@mstrCacheGroup)
+				end
+			end
+			if @mstrCacheCommand == 'clearall' || @mstrCacheCommand == CACHE_COMMAND_FORCE
+				self.clearAllCachedFiles
 			end
-		  end
-		  if @mstrCacheCommand == 'clearall' || @mstrCacheCommand == CACHE_COMMAND_FORCE
-		    self.clearAllCachedFiles
-		  end
 		end
 	end
-	
+
 	def cachedFileExists()
-	  File.readable?(@mstrCachedFileName)
+		File.readable?(@mstrCachedFileName)
 	end
-	
+
 	def cacheFileIsExpired()
 		# Ruby 1.9.x Time.parse expects d/m/y
 		strDate = File.mtime(@mstrCachedFileName).strftime('%d/%m/%Y %I:%M:%S %p')
 		case @mintCacheIntervalUnit
-	    when CI_MINUTES then strUnit = 'n'
-	    when CI_HOURS then strUnit = 'h'
-	    when CI_DAYS then strUnit = 'd'
-      when CI_FOREVER then return false
+		when CI_MINUTES then strUnit = 'n'
+		when CI_HOURS then strUnit = 'h'
+		when CI_DAYS then strUnit = 'd'
+		when CI_FOREVER then return false
 		end
-		
+
 		if self.datediff(strUnit,strDate,Time.now().strftime('%d/%m/%Y %I:%M:%S %p')) > @mintCacheIntervalLength
-		  return true
+			return true
 		else
-		  return false
+			return false
 		end
 	end
 	
-	def createCacheFile()
-		strDynURL = @mstrDynURL					
+	def saveState
+		if (!self.stateFileExists)
+			self.createStateFile
+		end
+		self.writeStateFile
+	end
+
+	def readState()		
+		readStateFile
+	end
+
+	def createStateFile()
+		File.new(@mstrStateFile,'w')
+	end
+
+	def readStateFile()	
+		if (self.stateFileExists)			
+			File.open(@mstrStateFile, "r").each_line do |line|
+				@mstrClientWhiteList = line
+			end	
+		end
+	end
+
+	def writeStateFile
+		File.open(@mstrStateFile,'w') do |file|
+			file.write(@mstrClientWhiteList)
+		end
+	end
+
+	def stateFileExists()
+		File.readable?(@mstrStateFile)
+	end
+
+	def createCacheFile()		
 		sFile = @mstrCachedFileName
 		# Fetch the url
 		begin
-		  r = Net::HTTP.get_response(URI.parse(@mstrDynURL))
+			r = Net::HTTP.get_response(URI.parse(@mstrDynURL))
 		rescue
-		  logfile = File.open(File.join(Rails.root.to_s,'log','FeedUsGrabber.log'),'a');
-		  grabber_logger = FeedUsGrabberLogger.new(logfile)
+			logfile = File.open(File.join(Rails.root.to_s,'log','FeedUsGrabber.log'),'a');
+			grabber_logger = FeedUsGrabberLogger.new(logfile)
 
-		  grabber_logger.error("Unable to fetch URL #{@mstrDynURL}")
-		  logfile.close
-		  return;
+			grabber_logger.error("Unable to fetch URL #{@mstrDynURL}")
+			logfile.close
+			return;
 		end
 
 		if self.makeDirectory(File.join(@mstrCacheFolder,@mstrCacheGroup))
-		  File.open(sFile,'w') do |file|
-  		  file.write(r.body)  
-  		end
-  		return true
+			File.open(sFile,'w') do |file|
+				file.write(r.body)
+			end
+			return true
 		end
 		return false
-  end
-  
+	end
+
 	def makeDirectory(dir, mode = 0755)
 		if File.directory?(dir) || FileUtils.mkdir(dir)
-		  return true
+			return true
 		end
 		return false
 	end
-	
-	def datediff(interval, datefrom, dateto, using_timestamps = false) 
+
+	def datediff(interval, datefrom, dateto, using_timestamps = false)
 		#$interval can be:
 		#yyyy - Number of full years
 		#q - Number of full quarters
@@ -203,106 +241,106 @@ class FeedUsGrabber
 		#h - Number of full hours
 		#n - Number of full minutes
 		#s - Number of full seconds (default)
-		
-		unless using_timestamps	
-		  datefrom = Time.parse(datefrom).to_i
-		  dateto = Time.parse(dateto).to_i
+
+		unless using_timestamps
+			datefrom = Time.parse(datefrom).to_i
+			dateto = Time.parse(dateto).to_i
 		end
-		
+
 		difference = dateto - datefrom  # Difference in seconds
-	  if interval == 'd'
-	    	datediff = (difference / 86400).floor
-	  elsif interval == 'h'
-	    datediff = (difference / 3600).floor
-    elsif interval == 'n'
-      datediff = (difference / 60).floor
-    else
-      datediff = difference
-	  end
-	  datediff
+		if interval == 'd'
+			datediff = (difference / 86400).floor
+		elsif interval == 'h'
+			datediff = (difference / 3600).floor
+		elsif interval == 'n'
+			datediff = (difference / 60).floor
+		else
+			datediff = difference
+		end
+		datediff
 	end
-	
+
 	def renderCacheFromFile
 		sFile = @mstrCachedFileName
 		data = ''
 		begin
-		  File.open(sFile,'r') do |file|
-		    while temp_data = file.gets
-		      data = data + temp_data
-		    end
-      end
-      data
-    rescue
-      logfile = File.open(File.join(Rails.root.to_s,'log','FeedUsGrabber.log'),'a');
-  		grabber_logger = FeedUsGrabberLogger.new(logfile)
-		  grabber_logger.error("Unable to render/open #{@mstrCachedFileName}")
-		  logfile.close
-    end
+			File.open(sFile,'r') do |file|
+				while temp_data = file.gets
+					data = data + temp_data
+				end
+			end
+			data
+		rescue
+			logfile = File.open(File.join(Rails.root.to_s,'log','FeedUsGrabber.log'),'a');
+			grabber_logger = FeedUsGrabberLogger.new(logfile)
+			grabber_logger.error("Unable to render/open #{@mstrCachedFileName}")
+			logfile.close
+		end
 	end
-	
-	
+
+
 	def clearCacheGroupFiles(group)
-	  if group == '.' || group == '..'
-	    logfile = File.open(File.join(Rails.root.to_s,'log','FeedUsGrabber.log'),'a');
-  		grabber_logger = FeedUsGrabberLogger.new(logfile)
-		  grabber_logger.warn("someone requested to delete . OR .. ")
-		  logfile.close
-	    return
-	  end
-	  logfile = File.open(File.join(Rails.root.to_s,'log','FeedUsGrabber.log'),'a');
+		if group == '.' || group == '..'
+			logfile = File.open(File.join(Rails.root.to_s,'log','FeedUsGrabber.log'),'a');
+			grabber_logger = FeedUsGrabberLogger.new(logfile)
+			grabber_logger.warn("someone requested to delete . OR .. ")
+			logfile.close
+			return
+		end
+		logfile = File.open(File.join(Rails.root.to_s,'log','FeedUsGrabber.log'),'a');
 		grabber_logger = FeedUsGrabberLogger.new(logfile)
-	  grabber_logger.info("Clearing cache at group  #{group} at path #{File.join(@mstrCacheFolder,group)}")
-	  logfile.close
-	  self.clearCacheFolder(File.join(@mstrCacheFolder,group))
-  end
-  
-  def clearAllCachedFiles
-	# For testing heroku logging	
-	puts "Trace: Clearing all caches at path = #{@mstrCacheFolder}"
-    logfile = File.open(File.join(Rails.root.to_s,'log','FeedUsGrabber.log'),'a');
-	grabber_logger = FeedUsGrabberLogger.new(logfile)
-	grabber_logger.info("Clearing all caches at path #{@mstrCacheFolder}")
-	logfile.close
-    self.clearCacheFolder(@mstrCacheFolder);
-	end
-  
-  def clearCacheFolder(folder)
-	canConnect = canConnectToFeedUs()	
-	
-	if canConnect == true
-		puts "Trace: clear cache folder can connect"
-		FileUtils.rm_r Dir.glob("#{folder}/*")
-	else
-		logError("Unable to connect to Feed.Us. Cache will not be cleared. URL that was checked: #{@mstrDynURL}")
-	end
-  end
-  
-  def canConnectToFeedUs()	
-	# Used for phone home check
-	canConnect = false	
-	
-	if @mstrCacheCommand == CACHE_COMMAND_FORCE 
-		canConnect = true
-	else
-		begin
-			r = Net::HTTP.get_response(URI.parse(@mstrDynURL))
-			if r.body.nil? == false && r.body != ERROR_RESPONSE
-				canConnect = true
-			end			
-		rescue
-		  logError("Unable to connect to Feed.Us.  Cache will not be cleared. URL #{@mstrDynURL}")	   
+		grabber_logger.info("Clearing cache at group  #{group} at path #{File.join(@mstrCacheFolder,group)}")
+		logfile.close
+		self.clearCacheFolder(File.join(@mstrCacheFolder,group))
+	end
+
+	def clearAllCachedFiles
+		# For testing heroku logging
+		puts "Trace: Clearing all caches at path = #{@mstrCacheFolder}"
+		logfile = File.open(File.join(Rails.root.to_s,'log','FeedUsGrabber.log'),'a');
+		grabber_logger = FeedUsGrabberLogger.new(logfile)
+		grabber_logger.info("Clearing all caches at path #{@mstrCacheFolder}")
+		logfile.close
+		self.clearCacheFolder(@mstrCacheFolder);
+	end
+
+	def clearCacheFolder(folder)
+		canConnect = canConnectToFeedUs()
+
+		if canConnect == true
+			puts "Trace: clear cache folder can connect"
+			FileUtils.rm_r Dir.glob("#{folder}/*")
+		else
+			logError("Unable to connect to Feed.Us. Cache will not be cleared. URL that was checked: #{@mstrDynURL}")
+		end
+	end
+
+	def canConnectToFeedUs()
+		# Used for phone home check
+		canConnect = false
+
+		if @mstrCacheCommand == CACHE_COMMAND_FORCE
+			canConnect = true
+		else
+			begin
+				r = Net::HTTP.get_response(URI.parse(@mstrDynURL))
+				if r.body.nil? == false && r.body != ERROR_RESPONSE
+					canConnect = true
+				end
+			rescue
+				logError("Unable to connect to Feed.Us.  Cache will not be cleared. URL #{@mstrDynURL}")
+			end
 		end
+
+		return canConnect;
 	end
-  	
-    return canConnect; 
-  end
-  
-  def logError(contents)
-    logfile = File.open(File.join(Rails.root.to_s,'log','FeedUsGrabber.log'),'a');
-    grabber_logger = FeedUsGrabberLogger.new(logfile)
-
-    grabber_logger.error(contents)
-    logfile.close	  
-  end
-			
+
+	def logError(contents)
+		logfile = File.open(File.join(Rails.root.to_s,'log','FeedUsGrabber.log'),'a');
+		grabber_logger = FeedUsGrabberLogger.new(logfile)
+
+		grabber_logger.error(contents)
+		logfile.close
+	end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feed_us_grabber
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -124,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 413069715
+      hash: -873202771
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: