weather_fetcher 0.0.0 → 0.0.1

data/Gemfile

@@ -5,4 +5,5 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
+  gem "rdoc"
 end

data/Gemfile.lock

@@ -7,8 +7,11 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    json (1.6.1)
     rake (0.9.2.2)
     rcov (0.9.11)
+    rdoc (3.11)
+      json (~> 1.4)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -25,4 +28,5 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
   rcov
+  rdoc
   rspec (~> 2.3.0)

data/README.rdoc

@@ -1,12 +1,17 @@
 = weather_fetcher
 
-Fetch weather from various Polish websites and via other gems
+Fetch weather from various Polish websites and via other gems.
 
 == How to use
 
-It is very early gem. More feature coming soon.
+It is very early gem. More feature coming soon. At this moment you can use 3 providers: Onet.pl,
+Wp.pl and Interia.pl.
 
-The simplest way to use is:
+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.
+
+
+= Onet.pl
 
   weathers = WeatherFetcher::Provider::OnetPl.new(defs).fetch
 
@@ -19,6 +24,35 @@ Where _defs_ is something like this:
       :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
+
+
 == 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

@@ -38,7 +38,8 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/lib/weather_fetcher/provider_list.rb

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

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

@@ -0,0 +1,129 @@
+#encoding: utf-8
+
+module WeatherFetcher
+  class Provider::InteriaPl < HtmlBased
+
+    def self.provider_name
+      "Interia.pl"
+    end
+
+    def process(string)
+      @weathers += _process(string)
+    end
+
+    # Process response body and rip out weather data
+    def _process(body_raw)
+
+      body = body_raw.downcase
+
+      hours_first = body.scan(/(\d{2})\s*do\s*(\d{2})/)
+      #puts hours_first.inspect
+      hours_add = body.scan(/<td height=\"40\">.*(\d{2})-(\d{2}).*<\/td>/)
+      #puts hours_add.inspect
+      hours = hours_first + hours_add
+      #puts hours.inspect
+
+      # interia uses min/aesthes./max temperatures, aesth. used
+      temperatures = body.scan(/<span\s*class=\"tex2b\"\s*style=\"font-size:\s*14px;\">(-?\d+)<\/span>/)
+      # there is 'sample' temperature which should be deleted
+      temperatures.delete_at(2) # if temperatures[2] == 5
+      #puts temperatures.inspect
+
+      winds = body.scan(/wiatr:\D*(\d+)\D*km\/h\s*</)
+      #puts winds.inspect
+
+      rains = body.scan(/deszcz:\D*(\d+\.?\d*)\D*mm\s*</)
+      #puts rains.inspect
+
+      snows = body.scan(/nieg:\D*(\d+\.?\d*)\D*mm\s*</)
+      #puts snows.inspect
+
+      pressures = body.scan(/<b>(\d{3,4})<\/b>.*hpa/)
+      #puts pressures.inspect
+
+      # TODO fix it better!
+      #puts rains.inspect
+      #puts snows.inspect
+      if snows.nil? or snows.size < 2
+        snows = [[nil], [nil], [nil]]
+      end
+      if rains.nil? or rains.size < 2
+        rains = [[nil], [nil], [nil]]
+      end
+
+      unix_time_today = Time.mktime(
+        Time.now.year,
+        Time.now.month,
+        Time.now.day,
+        0, 0, 0, 0)
+
+      unix_time_now_from = unix_time_today + 3600 * hours[0][0].to_i
+      unix_time_now_to = unix_time_today + 3600 * hours[0][1].to_i
+      if hours[0][1].to_i < hours[0][0].to_i
+        # next day
+        unix_time_now_to += 24 * 3600
+      end
+
+      unix_time_soon_from = unix_time_today + 3600 * hours[1][0].to_i
+      unix_time_soon_to = unix_time_today + 3600 * hours[1][1].to_i
+      if hours[1][1].to_i < hours[1][0].to_i
+        # next day
+        unix_time_soon_to += 24 * 3600
+      end
+      if hours[1][0].to_i > hours[1][0].to_i
+        # time soon is whole new day
+        unix_time_soon_from += 24 * 3600
+        unix_time_soon_to += 24 * 3600
+      end
+
+      # if 1 data is for next day morning
+      if hours[0][1].to_i < Time.now.hour
+        unix_time_now_to += 24 * 3600
+        unix_time_now_from += 24 * 3600
+
+        unix_time_soon_to += 24 * 3600
+        unix_time_soon_from += 24 * 3600
+      end
+
+      # TODO zrób auto testy dla innych typów
+      # TODO i dodaj inkrementacje dnia po
+      # if 1 data is for next day morning
+      if unix_time_now_to > unix_time_soon_to
+        unix_time_soon_to += 24 * 3600
+        unix_time_soon_from += 24 * 3600
+      end
+
+      data = [
+        {
+          :time_created => Time.now,
+          :time_from => unix_time_now_from,
+          :time_to => unix_time_now_to,
+          :temperature => temperatures[0][0].to_f,
+          :pressure => pressures[0][0].to_f,
+          :wind_kmh => winds[0][0].to_f,
+          :wind => winds[0][0].to_f / 3.6,
+          :snow => snows[0][0].to_f,
+          :rain => rains[0][0].to_f,
+          :provider => self.class.provider_name
+        },
+        {
+          :time_created => Time.now,
+          :time_from => unix_time_soon_from,
+          :time_to => unix_time_soon_to,
+          :temperature => temperatures[1][0].to_f,
+          :pressure => pressures[1][0].to_f,
+          :wind_kmh => winds[1][0].to_f,
+          :wind => winds[1][0].to_f / 3.6,
+          :snow => snows[1][0].to_f,
+          :rain => rains[1][0].to_f,
+          :provider => self.class.provider_name
+        }
+      ]
+
+      return data
+    end
+
+  end
+
+end
+

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

@@ -150,8 +150,7 @@ module WeatherFetcher
           :wind => winds[i],
           :snow => snows[i],
           :rain => rains[i],
-          :provider => self.class.provider_name,
-          :weather_provider_id => id
+          :provider => self.class.provider_name
         }
         data << h
       end
@@ -160,4 +159,6 @@ module WeatherFetcher
     end
 
   end
+
 end
+

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

@@ -0,0 +1,119 @@
+#encoding: utf-8
+
+module WeatherFetcher
+  class Provider::WpPl < HtmlBased
+
+    def self.provider_name
+      "Interia.pl"
+    end
+
+    def process(string)
+      @weathers += _process(string)
+    end
+
+    # Process response body and rip out weather data
+    def _process(body_raw)
+
+      body = body_raw.downcase
+
+      # days from detailed weather
+      days = body.scan(/(\d{1,2})\.(\d{1,2})\.(\d{4})/)
+      #puts days.inspect
+      #puts days.size
+
+      hours = body.scan(/(\d{2})-(\d{2})/)
+      hours = hours.select { |h| h[0].to_i <= 24 and h[1].to_i <= 24 }
+      #puts hours.inspect
+      #puts hours.size
+
+      # create times
+      i_day = 0
+      times = Array.new
+
+      (0...(hours.size)).each do |ih|
+        # next day
+        if ih > 0 and hours[ih][0].to_i < hours[ih - 1][0].to_i
+          i_day += 1
+        end
+
+        # can not create time with hour 24
+        hour_from = hours[ih][0].to_i
+        hour_from = 0 if hour_from == 24
+        time_from = Time.mktime(
+          days[i_day][2].to_i,
+          days[i_day][1].to_i,
+          days[i_day][0].to_i,
+          hour_from,
+          0,
+          0,
+          0
+        )
+        time_from += 24*3600 if hours[ih][0].to_i == 24
+
+        hour_to = hours[ih][1].to_i
+        hour_to = 0 if hour_to == 24
+        time_to = Time.mktime(
+          days[i_day][2].to_i,
+          days[i_day][1].to_i,
+          days[i_day][0].to_i,
+          hour_to,
+          0,
+          0,
+          0
+        )
+        time_to += 24*3600 if hours[ih][1].to_i == 24
+
+        h = { :time_from => time_from, :time_to => time_to }
+        times << h
+      end
+      # puts times.to_yaml
+      #puts times.size
+
+      temperatures = body.scan(/temperatura:\s*<strong>(-?\d+)[^<]*<\/strong>/)
+      #puts temperatures.inspect
+      #puts temperatures.size
+
+      #winds = body.scan(/<strong>(\d*\.?\d*)\s*km\/h<\/strong>/)
+      #winds.slice!(0,5)
+      winds = body.scan(/<td width=\"30%\">[^<]*<strong>(\d*\.?\d*)\s*km\/h<\/strong>/)
+      #puts winds.inspect
+      #puts winds.size
+
+      data = Array.new
+
+      (0...(temperatures.size)).each do |i|
+        t = temperatures[i][0]
+        t = t.to_f unless t.nil?
+
+        wind_speed_km_per_h = winds[i][0]
+        if t.nil?
+          wind_speed_km_per_h = nil
+          w = nil
+        else
+          wind_speed_km_per_h = wind_speed_km_per_h.to_f
+          w = wind_speed_km_per_h / 3.6
+        end
+
+        h = {
+          :time_created => Time.now,
+          :time_from => times[i][:time_from],
+          :time_to => times[i][:time_to],
+          :temperature => t,
+          #:pressure => nil,
+          :wind_kmh => wind_speed_km_per_h,
+          :wind => w,
+          #:snow => snows[0][0].to_f,
+          #:rain => rains[0][0].to_f,
+          :provider => self.class.provider_name
+        }
+
+        data << h
+      end
+
+      return data
+    end
+
+
+  end
+
+end

data/lib/weather_fetcher/providers.rb

@@ -3,4 +3,6 @@ $:.unshift(File.dirname(__FILE__))
 require 'providers/provider'
 require 'providers/html_based'
 
-require 'providers/onet_pl'
+require 'providers/html_based/onet_pl'
+require 'providers/html_based/interia_pl'
+require 'providers/html_based/wp_pl'

data/lib/weather_fetcher.rb

@@ -1,6 +1,7 @@
 $:.unshift(File.dirname(__FILE__))
 
 require 'weather_fetcher/providers'
+require 'weather_fetcher/provider_list'
 
 module WeatherFetcher
 end

data/spec/fixtures/interia_pl.yml

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

data/spec/fixtures/weather.yml

@@ -0,0 +1,8 @@
+- :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

@@ -0,0 +1,6 @@
+- :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

@@ -0,0 +1,14 @@
+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,4 +1,4 @@
-describe "WeatherFetcher::Provider::OnetPl" do
+describe "WeatherFetcher::Provider::OnetPl", :html => true do
   before :each do
     @defs = load_fixture('onet_pl')
     @defs.size.should > 0
@@ -9,7 +9,6 @@ describe "WeatherFetcher::Provider::OnetPl" do
     weathers = f.fetch
     weathers.should == f.weathers
 
-    puts weathers.to_yaml
-
+    # puts weathers.to_yaml
   end
 end

data/spec/providers/wp_pl_spec.rb

@@ -0,0 +1,14 @@
+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

@@ -8,7 +8,8 @@ require 'weather_fetcher'
 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)

data/spec/weather_fetcher_spec.rb

@@ -13,4 +13,14 @@ describe "WeatherFetcher" do
     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

@@ -0,0 +1,77 @@
+# 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
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: weather_fetcher
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 0
-  - 0
-  version: 0.0.0
+  - 1
+  version: 0.0.1
 platform: ruby
 authors: 
 - Aleksander Kwiatkowski
@@ -79,6 +79,20 @@ dependencies:
   name: rcov
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id005
+  name: rdoc
+  prerelease: false
+  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.
 email: bobikx@poczta.fm
 executables: []
@@ -98,14 +112,23 @@ files:
 - 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/onet_pl.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
 homepage: http://github.com/akwiatkowski/weather_fetcher
 licenses: 
 - LGPLv3