frosty_meadow 2.1.0 → 2.2.0

data/lib/frosty_meadow.rb

@@ -3,7 +3,7 @@ require 'json'
 module FrostyMeadow
 	module Version
     	MAJOR  = 2
-    	MINOR  = 1
+    	MINOR  = 2
     	PATCH  = 0
 
     	FULL = [MAJOR, MINOR, PATCH].join('.')
@@ -25,6 +25,7 @@ module FrostyMeadow
 
   	class << self
   		@@words = []
+  		@@cached_path = ''
 
 		def generate params = {}
 			words = get_words params
@@ -43,8 +44,13 @@ module FrostyMeadow
 
 		def get_words params = {}
 
-			if @@words.empty?
-				file_path =  File.join(File.dirname(__FILE__), 'data/words.json')
+			if @@words.empty? || !params[:skip_cache].nil? || params[:from_file] != @@cached_path
+				if params[:from_file].nil?
+					file_path =  File.join(File.dirname(__FILE__), 'data/words.json')
+				else
+					file_path = params[:from_file]
+				end
+
 				file = File.new file_path, "r"
 
 				file_contents = ""
@@ -53,7 +59,9 @@ module FrostyMeadow
 				end
 
 				words 	= JSON.parse(file_contents)
-				@@words = words
+
+				@@words 	  = words
+				@@cached_path = file_path
 			else
 				words = @@words
 			end
@@ -64,8 +72,8 @@ module FrostyMeadow
 			return words
 		end
 
-		def generate_hex_name 
-			generated_string = self.generate(:separator => '-')
+		def generate_hex_name params = {}
+			generated_string = self.generate({:separator => '-'}.merge(params))
 
 			return "#{generated_string}-#{self::Hex.generate}"
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frosty_meadow
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies: []
 description: This gem will generate a random name for your server, much in the way
   Heroku does.