pimple 0.0.1.alpha → 0.0.2.beta

data/lib/pimple.rb

@@ -1,11 +1,18 @@
 class Pimple < Hash
   
-  VERSION = '0.0.1.alpha'
+  VERSION = '0.0.2.beta'
   
+  # Initialize a container with some default parameters
   def initialize(parameters={})
     self.replace(parameters)
   end
   
+  # Get an object.
+  # If the fetched object is a lambda, it returns its value.
+  # 
+  # @params [Symbol, String] key Identifier of the searched elements in the container.
+  # 
+  # @return [Object]
   def [](key)
     obj = self.fetch key
     obj.kind_of?(Proc) ? obj.call(self) : obj
@@ -13,11 +20,29 @@ class Pimple < Hash
     raise KeyError, "Identifier \"#{key}\" is not defined."
   end
   
+  # Create a protected parameter.
+  # 
+  # @return [Proc]
+  #
+  # @example
+  #   container[:rand] = container.protect { rand(100) }
+  #   container[:rand] # => 34
+  #   container[:rand] # => 67
   def protect
     raise ArgumentError, "Missing block for protected function" unless block_given?
     Proc.new { yield }
   end
   
+  # Create a shared service definition
+  # This method require to called with a block that contains service definition
+  #
+  # @return [Proc]
+  # 
+  # @example
+  #   container[:session] = container.share { |c| Session.new }
+  #   container[:session] # => #<Session:0x007>
+  #   # Returns the same object later...
+  #   container[:session] # => #<Session:0x007>
   def share
     raise ArgumentError, "Missing block for shared service" unless block_given?
     lambda do |c|
@@ -26,8 +51,42 @@ class Pimple < Hash
     end
   end
   
-  def extend
-    # Not implemented yet
+  # Get the raw data from the container
+  # If you call this method by specifying a service as the key, it will return the Proc.
+  #
+  # @return [Object, Proc]
+  #
+  # @example
+  #   container[:session] = lambda { |c| Service.new }
+  #   container.raw(:service) # => #<Proc:0x007>
+  def raw(key)
+    self.fetch key
+  rescue
+    raise KeyError, "Identifier \"#{key}\" is not defined."
+  end
+  
+  # Extend a service definition
+  #
+  # @param [Symbol, String] key Identifier of the service definition to extend
+  #
+  # @return [Proc]
+  #
+  # @example
+  #   container[:service] = container.share { |c| Service.new }
+  #   container[:service] = container.extend(:service) { |s, c| 
+  #     c.configure (:foo, 'bar')
+  #     return c # need to return the service object.
+  #   }
+  def extends(key)
+    factory = self.raw(key)
+    
+    unless factory.kind_of?(Proc)
+      raise ArgumentError, "Identifier #{key} does not contain an object definition."
+    end
+    
+    lambda do |c|
+      yield(factory.call(c), c)
+    end
   end
   
 end

data/spec/pimple_spec.rb

@@ -17,16 +17,21 @@ describe Pimple do
   
   describe '.[]' do
     let(:container) { Pimple.new }
-    before { class Facebook; end; } # Simulate Facebook Api Client class
     
     it 'should inject service' do
-      container[:facebook] = lambda { |c| Facebook.new }
-      container[:facebook].class.should equal(Facebook)
+      container[:service] = lambda { |c| Service.new }
+      container[:service].class.should equal(Service)
+    end
+    
+    it 'should inject configuring service from container parameters' do
+      container[:foo] = 'bar'
+      container[:service] = lambda { |c| Service.new(c[:foo]) }
+      container[:service].param.should == 'bar'
     end
     
     it 'should return a new instance each time the [](key) method is invoked' do
-      container[:facebook] = lambda { |c| Facebook.new }
-      container[:facebook].should_not equal(container[:facebook])
+      container[:service] = lambda { |c| Service.new }
+      container[:service].should_not equal(container[:service])
     end
     
     it 'should raise KeyError if service not found' do
@@ -39,13 +44,13 @@ describe Pimple do
     let(:container) { Pimple.new }
     
     it 'should define anonymous function as parameter' do
-      container[:lambda_param] = container.protect { rand(1000) }
-      container[:lambda_param].should_not equal(container[:lambda_param])
+      container[:protected] = container.protect { rand(1000) }
+      container[:protected].should_not equal(container[:protected])
     end
     
     it 'should define anonymous function as parameter by Proc.new way' do
-      container[:lambda_param] = Proc.new { rand(1000) }
-      container[:lambda_param].should_not equal(container[:lambda_param])
+      container[:protected] = Proc.new { rand(1000) }
+      container[:protected].should_not equal(container[:protected])
     end
     
     it 'should raise ArgumentError when block is missing' do
@@ -56,21 +61,81 @@ describe Pimple do
   
   describe '.share' do
     let(:container) { Pimple.new }
-    before { class Facebook; end; } # Simulate Facebook Api Client class
     
-    it 'should define shared (global) service' do
-      container[:facebook] = container.share { |c| Facebook.new }
-      container[:facebook].class.should equal(Facebook)
+    it 'should define shared service' do
+      container[:service] = container.share { |c| Service.new }
+      container[:service].class.should equal(Service)
+    end
+    
+    it 'should inject configuring shared service from container parameters' do
+      container[:foo] = 'bar'
+      container[:service] = container.share { |c| Service.new(c[:foo]) }
+      container[:service].param.should == 'bar'
     end
     
     it 'should get the same instance each time [](key) method is invoked' do
-       container[:facebook] = container.share { |c| Facebook.new }
-       container[:facebook].should equal(container[:facebook])
+       container[:service] = container.share { |c| Service.new }
+       container[:service].should equal(container[:service])
+    end
+    
+  end
+  
+  describe '.raw' do
+    let(:container) { Pimple.new }
+    
+    it 'should return the anonymous function for the defined serivce' do
+      container[:service] = lambda { |c| Service.new }
+      container.raw(:service).kind_of?(Proc).should be_true
+    end
+    
+    it 'should raise KeyError exception if service not defined' do
+      lambda { container.raw :notfound }.should raise_error(KeyError)
     end
     
   end
   
-  describe '.extend', :pending => true do
+  describe '.extends' do
+    let(:container) { Pimple.new }
+    
+    it 'should extend a service definition' do
+      container[:service] = lambda { |c| Service.new }
+      container[:service] = container.extends(:service) do |service, c|
+        service.param = 'foo'
+        service
+      end
+      container[:service].param.should == 'foo'
+    end
+    
+    it 'should extend a shared service definition' do
+      container[:service] = container.share { |c| Service.new }
+      container[:service] = container.extends(:service) do |service, c|
+        service.param = 'foo'
+        service
+      end
+      container[:service].should equal(container[:service])
+      container[:service].param.should == 'foo'
+    end
+    
+    it 'should extend protected parameter' do
+      container[:protected] = container.protect { rand(100) }
+      container[:protected] = container.extends(:protected) do |p, c|
+        p + 200
+      end
+      container[:protected].should_not == container[:protected]
+    end
+    
+    it 'should not extend parameter' do
+      container[:foo] = 'bar'
+      lambda { 
+        container.extends(:foo) { |p, c| 'foo' } 
+      }.should raise_error(ArgumentError)
+    end
+    
+    it 'should raise KeyError if service not found' do
+      lambda { 
+        container.extends(:notfound) { |p, c| }
+      }.should raise_error(KeyError)
+    end
     
   end
   

data/spec/spec_helper.rb

@@ -10,4 +10,11 @@ require 'pimple'
 
 RSpec.configure do |config|
 	config.filter_run_excluding :broken => true
+end
+
+class Service 
+  attr_accessor :param
+  def initialize(param=nil)
+    @param = param
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pimple
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha
+  version: 0.0.2.beta
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-08 00:00:00.000000000 Z
+date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake