frosty_meadow 0.0.2 → 0.0.3

data/lib/frosty_meadow.rb

@@ -1,35 +1,35 @@
+require 'json'
+
 class FrostyMeadow
 	def self.generate params = {}
-		adjectives = (params[:adjectives].nil?)? self.get_default_words[:adjectives] : params[:adjectives]
-		nouns = (params[:nouns].nil?)? self.get_default_words[:nouns] : params[:nouns]
+		words = get_words params
 
-		result = "#{adjectives[rand(adjectives.length)]} #{nouns[rand(nouns.length)]}"
+		adjectives = words['adjectives']
+		nouns      = words['nouns']
 
-		return (params[:underscored].nil? || params[:underscored] == false)? result : self.to_underscored(result)
+		result = "#{adjectives[rand(adjectives.length)]} #{nouns[rand(nouns.length)]}"
+		
+		return (params[:underscored] && self.to_underscored(result)) || result
 	end
 
 	def self.to_underscored result
 		result.gsub(/ +/, '_')
 	end
 
-	def self.get_default_words
-		{:adjectives => ["autumn", "hidden", "bitter", "misty", "silent", "empty", "dry", "dark",
-	    "summer", "icy", "delicate", "quiet", "white", "cool", "spring", "winter",
-	    "patient", "twilight", "dawn", "crimson", "wispy", "weathered", "blue",
-	    "billowing", "broken", "cold", "damp", "falling", "frosty", "green",
-	    "long", "late", "lingering", "bold", "little", "morning", "muddy", "old",
-	    "red", "rough", "still", "small", "sparkling", "throbbing", "shy",
-	    "wandering", "withered", "wild", "black", "young", "holy", "solitary",
-	    "fragrant", "aged", "snowy", "proud", "floral", "restless", "divine",
-	    "polished", "ancient", "purple", "lively", "nameless"],
-	     :nouns => ["waterfall", "river", "breeze", "moon", "rain", "wind", "sea", "morning",
-	    "snow", "lake", "sunset", "pine", "shadow", "leaf", "dawn", "glitter",
-	    "forest", "hill", "cloud", "meadow", "sun", "glade", "bird", "brook",
-	    "butterfly", "bush", "dew", "dust", "field", "fire", "flower", "firefly",
-	    "feather", "grass", "haze", "mountain", "night", "pond", "darkness",
-	    "snowflake", "silence", "sound", "sky", "shape", "surf", "thunder",
-	    "violet", "water", "wildflower", "wave", "water", "resonance", "sun",
-	    "wood", "dream", "cherry", "tree", "fog", "frost", "voice", "paper",
-	    "frog", "smoke", "star"]}
+	def self.get_words params = {}
+		file_path =  File.join(File.dirname(__FILE__), 'data/words.json')
+		file = File.new file_path, "r"
+
+		file_contents = ""
+		while line = file.gets
+			file_contents << line
+		end
+
+		words = JSON.parse(file_contents)
+
+		words['adjectives'] = params[:adjectives] unless params[:adjectives].nil?
+		words['nouns'] = params[:nouns] unless params[:nouns].nil?
+
+		return words
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frosty_meadow
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: