roda-container 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15f3136a230d1b934b51c0ca18f2c772378deb5f
-  data.tar.gz: 2ff4e2383eb0e47f4000b97912cc0a7d195b82b6
+  metadata.gz: 15d116dc716eb7e2220f95bab7a4179e53737569
+  data.tar.gz: 02779f0dd1d9e5c7c6ab4bec115abd2f65d1d586
 SHA512:
-  metadata.gz: 88241b79de3a8dcf2f8a801562923e26b9aa9b509156642776eccf280aab2fe2880f5c6c29fca44100149cc1ed425721d9e9ab6cc37cc0b4d4caf3717ebfb61e
-  data.tar.gz: 52f0ace71d379a143625d95bc2d22f9055f4e3b7eceee7eaecf0668750a540460e1d6dad38272f09ce2d0750ab827567d90e541c2bb689c0da27653e857a6ab1
+  metadata.gz: 7134e5541427b5da8d8b49f217baccdc3d5063fe6a350ccbf19c09b68167821f97bdc5489d887c4ae032a0749f7c3b46b3d9bea9965dc85f62980cb7ebf6600d
+  data.tar.gz: fcafa937f4f20c140ea30397a28478631381aad60f9a732e49af9e0d6260cbcc26d6568b82bdc344cb0edd9395027fd247dd7a0e1e8537601b83fa7123cb00d0

data/README.md

@@ -45,11 +45,43 @@ end
 
 MyApplication.route do |r|
   # Roda responds to the instance method #call, with the call: false
-  # option, calling MyApplication.resolve(:app) will not attempt to call
+  # option, calling MyApplication.instance.resolve(:app) will not attempt to call
   # it, without the option, the application would error
+  MyApplication.instance.register(:app, self, call: false)
+end
+```
+
+## Thread safety
+
+Please note the use of `MyApplication.instance.register` and `MyApplication.instance.resolve` above, without the calls to `Roda.instance` there is a high possiblilty of a thread safety issue when registering anything at runtime. For example:
+
+```ruby
+class MyApplication < Roda
+  plugin :container
+end
+
+MyApplication.route do |r|
+  # DO NOT DO THIS, SEE ABOVE ^^^
   MyApplication.register(:app, self, call: false)
+
+  r.on 'users' do
+    # ...
+    r.get :id do |user_id|
+      MyApplication.resolve(:app)
+    end
+
+    r.post do
+      sleep(5)
+      MyApplication.resolve(:app)
+    end
+  end
+end
 ```
 
+Immagine a user hitting `POST /users`, then another user hitting `GET /users/{id}` in quick succession; the first user registers their instance of app with the container, then hits the 5 second sleep, then the second user comes along, registers their instance of app with the container, the request executes and they go on their merry way.
+
+A few seconds later the 5 second sleep is complete, and the first user resolves `:app` from the container, only to find the instance that was registered by the user hitting `GET /users/{id}`, they have just spent 5 minutes meticulously filling out your webform to create their user account, only for their payload to lost in a race condition, needless to say, you don't want this to happen.
+
 ## Contributing
 
 1. Fork it ( https://github.com/AMHOL/roda-container )

data/lib/roda/plugins/container.rb

@@ -31,6 +31,27 @@ class Roda
     #   MyApplication.register(:person_repository, -> { PersonRepository.new })
     #   MyApplication.resolve(:person_repository).first
     module Container
+      class Container < RodaCache
+        def register(key, contents = nil, options = {}, &block)
+          if block_given?
+            item = block
+            options = contents if contents.is_a?(::Hash)
+          else
+            item = contents
+          end
+
+          self[key] = Content.new(item, options)
+        end
+
+        def resolve(key)
+          content = fetch(key) do
+            fail ::Roda::ContainerError, "Nothing registered with the name #{key}"
+          end
+
+          content.call
+        end
+      end
+
       class Content
         attr_reader :item, :options
 
@@ -54,7 +75,7 @@ class Roda
         private :container
 
         def self.extended(subclass)
-          subclass.instance_variable_set(:@container, RodaCache.new)
+          subclass.instance_variable_set(:@container, Container.new)
           super
         end
 
@@ -63,28 +84,29 @@ class Roda
           super
         end
 
+        def instance
+          Thread.current[:__container__]
+        end
+
         def register(key, contents = nil, options = {}, &block)
-          if block_given?
-            item = block
-            options = contents if contents.is_a?(::Hash)
-          else
-            item = contents
-          end
-          container[key] = Roda::RodaPlugins::Container::Content.new(item, options)
+          container.register(key, contents, options, &block)
         end
 
         def resolve(key)
-          content = container.fetch(key) do
-            fail ::Roda::ContainerError, "Nothing registered with the name #{key}"
-          end
-
-          content.call
+          container.resolve(key)
         end
 
         def detach_container
           @container = container.dup
         end
       end
+
+      module InstanceMethods
+        def call(*args, &block)
+          Thread.current[:__container__] = self.class.send(:container).dup
+          super
+        end
+      end
     end
 
     register_plugin(:container, Container)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-container
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Andy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A plugin for Roda which turns your application into a (IoC) container
 email:
 - andyholland1991@aol.com