Skip to content

Commit

Permalink
Cleaner variable stores
Browse files Browse the repository at this point in the history
  • Loading branch information
aspires committed May 3, 2012
1 parent c624b35 commit ef478ec
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions lib/gwx.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ def initialize(location)
end

def current
@current = Current.new(@wx)
@current ||= Current.new(@wx)
end

def information
@information = Information.new(@wx)
@information ||= Information.new(@wx)
end

def forecast
Expand Down
12 changes: 6 additions & 6 deletions lib/gwx/current_conditions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@ def initialize(wx)
end

def condition
@conditon = @current_conditions["condition"]["data"]
@conditon ||= @current_conditions["condition"]["data"]
end

def temp_f
@temp_f = @current_conditions["temp_f"]["data"].to_i
@temp_f ||= @current_conditions["temp_f"]["data"].to_i
end

def temp_c
@temp_c = @current_conditions["temp_c"]["data"].to_i
@temp_c ||= @current_conditions["temp_c"]["data"].to_i
end

def humidity
@humidity = @current_conditions["humidity"]["data"]
@humidity ||= @current_conditions["humidity"]["data"]
end

def icon
@icon = @current_conditions["icon"]["data"]
@icon ||= @current_conditions["icon"]["data"]
end

def wind_condition
@wind_condition = @current_conditions["wind_condition"]["data"]
@wind_condition ||= @current_conditions["wind_condition"]["data"]
end
end
14 changes: 7 additions & 7 deletions lib/gwx/forecast_information.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@ def initialize(wx)
end

def city
@city = @forecast_information["city"]["data"]
@city ||= @forecast_information["city"]["data"]
end

def postal_code
@postal_code = @forecast_information["city"]["data"]
@postal_code ||= @forecast_information["city"]["data"]
end

def latitude
@latitude = @forecast_information["latitude_e6"]["data"]
@latitude ||= @forecast_information["latitude_e6"]["data"]
end

def longitude
@longitude = @forecast_information["longitude_e6"]["data"]
@longitude ||= @forecast_information["longitude_e6"]["data"]
end

def forecast_date
@forecast_date = @forecast_information["forecast_time"]["data"]
@forecast_date ||= @forecast_information["forecast_time"]["data"]
end

def current_date_time
@current_date_time = @forecast_information["current_date_time"]["data"]
@current_date_time ||= @forecast_information["current_date_time"]["data"]
end

def unit_system
@unit_system = @forecast_information["unit_system"]["data"]
@unit_system ||= @forecast_information["unit_system"]["data"]
end
end

0 comments on commit ef478ec

Please sign in to comment.