2.x

README.md

@@ -84,7 +84,7 @@ Because Pimple sees anonymous functions as service definitions, you need to wrap
 In some cases you may want to modify a service definition after it has been defined. You can use the extend() method to define additional code to be run on your service just after it is created
 
     container.set('mail',function (c) {
-        return new \Mail();
+        return new Mail();
     });
 
     container.extend('mail', function(mail, c) {

pimple.js

@@ -83,6 +83,9 @@
     };
     /** get a service instance */
     this.Pimple.prototype.get=function(name){
+        if(this._definitions[name]===undefined){
+            throw new Error('Identifier "%s" is not defined.'.replace('%s', name));
+        }
         if (this._definitions[name] instanceof Function){
             return this._definitions[name](this);
         }
@@ -97,15 +100,16 @@
     /** extend a service */
     this.Pimple.prototype.extend=function(serviceName,service){
         var def,self=this;
-        if(this._definitions[serviceName]!==undefined){
-            def=self._definitions[serviceName];
-            return function(container){
-                if(def instanceof Function){
-                    def=def(container);
-                }
-                return service(def,container);
-            };
+        if(this._definitions[serviceName]===undefined){
+            throw new Error('Identifier "%s" is not defined.'.replace('%s', serviceName));
+        }
+        def=self._definitions[serviceName];
+        if(def instanceof Function){
+            def=def(this);
         }
+        service(def,this);
+
+	return this;
     };
     /** get a service raw definition */
     this.Pimple.prototype.raw=function(name){
@@ -125,7 +129,7 @@
         this.define('pimple',[],function(){return self.Pimple;});
     }
     //CommonJS
-    if(module && module.exports){
+    if(typeof exports !== 'undefined' && module && module.exports){
         module.exports = this.Pimple;
     }
 }).call(this);

test/pimple.test.js

@@ -51,17 +51,37 @@ describe('Pimple',function(){
         assert.ok(container.protected instanceof Function);
         assert.equal(container.protected(),5);
     });
+    it('should throw exception when trying to get service that not exists', function () {
+        try {
+            container.get('none');
+            assert.fail('Expected exception');
+        } catch (e) {
+            assert(e instanceof Error);
+            assert.equal(e.message, 'Identifier "none" is not defined.');
+        }
+    });
+    it('should throw exception when trying to extend definition that not exists', function () {
+        try {
+            container.extend('params', function (params, container) {
+                return params;
+            });
+            assert.fail('Expected exception');
+        } catch (e) {
+            assert(e instanceof Error);
+            assert.equal(e.message, 'Identifier "params" is not defined.');
+        }
+    });
     it(('should support definition extension'),function(){
         container.set('params',function(){
             return {
                 param1:1
             }
         });
-        container.set('params',container.extend('params',function(params,container){
+        container.extend('params',function(params,container){
             params.param2=2;
             container.set('param3',3);
             return params;
-        }));
+        });
         assert.equal(container.params.param2,2);
         assert.equal(container.params.param1,1);
         assert.equal(container.param3,3);