simple_weather 0.0.2 → 0.0.3

data/lib/simple_weather.rb

@@ -4,25 +4,9 @@ require 'net/http'
 
 # api key from wunderground: 7b1e71b12f5535c0
 module SimpleWeather
-	class << self
-		attr_accessor :configuration
-	end
-
-	def self.configuration
-		@configuration ||= Configuration.new
-	end
-
-	def self.configure
-		yield(configuration)
-	end
-
-	class Configuration
-		attr_accessor :last_update, :conditions
-
-		def initialize
-			@last_update = Time.now
-			@conditions = {}
-		end
+	def self.initialize
+		@last_update = Time.now
+		@conditions = {}
 	end
 	
 	def self.included(base)
@@ -31,46 +15,41 @@ module SimpleWeather
 		base.send :include, InstanceMethods
 	end
 
-	module ClassMethods
-	end
-
-	module InstanceMethods
-		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)
-			
-			if @conditions.has_key? 'error'
-				raise 'Web service error'
-			end
-		end                   
-		
-		def getImageUrl  
-			@conditions['current_observation']['icon_url'] 
-		end	
+	def self.updateWeather(city = 'MD/College Park')
+		base_url = 'http://api.wunderground.com/api/'
+		api_key = '7b1e71b12f5535c0'
+		query = '/conditions/q/'
+		format = '.json'
 		
-		def getWeather
-			@conditions['current_observation']['weather']
-		end
-		
-		def getTemp_f
-			@conditions['current_observation']['temp_f']
-		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)
+
+		@conditions = JSON.parse(data)
 		
-		def getTemp_c
-			@conditions['current_observation']['temp_c']
+		if @conditions.has_key? 'error'
+			raise 'Web service error'
 		end
+	end                   
 		
-		def getFeelsLike
-			@conditions['current_observation']['fellslike_string']
-		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']
 	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_weather
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-08-12 00:00:00.000000000 Z
 dependencies: []
 description: A simple weather gem
 email: ye.yicheng123@gmail.com