Added an exception when bundle name is not valid (django-webpack#71)

* Added an exception when bundle name is not valid * Fix error in python2.6 * Added new exception when bundle is missing * Fix python2.6 error

Author: aouaki

tests/app/tests/test_webpack.py

@@ -13,7 +13,8 @@
 from webpack_loader.exceptions import (
  WebpackError,
  WebpackLoaderBadStatsError,
- WebpackLoaderTimeoutError
+ WebpackLoaderTimeoutError,
+ WebpackBundleLookupError
 )
 from webpack_loader.utils import get_loader
 
@@ -153,6 +154,14 @@ def test_reporting_errors(self):
  except WebpackError as e:
  self.assertIn("Cannot resolve module 'the-library-that-did-not-exist'", str(e))
 
+ def test_missing_bundle(self):
+ missing_bundle_name = 'missing_bundle'
+ self.compile_bundles('webpack.config.simple.js')
+ try:
+ get_loader(DEFAULT_CONFIG).get_bundle(missing_bundle_name)
+ except WebpackBundleLookupError as e:
+ self.assertIn('Cannot resolve bundle {0}'.format(missing_bundle_name), str(e))
+
  def test_missing_stats_file(self):
  stats_file = settings.WEBPACK_LOADER[DEFAULT_CONFIG]['STATS_FILE']
  if os.path.exists(stats_file):

webpack_loader/exceptions.py

@@ -1,4 +1,9 @@
-__all__ = ('WebpackError', 'WebpackLoaderBadStatsError')
+__all__ = (
+ 'WebpackError',
+ 'WebpackLoaderBadStatsError',
+ 'WebpackLoaderTimeoutError',
+ 'WebpackBundleLookupError'
+)
 
 
 class WebpackError(Exception):
@@ -11,3 +16,7 @@ class WebpackLoaderBadStatsError(Exception):
 
 class WebpackLoaderTimeoutError(Exception):
  pass
+
+
+class WebpackBundleLookupError(Exception):
+ pass

webpack_loader/loader.py

@@ -7,7 +7,8 @@
 from .exceptions import (
  WebpackError,
  WebpackLoaderBadStatsError,
- WebpackLoaderTimeoutError
+ WebpackLoaderTimeoutError,
+ WebpackBundleLookupError
 )
 from .config import load_config
 
@@ -76,7 +77,9 @@ def get_bundle(self, bundle_name):
  )
 
  if assets.get('status') == 'done':
- chunks = assets['chunks'][bundle_name]
+ chunks = assets['chunks'].get(bundle_name, None)
+ if chunks is None:
+ raise WebpackBundleLookupError('Cannot resolve bundle {0}.'.format(bundle_name))
  return self.filter_chunks(chunks)
 
  elif assets.get('status') == 'error':