weather_fetcher 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4e125667ec4f19310d5d5fd67f808d78b0c8f22
-  data.tar.gz: 0f5834b7b8bbea71bc4ce3ac3e57b0fd2aa8110f
+  metadata.gz: 36ae3bc84d954a730d42f83787961d04b3fdad94
+  data.tar.gz: ea7802ca4db56e1a33d4586ec993615ad7594fe9
 SHA512:
-  metadata.gz: 9800629a7cefc2f5f8ee4e0c808ae9aad1ad1b6b4fe1fff3d556443a12cef3dc9aa7db534189a2c7cc1970e249dfc3b7dbad160003c92492c7a13f6e1822d74f
-  data.tar.gz: bf7c4406acea6b09332b217d89bc1374b59cd0fb9177072db9eac8e7dabdf1a513101fa874e9e993ff7c86dfa2b9df4a4e941990195ea1aac941d50ba8c7e350
+  metadata.gz: 5d89d9a57e5cf04a84c5cf9ec302927cf04a30645a2f50fa5c2dca536c0d46c5e41b48281bd52061710c3b7ebc1df137eee697be3f2c4457b94071656d5915e6
+  data.tar.gz: f78d5c42bdee4420a8a9291a9dfb0b813e858c914724df621ca0fa3f52cc17e2aabca190f895bea4c85c45b619f186b3f7dfb5c0e0465c23745dcca3eff2a964

data/Gemfile.lock

@@ -1,65 +1,72 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.6)
     builder (3.2.2)
-    curb (0.8.5)
+    curb (0.8.6)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    docile (1.1.1)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
+    docile (1.1.5)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.8)
+    github_api (0.12.2)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.3)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.3)
       oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    httpauth (0.2.0)
-    jeweler (1.8.8)
+    hashie (3.3.2)
+    highline (1.6.21)
+    jeweler (2.0.1)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
     json (1.8.1)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    multi_json (1.8.2)
+    jwt (1.2.0)
+    mini_portile (0.6.1)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    multipart-post (2.0.0)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.1.1)
-    rdoc (4.0.1)
+    rack (1.6.0)
+    rake (10.4.2)
+    rdoc (4.2.0)
       json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
     simple_metar_parser (0.0.1)
-    simplecov (0.8.2)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
+    thread_safe (0.3.4)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/weather_fetcher/providers.rb

@@ -6,6 +6,7 @@ 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/twoja_pogoda_pl'
 require 'providers/html_based/world_weather_online'
 
 require 'providers/metar_provider'

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

@@ -0,0 +1,112 @@
+#encoding: utf-8
+
+require 'nokogiri'
+require 'time'
+
+module WeatherFetcher
+  class Provider::TwojaPogodaPl < HtmlBasedProvider
+
+    def self.provider_name
+      "TwojaPogoda.pl"
+    end
+
+    def process(string)
+      return WeatherData.factory(_process(string))
+    end
+
+    # Process response body and rip out weather data
+    def _process(body_raw)
+      data = Array.new
+      b = Nokogiri::HTML(body_raw)
+
+      dates = b.css("table.items > tr > th > small")
+      dates = dates.collect { |d| Time.parse(d.children.first.to_s) }
+
+      temperatures = Array.new
+      winds = Array.new
+      clouds = Array.new
+      feel_temps = Array.new
+      humids = Array.new
+      pressures = Array.new
+      precips = Array.new
+
+      rows = b.css("table.items > tr")
+      rows.each do |row|
+        tags = row.css("td > div")
+        tags.each_with_index do |tag, i|
+          if tag.attribute("class").to_s == "info"
+            temperatures << tag.css("strong").children.first.to_s.to_f
+          end
+
+          if tag.children.first.to_s == "Wiatr"
+            wind = tags[i + 1].children.first.to_s.to_f
+            winds << wind
+          end
+
+          if tag.children.first.to_s == "Chmury"
+            cloud = tags[i + 1].children.first.to_s
+            if cloud =~ /(\d{1,2})-(\d{1,2})/
+              cloud = ($1.to_i + $2.to_i) / 2
+            elsif cloud =~ /(\d{1,2}) /
+              cloud = $1.to_i
+            else
+              cloud = nil
+            end
+            clouds << cloud
+          end
+
+          if tag.children.first.to_s == "T.odczuw."
+            feel_temp = tags[i + 1].children.first.to_s.to_f
+            feel_temps << feel_temp
+          end
+
+          if tag.children.first.to_s == "Wilgotność"
+            humid = tags[i + 1].children.first.to_s.to_f
+            humids << humid
+          end
+
+          if tag.children.first.to_s == "Ciśnienie"
+            pressure = tags[i + 1].children.first.to_s.to_f
+            pressures << pressure
+          end
+
+          if tag.children.first.to_s == "Opady"
+            precip = tags[i + 1].children.first.to_s
+            if precip =~ /(\d{1,2}\.?\d{1,2})/
+              precip = $1.to_f
+            else
+              precip = nil
+            end
+            precips << precip
+          end
+
+        end
+      end
+
+      dates.each_with_index do |d, i|
+        data << {
+          :time_created => Time.now,
+          :time_from => d,
+          :time_to => d + 24*3600,
+          :temperature => temperatures[i],
+          :feel_temperature => feel_temps[i],
+          :pressure => pressures[i],
+          :wind_kmh => winds[i],
+          :wind => winds[i] / 3.6,
+          #  :snow => nil, #snows[0][0].to_f,
+          :rain => precips[i],
+          :cloud_cover => clouds[i],
+          :humidity => humids[i],
+          :provider => self.class.provider_name
+        }
+      end
+
+      # puts data.inspect
+
+      return data
+    end
+
+
+  end
+
+end

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

@@ -25,7 +25,6 @@ module WeatherFetcher
 
     # 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"
       "http://api.worldweatheronline.com/free/v1/weather.ashx?q=#{p[:coords][:lat]},#{p[:coords][:lon]}&format=json&num_of_days=5&key=#{@@api}"
     end
 
@@ -65,38 +64,41 @@ module WeatherFetcher
 
       # prediction
       predictions = result["data"]["weather"]
-      predictions.each do |p|
-        h = process_node(p)
+      # example, there is no prediction on Antarctica
+      if predictions and predictions.kind_of?(Array)
+        predictions.each do |p|
+          h = process_node(p)
+
+          # is always 0
+          [:pressure, :cloud_cover, :humidity, :visibility].each do |k|
+            h.delete(k)
+          end
+
+          # create 2 records using tempMinC and tempMaxC
+          hl = h.clone.merge(
+            {
+              :wwo_type => :prediction_temp_low,
+              :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.clone.merge(
+            {
+              :wwo_type => :prediction_temp_high,
+              :time_created => Time.now,
+              :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
 
-        # is always 0
-        [:pressure, :cloud_cover, :humidity, :visibility].each do |k|
-          h.delete(k)
         end
-
-        # create 2 records using tempMinC and tempMaxC
-        hl = h.clone.merge(
-          {
-            :wwo_type => :prediction_temp_low,
-            :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.clone.merge(
-          {
-            :wwo_type => :prediction_temp_high,
-            :time_created => Time.now,
-            :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 WeatherData.factory(weather_archives)

data/lib/weather_fetcher/scheduler_helper.rb

@@ -12,7 +12,7 @@ module WeatherFetcher
       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}
+      recommended = all_providers_classes.select{|k| puts k.provider_name.inspect; ([k.provider_name] & providers_to_remove).size == 0}
 
       return recommended
     end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: weather_fetcher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Aleksander Kwiatkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_metar_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: At this moment you can fetch weather http://www.worldweatheronline.com/,
@@ -130,6 +130,7 @@ files:
 - lib/weather_fetcher/providers.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/twoja_pogoda_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
@@ -153,17 +154,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Fetch weather from various providers in one place