tins 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb26b5aa4d1854350b2a520c593a0085a2a1097f9058f5635357189c83671dca
-  data.tar.gz: 650ee7963f5b40ab1820becdabc32810309657c55a1774a0c97a5bfa74823a1d
+  metadata.gz: 78a0c250276797f603fe2ae06f3ce7344d08a8c5d85155c8de3c0604c2440bd9
+  data.tar.gz: 4fc9a4a4cdb05ac38be0b80d384e042e5e2a99c8334cd58c21af5aaa6728de7f
 SHA512:
-  metadata.gz: 37fbc2ffb339c99c81622c9fc1303f22f200993e3a99d77e10b9b6f6fbfd90ee20f1814091f3d0ca49323a52ada93ecbce9e231b37820c07e15bad111517f8ad
-  data.tar.gz: 798701836440f59d8d39a448935651ec5ed86a8b7375717b09d1611db19ff323361e8ac2052cf4c221b65b0ed1d861309b8eea82d61d18298e68388c7be9768f
+  metadata.gz: eae62a0aff396940e442ed9d00b1e566e9dff432713884e75b4012c2a73e913a316e68d06c1f04ef8825c2379f100ec45ef733cc626697d4ebaec47075981618
+  data.tar.gz: d05e7cdeebcc16a2f968e24b722ed32ee0dd88e67d6d838863211fbacaee639344efc1a999fa735e26744abb81314903983f183961d75c2806437bed22a97b8e

data/README.md

@@ -12,7 +12,9 @@ Non yet.
 
 ## Changes
 
-* 2018-10-15 RElease 1.17.0
+* 2018-11-02 Release 1.18.0
+ - `thread_local` and `thread_global` with default block
+* 2018-10-15 Release 1.17.0
  - Add Tins::TempIO::Enum class to wrap `temp_io` into Enumerator.
 * 2017-12-05 Release 1.16.3
  - Improve `temp_io` method by not changing working dir.

data/VERSION

@@ -1 +1 @@
-1.17.0
+1.18.0

data/lib/tins/dslkit.rb

@@ -51,9 +51,16 @@ module Tins
   module ThreadGlobal
     # Define a thread global variable named _name_ in this module/class. If the
     # value _value_ is given, it is used to initialize the variable.
-    def thread_global(name, default_value = nil)
+    def thread_global(name, default_value = nil, &default)
       is_a?(Module) or raise TypeError, "receiver has to be a Module"
 
+      default_value && default and raise ArgumentError,
+        "require either default_falue or default block"
+
+      if default_value
+        default = -> * { default_value }
+      end
+
       name = name.to_s
       var_name = "@__#{name}_#{__id__.abs}__"
 
@@ -61,14 +68,18 @@ module Tins
       modul = self
 
       define_method(name) do
-        lock.synchronize { modul.instance_variable_get var_name }
+        lock.synchronize {
+          if default && !modul.instance_variable_defined?(var_name)
+            modul.instance_variable_set var_name, default.call
+          end
+          modul.instance_variable_get var_name
+        }
       end
 
       define_method(name + "=") do |value|
         lock.synchronize { modul.instance_variable_set var_name, value }
       end
 
-      modul.instance_variable_set var_name, default_value if default_value
       self
     end
 

data/lib/tins/thread_local.rb

@@ -13,17 +13,27 @@ module Tins
 
     # Define a thread local variable named _name_ in this module/class. If the
     # value _value_ is given, it is used to initialize the variable.
-    def thread_local(name, default_value = nil)
+    def thread_local(name, default_value = nil, &default)
       is_a?(Module) or raise TypeError, "receiver has to be a Module"
 
+      default_value && default and raise ArgumentError,
+        "require either default_falue or default block"
+
+      if default_value
+        default = -> * { default_value }
+      end
+
       name = name.to_s
       my_id = "__thread_local_#{__id__}__"
 
       ObjectSpace.define_finalizer(self, @@cleanup)
 
       define_method(name) do
-        Thread.current[my_id] ||= {}
-        Thread.current[my_id][name]
+        values = Thread.current[my_id] ||= {}
+        if default && !values.key?(name)
+          values[name] = default.call
+        end
+        values[name]
       end
 
       define_method("#{name}=") do |value|
@@ -31,20 +41,16 @@ module Tins
         Thread.current[my_id][name] = value
       end
 
-      if default_value
-        Thread.current[my_id] = {}
-        Thread.current[my_id][name] = default_value
-      end
       self
     end
 
     # Define a thread local variable for the current instance with name _name_.
     # If the value _value_ is given, it is used to initialize the variable.
-    def instance_thread_local(name, value = nil)
+    def instance_thread_local(name, default_value = nil, &default)
       class << self
         extend Tins::ThreadLocal
         self
-      end.thread_local name, value
+      end.thread_local name, default_value, &default
       self
     end
   end

data/lib/tins/version.rb

@@ -1,6 +1,6 @@
 module Tins
   # Tins version
-  VERSION         = '1.17.0'
+  VERSION         = '1.18.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/tests/dslkit_test.rb

@@ -9,6 +9,9 @@ class TL
   extend Tins::ThreadLocal
   thread_local :foo
 
+  extend Tins::ThreadLocal
+  thread_local :foo2 do {} end
+
   include Tins::ThreadLocal
   def make_baz
     instance_thread_local :baz
@@ -16,6 +19,8 @@ class TL
 
   extend Tins::ThreadGlobal
   thread_global :bar
+
+  thread_global :bar2 do {} end
 end
 
 class IE
@@ -122,6 +127,19 @@ class PoliteTest < Test::Unit::TestCase
     assert_equal @tl.baz, @tl2.baz
   end
 
+  def test_thread_local_with_default
+    assert_kind_of Hash, @tl.foo2
+    @tl.foo2[:hi] = 1
+    assert_equal 1, @tl.foo2[:hi]
+    thread = Thread.new do
+      assert_kind_of Hash, @tl.foo2
+      assert_nil @tl.foo2[:hi]
+      @tl.foo2[:hi] = 2
+    end
+    thread.join
+    assert_equal 1, @tl.foo2[:hi]
+  end
+
   def test_instance_thread_local
     assert_nil @tl.baz
     @tl.baz = 1
@@ -151,6 +169,18 @@ class PoliteTest < Test::Unit::TestCase
     assert_equal 2, @tl.bar
   end
 
+  def test_thread_global_with_default
+    assert_kind_of Hash, @tl.bar2
+    @tl.bar2[:hi] = 1
+    assert_equal 1, @tl.bar2[:hi]
+    thread = Thread.new do
+      assert_kind_of Hash, @tl.bar2
+      assert_equal 1, @tl.bar2[:hi]
+    end
+    thread.join
+    assert_equal 1, @tl.bar2[:hi]
+  end
+
   def test_instance_exec
     assert_equal :foo, @ie.foo
     assert_equal :foo, @ie.exec

data/tests/find_test.rb

@@ -110,7 +110,7 @@ module Tins
         Tins::Find::Finder.new(visit: :foo, suffix: 'bla')
       end
       finder = Tins::Find::Finder.new(visit: -> path { path.stat.file? })
-      f = File.open(fpath = File.join(@work_dir, 'foo.bar'), 'w')
+      File.new(fpath = File.join(@work_dir, 'foo.bar'), 'w').close
       mkdir_p(gpath = File.join(@work_dir, 'dir'))
       fpath = finder.prepare_path fpath
       gpath = finder.prepare_path gpath

data/tins.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: tins 1.17.0 ruby lib
+# stub: tins 1.18.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tins".freeze
-  s.version = "1.17.0"
+  s.version = "1.18.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2018-10-15"
+  s.date = "2018-11-02"
   s.description = "All the stuff that isn't good/big enough for a real library.".freeze
   s.email = "flori@ping.de".freeze
   s.extra_rdoc_files = ["README.md".freeze, "lib/dslkit.rb".freeze, "lib/dslkit/polite.rb".freeze, "lib/dslkit/rude.rb".freeze, "lib/spruz.rb".freeze, "lib/tins.rb".freeze, "lib/tins/alias.rb".freeze, "lib/tins/annotate.rb".freeze, "lib/tins/ask_and_send.rb".freeze, "lib/tins/attempt.rb".freeze, "lib/tins/bijection.rb".freeze, "lib/tins/case_predicate.rb".freeze, "lib/tins/complete.rb".freeze, "lib/tins/concern.rb".freeze, "lib/tins/count_by.rb".freeze, "lib/tins/date_dummy.rb".freeze, "lib/tins/date_time_dummy.rb".freeze, "lib/tins/deep_const_get.rb".freeze, "lib/tins/deep_dup.rb".freeze, "lib/tins/dslkit.rb".freeze, "lib/tins/duration.rb".freeze, "lib/tins/expose.rb".freeze, "lib/tins/extract_last_argument_options.rb".freeze, "lib/tins/file_binary.rb".freeze, "lib/tins/find.rb".freeze, "lib/tins/generator.rb".freeze, "lib/tins/go.rb".freeze, "lib/tins/hash_symbolize_keys_recursive.rb".freeze, "lib/tins/hash_union.rb".freeze, "lib/tins/if_predicate.rb".freeze, "lib/tins/implement.rb".freeze, "lib/tins/limited.rb".freeze, "lib/tins/lines_file.rb".freeze, "lib/tins/memoize.rb".freeze, "lib/tins/method_description.rb".freeze, "lib/tins/minimize.rb".freeze, "lib/tins/module_group.rb".freeze, "lib/tins/named_set.rb".freeze, "lib/tins/null.rb".freeze, "lib/tins/once.rb".freeze, "lib/tins/p.rb".freeze, "lib/tins/partial_application.rb".freeze, "lib/tins/proc_compose.rb".freeze, "lib/tins/proc_prelude.rb".freeze, "lib/tins/range_plus.rb".freeze, "lib/tins/require_maybe.rb".freeze, "lib/tins/responding.rb".freeze, "lib/tins/secure_write.rb".freeze, "lib/tins/sexy_singleton.rb".freeze, "lib/tins/string_byte_order_mark.rb".freeze, "lib/tins/string_camelize.rb".freeze, "lib/tins/string_underscore.rb".freeze, "lib/tins/string_version.rb".freeze, "lib/tins/subhash.rb".freeze, "lib/tins/temp_io.rb".freeze, "lib/tins/temp_io_enum.rb".freeze, "lib/tins/terminal.rb".freeze, "lib/tins/thread_local.rb".freeze, "lib/tins/time_dummy.rb".freeze, "lib/tins/to.rb".freeze, "lib/tins/to_proc.rb".freeze, "lib/tins/token.rb".freeze, "lib/tins/uniq_by.rb".freeze, "lib/tins/unit.rb".freeze, "lib/tins/version.rb".freeze, "lib/tins/write.rb".freeze, "lib/tins/xt.rb".freeze, "lib/tins/xt/annotate.rb".freeze, "lib/tins/xt/ask_and_send.rb".freeze, "lib/tins/xt/attempt.rb".freeze, "lib/tins/xt/blank.rb".freeze, "lib/tins/xt/case_predicate.rb".freeze, "lib/tins/xt/complete.rb".freeze, "lib/tins/xt/concern.rb".freeze, "lib/tins/xt/count_by.rb".freeze, "lib/tins/xt/date_dummy.rb".freeze, "lib/tins/xt/date_time_dummy.rb".freeze, "lib/tins/xt/deep_const_get.rb".freeze, "lib/tins/xt/deep_dup.rb".freeze, "lib/tins/xt/dslkit.rb".freeze, "lib/tins/xt/expose.rb".freeze, "lib/tins/xt/extract_last_argument_options.rb".freeze, "lib/tins/xt/file_binary.rb".freeze, "lib/tins/xt/full.rb".freeze, "lib/tins/xt/hash_symbolize_keys_recursive.rb".freeze, "lib/tins/xt/hash_union.rb".freeze, "lib/tins/xt/if_predicate.rb".freeze, "lib/tins/xt/implement.rb".freeze, "lib/tins/xt/irb.rb".freeze, "lib/tins/xt/method_description.rb".freeze, "lib/tins/xt/named.rb".freeze, "lib/tins/xt/null.rb".freeze, "lib/tins/xt/p.rb".freeze, "lib/tins/xt/partial_application.rb".freeze, "lib/tins/xt/proc_compose.rb".freeze, "lib/tins/xt/proc_prelude.rb".freeze, "lib/tins/xt/range_plus.rb".freeze, "lib/tins/xt/require_maybe.rb".freeze, "lib/tins/xt/responding.rb".freeze, "lib/tins/xt/secure_write.rb".freeze, "lib/tins/xt/sexy_singleton.rb".freeze, "lib/tins/xt/string.rb".freeze, "lib/tins/xt/string_byte_order_mark.rb".freeze, "lib/tins/xt/string_camelize.rb".freeze, "lib/tins/xt/string_underscore.rb".freeze, "lib/tins/xt/string_version.rb".freeze, "lib/tins/xt/subhash.rb".freeze, "lib/tins/xt/temp_io.rb".freeze, "lib/tins/xt/time_dummy.rb".freeze, "lib/tins/xt/time_freezer.rb".freeze, "lib/tins/xt/to.rb".freeze, "lib/tins/xt/uniq_by.rb".freeze, "lib/tins/xt/write.rb".freeze]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tins
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar