Merge pull request #4 from csparpa/dev

Release 0.2

README.md

@@ -11,6 +11,8 @@ A Django ORM interface for PyOWM domain entities
 Python 2.7 is supported.
 
 
+** Please notice that the API can be unstable as this project is still in beta testing **
+
 ## Install
 
 Install the library with `pip`:
@@ -73,4 +75,4 @@ original_obs = m.to_entity()
 ```
 
 ## Testing
-All details in file [docs/testing.md](docs/testing.md)
+All details about testing are [here](https://github.com/csparpa/django-pyowm/wiki/Testing)

django_pyowm/models.py

@@ -193,8 +193,12 @@ def save_all(self):
         Saves this model along with all related ones.
         :return: None
         """
-        self.location.save()
-        self.weather.save()
+        location = self.location
+        weather = self.weather
+        location.save()
+        weather.save()
+        self.location = location
+        self.weather = weather
         self.save()
 
     class Meta:
@@ -265,13 +269,9 @@ def save_all(self):
         Saves this model along with all related ones.
         :return: None
         """
-        self.location.save()
-        weats = self.weathers
-        self.weathers = []
-        self.save()
-        for w in weats:
-            w.save()
-        self.weathers = weats
+        location = self.location
+        location.save()
+        self.location = location
         self.save()
 
     class Meta:
@@ -353,7 +353,9 @@ def save_all(self):
         Saves this model along with all related ones.
         :return: None
         """
-        self.last_weather.save()
+        last_weather = self.last_weather
+        last_weather.save()
+        self.last_weather = last_weather
         self.save()
 
     class Meta:
@@ -489,7 +491,9 @@ def save_all(self):
         Saves this model along with all related ones.
         :return: None
         """
-        self.location.save()
+        location = self.location
+        location.save()
+        self.location = location
         self.save()
 
     class Meta:
@@ -564,7 +568,9 @@ def save_all(self):
         Saves this model along with all related ones.
         :return: None
         """
-        self.location.save()
+        location = self.location
+        location.save()
+        self.location = location
         self.save()
 
     class Meta:
@@ -639,7 +645,9 @@ def save_all(self):
         Saves this model along with all related ones.
         :return: None
         """
-        self.location.save()
+        location = self.location
+        location.save()
+        self.location = location
         self.save()
 
     class Meta:

django_pyowm/tests.py

@@ -11,7 +11,7 @@
 from pyowm.webapi25.uvindex import UVIndex as UVIndexEntity
 from pyowm.webapi25.coindex import COIndex as COIndexEntity
 from pyowm.webapi25.ozone import Ozone as OzoneEntity
-from .models import Location, Weather, Observation, Forecast, Station, \
+from django_pyowm.models import Location, Weather, Observation, Forecast, Station, \
     StationHistory, UVIndex, COIndex, Ozone
 
 
@@ -305,6 +305,21 @@ def test_to_entity(self):
         Asserter.assertWeatherEntitiesEqual(self, expected.get_weather(),
                                           result.get_weather())
 
+    def test_save_all(self):
+        location = Location.from_entity(Databox.location)
+        weather = Weather.from_entity(Databox.weather)
+        observation = Observation(reception_time=Databox.reception_time,
+                                  location=location,
+                                  weather=weather)
+        self.assertIsNone(location.pk)
+        self.assertIsNone(weather.pk)
+        self.assertIsNone(observation.pk)
+
+        observation.save_all()
+        self.assertIsNotNone(location.pk)
+        self.assertIsNotNone(weather.pk)
+        self.assertIsNotNone(observation.pk)
+
 
 class TestForecastModel(TestCase):
 
@@ -339,6 +354,23 @@ def test_to_entity(self):
         for ex_w, res_w in zip(expected.get_weathers(), result.get_weathers()):
             Asserter.assertWeatherEntitiesEqual(self, ex_w, res_w)
 
+    def test_save_all(self):
+        weathers = [Weather.from_entity(w) for w in Databox.weathers]
+        location = Location.from_entity(Databox.location)
+        forecast = Forecast(interval=Databox.interval,
+                            reception_time=Databox.reception_time,
+                            location=location)
+        self.assertIsNone(location.pk)
+        for w in weathers:
+            self.assertIsNone(w.pk)
+        self.assertIsNone(forecast.pk)
+
+        for w in weathers:
+            w.save()
+        forecast.save_all()
+        self.assertIsNotNone(location.pk)
+        self.assertIsNotNone(forecast.pk)
+
 
 class TestStationModel(TestCase):
 
@@ -381,6 +413,22 @@ def test_to_entity(self):
         Asserter.assertWeatherEntitiesEqual(self, expected.get_last_weather(),
                                             result.get_last_weather())
 
+    def test_save_all(self):
+        last_weather = Weather.from_entity(Databox.weather)
+        station = Station(name=Databox.station_name,
+                          station_id=Databox.station_id,
+                          station_type=Databox.station_type,
+                          station_status=Databox.station_status,
+                          lat=Databox.lat, lon=Databox.lon,
+                          distance=Databox.station_distance,
+                          last_weather=last_weather)
+        self.assertIsNone(last_weather.pk)
+        self.assertIsNone(station.pk)
+
+        station.save_all()
+        self.assertIsNotNone(last_weather.pk)
+        self.assertIsNotNone(station.pk)
+
 
 class TestStationHistoryModel(TestCase):
 
@@ -442,6 +490,21 @@ def test_to_entity(self):
         Asserter.assertLocationEntitiesEqual(self, expected.get_location(),
                                              result.get_location())
 
+    def test_save_all(self):
+        location = Location.from_entity(Databox.location)
+        uvindex = UVIndex(
+            reference_time=Databox.reference_time,
+            location=location,
+            value=Databox.uvindex_intensity,
+            interval=Databox.uvindex_interval,
+            reception_time=Databox.reception_time)
+        self.assertIsNone(location.pk)
+        self.assertIsNone(uvindex.pk)
+
+        uvindex.save_all()
+        self.assertIsNotNone(location.pk)
+        self.assertIsNotNone(uvindex.pk)
+
 
 class TestCOIndexModel(TestCase):
 
@@ -475,6 +538,21 @@ def test_to_entity(self):
         Asserter.assertLocationEntitiesEqual(self, expected.get_location(),
                                              result.get_location())
 
+    def test_save_all(self):
+        location = Location.from_entity(Databox.location)
+        coindex = COIndex(
+            reference_time=Databox.reference_time,
+            location=location,
+            interval=Databox.coindex_interval,
+            reception_time=Databox.reception_time,
+            co_samples=json.dumps(Databox.co_samples))
+        self.assertIsNone(location.pk)
+        self.assertIsNone(coindex.pk)
+
+        coindex.save_all()
+        self.assertIsNotNone(location.pk)
+        self.assertIsNotNone(coindex.pk)
+
 
 class TestOzoneModel(TestCase):
 
@@ -507,3 +585,18 @@ def test_to_entity(self):
         self.assertEquals(expected.get_reception_time(), result.get_reception_time())
         Asserter.assertLocationEntitiesEqual(self, expected.get_location(),
                                              result.get_location())
+
+    def test_save_all(self):
+        location = Location.from_entity(Databox.location)
+        ozone = Ozone(
+            reference_time=Databox.reference_time,
+            location=location,
+            du_value=Databox.du_value,
+            interval=Databox.ozone_interval,
+            reception_time=Databox.reception_time)
+        self.assertIsNone(location.pk)
+        self.assertIsNone(ozone.pk)
+
+        ozone.save_all()
+        self.assertIsNotNone(location.pk)
+        self.assertIsNotNone(ozone.pk)

docs/releasing.md

@@ -0,0 +1,12 @@
+https://github.com/csparpa/django-pyowm
+
+Checklist:
+
+  - write new models / patch existing ones
+  - write / patch tests
+  -
+  - update setup.py
+  - merge develop branch into master branch (no feature/hotfix branches left open)
+  - handle github stuff (issues, PRs, etc..)
+  - tag release on github
+  -  generate and upload release on pypi

docs/testing.md

@@ -0,0 +1,43 @@
+# Testing
+
+## How to run tests
+
+As `django_pyowm` is a Django app, it must be tested against a Django project, so we will create one.
+
+First of all you need to have the app installed in your `PYTHONPATH`.
+Then create a test Django project and a test Django app with:
+
+```shell
+$ django-admin startproject testproject
+$ cd testproject
+$ django-admin startapp testapp
+```
+
+Then edit your `INSTALLED_APPS` in file `testproject/testproject/settings.py`
+
+```python
+INSTALLED_APPS = [
+    ...
+    'testapp',
+    'django_pyowm'
+]
+```
+
+Now copy the content of file `django_pyowm/django_pyowm/tests.py` into file `testproject/testapp/tests.py`
+
+Apply migrations with:
+
+```
+$ cd testproject
+$ python manage.py makemigrations django_pyowm
+$ python manage.py migrate
+```
+
+Finally launch the tests with:
+
+```
+$ python manage.py test
+```
+
+## Good reads
+http://joebergantine.com/blog/2015/dec/03/test-reusable-django-application-support-multiple-/

setup.py

@@ -23,6 +23,7 @@
     author='Claudio Sparpaglione',
     author_email='csparpa@gmail.com',
     classifiers=[
+        'Development Status :: 4 - Beta',
         'Environment :: Web Environment',
         'Framework :: Django',
         'Framework :: Django :: 1.10',
@@ -37,5 +38,5 @@
         'Programming Language :: Python :: 3.5',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
-    ],
+    ]
 )