lspace 0.4 → 0.5

data/lib/lspace.rb

@@ -106,6 +106,7 @@ class LSpace
   #
   def around_filter(&filter)
     around_filters.unshift filter
+    self
   end
 
   # Enter this LSpace for the duration of the block

data/lib/lspace/core_ext.rb

@@ -27,7 +27,7 @@ class Module
   # Preserve lspace of all blocks passed to this function.
   #
   # This wraps both the &block parameter, and also any Procs
-  # that are passed into the function directly.
+  # and Methods that are passed into the function directly.
   #
   # If you need more complicated logic (e.g. wrapping Procs
   # that are passed to a function in a dictionary) you're
@@ -54,7 +54,7 @@ class Module
       alias_method method_without_lspace, method
 
       define_method(method) do |*args, &block|
-        args.map!{ |a| Proc === a ? a.in_lspace : a }
+        args.map!{ |a| (Proc === a || Method === a) ? a.in_lspace : a }
         block = block.in_lspace if block
         __send__(method_without_lspace, *args, &block)
       end
@@ -80,3 +80,22 @@ class Proc
     LSpace.preserve(&self)
   end
 end
+
+class Method
+  # Preserve LSpace when this method is run. Returns a new Proc, a closure that
+  # re-enters the current LSpace when it is called.
+  #
+  # @example
+  #   def fire
+  #     LSpace[:user_id]
+  #   end
+  #
+  #   todo = method(:fire!).in_lspace
+  #   todo.call == 2
+  # @see LSpace.preserve
+  # @return [Proc] A version of self that re-enters LSpace before running
+  def in_lspace
+    LSpace.preserve(&self)
+  end
+end
+

data/lib/lspace/eventmachine.rb

@@ -12,6 +12,13 @@ module EventMachine
   class << self
     in_lspace :add_timer, :next_tick, :error_handler, :defer, :run, :run_block, :schedule, :fork_reactor
     in_lspace :add_shutdown_hook if method_defined?(:add_shutdown_hook) # only some versions of EM
+
+    alias_method :start_server_without_lspace, :start_server
+    def start_server(*args, &block)
+      s = start_server_without_lspace(*args, &(block ? block.in_lspace : nil))
+      @acceptors[s][0].in_lspace
+      s
+    end
   end
 
   # Many EM APIs (e.g. em-http-request) are based on deferrables. Preserving lspace for
@@ -28,14 +35,40 @@ module EventMachine
       alias_method :allocate_without_lspace, :allocate
     end
 
+    # Ensure that instances of this connection are run in the current LSpace
+    #
+    # This is used by our version of {EM.start_server} to ensure that every
+    # instance of the server boots inside the same LSpace.
+    #
+    # We don't call it on client classes, so they will inherit the active
+    # LSpace when the outbound connection is created.
+    #
+    # @example
+    #   module Handler
+    #     def post_init
+    #       puts LSpace[:error_prefix]
+    #     end
+    #   end
+    #
+    #   LSpace.with(:error_prefix => 'handler') do
+    #     EM::start_server 'localhost', 8080, Handler
+    #   end
+    #
+    def self.in_lspace
+      @lspace = LSpace.current
+    end
+
     # Overridden allocate which sets up a new LSpace.
     #
     # Each connection object is run in its own LSpace, which can be
     # configured by implementing the {Connection#setup_lspace} method.
     def self.allocate
+      lspace = @lspace || LSpace.current
       allocate_without_lspace.instance_eval do
         extend EventMachine::LSpacePreserver
-        LSpace.with do
+        # Create a new LSpace per connection so that connections don't
+        # effect each other side-ways.
+        LSpace.new({}, lspace).enter do
           setup_lspace
           @lspace = LSpace.current
         end

data/lspace.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "lspace"
-  s.version = "0.4"
+  s.version = "0.5"
   s.platform = Gem::Platform::RUBY
   s.author = "Conrad Irwin"
   s.email = "conrad.irwin@gmail.com"

data/spec/eventmachine_spec.rb

@@ -76,6 +76,7 @@ describe LSpace do
     it "should preserve LSpace in all connection callbacks" do
       $server = []
       $client = []
+      $tick = []
       server = Module.new do
         def setup_lspace
           LSpace[:foo] = :server
@@ -113,19 +114,23 @@ describe LSpace do
 
         def unbind
           $client << [:unbind, LSpace[:foo], LSpace[:bar]]
-          EM::stop
         end
       end
 
-      LSpace.with(:bar => :baz) do
-        EM::run do
+      EM::run do
+        LSpace.with(:bar => :baz) do
           EM::start_server '0.0.0.0', 9345, server
           EM::connect '127.0.0.1', 9345, client
+          EM::PeriodicTimer.new(0.1) do
+            $tick << [:tick, LSpace[:bar]]
+            EM::stop
+          end
         end
       end
 
       $client.should == [[:post_init, :client, :baz], [:receive_data, :client, :baz], [:unbind, :client, :baz]]
       $server.should == [[:post_init, :server, :baz], [:receive_data, :server, :baz], [:unbind, :server, :baz]]
+      $tick.should == [[:tick, :baz]]
     end
   end
 end

metadata

@@ -1,128 +1,134 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lspace
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: '0.5'
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  version: "0.4"
 platform: ruby
-authors: 
+authors:
 - Conrad Irwin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: pry-rescue
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-rescue
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: pry-stack_explorer
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: celluloid
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: celluloid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: redcarpet
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides the convenience of global variables, without the safety concerns.
 email: conrad.irwin@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.MIT
@@ -144,37 +150,27 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/ConradIrwin/lspace
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Provides local global storage
 test_files: []
-
 has_rdoc: