instance_storage 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d979de0479edc2e246b2dec5074f04aa378fd8e4
-  data.tar.gz: 5ce55b2dfd968ceec11d720d0594e5d4fa52736e
+  metadata.gz: 2ab3fca4c92a0d5c88ff4fff5751feda09592ede
+  data.tar.gz: db4128fe44f81bd8895e9c9b3c38fe695047d034
 SHA512:
-  metadata.gz: 612331ea0098cfc273c31b8aeae1e79a9332bc062fa0691aad3f00c327ccc0ea98944621a1eec6ee9907e0b5840bc0113ab82149c12abcb1ff4958916ca455ad
-  data.tar.gz: 4cee8191d7c163848b0a1ebe2dc12c6c8a5fa3554da2ddb7d6e94034736ab5c81e5725865b51bc14d448d57ce1fa8c0ab5ec60bb4853e8ec1cfc20fd1ea3204d
+  metadata.gz: 747dabd4ac2cc2c925fc0127422bf350455d032ba79f9177b8cd29f8cef6ff4051ef9d9264923a93f714ad3046b9883e25e775feb7241d84cae51995d507a367
+  data.tar.gz: 6b590975c1845dba1ce2db36b315c35835332d7b57b384c1d5aefeb45f6375e02201a26728c64838a9453506faac5fc48c9e2555a177eafa400701713125bbec

data/lib/instance_storage.rb

@@ -11,8 +11,10 @@ module InstanceStorage
   alias to_sym name
 
   def self.included(klass)
-    klass.extend InstanceStorageExtend
-    klass.clear!
+    super
+    klass.class_eval do
+      extend InstanceStorageExtend
+    end
   end
 
   def initialize(name)
@@ -25,10 +27,15 @@ module InstanceStorage
     @name.to_s end
 
   module InstanceStorageExtend
+    def instances_dict
+      @instances ||= {} end
+
+    def storage_lock
+      @storage_lock ||= Mutex.new end
+
     # 定義されているインスタンスを全て削除する
     def clear!
-      @instances = {}
-      @storage_lock = Mutex.new end
+      @instances = @storage_lock = nil end
 
     # インスタンス _event_name_ を返す。既に有る場合はそのインスタンス、ない場合は新しく作って返す。
     # ==== Args
@@ -37,26 +44,26 @@ module InstanceStorage
     # Event
     def [](name)
       name_sym = name.to_sym
-      if @instances.has_key?(name_sym)
-        @instances[name_sym]
+      if instances_dict.has_key?(name_sym)
+        instances_dict[name_sym]
       else
-        @storage_lock.synchronize{
-          if @instances.has_key?(name_sym)
-            @instances[name_sym]
+        storage_lock.synchronize{
+          if instances_dict.has_key?(name_sym)
+            instances_dict[name_sym]
           else
-            @instances[name_sym] = self.new(name_sym) end } end end
+            instances_dict[name_sym] = self.new(name_sym) end } end end
 
     # このクラスのインスタンスを全て返す
     # ==== Return
     # インスタンスの配列(Array)
     def instances
-      @instances.values end
+      instances_dict.values end
 
     # このクラスのインスタンスの名前を全て返す
     # ==== Return
     # インスタンスの名前の配列(Array)
     def instances_name
-      @instances.keys end
+      instances_dict.keys end
 
     # 名前 _name_ に対応するインスタンスが存在するか否かを返す
     # ==== Args
@@ -64,7 +71,7 @@ module InstanceStorage
     # ==== Return
     # インスタンスが存在するなら真
     def instance_exist?(name)
-      @instances.has_key? name.to_sym end
+      instances_dict.has_key? name.to_sym end
 
     # _name_ に対応するインスタンスが既にあれば真
     # ==== Args
@@ -72,9 +79,9 @@ module InstanceStorage
     # ==== Return
     # インスタンスかnil
     def instance(name)
-      @instances[name.to_sym] end
+      instances_dict[name.to_sym] end
 
     def destroy(name)
-      @instances.delete(name.to_sym) end
+      instances_dict.delete(name.to_sym) end
   end
 end

data/lib/instance_storage/version.rb

@@ -1,3 +1,3 @@
 module InstanceStorage
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

data/test/instance_storage_test.rb

@@ -46,4 +46,12 @@ describe(InstanceStorage) do
     assert_equal(klass[:a], klass.instance(:a))
   end
 
+  it "should support inherited class" do
+    klass = Class.new do
+      include InstanceStorage end
+    child = Class.new(klass)
+    assert_same(child[:foo], child[:foo])
+    refute_same(child[:foo], klass[:foo])
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instance_storage
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Toshiaki Asai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler