simple_weather 0.0.3 → 0.0.4

data/lib/simple_weather.rb

@@ -4,52 +4,54 @@ require 'net/http'
 
 # api key from wunderground: 7b1e71b12f5535c0
 module SimpleWeather
-	def self.initialize
-		@last_update = Time.now
-		@conditions = {}
-	end
-	
-	def self.included(base)
-		SimpleWeather.configure { |c| nil }
-		base.extend ClassMethods
-		base.send :include, InstanceMethods
-	end
-
-	def self.updateWeather(city = 'MD/College Park')
-		base_url = 'http://api.wunderground.com/api/'
-		api_key = '7b1e71b12f5535c0'
-		query = '/conditions/q/'
-		format = '.json'
+	class Weather
+		def initialize
+			@last_update = Time.now
+			@conditions = {}
+		end
 		
-		url = URI.escape(base_url << api_key << query << city << format)
-		res = Net::HTTP.get_response(URI(url))
-		data = res.body if res.is_a?(Net::HTTPSuccess)
+		def included(base)
+			SimpleWeather.configure { |c| nil }
+			base.extend ClassMethods
+			base.send :include, InstanceMethods
+		end
+
+		def updateWeather(city = 'MD/College Park')
+			base_url = 'http://api.wunderground.com/api/'
+			api_key = '7b1e71b12f5535c0'
+			query = '/conditions/q/'
+			format = '.json'
+			
+			url = URI.escape(base_url << api_key << query << city << format)
+			res = Net::HTTP.get_response(URI(url))
+			data = res.body if res.is_a?(Net::HTTPSuccess)
 
-		@conditions = JSON.parse(data)
+			@conditions = JSON.parse(data)
+			
+			if @conditions.has_key? 'error'
+				raise 'Web service error'
+			end
+		end                   
+			
+		def getImageUrl  
+			@conditions['current_observation']['icon_url'] 
+		end	
 		
-		if @conditions.has_key? 'error'
-			raise 'Web service error'
+		def getWeather
+			@conditions['current_observation']['weather']
 		end
-	end                   
 		
-	def self.getImageUrl  
-		@conditions['current_observation']['icon_url'] 
-	end	
-	
-	def self.getWeather
-		@conditions['current_observation']['weather']
-	end
-	
-	def self.getTemp_f
-		@conditions['current_observation']['temp_f']
-	end
-	
-	def self.getTemp_c
-		@conditions['current_observation']['temp_c']
-	end
-	
-	def self.getFeelsLike
-		@conditions['current_observation']['fellslike_string']
+		def getTemp_f
+			@conditions['current_observation']['temp_f']
+		end
+		
+		def getTemp_c
+			@conditions['current_observation']['temp_c']
+		end
+		
+		def getFeelsLike
+			@conditions['current_observation']['fellslike_string']
+		end
 	end
 end
 

metadata

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