feed_us_grabber 1.0.2 → 1.0.3

data/README.rdoc

@@ -8,24 +8,24 @@ To be used with Rails 3.x and Ruby 1.9x.  We're proud of our software, and we wa
 
 Follow these steps to download and install the feed_us_grabber gem:
 	
-	1. In your rails application, edit your Gemfile to include:
+(1) In your rails application, edit your Gemfile to include:
 	gem 'feed_us_grabber'
 	
-	2. Run bundle install from the command line (this will download the feed_us_grabber to your environment)
+(2) Run bundle install from the command line (this will download the feed_us_grabber to your environment)
 	
-	3. Open config/routes.rb and add following line: 
+(3) Open config/routes.rb and add following line: 
 	match "rails_app/FeedUsGrabber" => "FeedUsGrabber#index"        
 	** where rails_app is the root URL to your application.  The match is case sensitive.
 	
-	4. Update environment.rb and include require 'net/http'
+(4) Update environment.rb and include require 'net/http'
 	
-	5. Your installation is complete
+(5) Your installation is complete
 
 == USAGE
-	1. Add following line to each controller (or app/controllers/application_controller.rb):
+(1) Add following line to each controller (or app/controllers/application_controller.rb):
 			include FeedUsGrabberHelper
 			
-	2. Add following code inside your controllers actions:
+(2) Add following code inside your controllers actions:
 	@grabber = feedUsGrabber(:FeedUsURL => '<FEED.US URL>',:FeedUsCacheInterval => FEED_INTERVAL, :FeedUsCacheIntervalLength => FEED_INTERVAL_LENGTH, :FeedUsCacheGroup => 'FEED CACHE GROUP NAME')
 
 		If you want to use FeedUsGrabber inside action index under controller "test" add following code inside action index of "test" controller
@@ -41,7 +41,7 @@ Follow these steps to download and install the feed_us_grabber gem:
 			@grabber = feedUsGrabber(:FeedUsURL => 'http://render.feed.us/Feed.aspx?g=00767d50-bde8-e111-9875-4040419a7f04')
 		end
 		
-	3. Inside the view of the action add the following code to render your content
+(3) Inside the view of the action add the following code to render your content
 		<%= feedUsGrabberRender @grabber %>
 			
 		Example
@@ -66,9 +66,12 @@ To clear cache goto following url
 * 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
+* Clear cache in specific folder
+	http://rails_app/FeedUsGrabber?cachecommand=clear&folder=myFolder (can also optionally include group=demo to clear the cache group demo under the myFolder directory)
+
+: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 (where xxx.xx.xx.xx is your IP)
 def index
-	@grabber = feedUsGrabber(:FeedUsURL => 'http://render.feed.us/Feed.aspx?g=00767d50-bde8-e111-9875-4040419a7f04', :ClientWhiteList => '127.0.0.1')
+	@grabber = feedUsGrabber(:FeedUsURL => 'http://render.feed.us/Feed.aspx?g=00767d50-bde8-e111-9875-4040419a7f04', :ClientWhiteList => 'xxx.xx.xx.xx') 
 end
 
 == LOCATION OF CACHE

data/lib/app/controllers/feed_us_grabber_controller.rb

@@ -27,6 +27,10 @@ class FeedUsGrabberController < ActionController::Base
 		unless params[:group].nil?
 			@mArgs[:FeedUsCacheGroup] = params[:group]
 		end
+
+		unless params[:folder].nil?
+			@mArgs[:FeedUsCacheFolder] = params[:folder]
+		end
 		
 		unless params[:debug].nil?
 			@mArgs[:Debug] = params[:debug] == "1"
@@ -42,6 +46,8 @@ class FeedUsGrabberController < ActionController::Base
 		
 		if @mArgs[:CacheCommand] == 'clear' && @mArgs[:FeedUsCacheGroup]
 		  fetch = true
+		elsif @mArgs[:CacheCommand] == 'clear' && @mArgs[:FeedUsCacheFolder]
+		  fetch = true
 		else
 		  fetch = false
 		end
@@ -125,11 +131,12 @@ class FeedUsGrabberController < ActionController::Base
 			included = true
 		else	
 			# User can specify additional IP's to add to whitelist				
-			configuredClientWhiteList = FeedUsGrabber.new.getClientWhiteList
+			grabber = FeedUsGrabber.new
+			configuredClientWhiteList = grabber.getClientWhiteList
 			unless configuredClientWhiteList.nil? || configuredClientWhiteList.empty?			
 				@mClientWhiteList.push(configuredClientWhiteList)
 			end
-
+			AddToDebugOutput(grabber.getDebugOutput)
 			AddToDebugOutput("Checking if IP #{@mClientIp} is in ClientWhiteList #{@mClientWhiteList.to_s}")	
 
 			if @mClientWhiteList.nil? == false && @mClientWhiteList.include?(@mClientIp) == true

data/lib/app/models/feed_us_grabber.rb

@@ -140,11 +140,13 @@ class FeedUsGrabber
 		if @mstrCacheCommand.nil? || @mstrCacheCommand == ''
 			if (!self.cachedFileExists) or self.cacheFileIsExpired
 				self.createCacheFile
-			end
+			end		
 		else
 			if @mstrCacheCommand == "clear"
 				if @mstrCacheGroup != ''
 					self.clearCacheGroupFiles(@mstrCacheGroup)
+				elsif @mstrCacheFolder
+					self.clearCacheFolder(@mstrCacheFolder)
 				end
 			end
 			if @mstrCacheCommand == 'clearall' || @mstrCacheCommand == CACHE_COMMAND_FORCE
@@ -234,7 +236,7 @@ class FeedUsGrabber
 	end
 
 	def makeDirectory(dir, mode = 0755)
-		if File.directory?(dir) || FileUtils.mkdir(dir)
+		if File.directory?(dir) || FileUtils.mkdir_p(dir)
 			return true
 		end
 		return false
@@ -286,7 +288,7 @@ class FeedUsGrabber
 			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
+			logfile.close			
 		end
 	end
 
@@ -299,19 +301,21 @@ class FeedUsGrabber
 			logfile.close
 			return
 		end
+		logMessage = "Clearing cache at group  #{group} at path #{File.join(@mstrCacheFolder,group)}"
+	 	appendDebugOutput(logMessage)
 		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)}")
+		grabber_logger.info(logMessage)
 		logfile.close
 		self.clearCacheFolder(File.join(@mstrCacheFolder,group))
 	end
 
 	def clearAllCachedFiles
-		# For testing heroku logging		
-		appendDebugOutput("Clearing all caches at path = #{@mstrCacheFolder}")			
+		logMessage = "Clearing all caches at path = #{@mstrCacheFolder}" 		
+		appendDebugOutput(logMessage)			
 		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}")
+		grabber_logger.info(logMessage)
 		logfile.close
 		self.clearCacheFolder(@mstrCacheFolder);
 	end
@@ -320,7 +324,7 @@ class FeedUsGrabber
 		canConnect = canConnectToFeedUs()
 
 		if canConnect == true
-			appendDebugOutput("Clear cache folder can connect")						
+			appendDebugOutput("Clear cache folder can connect, removing cache from #{folder}")						
 			FileUtils.rm_r Dir.glob("#{folder}/*")
 		else
 			logError("Unable to connect to Feed.Us. Cache will not be cleared. URL that was checked: #{@mstrDynURL}")
@@ -353,6 +357,7 @@ class FeedUsGrabber
 
 		grabber_logger.error(contents)
 		logfile.close
+		appendDebugOutput(contents)
 	end
 
 	def addToDebugOutput(debugOutput, info)	    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feed_us_grabber
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-21 00:00:00.000000000 Z
+date: 2013-04-28 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: 637896321
+      hash: -47287185
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: