weather_fetcher 0.0.1 → 0.0.2

data/Gemfile

@@ -1,9 +1,11 @@
 source "http://rubygems.org"
 
+gem "simple_metar_parser", ">= 0.0.1"
+
 group :development do
   gem "rspec", "~> 2.3.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem 'simplecov', :require => false, :group => :test
   gem "rdoc"
 end

data/Gemfile.lock

@@ -7,10 +7,10 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.1)
+    json (1.6.5)
+    multi_json (1.1.0)
     rake (0.9.2.2)
-    rcov (0.9.11)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
@@ -20,6 +20,11 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
+    simple_metar_parser (0.0.1)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
 
 PLATFORMS
   ruby
@@ -27,6 +32,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
-  rcov
   rdoc
   rspec (~> 2.3.0)
+  simple_metar_parser (>= 0.0.1)
+  simplecov

data/README.rdoc

@@ -10,49 +10,38 @@ Wp.pl and Interia.pl.
 There is simple 'how to use' code below. _defs_ is Hash object with proper data. Refactoring is on
 the way, so read this file later.
 
+Please check spec/fetcher_spec.rb for code sample, and spec/fixtures/main.yml for parameters.
 
-= Onet.pl
+= Definitions
 
-  weathers = WeatherFetcher::Provider::OnetPl.new(defs).fetch
-
-Where _defs_ is something like this:
-
-  - :url: 'http://pogoda.onet.pl/0,846,38,,,inowroclaw,miasto.html'
-    :city: 'Inowrocław'
+  - :name: 'Poznań'
     :country: 'Poland'
-    :coord:
-      :lat: 52.799264
-      :lon: 18.259935
-
-
-== Wp.pl
-
-  weathers = WeatherFetcher::Provider::WpPl.new(defs).fetch
-
-Where _defs_ is something like this:
-
-  - :url: 'http://pogoda.wp.pl/miasto,bydgoszcz,mid,1201023,mi.html'
-    :city: 'Bydgoszcz'
-    :country: 'Poland'
-    :coord:
-      :lat: 53.128893
-      :lon: 18.006363
-
-
-== Interia.pl
-
-  weathers = WeatherFetcher::Provider::InteriaPl.new(defs).fetch
-
-Where _defs_ is something like this:
-
-  - :url: 'http://pogoda.interia.pl/miasta?id=11721'
-    :city: 'Inowrocław'
-    :country: 'Poland'
-    :coord:
-      :lat: 52.799264
-      :lon: 18.259935
-
-
+    :metar: 'EPPO'
+    :coords:
+      :lat: 52.411048,
+      :lon: 16.928329
+    :classes:
+      OnetPl:
+        :url: 'http://pogoda.onet.pl/0,198,38,poznan,miasto.html'
+      WpPl:
+        :url: 'http://pogoda.wp.pl/miasto,poznan,mid,1201201,mi.html'
+      InteriaPl:
+        :url: 'http://pogoda.interia.pl/miasta?id=11875'
+      WorldWeatherOnline:
+        :key: 'api key'
+
+= Fetching
+
+  result = WeatherFetcher::Fetcher.fetch(@defs)
+
+= Providers
+
+* Onet.pl
+* Wp.pl
+* Interia.pl
+* WorldWeatherOnline (free api key required)
+* and 4 metar providers
+ 
 == Contributing to weather_fetcher
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/Rakefile

@@ -22,6 +22,10 @@ Jeweler::Tasks.new do |gem|
   gem.email = "bobikx@poczta.fm"
   gem.authors = ["Aleksander Kwiatkowski"]
   # dependencies defined in Gemfile
+
+  gem.files = FileList[
+    "[A-Z]*", "{bin,generators,lib,test}/**/*"
+  ]
 end
 Jeweler::RubygemsDotOrgTasks.new
 
@@ -48,3 +52,9 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+desc "Run RSpec with code coverage"
+task :coverage do
+  `rake spec COVERAGE=true`
+  #`open coverage/index.html`
+end

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/weather_fetcher/fetcher.rb

@@ -0,0 +1,28 @@
+# Fetcher
+module WeatherFetcher
+  class Fetcher
+
+    def self.fetch(p)
+      require 'yaml'
+      classes = ProviderList.providers
+      result = Array.new
+
+      classes.each do |c|
+        instance = c.new(p)
+        instance.fetch
+        result += instance.weathers
+      end
+
+      return result
+    end
+
+    def self.represent_result(result)
+      puts result.inspect
+      data = result.sort{|r,s| r.time_from <=> s.time_from}
+      data.each do |d|
+        puts "#{d.time_from} #{d.temperature} #{d.wind}"
+      end
+    end
+
+  end
+end

data/lib/weather_fetcher/provider_list.rb

@@ -1,8 +1,8 @@
 module WeatherFetcher
   class ProviderList
     def self.providers
-      classes = WeatherFetcher::Provider.constants - ['TYPE']
-      classes.collect{|c| WeatherFetcher::Provider.const_get c}
+      classes = WeatherFetcher::Provider.constants
+      classes.collect{|c| WeatherFetcher::Provider.const_get c}.select{|c| c.kind_of? Class}
     end
 
   end

data/lib/weather_fetcher/providers/html_based/interia_pl.rb

@@ -1,14 +1,14 @@
 #encoding: utf-8
 
 module WeatherFetcher
-  class Provider::InteriaPl < HtmlBased
+  class Provider::InteriaPl < HtmlBasedProvider
 
     def self.provider_name
       "Interia.pl"
     end
 
     def process(string)
-      @weathers += _process(string)
+      WeatherData.factory( _process(string) )
     end
 
     # Process response body and rip out weather data

data/lib/weather_fetcher/providers/html_based/onet_pl.rb

@@ -1,15 +1,17 @@
 #encoding: utf-8
 
 module WeatherFetcher
-  class Provider::OnetPl < HtmlBased
+  class Provider::OnetPl < HtmlBasedProvider
 
     def self.provider_name
       "Onet.pl"
     end
 
     def process(string)
-      @weathers += _process_details(string)
-      @weathers += _process_daily(string)
+      a = Array.new
+      a += WeatherData.factory( _process_details(string) )
+      a += WeatherData.factory( _process_daily(string) )
+      return a
     end
 
     # Process response body and rip out weather data, details

data/lib/weather_fetcher/providers/html_based/world_weather_online.rb

@@ -0,0 +1,105 @@
+#encoding: utf-8
+
+require 'json'
+
+module WeatherFetcher
+  class Provider::WorldWeatherOnline < HtmlBasedProvider
+    def self.provider_name
+      "WorldWeatherOnline"
+    end
+
+    # This provider required API key
+    def self.api=(_api)
+      @@api = _api
+    end
+
+    def self.api
+      @@api
+    end
+
+    # Url for current provider
+    def url(p)
+      "http://free.worldweatheronline.com/feed/weather.ashx?key=#{@@api}&q=#{p[:coords][:lat]},#{p[:coords][:lon]}&num_of_days=2&format=json"
+    end
+
+    def can_fetch?(p)
+      return false if not defined? @@api
+
+      begin
+        url(p).nil? == false
+      rescue
+        false
+      end
+    end
+
+    def process(string)
+      result = JSON.parse(string)
+
+      # weather archives as processing output
+      weather_archives = Array.new
+
+      # fix for empty response
+      return if result.nil? or result["data"].nil? or result["data"]["current_condition"].nil?
+
+      # current conditions
+      current = result["data"]["current_condition"].first
+      current_time = Time.create_time_from_string_12_utc(nil, current["observation_time"])
+
+      h = process_node(current)
+      h.merge(
+        {
+          :time_created => Time.now,
+          :time_from => current_time - 3600,
+          :time_to => current_time
+        }
+      )
+      weather_archives << h
+
+      # prediction
+      predictions = result["data"]["weather"]
+      predictions.each do |p|
+        h = process_node(p)
+        h[:pressure] = nil
+
+        # create 2 records using tempMinC and tempMaxC
+        hl = h.merge(
+          {
+            :time_created => Time.now,
+            :time_from => Time.create_time_from_string(p["date"], "0:00") - 4 * 3600,
+            :time_to => Time.create_time_from_string(p["date"], "0:00") + 8 * 3600,
+            :temperature => p["tempMinC"].to_i
+          }
+        )
+        weather_archives << hl
+
+        # and high
+        hh = h.merge(
+          {
+            :time_from => Time.create_time_from_string(p["date"], "0:00") + 8 * 3600,
+            :time_to => Time.create_time_from_string(p["date"], "0:00") + 20 * 3600,
+            :temperature => p["tempMaxC"].to_i
+          }
+        )
+        weather_archives << hh
+
+      end
+
+      return weather_archives.collect { |w| WeatherData.factory(w) }
+
+    end
+
+
+    # Process json node to Hash for AR
+    def process_node(node)
+      return {
+        :temperature => node["temp_C"].to_i,
+        :wind => node["windspeedKmph"].to_f / 3.6,
+        :pressure => node["pressure"].to_f / 3.6,
+        :rain => node["precipMM"].to_f / 3.6,
+        :snow => nil,
+        :weather_provider_id => @id
+      }
+    end
+
+  end
+end

data/lib/weather_fetcher/providers/html_based/wp_pl.rb

@@ -1,14 +1,14 @@
 #encoding: utf-8
 
 module WeatherFetcher
-  class Provider::WpPl < HtmlBased
+  class Provider::WpPl < HtmlBasedProvider
 
     def self.provider_name
       "Interia.pl"
     end
 
     def process(string)
-      @weathers += _process(string)
+      return WeatherData.factory( _process(string) )
     end
 
     # Process response body and rip out weather data

data/lib/weather_fetcher/providers/{html_based.rb → html_based_provider.rb}

@@ -2,14 +2,15 @@ require 'net/http'
 
 # All ugly providers who parse even uglier html code and rip off data
 module WeatherFetcher
-  class HtmlBased < Provider
+  class HtmlBasedProvider < Provider
 
     TYPE = :html_based
 
     # Get processed weather for one definition
-    def fetch_and_process_single(d)
-      url = d[:url]
-      body = fetch_url(url)
+    def fetch_and_process_single(p)
+      return nil unless can_fetch?(p)
+      
+      body = fetch_url(url(p))
       processed = process(body)
       return processed
     end
@@ -19,5 +20,18 @@ module WeatherFetcher
       return Net::HTTP.get(URI.parse(url))
     end
 
+    # Url for current provider
+    def url(p)
+      provider_params(p)[:url]
+    end
+
+    def can_fetch?(p)
+      begin
+        url(p).nil? == false
+      rescue
+        false
+      end
+    end
+
   end
 end

data/lib/weather_fetcher/providers/metar/all_met_sat.rb

@@ -0,0 +1,24 @@
+#encoding: utf-8
+
+module WeatherFetcher
+  class Provider::AllMetSat < MetarProvider
+
+    def url_for_metar(metar_city)
+      u = "http://pl.allmetsat.com/metar-taf/polska.php?icao=#{metar_city.upcase}"
+      return u
+    end
+
+    def process(string)
+      reg = /<b>METAR:<\/b>([^<]*)<br>/
+      string = string.scan(reg).first.first
+      string.gsub!(/\n/, ' ')
+      string.gsub!(/\t/, ' ')
+      string.gsub!(/\s{2,}/, ' ')
+      string.strip
+    end
+
+  end
+
+end
+
+

data/lib/weather_fetcher/providers/metar/aviation_weather.rb

@@ -0,0 +1,29 @@
+#encoding: utf-8
+
+module WeatherFetcher
+  class Provider::AviationWeather < MetarProvider
+
+    def url_for_metar(metar_city)
+      u = "http://aviationweather.gov/adds/metars/index.php?submit=1&station_ids=#{metar_city.upcase}"
+      return u
+    end
+
+    def process(string)
+      reg = /\">([^<]*)<\/FONT>/
+      data = string.scan(reg).first
+      if not data.nil? and not data.first.nil?
+        string = data.first
+        string.gsub!(/\n/, ' ')
+        string.gsub!(/\t/, ' ')
+        string.gsub!(/\s{2,}/, ' ')
+        string.strip
+      end
+
+      @metars
+    end
+
+  end
+
+end
+
+

data/lib/weather_fetcher/providers/metar/noaa.rb

@@ -0,0 +1,23 @@
+#encoding: utf-8
+
+module WeatherFetcher
+  class Provider::Noaa < MetarProvider
+
+    def url_for_metar(metar_city)
+      u = "http://weather.noaa.gov/pub/data/observations/metar/stations/#{metar_city.upcase}.TXT"
+      return u
+    end
+
+    def process(string)
+      string.gsub!(/\d{4}\/\d{1,2}\/\d{1,2} \d{1,2}\:\d{1,2}\s*/, ' ')
+      string.gsub!(/\n/, ' ')
+      string.gsub!(/\t/, ' ')
+      string.gsub!(/\s{2,}/, ' ')
+      string.strip
+    end
+
+  end
+
+end
+
+

data/lib/weather_fetcher/providers/metar/wunderground.rb

@@ -0,0 +1,24 @@
+#encoding: utf-8
+
+module WeatherFetcher
+  class Provider::Wunderground < MetarProvider
+
+    def url_for_metar(metar_city)
+      u = "http://www.wunderground.com/Aviation/index.html?query=#{metar_city.upcase}"
+      return u
+    end
+
+    def process(string)
+      reg = /<div class=\"textReport\">\s*METAR\s*([^<]*)<\/div>/
+      string = string.scan(reg).first.first
+      string.gsub!(/\n/, ' ')
+      string.gsub!(/\t/, ' ')
+      string.gsub!(/\s{2,}/, ' ')
+      string.strip
+    end
+
+  end
+
+end
+
+

data/lib/weather_fetcher/providers/metar_provider.rb

@@ -0,0 +1,64 @@
+require 'simple_metar_parser'
+
+# All ugly providers who parse even uglier html code and rip off data
+module WeatherFetcher
+  class MetarProvider < HtmlBasedProvider
+
+    TYPE = :metar
+
+    # Get processed weather for one definition
+    def fetch_and_process_single(p)
+      return nil unless can_fetch?(p)
+
+      url = url_for_metar(metar(p))
+      body = fetch_url(url)
+      metars = process(body)
+      metars = [metars] unless metars.kind_of?(Array)
+      processed = Array.new
+
+      metars.each do |m|
+        m = SimpleMetarParser::Parser.parse(m)
+
+        if m.valid?
+          processed << {
+            :time_created => Time.now,
+            :time_from => m.time_from,
+            :time_to => m.time_to,
+            :temperature => m.temperature.degrees,
+            :pressure => m.pressure.hpa,
+            :wind_kmh => m.wind.kmh,
+            :wind => m.wind.mps,
+            :snow_metar => m.specials.snow_metar,
+            :rain_metar => m.specials.rain_metar,
+            :provider => self.class.provider_name
+          }
+        end
+
+      end
+
+      return WeatherData.factory(processed)
+    end
+
+    def self.provider_name
+      "MetarProvider"
+    end
+
+    def url_for_metar(metar_city)
+      raise 'Not implemented'
+    end
+
+    # Metar
+    def metar(p)
+      p[:metar]
+    end
+
+    def can_fetch?(p)
+      begin
+        metar(p).nil? == false
+      rescue
+        false
+      end
+    end
+
+  end
+end

data/lib/weather_fetcher/providers/provider.rb

@@ -7,7 +7,7 @@ module WeatherFetcher
     # Create an instance, definitions can be set here
     def initialize(_defs = Array.new)
       @weathers = Array.new
-      self.defs= _defs
+      self.defs = _defs
     end
 
     attr_reader :weathers
@@ -39,26 +39,52 @@ module WeatherFetcher
 
     # Name of provider, should be overrode
     def self.provider_name
-      raise 'Not implemented'
+      raise NotImplementedError
     end
 
     # Fetch everything from definitions (defs)
     def fetch
       a = Array.new
       defs.each do |d|
-        a += fetch_and_process_single(d)
+        p = fetch_and_process_single(d)
+        a += p unless p.nil?
       end
+      # add to result array
+      @weathers += a
+
       return a
     end
 
     # Fetch single definition
     def fetch_and_process_single(d)
-      url = d[:url]
+      return nil unless can_fetch?
+
       body = fetch_url(url)
       processed = process(body)
       return processed
     end
 
+    # All parameters are available and we can fetch
+    def can_fetch?(p = nil)
+      raise NotImplementedError
+    end
+
+    def url(p = nil)
+      raise NotImplementedError
+    end
+
+    def self.short_class_name
+      self.to_s.gsub(/^.*::/, '')
+    end
+
+    def short_class_name
+      self.class.short_class_name
+    end
+
+    # Return Hash of parameters used for current provider
+    def provider_params(p)
+      return p[:classes][short_class_name]
+    end
 
   end
 end

data/lib/weather_fetcher/providers.rb

@@ -1,8 +1,15 @@
 $:.unshift(File.dirname(__FILE__))
 
 require 'providers/provider'
-require 'providers/html_based'
 
+require 'providers/html_based_provider'
 require 'providers/html_based/onet_pl'
 require 'providers/html_based/interia_pl'
-require 'providers/html_based/wp_pl'
+require 'providers/html_based/wp_pl'
+require 'providers/html_based/world_weather_online'
+
+require 'providers/metar_provider'
+require 'providers/metar/noaa'
+require 'providers/metar/all_met_sat'
+require 'providers/metar/aviation_weather'
+require 'providers/metar/wunderground'

data/lib/weather_fetcher/server.rb

@@ -0,0 +1,10 @@
+# Daemon
+module WeatherFetcher
+  class Server
+
+    def initialize(h = { })
+      @h = h
+    end
+
+  end
+end

data/lib/weather_fetcher/utils/time.rb

@@ -0,0 +1,55 @@
+class Time
+  # Create Time from YYYY-MM-DD HH:mm A/PM string format
+  #
+  # :call-seq:
+  #   Time.create_time_from_string( String date, String time ) => Time
+  def self.create_time_from_string_12_utc(date, time)
+    if date.nil?
+      y = Time.now.year
+      m = Time.now.month
+      d = Time.now.day
+    else
+      date =~ /(\d{4})-(\d{1,2})-(\d{1,2})/
+      y = $1.to_i
+      mo = $2.to_i
+      d = $3.to_i
+    end
+
+    # hour
+    time =~ /(\d{1,2}):(\d{1,2}) ([PM])M/
+    h = $1.to_i
+    m = $2.to_i
+
+    if $3 == "P"
+      h_plus = 12
+    else
+      h_plus = 0
+    end
+    h += h_plus
+    h = h % 24
+
+    return Time.utc(y, mo, d, h, m).localtime
+
+  end
+
+  # Create Time from YYYY-MM-DD HH:mm string format
+  #
+  # :call-seq:
+  #   Time.create_time_from_string( String date, String time ) => Time
+  def self.create_time_from_string(date, time)
+    date =~ /(\d{4})-(\d{1,2})-(\d{1,2})/
+    y = $1.to_i
+    m = $2.to_i
+    d = $3.to_i
+
+    if time =~ /(\d{1,2}):(\d{1,2})/
+      h = $1.to_i
+      min = $2.to_i
+    else
+      h = 0
+      min = 0
+    end
+
+    return Time.mktime(y, m, d, h, min, 0, 0)
+  end
+end

data/lib/weather_fetcher/weather_data.rb

@@ -0,0 +1,33 @@
+# Fetcher
+module WeatherFetcher
+  class WeatherData
+
+    # TODO move to other gem
+
+    def initialize(h = { })
+      @h = h
+      @h.keys.each do |k|
+        self.instance_variable_set("@#{k}".to_sym, @h[k])
+        #send :attr_accessor, k
+      end
+    end
+
+    # Return Array of WeatherData objects
+    def self.factory(obj)
+      return [ new(obj) ] if obj.kind_of? Hash
+      return factory_from_array(obj) if obj.kind_of? Array
+    end
+
+    def self.factory_from_array(array = [])
+      ao = Array.new
+      array.each do |a|
+        obj = self.new(a)
+        ao << obj
+      end
+      return ao
+    end
+
+    attr_reader :temperature, :wind, :time_from, :time_to
+
+  end
+end

data/lib/weather_fetcher.rb

@@ -1,7 +1,12 @@
 $:.unshift(File.dirname(__FILE__))
 
+require 'weather_fetcher/utils/time'
+
+require 'weather_fetcher/weather_data'
 require 'weather_fetcher/providers'
 require 'weather_fetcher/provider_list'
+require 'weather_fetcher/fetcher'
+require 'weather_fetcher/server'
 
 module WeatherFetcher
 end

metadata

@@ -1,110 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: weather_fetcher
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Aleksander Kwiatkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-03-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: simple_metar_parser
+  requirement: &26196120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *26196120
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &26195620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.3.0
-  version_requirements: *id001
-  name: rspec
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *26195620
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &26195100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  version_requirements: *id002
-  name: bundler
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *26195100
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &26194600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
-  version_requirements: *id003
-  name: jeweler
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
-  name: rcov
   prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *26194600
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &26194080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id005
-  name: rdoc
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *26194080
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &26193580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-description: Fetch weather from various Polish websites and via other gems. At the moment it is only polish portal Onet.pl but more providers will come soon.
+  prerelease: false
+  version_requirements: *26193580
+description: Fetch weather from various Polish websites and via other gems. At the
+  moment it is only polish portal Onet.pl but more providers will come soon.
 email: bobikx@poczta.fm
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
-- .document
-- .rspec
+files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -112,55 +93,49 @@ files:
 - Rakefile
 - VERSION
 - lib/weather_fetcher.rb
+- lib/weather_fetcher/fetcher.rb
 - lib/weather_fetcher/provider_list.rb
 - lib/weather_fetcher/providers.rb
-- lib/weather_fetcher/providers/html_based.rb
 - lib/weather_fetcher/providers/html_based/interia_pl.rb
 - lib/weather_fetcher/providers/html_based/onet_pl.rb
+- lib/weather_fetcher/providers/html_based/world_weather_online.rb
 - lib/weather_fetcher/providers/html_based/wp_pl.rb
+- lib/weather_fetcher/providers/html_based_provider.rb
+- lib/weather_fetcher/providers/metar/all_met_sat.rb
+- lib/weather_fetcher/providers/metar/aviation_weather.rb
+- lib/weather_fetcher/providers/metar/noaa.rb
+- lib/weather_fetcher/providers/metar/wunderground.rb
+- lib/weather_fetcher/providers/metar_provider.rb
 - lib/weather_fetcher/providers/provider.rb
-- spec/fixtures/interia_pl.yml
-- spec/fixtures/onet_pl.yml
-- spec/fixtures/weather.yml
-- spec/fixtures/wp_pl.yml
-- spec/providers/interia_pl_spec.rb
-- spec/providers/onet_pl_spec.rb
-- spec/providers/wp_pl_spec.rb
-- spec/spec_helper.rb
-- spec/weather_fetcher_spec.rb
-- weather_fetcher.gemspec
+- lib/weather_fetcher/server.rb
+- lib/weather_fetcher/utils/time.rb
+- lib/weather_fetcher/weather_data.rb
 homepage: http://github.com/akwiatkowski/weather_fetcher
-licenses: 
+licenses:
 - LGPLv3
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3286165860735989117
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Fetch weather from various Polish websites and via other gems
 test_files: []
-

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rspec

@@ -1 +0,0 @@
---color

data/spec/fixtures/interia_pl.yml

@@ -1,6 +0,0 @@
-- :url: 'http://pogoda.interia.pl/miasta?id=11721'
-  :city: 'Inowrocław'
-  :country: 'Poland'
-  :coord:
-    :lat: 52.799264
-    :lon: 18.259935

data/spec/fixtures/onet_pl.yml

@@ -1,6 +0,0 @@
-- :url: 'http://pogoda.onet.pl/0,846,38,,,inowroclaw,miasto.html'
-  :city: 'Inowrocław'
-  :country: 'Poland'
-  :coord:
-    :lat: 52.799264
-    :lon: 18.259935

data/spec/fixtures/weather.yml

@@ -1,8 +0,0 @@
-- :url:
-    Interia.pl: 'http://pogoda.interia.pl/miasta?id=11721'
-    Onet.pl: 'http://pogoda.onet.pl/0,846,38,,,inowroclaw,miasto.html'
-  :city: 'Inowrocław'
-  :country: 'Poland'
-  :coord:
-    :lat: 52.799264
-    :lon: 18.259935

data/spec/fixtures/wp_pl.yml

@@ -1,6 +0,0 @@
-- :url: 'http://pogoda.wp.pl/miasto,bydgoszcz,mid,1201023,mi.html'
-  :city: 'Bydgoszcz'
-  :country: 'Poland'
-  :coord:
-    :lat: 53.128893
-    :lon: 18.006363

data/spec/providers/interia_pl_spec.rb

@@ -1,14 +0,0 @@
-describe "WeatherFetcher::Provider::InteriaPl", :html => true do
-  before :each do
-    @defs = load_fixture('interia_pl')
-    @defs.size.should > 0
-  end
-
-  it "simple fetch" do
-    f = WeatherFetcher::Provider::InteriaPl.new(@defs)
-    weathers = f.fetch
-    weathers.should == f.weathers
-
-    # puts weathers.to_yaml
-  end
-end

data/spec/providers/onet_pl_spec.rb

@@ -1,14 +0,0 @@
-describe "WeatherFetcher::Provider::OnetPl", :html => true do
-  before :each do
-    @defs = load_fixture('onet_pl')
-    @defs.size.should > 0
-  end
-
-  it "simple fetch" do
-    f = WeatherFetcher::Provider::OnetPl.new(@defs)
-    weathers = f.fetch
-    weathers.should == f.weathers
-
-    # puts weathers.to_yaml
-  end
-end

data/spec/providers/wp_pl_spec.rb

@@ -1,14 +0,0 @@
-describe "WeatherFetcher::Provider::WpPl", :html => true do
-  before :each do
-    @defs = load_fixture('wp_pl')
-    @defs.size.should > 0
-  end
-
-  it "simple fetch" do
-    f = WeatherFetcher::Provider::WpPl.new(@defs)
-    weathers = f.fetch
-    weathers.should == f.weathers
-
-    # puts weathers.to_yaml
-  end
-end

data/spec/spec_helper.rb

@@ -1,17 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'weather_fetcher'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  #config.filter_run :html => false
-  #config.filter_run_excluding :html => true
-end
-
-def load_fixture(f)
-  return YAML::load(File.open(File.join(Dir.pwd, 'spec', 'fixtures', "#{f}.yml")))
-end

data/spec/weather_fetcher_spec.rb

@@ -1,26 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "WeatherFetcher" do
-  it "simple stuff" do
-    WeatherFetcher.class.should == Module
-  end
-
-  it "should accept only Array or Hash definitions" do
-    lambda { WeatherFetcher::Provider.new("ble") }.should raise_error
-    lambda { WeatherFetcher::Provider.new(1) }.should raise_error
-    lambda { WeatherFetcher::Provider.new() }.should_not raise_error
-    lambda { WeatherFetcher::Provider.new([]) }.should_not raise_error
-    lambda { WeatherFetcher::Provider.new({}) }.should_not raise_error
-  end
-
-  it "should return provider classes list" do
-    providers = WeatherFetcher::ProviderList.providers
-    providers.each do |p|
-      p.should be_kind_of(Class)
-
-      instance = p.new
-      instance.should respond_to(:fetch)
-    end
-  end
-
-end

data/weather_fetcher.gemspec

@@ -1,77 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "weather_fetcher"
-  s.version = "0.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Aleksander Kwiatkowski"]
-  s.date = "2011-12-25"
-  s.description = "Fetch weather from various Polish websites and via other gems. At the moment it is only polish portal Onet.pl but more providers will come soon."
-  s.email = "bobikx@poczta.fm"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/weather_fetcher.rb",
-    "lib/weather_fetcher/provider_list.rb",
-    "lib/weather_fetcher/providers.rb",
-    "lib/weather_fetcher/providers/html_based.rb",
-    "lib/weather_fetcher/providers/html_based/interia_pl.rb",
-    "lib/weather_fetcher/providers/html_based/onet_pl.rb",
-    "lib/weather_fetcher/providers/html_based/wp_pl.rb",
-    "lib/weather_fetcher/providers/provider.rb",
-    "spec/fixtures/interia_pl.yml",
-    "spec/fixtures/onet_pl.yml",
-    "spec/fixtures/weather.yml",
-    "spec/fixtures/wp_pl.yml",
-    "spec/providers/interia_pl_spec.rb",
-    "spec/providers/onet_pl_spec.rb",
-    "spec/providers/wp_pl_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/weather_fetcher_spec.rb",
-    "weather_fetcher.gemspec"
-  ]
-  s.homepage = "http://github.com/akwiatkowski/weather_fetcher"
-  s.licenses = ["LGPLv3"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "Fetch weather from various Polish websites and via other gems"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-  end
-end
-