weather_fetcher 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/weather_fetcher/fetcher.rb

@@ -2,9 +2,9 @@
 module WeatherFetcher
   class Fetcher
 
-    def self.fetch(p)
+    def self.fetch(p, max_response_time = 0.8)
       require 'yaml'
-      classes = ProviderList.providers
+      classes = ProviderList.providers(max_response_time)
       result = Array.new
 
       classes.each do |c|

data/lib/weather_fetcher/provider_list.rb

@@ -1,9 +1,9 @@
 module WeatherFetcher
   class ProviderList
-    def self.providers
+    def self.providers(speed = 0.7)
       classes = WeatherFetcher::Provider.constants
-      classes.collect{|c| WeatherFetcher::Provider.const_get c}.select{|c| c.kind_of? Class}
+      classes = classes.collect{|c| WeatherFetcher::Provider.const_get c}.select{|c| c.kind_of? Class}
+      classes.select{|k| not defined? k::SLOW or k::SLOW <= speed}
     end
-
   end
 end

data/lib/weather_fetcher/providers/html_based_provider.rb

@@ -9,9 +9,14 @@ module WeatherFetcher
     # Get processed weather for one definition
     def fetch_and_process_single(p)
       return nil unless can_fetch?(p)
-      
+
+      @pre_download = Time.now
       body = fetch_url(url(p))
+      @pre_process = Time.now
       processed = process(body)
+      @post_process = Time.now
+      store_time_costs(processed)
+
       return processed
     end
 

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

@@ -2,6 +2,9 @@
 
 module WeatherFetcher
   class Provider::AllMetSat < MetarProvider
+    # this provider is turned off because long response time
+    # typical website response - 5s
+    SLOW = 5.0
 
     def url_for_metar(metar_city)
       u = "http://pl.allmetsat.com/metar-taf/polska.php?icao=#{metar_city.upcase}"

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

@@ -2,6 +2,10 @@
 
 module WeatherFetcher
   class Provider::Wunderground < MetarProvider
+    # this provider is turned off because quite long response time
+    # and because there are 2 other faster metar providers available
+    # typical website response - 1s
+    SLOW = 1.1
 
     def url_for_metar(metar_city)
       u = "http://www.wunderground.com/Aviation/index.html?query=#{metar_city.upcase}"

data/lib/weather_fetcher/providers/metar_provider.rb

@@ -5,13 +5,17 @@ module WeatherFetcher
   class MetarProvider < HtmlBasedProvider
 
     TYPE = :metar
+    # treat metars as not current when time_from is not within time range
+    MAX_METAR_TIME_THRESHOLD = 4*3600
 
     # Get processed weather for one definition
     def fetch_and_process_single(p)
       return nil unless can_fetch?(p)
 
+      @pre_download = Time.now
       url = url_for_metar(metar(p))
       body = fetch_url(url)
+      @pre_process = Time.now
       metars = process(body)
       metars = [metars] unless metars.kind_of?(Array)
       processed = Array.new
@@ -19,7 +23,7 @@ module WeatherFetcher
       metars.each do |m|
         m = SimpleMetarParser::Parser.parse(m)
 
-        if m.valid?
+        if m.valid? and (m.time_from - Time.now).abs < MAX_METAR_TIME_THRESHOLD
           processed << {
             :time_created => Time.now,
             :time_from => m.time_from,
@@ -30,13 +34,18 @@ module WeatherFetcher
             :wind => m.wind.mps,
             :snow_metar => m.specials.snow_metar,
             :rain_metar => m.specials.rain_metar,
-            :provider => self.class.provider_name
+            :provider => self.class.provider_name,
+            :metar_string => m.raw
           }
         end
 
       end
 
-      return WeatherData.factory(processed)
+      processed = WeatherData.factory(processed)
+      @post_process = Time.now
+      store_time_costs(processed)
+
+      return processed
     end
 
     def self.provider_name

data/lib/weather_fetcher/providers/provider.rb

@@ -68,8 +68,13 @@ module WeatherFetcher
     def fetch_and_process_single(d)
       return nil unless can_fetch?
 
+      @pre_download = Time.now
       body = fetch_url(url)
+      @pre_process = Time.now
       processed = process(body)
+      @post_process = Time.now
+      store_time_costs(processed)
+
       return processed
     end
 
@@ -95,5 +100,12 @@ module WeatherFetcher
       return p[:classes][short_class_name]
     end
 
+    def store_time_costs(_processed)
+      _processed.each do |p|
+        p.time_costs[:download_time] = @pre_process - @pre_download
+        p.time_costs[:process_time] = @post_process - @pre_process
+      end
+    end
+
   end
 end

data/lib/weather_fetcher/scheduler_helper.rb

@@ -0,0 +1,21 @@
+# Helps getting provider classes which should be executed because
+# there might be updated weather
+module WeatherFetcher
+  class SchedulerHelper
+
+    def self.recommended_providers(_wd, speed = 0.7)
+      # all available
+      all_providers_classes = ProviderList.providers(speed)
+
+      # getting list providers to remove because there is now
+      # new weather available
+      providers_to_remove = _wd.select{|w| w.next_fetch_time > Time.now}.collect{|w| w.provider}.uniq
+
+      # remove providers
+      recommended = all_providers_classes.select{|k| ([k.provider_name] & providers_to_remove).size == 0}
+
+      return recommended
+    end
+
+  end
+end

data/lib/weather_fetcher/weather_data.rb

@@ -2,13 +2,13 @@
 module WeatherFetcher
   class WeatherData
 
-    # TODO move to other gem
+    attr_accessor :time_costs
 
     def initialize(h = { })
+      @time_costs = Hash.new
       @h = h
       @h.keys.each do |k|
         self.instance_variable_set("@#{k}".to_sym, @h[k])
-        #send :attr_accessor, k
       end
     end
 
@@ -37,7 +37,9 @@ module WeatherFetcher
       @next_fetch_time = @fetch_time + _interval
     end
 
-    attr_reader :temperature, :wind, :time_from, :time_to, :fetch_time, :next_fetch_time
+    attr_reader :time_created, :time_from, :time_to, :fetch_time, :next_fetch_time,
+      :temperature, :wind, :pressure, :wind_kmh, :snow, :rain,
+      :provider
 
   end
 end

data/lib/weather_fetcher.rb

@@ -6,6 +6,7 @@ require 'weather_fetcher/weather_data'
 require 'weather_fetcher/providers'
 require 'weather_fetcher/provider_list'
 require 'weather_fetcher/fetcher'
+require 'weather_fetcher/scheduler_helper'
 require 'weather_fetcher/server'
 
 module WeatherFetcher

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weather_fetcher
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_metar_parser
-  requirement: &13340220 !ruby/object:Gem::Requirement
+  requirement: &18527420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *13340220
+  version_requirements: *18527420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13339720 !ruby/object:Gem::Requirement
+  requirement: &18526900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *13339720
+  version_requirements: *18526900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13339220 !ruby/object:Gem::Requirement
+  requirement: &18526400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *13339220
+  version_requirements: *18526400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13338700 !ruby/object:Gem::Requirement
+  requirement: &18525900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *13338700
+  version_requirements: *18525900
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &13338200 !ruby/object:Gem::Requirement
+  requirement: &18525380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13338200
+  version_requirements: *18525380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &13337660 !ruby/object:Gem::Requirement
+  requirement: &18524780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13337660
+  version_requirements: *18524780
 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
@@ -107,6 +107,7 @@ files:
 - lib/weather_fetcher/providers/metar/wunderground.rb
 - lib/weather_fetcher/providers/metar_provider.rb
 - lib/weather_fetcher/providers/provider.rb
+- lib/weather_fetcher/scheduler_helper.rb
 - lib/weather_fetcher/server.rb
 - lib/weather_fetcher/utils/time.rb
 - lib/weather_fetcher/weather_data.rb
@@ -125,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3850165663943565534
+      hash: 809385546591305443
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: