weathergrabber 0.0.10__tar.gz → 0.0.11__tar.gz

{weathergrabber-0.0.10/weathergrabber.egg-info → weathergrabber-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weathergrabber
-Version: 0.0.10
+Version: 0.0.11
 Summary: A grabber for weather.com data with various output formats.
 Author-email: Carlos Anselmo Mendes Junior <cjuniorfox@gmail.com>
 License: MIT

{weathergrabber-0.0.10 → weathergrabber-0.0.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "weathergrabber"
-version = "0.0.10"
+version = "0.0.11"
 description = "A grabber for weather.com data with various output formats."
 readme = "README.md"
 requires-python = ">=3.12"

{weathergrabber-0.0.10 → weathergrabber-0.0.11}/weathergrabber/__init__.py

@@ -4,7 +4,7 @@ from .core import main
 from .cli import main_cli
 
 __all__ = ["main", "main_cli"]
-__version__ = "0.0.10"
+__version__ = "0.0.11"
 
 def get_version():
     return __version__

{weathergrabber-0.0.10 → weathergrabber-0.0.11}/weathergrabber/application/services/extract_current_conditions_service.py

@@ -1,4 +1,5 @@
 import logging
+import json
 from pyquery import PyQuery
 from weathergrabber.domain.entities.weather_icon_enum import WeatherIconEnum
 from weathergrabber.domain.entities.city_location import CityLocation
@@ -16,12 +17,12 @@ class ExtractCurrentConditionsService:
 
         data = PyQuery(weather_data('div[data-testid="CurrentConditionsContainer"]'))
     
-        city_location_data = data.find('h1').text() #'Nova Friburgo, Rio de Janeiro, Brazil'
+    
         timestamp_data = data.find('span[class*="timestamp"]').text() # 'As of 8:01 pm GMT-03:00'
         icon_data = data.find('svg[class*="wxIcon"]').attr('name') # 'partly-cloudy-night'
         temp_day_night = data.find('div[class*="tempHiLoValue"]').text() #'Day\xa063°\xa0•\xa0Night\xa046°'
 
-        city_location = CityLocation.from_string(city_location_data)
+        city_location = self.__location(weather_data)
         timestamp = Timestamp.from_string(timestamp_data)
         temperature = data.find('span[class*="tempValue"]').text() # '48°'
         icon = WeatherIconEnum.from_name(icon_data)
@@ -39,4 +40,15 @@ class ExtractCurrentConditionsService:
 
         self.logger.debug(f"Extracted current conditions: {current_conditions}")
 
-        return current_conditions
+        return current_conditions
+    
+    def __location(self, weather_data: PyQuery) -> CityLocation:
+        location_str = weather_data.find('script[type="application/ld+json"]').contents().eq(2).text()
+        location_data = json.loads(location_str)
+        address = location_data.get("address", {})
+        
+        return CityLocation(
+            city=address.get("addressLocality"),
+            state_province=address.get("addressRegion"),
+            country=address.get("addressCountry")
+        )

{weathergrabber-0.0.10 → weathergrabber-0.0.11/weathergrabber.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weathergrabber
-Version: 0.0.10
+Version: 0.0.11
 Summary: A grabber for weather.com data with various output formats.
 Author-email: Carlos Anselmo Mendes Junior <cjuniorfox@gmail.com>
 License: MIT