activecontext 0.1 → 0.2.1

data/lib/activecontext.rb

@@ -8,19 +8,38 @@ module ActiveContext
   
   def inject(*names)
     names.each do |name|
-      raise "invalid inject name #{name}" if methods.include?(name)
-      define_method name do
-        (value = Container.current[name]) && value.is_a?(Proc) ? value.call : value
+      if name.is_a?(Hash)
+        name.each_pair {|key, val| create_inject_method(name, val)}
+      else
+        create_inject_method(name, name)
       end
     end
   end
   
   def outject(*names)
     names.each do |name|
-      raise "invalid outject name #{name}" if methods.include?(:"#{name}=")
-      define_method "#{name}=" do |*args|
-        Container.current[name] = args.first
+      if name.is_a?(Hash)
+        name.each_pair {|key, val| create_outject_method(name, val)}
+      else
+        create_outject_method(name, name)
       end
     end
   end
+
+  private
+
+  def create_outject_method(name, as)
+    raise "invalid outject name #{as}" if methods.include?(:"#{as}=")
+    define_method "#{as}=" do |*args|
+      Container.current[name] = args.first
+    end
+  end
+  
+  def create_inject_method(name, as)
+    raise "invalid inject name #{as}" if methods.include?(as)
+    define_method as do
+      (value = Container.current[name]) && value.is_a?(Proc) ? value.call : value
+    end
+  end
+
 end

data/lib/activecontext/container.rb

@@ -1,12 +1,17 @@
+require "activecontext/context"
+
 module ActiveContext
   class Container
     def initialize
       @names = {}
+      @contexts = {}
     end
 
-    def register(name, ctx={}, &block)
+    def register(name, storage, &block)
       raise "invalid context name" if methods.include?(name)
-      instance_variable_set("@#{name}", ctx)
+      raise "invalid storage" unless storage.respond_to?(:"[]") && storage.respond_to?(:"[]=")
+      
+      @contexts[name] = Context.new(storage)
 
       eigen = class << self; self; end
       eigen.send(:define_method, name) do |*args, &block2|
@@ -49,13 +54,14 @@ module ActiveContext
         Thread.current[:contextualize] = nil
       end unless c
     end
-
+    
     def self.current
       Thread.current[:contextualize]
     end
 
     def context(name)
-      instance_variable_get("@#{name}")
+      yield(@contexts[name]) if block_given?
+      @contexts[name]
     end
 
   end

data/lib/activecontext/context.rb

@@ -0,0 +1,22 @@
+module ActiveContext
+  class Context
+    attr_accessor :serialize, :deserialize
+    def initialize(storage)
+      @storage = storage
+      @values = {}
+      @serialize = ->(key, value){ value }
+      @deserialize = ->(key, value){ value }
+    end
+    def [](key)
+      if @values.key?(key)
+        @values[key]
+      else
+        @values[key] = @deserialize.call(key, @storage[key])
+      end
+    end
+    def []=(key, value)
+      @storage[key] = @serialize.call(key, value)
+      @values[key] = value
+    end
+  end
+end

data/lib/activecontext/rack.rb

@@ -14,7 +14,7 @@ module ActiveContext
       container = Container.new
 
       container.register :request, {}
-      container.register :session, req.session
+      container.register :session, (req.session[:session] ||= {})
 
       container.instance_exec(req, &@block) if @block
 

data/spec/activecontext_spec.rb

@@ -26,6 +26,15 @@ describe ActiveContext do
       o.should respond_to(:somename)
     end
     
+    it "should create an aliased method for the injected name" do
+      o = new_test_object
+      o.eigenclass.instance_eval do
+        extend ActiveContext
+        inject :somename => :othername
+      end
+      o.should respond_to(:othername)
+    end
+    
     it "should create multiple methods when passing multiple injected names" do
       o = new_test_object
       o.eigenclass.instance_eval do
@@ -118,6 +127,15 @@ describe ActiveContext do
       o.should respond_to(:"othername=")
     end
   
+    it "should create an aliased method for the outjected name" do
+      o = new_test_object
+      o.eigenclass.instance_eval do
+        extend ActiveContext
+        outject :somename => :othername
+      end
+      o.should respond_to(:"othername=")
+    end
+  
     it "should fail if a method with the same name as outjected already exist" do
       o = new_test_object
       lambda do

data/spec/container_spec.rb

@@ -53,9 +53,8 @@ describe ActiveContext::Container do
   describe "registering a context" do
     it "should create an instance variable with same name as context" do
       c = ActiveContext::Container.new
-      ctx = {}
-      c.register :request, ctx
-      c.context("request").should eq(ctx)
+      c.register :request, {}
+      c.context(:request).should_not be_nil
     end
     
     it "should create a method with same name as context to declare names in this context" do
@@ -92,7 +91,7 @@ describe ActiveContext::Container do
         c = ActiveContext::Container.new
         c.register :request, {}
         c.request :somename, :joe
-        c.context("request")[:somename].should be(:joe)
+        c.context(:request)[:somename].should be(:joe)
       end
 
       it "should take a initial value factory as block" do
@@ -100,7 +99,7 @@ describe ActiveContext::Container do
         c.register :request, {}
         factory = -> { :joe }
         c.request :somename, &factory
-        c.context("request")[:somename].should be(factory)
+        c.context(:request)[:somename].should be(factory)
       end
       
       it "should fail when passing a initial value argument and a block at the same time" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activecontext
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70264750979080 !ruby/object:Gem::Requirement
+  requirement: &70180248337160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70264750979080
+  version_requirements: *70180248337160
 description: ''
 email:
 - jan.zimmek@web.de
@@ -30,6 +30,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/activecontext/container.rb
+- lib/activecontext/context.rb
 - lib/activecontext/rack.rb
 - lib/activecontext.rb
 - spec/activecontext_spec.rb