hypo 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e0d6a53f9f9c68dce9af65d0eaef9b209fd54c6
-  data.tar.gz: 70d8862335541f7f9973c93f49934492fef939ca
+  metadata.gz: eeb29a3bdf425982108ca90f88d03e7de685e3ee
+  data.tar.gz: 758529eb5a151b6f42d8cdc99d4886437aebaa46
 SHA512:
-  metadata.gz: 8a2412d9b4226b8816db156cf2cc45ca763dc227005071b1f704263584af6c0b4ae45d14a994d1dd65b3a8c66ab73744311abe619a556b3c611dc8fb2e8b1519
-  data.tar.gz: 2e03e94c0303e02b175d54bdfa94d880d027b5b68d0152c2d9d56b7f9ba952cf7fb5a64b7de2e14f7182b0ca34d1fcbabe573da954fcf6e712b16132cce8e5d3
+  metadata.gz: 51bfdac12ce95e82b6791d59786b98cd59811235edad08f3045a212b06246adebbb3f97b7be32799a49c29b30ca44d3ec0c3d2254ea428df3b845356559ac602
+  data.tar.gz: 5cf5df30c587ed234fccc25e32ad773c6db5e6449d9b94f2d73d797a8137e8707f4530a39c6d3fe488efd9061ce6ae7bc14e4ddc0b5b2c6626b23182116d499c

data/README.md

@@ -191,23 +191,6 @@ end
 ```
 Method "finalize" calls on scope releasing (Hypo::Scope#release).
 
-### Remove components
-Sometimes you need to manage a component lifetime manually. Especially it can be useful for "instances".
-For example, you're going to inject new instance of request parameters every http request in your web application:
-
-```ruby
-# somewhere in Rack application: request handling
-# ...
-query_string = env['QUERY_STRING']
-container.register_instance(query_string, :query_string)
-
-# handle the request
-# ...
-
-container.remove(:query_string)
-# ...
-```
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/hypo/container.rb

@@ -12,6 +12,8 @@ module Hypo
     def initialize
       @components = {}
       @lifetimes = {}
+      @mutex = Mutex.new
+
       add_lifetime(Lifetime::Transient.new, :transient)
       add_lifetime(Lifetime::Singleton.new, :singleton)
       add_lifetime(Lifetime::Scope.new, :scope)
@@ -26,7 +28,7 @@ module Hypo
 
       component = Component.new(item, self, name)
 
-      unless @components.key?(component.name)
+      @mutex.synchronize do
         @components[component.name] = component
       end
 
@@ -39,7 +41,7 @@ module Hypo
           'If you wanna register a type please use method "register".'
       end
 
-      unless @components.key?(name)
+      @mutex.synchronize do
         instance = Instance.new(item, self, name)
         @components[name] = instance
       end

data/lib/hypo/instance.rb

@@ -6,7 +6,7 @@ module Hypo
     include ScopeFriendly
     include LifetimeFriendly
 
-    attr_reader :name, :container, :scope, :object
+    attr_reader :name, :container, :object
 
     def initialize(object, container, name)
       raise ContainerError, 'Registered object should have a name' if name.nil?

data/lib/hypo/lifetime/scope.rb

@@ -1,31 +1,22 @@
 module Hypo
   module Lifetime
     class Scope
-      def initialize
-        @instances = {}
-      end
-
       def instance(component)
-        scope = component.scope.object_id
-        @instances[scope] = {} unless @instances.key? scope
+        instances = component.scope.instances
 
-        unless @instances[scope].key? component.name
+        unless instances.key? component.name
           if component.respond_to? :type
-            @instances[scope][component.name] = component.type.new(*component.dependencies)
+            instances[component.name] = component.type.new(*component.dependencies)
           else
-            @instances[scope][component.name] = component.object
+            instances[component.name] = component.object
           end
         end
 
-        @instances[scope][component.name]
+        instances[component.name]
       end
 
       def purge(scope)
-        @instances[scope.object_id].each_value do |instance|
-          instance.finalize if instance.respond_to? :finalize
-        end
-
-        @instances.delete scope.object_id
+        scope.purge
       end
     end
   end

data/lib/hypo/lifetime/singleton.rb

@@ -2,19 +2,21 @@ module Hypo
   module Lifetime
     class Singleton
       def initialize
-        @instances = {}
+        @instances = Hash.new
+        @mutex = Mutex.new
       end
 
       def instance(component)
-        unless @instances.key? component.name
-          if component.respond_to? :type
-            @instances[component.name] = component.type.new(*component.dependencies)
-          else
-            @instances[component.name] = component.object
+        @instances[component.name]
+      end
+
+      def preload(component)
+        @mutex.synchronize do
+          unless @instances.key? component.name
+            instance = component.respond_to?(:type) ? component.type.new(*component.dependencies) : component.object
+            @instances[component.name] = instance
           end
         end
-
-        @instances[component.name]
       end
     end
   end

data/lib/hypo/lifetime_friendly.rb

@@ -6,6 +6,7 @@ module Hypo
       end
 
       @lifetime = @container.lifetimes[name]
+      @lifetime.preload(self) if @lifetime.respond_to? :preload
 
       self
     end

data/lib/hypo/scope.rb

@@ -1,7 +1,17 @@
 module Hypo
   module Scope
+    attr_reader :instances
+
     def release
       @container.lifetimes[:scope].purge(self)
     end
+
+    def purge
+      @instances.each_value do |instance|
+        instance.finalize if instance.respond_to? :finalize
+      end
+
+      @instances = Hash.new
+    end
   end
 end

data/lib/hypo/scope_friendly.rb

@@ -5,6 +5,7 @@ module Hypo
         @scope_name = scope
       else
         @scope = scope
+        @scope.instance_variable_set('@instances'.freeze, Hash.new)
       end
 
       self

data/lib/hypo/version.rb

@@ -1,3 +1,3 @@
 module Hypo
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hypo
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Vladimir Kalinkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-24 00:00:00.000000000 Z
+date: 2017-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler