uk_bin_collection 0.85.6__tar.gz → 0.86.0__tar.gz

{uk_bin_collection-0.85.6 → uk_bin_collection-0.86.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.85.6
+Version: 0.86.0
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com

{uk_bin_collection-0.85.6 → uk_bin_collection-0.86.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uk_bin_collection"
-version = "0.85.6"
+version = "0.86.0"
 description = "Python Lib to collect UK Bin Data"
 readme = "README.md"
 authors = ["Robert Bradley <robbrad182@gmail.com>"]

{uk_bin_collection-0.85.6 → uk_bin_collection-0.86.0}/uk_bin_collection/tests/input.json

@@ -69,11 +69,11 @@
         "wiki_note": "In order to use this parser, you must provide a valid postcode and a uprn retrieved from the councils website for your specific address"
     },
     "BelfastCityCouncil": {
+        "postcode": "BT10 0GY",
         "skip_get_url": true,
+        "uprn": "185086469",
         "url": "https://online.belfastcity.gov.uk/find-bin-collection-day/Default.aspx",
-        "wiki_name": "BelfastCityCouncil",
-        "postcode": "BT10 0GY",
-        "uprn": "185086469"
+        "wiki_name": "BelfastCityCouncil"
     },
     "BexleyCouncil": {
         "house_number": "1 Dorchester Avenue, Bexley",
@@ -298,8 +298,8 @@
     },
     "DorsetCouncil": {
         "skip_get_url": true,
-        "url": "https://www.dorsetcouncil.gov.uk/",
         "uprn": "100040711049",
+        "url": "https://www.dorsetcouncil.gov.uk/",
         "wiki_name": "Dorset Council"
     },
     "DoverDistrictCouncil": {
@@ -360,12 +360,12 @@
         "wiki_name": "Eastleigh Borough Council"
     },
     "EnfieldCouncil": {
-        "url": "https://www.enfield.gov.uk/services/rubbish-and-recycling/find-my-collection-day",
-        "wiki_name": "Enfield Council",
-        "skip_get_url": true,
-        "postcode": "N13 5AJ",
         "house_number": "111",
-        "web_driver": "http://selenium:4444"
+        "postcode": "N13 5AJ",
+        "skip_get_url": true,
+        "url": "https://www.enfield.gov.uk/services/rubbish-and-recycling/find-my-collection-day",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "Enfield Council"
     },
     "EnvironmentFirst": {
         "url": "https://environmentfirst.co.uk/house.php?uprn=100060055444",
@@ -599,9 +599,9 @@
         "postcode": "RH16 1SS",
         "skip_get_url": true,
         "url": "https://www.midsussex.gov.uk/waste-recycling/bin-collection/",
+        "web_driver": "http://selenium:4444",
         "wiki_name": "Mid Sussex District Council",
-        "wiki_note": "Pass the name of the street with the house number parameter, wrapped in double quotes",
-        "web_driver": "http://selenium:4444"
+        "wiki_note": "Pass the name of the street with the house number parameter, wrapped in double quotes"
     },
     "MiltonKeynesCityCouncil": {
         "uprn": "Fullers Slade",
@@ -813,6 +813,11 @@
         "wiki_name": "Rochford Council",
         "wiki_note": "No extra parameters are required. Dates presented should be read as 'week commencing'."
     },
+    "RotherhamCouncil": {
+        "url": "https://www.rotherham.gov.uk/bin-collections\\?address\\=100050866000\\&submit\\=Submit",
+        "uprn": "100050866000",
+        "wiki_name": "RotherhamCouncil"
+    },
     "RugbyBoroughCouncil": {
         "postcode": "CV22 6LA",
         "skip_get_url": true,
@@ -1199,12 +1204,12 @@
         "wiki_note": "Works with all collection areas that use Joint Waste Solutions. Just use the correct URL."
     },
     "WychavonDistrictCouncil": {
+        "postcode": "WR3 7RU",
+        "skip_get_url": true,
+        "uprn": "100120716273",
         "url": "https://selfservice.wychavon.gov.uk/wdcroundlookup/wdc_search.jsp",
-        "wiki_name": "WychavonDistrictCouncil",
         "web_driver": "http://selenium:4444",
-        "skip_get_url": true,
-        "postcode": "WR3 7RU", 
-        "uprn": "100120716273"
+        "wiki_name": "WychavonDistrictCouncil"
     },
     "WyreCouncil": {
         "postcode": "FY6 8HG",

uk_bin_collection-0.86.0/uk_bin_collection/tests/test_collect_data.py

@@ -0,0 +1,73 @@
+from unittest.mock import MagicMock, patch
+import argparse
+import pytest
+from uk_bin_collection.collect_data import UKBinCollectionApp, import_council_module
+
+
+
+# Test UKBinCollectionApp setup_arg_parser
+def test_setup_arg_parser():
+    app = UKBinCollectionApp()
+    app.setup_arg_parser()
+
+    # Assert that the argument parser has the correct arguments
+    assert isinstance(app.parser, argparse.ArgumentParser)
+    args = app.parser._actions
+    arg_names = [action.dest for action in args]
+
+    expected_args = [
+        "module",
+        "URL",
+        "postcode",
+        "number",
+        "skip_get_url",
+        "uprn",
+        "web_driver",
+        "headless",
+        "local_browser",
+        "dev_mode",
+    ]
+    assert all(arg in arg_names for arg in expected_args)
+
+
+# Test UKBinCollectionApp set_args
+def test_set_args():
+    app = UKBinCollectionApp()
+    app.setup_arg_parser()
+
+    # Test valid args
+    args = ["council_module", "http://example.com", "--postcode", "AB1 2CD"]
+    app.set_args(args)
+
+    assert app.parsed_args.module == "council_module"
+    assert app.parsed_args.URL == "http://example.com"
+    assert app.parsed_args.postcode == "AB1 2CD"
+
+
+# Test UKBinCollectionApp client_code method
+def test_client_code():
+    app = UKBinCollectionApp()
+    mock_get_bin_data_class = MagicMock()
+
+    # Run the client_code and ensure that template_method is called
+    app.client_code(mock_get_bin_data_class, "http://example.com", postcode="AB1 2CD")
+    mock_get_bin_data_class.template_method.assert_called_once_with(
+        "http://example.com", postcode="AB1 2CD"
+    )
+
+
+# Test the run() function with logging setup
+@patch("uk_bin_collection.collect_data.setup_logging")  # Correct patch path
+@patch("uk_bin_collection.collect_data.UKBinCollectionApp.run")  # Correct patch path
+@patch("sys.argv", ["uk_bin_collection.py", "council_module", "http://example.com"])
+def test_run_function(mock_app_run, mock_setup_logging):
+    from uk_bin_collection.collect_data import run
+
+    mock_setup_logging.return_value = MagicMock()
+    mock_app_run.return_value = None
+
+    run()
+
+    # Ensure logging was set up and the app run method was called
+    mock_setup_logging.assert_called_once()
+    mock_app_run.assert_called_once()

uk_bin_collection-0.85.6/uk_bin_collection/tests/test_collect_data.py → uk_bin_collection-0.86.0/uk_bin_collection/tests/test_get_data.py

@@ -1,9 +1,11 @@
-import json
+import os
 from unittest import mock
+import tempfile
 
 import pytest
 from requests import exceptions as req_exp
 from requests.models import Response
+from unittest.mock import patch
 from uk_bin_collection.get_bin_data import AbstractGetBinDataClass as agbdc
 from uk_bin_collection.get_bin_data import setup_logging
 import logging
@@ -108,6 +110,10 @@ class ConcreteGetBinDataClass(agbdc):
     def parse_data(self, page: str, **kwargs) -> dict:
         return {"mock_key": "mock_value"}
 
+    def update_dev_mode_data(self, council_module_str, this_url, **kwargs):
+        # You can implement the method or delegate it to the abstract class's method
+        super().update_dev_mode_data(council_module_str, this_url, **kwargs)
+
 @pytest.fixture
 def concrete_class_instance():
     return ConcreteGetBinDataClass()
@@ -133,4 +139,59 @@ def test_get_and_parse_data_skip_get_url(concrete_class_instance):
         result = concrete_class_instance.get_and_parse_data("http://example.com", skip_get_url=True)
 
         mock_parse_data.assert_called_once_with("", url="http://example.com", skip_get_url=True)
-        assert result == mock_parsed_data
+        assert result == mock_parsed_data
+        
+@pytest.fixture
+def setup_test_update_dev_mode_data():
+    """Fixture to set up and tear down the environment for test_update_dev_mode_data"""
+    # Create a temporary directory to simulate the working directory
+    test_dir = tempfile.TemporaryDirectory()
+
+    # Patch os.getcwd() to return the temporary directory
+    cwd_patch = patch('os.getcwd', return_value=test_dir.name)
+    mock_getcwd = cwd_patch.start()
+
+    # Ensure the nested directory structure exists
+    os.makedirs(os.path.join(test_dir.name, "uk_bin_collection", "tests"))
+
+    # Yield control back to the test, then clean up after the test
+    yield test_dir.name  # Provide the test with the temporary directory
+
+    # Teardown
+    test_dir.cleanup()
+    cwd_patch.stop()
+
+
+def test_update_dev_mode_data(setup_test_update_dev_mode_data):
+    """Test update_dev_mode_data method to ensure input.json is updated correctly"""
+    # The setup fixture returns the mocked current working directory
+    mock_cwd = setup_test_update_dev_mode_data
+
+    # Create an instance of the concrete class that inherits from AbstractGetBinDataClass
+    obj = ConcreteGetBinDataClass()
+
+    # Define input arguments for the method
+    council_module_str = 'test_council_module'
+    this_url = 'https://example.com'
+    kwargs = {
+        'postcode': '12345',
+        'paon': '1A',
+        'uprn': '100012345',
+        'usrn': '200012345',
+        'web_driver': 'mocked_web_driver',
+        'skip_get_url': True,
+    }
+
+    # Call the method being tested on the instance
+    obj.update_dev_mode_data(council_module_str, this_url, **kwargs)
+
+    # Verify that input.json was created in the correct location
+    input_file_path = os.path.join(mock_cwd, "uk_bin_collection", "tests", "input.json")
+    assert os.path.exists(input_file_path)
+
+    # Read the contents of the file and make necessary assertions
+    with open(input_file_path, 'r') as f:
+        file_content = f.read()
+
+    # Example assertion - check if certain values exist in the file content (based on your actual file format)
+    assert '100012345' in file_content  # Checking UPRN as an example

uk_bin_collection-0.86.0/uk_bin_collection/uk_bin_collection/councils/RotherhamCouncil.py

@@ -0,0 +1,51 @@
+from bs4 import BeautifulSoup
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        user_uprn = kwargs.get("uprn")
+
+        check_uprn(user_uprn)
+
+        response = requests.post(
+            "https://www.rotherham.gov.uk/bin-collections?address={}&submit=Submit".format(user_uprn)
+        )
+        # Make a BS4 object
+        soup = BeautifulSoup(response.text, features="html.parser")
+        soup.prettify()
+
+        data = {"bins": []}
+
+        table = soup.select('table')[0]
+
+        if table:
+            rows = table.select('tr')
+
+            for index, row in enumerate(rows):
+                bin_info_cell = row.select('td')
+                if bin_info_cell: 
+                    bin_type = bin_info_cell[0].get_text(separator=' ', strip=True)
+                    bin_collection = bin_info_cell[1]
+
+                    if bin_collection:
+                        dict_data = {
+                            "type": bin_type.title(),
+                            "collectionDate": datetime.strptime(
+                                bin_collection.get_text(strip=True), "%A, %d %B %Y"
+                            ).strftime(date_format),
+                        }
+
+                    data["bins"].append(dict_data)
+        else:
+            print("Something went wrong. Please open a GitHub issue.")
+
+        return data