weather_fetcher 0.0.12 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/lib/weather_fetcher/providers/html_based_provider.rb

@@ -16,6 +16,7 @@ module WeatherFetcher
       processed = process(body)
       @post_process = Time.now
       store_time_costs(processed)
+      store_city_definition(processed, p)
 
       return processed
     end

data/lib/weather_fetcher/providers/metar_provider.rb

@@ -44,6 +44,7 @@ module WeatherFetcher
       processed = WeatherData.factory(processed)
       @post_process = Time.now
       store_time_costs(processed)
+      store_city_definition(processed, p)
 
       return processed
     end

data/lib/weather_fetcher/providers/provider.rb

@@ -69,11 +69,12 @@ module WeatherFetcher
       return nil unless can_fetch?
 
       @pre_download = Time.now
-      body = fetch_url(url)
+      body = fetch_url(url(d))
       @pre_process = Time.now
       processed = process(body)
       @post_process = Time.now
       store_time_costs(processed)
+      store_city_definition(processed, d)
 
       return processed
     end
@@ -108,5 +109,12 @@ module WeatherFetcher
       end
     end
 
+    def store_city_definition(_processed, _city_def)
+      return unless _processed.kind_of?(Array)
+      _processed.each do |p|
+        p.city_hash = _city_def
+      end
+    end
+
   end
 end

data/lib/weather_fetcher/weather_data.rb

@@ -37,6 +37,15 @@ module WeatherFetcher
       @next_fetch_time = @fetch_time + _interval
     end
 
+    def is_metar?
+      self.provider == WeatherFetcher::MetarProvider.provider_name
+    end
+
+    def city
+      return nil? if @city_hash.nil?
+      @city_hash[:name]
+    end
+
     attr_reader :time_created, :time_from, :time_to, :fetch_time, :next_fetch_time,
       :temperature, :wind, :pressure, :wind_kmh, :snow, :rain,
       :rain_metar, :snow_metar,
@@ -44,5 +53,9 @@ module WeatherFetcher
       :provider,
       :metar_string
 
+    attr_accessor :city_hash
+
+
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weather_fetcher
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-15 00:00:00.000000000Z
+date: 2012-09-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_metar_parser
-  requirement: &24600500 !ruby/object:Gem::Requirement
+  requirement: &28276020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *24600500
+  version_requirements: *28276020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24591560 !ruby/object:Gem::Requirement
+  requirement: &28272160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *24591560
+  version_requirements: *28272160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &24591080 !ruby/object:Gem::Requirement
+  requirement: &28271680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *24591080
+  version_requirements: *28271680
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &24590580 !ruby/object:Gem::Requirement
+  requirement: &28271200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *24590580
+  version_requirements: *28271200
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &24590060 !ruby/object:Gem::Requirement
+  requirement: &28270720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24590060
+  version_requirements: *28270720
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &24589560 !ruby/object:Gem::Requirement
+  requirement: &28270220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24589560
+  version_requirements: *28270220
 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
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2317311865113955722
+      hash: -2375302931478023427
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: