frosty_meadow 1.1.0 → 1.2.0

data/lib/frosty_meadow.rb

@@ -3,7 +3,7 @@ require 'json'
 module FrostyMeadow
 	module Version
     	MAJOR = 1
-    	MINOR = 1
+    	MINOR = 2
     	PATCH  = 0
 
     	FULL = [MAJOR, MINOR, PATCH].join('.')
@@ -15,45 +15,47 @@ module FrostyMeadow
     	end
   	end
 
-	def self.generate params = {}
-		words = get_words params
+  	class << self
+		def generate params = {}
+			words = get_words params
 
-		adjectives = words['adjectives']
-		nouns      = words['nouns']
+			adjectives = words['adjectives']
+			nouns      = words['nouns']
 
-		result = "#{adjectives[rand(adjectives.length)]} #{nouns[rand(nouns.length)]}"
-		
-		return (params[:separator] && self.seperate(result, params[:separator])) || result
-	end
+			result = "#{adjectives[rand(adjectives.length)]} #{nouns[rand(nouns.length)]}"
+			
+			return (params[:separator] && self.seperate(result, params[:separator])) || result
+		end
 
-	def self.seperate result, separator
-		result.gsub(/ +/, separator)
-	end
+		def seperate result, separator
+			result.gsub(/ +/, separator)
+		end
 
-	def self.get_words params = {}
-		file_path =  File.join(File.dirname(__FILE__), 'data/words.json')
-		file = File.new file_path, "r"
+		def 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
+			file_contents = ""
+			while line = file.gets
+				file_contents << line
+			end
 
-		words = JSON.parse(file_contents)
+			words = JSON.parse(file_contents)
 
-		words['adjectives'] = params[:adjectives] unless params[:adjectives].nil?
-		words['nouns'] = params[:nouns] unless params[:nouns].nil?
+			words['adjectives'] = params[:adjectives] unless params[:adjectives].nil?
+			words['nouns'] = params[:nouns] unless params[:nouns].nil?
 
-		return words
-	end
+			return words
+		end
 
-	def self.generate_hex_name
-		generated_string = self.generate(:separator => '-')
+		def generate_hex_name
+			generated_string = self.generate(:separator => '-')
 
-		return "#{generated_string}-#{self.hex_string}"
-	end
+			return "#{generated_string}-#{self.hex_string}"
+		end
 
-	def self.hex_string length=5
-		((0..length).map{rand(256).chr}*"").unpack("H*")[0][0,length]
+		def hex_string length=5
+			((0..length).map{rand(256).chr}*"").unpack("H*")[0][0,length]
+		end
 	end
 end

metadata

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