tins 1.21.1 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83d331730cd4ad491a20aa00b62c3bf143b90b4815c925ea9cac00ecca1e28df
-  data.tar.gz: 20caddb7ec694722fcb858e3f89575d059cf6184b9f7f3691097f1c26940b30f
+  metadata.gz: af6d1efde1eb5b47d047193f99d7bf9e8e04340f38602db17a913a0f8a13d657
+  data.tar.gz: bea619711defe84cc26090bc07405ed01ffdd32366b47dddbe6947a687c227c1
 SHA512:
-  metadata.gz: 42299ca6120a02909cb506d4c7b2f9cf2e183dbb306f63942f459230e29308a6e186c9381aa9a0045a72b144a5503fb70761c758a741e6c4a7d0d65322aa3dee
-  data.tar.gz: fce6386c9232be5d744c5d1dd80f2aa44302ca6240c04f79497783cb40f5e88040c19dade9f998dd1ac77b96e13c55ab11b5ce7f3e23aa960971c917b0fa276e
+  metadata.gz: e93d28cd97b016e3e5fad74625f5c6ddf2ed665fd378a84acdc6741c1f33222cbc63b751e1436125b49b5d14063000513c926b051a5e04a9f637fb5850d20e44
+  data.tar.gz: 6adf2f9c27f9a30324f600ebc8f4ba306e8adf701e6b109b33a30a57df0f69d073f0523051c6d7256f18f7e7fc5661ff4ce5fa643ee41092fe7535ecd08f5b43

data/VERSION

@@ -1 +1 @@
-1.21.1
+1.22.0

data/lib/tins/attempt.rb

@@ -1,5 +1,16 @@
 module Tins
   module Attempt
+    # Attempts code in block *attempts* times, sleeping according to *sleep*
+    # between attempts and catching the exception(s) in *exception_class*.
+    #
+    # *sleep* is either a Proc returning a floating point number for duration
+    # as seconds or a Numeric >= 0 or < 0. In the former case this is the
+    # duration directly, in the latter case -*sleep* is the total number of
+    # seconds that is slept before giving up, and every attempt is retried
+    # after a exponentially increasing duration of seconds.
+    #
+    # Iff *reraise* is true the caught exception is reraised after running out
+    # of attempts.
     def attempt(opts = {}, &block)
       sleep           = nil
       exception_class = StandardError

data/lib/tins/hash_symbolize_keys_recursive.rb

@@ -1,25 +1,42 @@
+require 'tins/thread_local'
+
 module Tins
   module HashSymbolizeKeysRecursive
-    def symbolize_keys_recursive
-      inject(self.class.new) do |h,(k, v)|
-        k = k.to_s
-        case v
-        when Hash
-          h[k.to_sym] = v.symbolize_keys_recursive
-        when Array
-          h[k.to_sym] = a = v.dup
-          v.each_with_index do |x, i|
-            Hash === x and a[i] = x.symbolize_keys_recursive
-          end
-        else
-          h[k.to_sym] = v
-        end
-        h
-      end
+    extend Tins::ThreadLocal
+
+    thread_local :seen
+
+    def symbolize_keys_recursive(circular: nil)
+      self.seen = {}
+      _symbolize_keys_recursive(self, circular: circular)
+    ensure
+      self.seen = nil
     end
 
-    def symbolize_keys_recursive!
-      replace symbolize_keys_recursive
+    def symbolize_keys_recursive!(circular: nil)
+      replace symbolize_keys_recursive(circular: circular)
+    end
+
+    private
+
+    def _symbolize_keys_recursive(object, circular: nil)
+      case
+      when seen[object.__id__]
+        circular != nil and object = circular
+      when Hash === object
+        seen[object.__id__] = true
+        result = {}
+        object.each do |k, v|
+          result[k.to_s.to_sym] = _symbolize_keys_recursive(v, circular: circular)
+        end
+        object.replace result
+      when Array === object
+        seen[object.__id__] = true
+        object.map! do |v|
+          _symbolize_keys_recursive(v, circular: circular)
+        end
+      end
+      object
     end
   end
 end

data/lib/tins/unit.rb

@@ -63,7 +63,7 @@ module Tins::Unit
       super source
       if prefixes
         @unit_re    = unit_re(Tins::Unit.prefixes(prefixes), unit)
-        @unit_lc_re = @unit_uc_re                                  = nil
+        @unit_lc_re = @unit_uc_re = nil
       else
         @unit_lc_re = unit_re(Tins::Unit.prefixes(:lc), unit)
         @unit_uc_re = unit_re(Tins::Unit.prefixes(:uc), unit)

data/lib/tins/version.rb

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

data/tests/hash_symbolize_keys_recursive_test.rb

@@ -11,7 +11,8 @@ module Tins
           {
             'key' => {
               'key' => true
-            }
+            },
+            'o' => Object.new,
           }
         ],
       }
@@ -20,5 +21,45 @@ module Tins
       hash.symbolize_keys_recursive!
       assert hash[:key][0][:key][:key]
     end
+
+    def test_symbolize_bang
+      hash = { 'foo' => 'bar' }
+      hash.symbolize_keys_recursive!
+      assert_equal({ foo: 'bar' }, hash)
+    end
+
+    def test_symbolize_with_circular_array
+      circular_array = [].tap { |a| a << a }
+      assert_equal(
+        { foo: circular_array },
+        { 'foo' => circular_array }.symbolize_keys_recursive
+      )
+      assert_equal(
+        { foo: [ :circular ] },
+        { 'foo' => circular_array }.symbolize_keys_recursive(circular: :circular)
+      )
+    end
+
+    def test_symbolize_with_circular_hash
+      circular_hash = {}.tap { |h| h['foo'] = h }
+      circular_hash_symbol = {}.tap { |h| h[:foo] = h }
+      p({ 'bar' => circular_hash }.symbolize_keys_recursive)
+      assert_equal(
+        { bar: circular_hash_symbol },
+        { 'bar' => circular_hash }.symbolize_keys_recursive
+      )
+      assert_equal(
+        { bar: { foo: :circular } },
+        { 'bar' => circular_hash }.symbolize_keys_recursive(circular: :circular)
+      )
+    end
+
+    def test_symbolize_deeper_nesting
+      hash = { 'foo' => [ true, [ { 'bar' => {}.tap { |h| h['foo'] = h } }, 3.141, [].tap { |arr| arr << arr } ] ] }
+      assert_equal(
+        {foo: [true, [{bar: {foo: :circular}}, 3.141, [:circular]]]},
+        hash.symbolize_keys_recursive(circular: :circular)
+      )
+    end
   end
 end

data/tins.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: tins 1.21.1 ruby lib
+# stub: tins 1.22.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tins".freeze
-  s.version = "1.21.1"
+  s.version = "1.22.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 = "2019-07-17"
+  s.date = "2019-10-30"
   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]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "Tins - Useful stuff.".freeze, "--main".freeze, "README.md".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.0".freeze)
-  s.rubygems_version = "3.0.3".freeze
+  s.rubygems_version = "3.0.6".freeze
   s.summary = "Useful stuff.".freeze
   s.test_files = ["tests/annotate_test.rb".freeze, "tests/ask_and_send_test.rb".freeze, "tests/attempt_test.rb".freeze, "tests/bijection_test.rb".freeze, "tests/blank_full_test.rb".freeze, "tests/case_predicate_test.rb".freeze, "tests/concern_test.rb".freeze, "tests/count_by_test.rb".freeze, "tests/date_dummy_test.rb".freeze, "tests/date_time_dummy_test.rb".freeze, "tests/deep_const_get_test.rb".freeze, "tests/deep_dup_test.rb".freeze, "tests/delegate_test.rb".freeze, "tests/dslkit_test.rb".freeze, "tests/duration_test.rb".freeze, "tests/dynamic_scope_test.rb".freeze, "tests/expose_test.rb".freeze, "tests/extract_last_argument_options_test.rb".freeze, "tests/file_binary_test.rb".freeze, "tests/find_test.rb".freeze, "tests/from_module_test.rb".freeze, "tests/generator_test.rb".freeze, "tests/go_test.rb".freeze, "tests/hash_symbolize_keys_recursive_test.rb".freeze, "tests/hash_union_test.rb".freeze, "tests/if_predicate_test.rb".freeze, "tests/implement_test.rb".freeze, "tests/limited_test.rb".freeze, "tests/lines_file_test.rb".freeze, "tests/memoize_test.rb".freeze, "tests/method_description_test.rb".freeze, "tests/minimize_test.rb".freeze, "tests/module_group_test.rb".freeze, "tests/named_set_test.rb".freeze, "tests/named_test.rb".freeze, "tests/null_test.rb".freeze, "tests/p_test.rb".freeze, "tests/partial_application_test.rb".freeze, "tests/proc_compose_test.rb".freeze, "tests/proc_prelude_test.rb".freeze, "tests/range_plus_test.rb".freeze, "tests/require_maybe_test.rb".freeze, "tests/responding_test.rb".freeze, "tests/rotate_test.rb".freeze, "tests/scope_test.rb".freeze, "tests/secure_write_test.rb".freeze, "tests/sexy_singleton_test.rb".freeze, "tests/string_byte_order_mark_test.rb".freeze, "tests/string_camelize_test.rb".freeze, "tests/string_underscore_test.rb".freeze, "tests/string_version_test.rb".freeze, "tests/subhash_test.rb".freeze, "tests/temp_io_test.rb".freeze, "tests/test_helper.rb".freeze, "tests/time_dummy_test.rb".freeze, "tests/time_freezer_test.rb".freeze, "tests/to_test.rb".freeze, "tests/token_test.rb".freeze, "tests/uniq_by_test.rb".freeze, "tests/unit_test.rb".freeze, "tests/if_predicate_test.rb".freeze, "tests/string_camelize_test.rb".freeze, "tests/case_predicate_test.rb".freeze, "tests/sexy_singleton_test.rb".freeze, "tests/hash_union_test.rb".freeze, "tests/date_dummy_test.rb".freeze, "tests/string_byte_order_mark_test.rb".freeze, "tests/deep_dup_test.rb".freeze, "tests/generator_test.rb".freeze, "tests/ask_and_send_test.rb".freeze, "tests/hash_symbolize_keys_recursive_test.rb".freeze, "tests/memoize_test.rb".freeze, "tests/find_test.rb".freeze, "tests/extract_last_argument_options_test.rb".freeze, "tests/null_test.rb".freeze, "tests/temp_io_test.rb".freeze, "tests/proc_prelude_test.rb".freeze, "tests/token_test.rb".freeze, "tests/bijection_test.rb".freeze, "tests/p_test.rb".freeze, "tests/dynamic_scope_test.rb".freeze, "tests/lines_file_test.rb".freeze, "tests/count_by_test.rb".freeze, "tests/responding_test.rb".freeze, "tests/time_freezer_test.rb".freeze, "tests/attempt_test.rb".freeze, "tests/concern_test.rb".freeze, "tests/implement_test.rb".freeze, "tests/dslkit_test.rb".freeze, "tests/range_plus_test.rb".freeze, "tests/deep_const_get_test.rb".freeze, "tests/named_set_test.rb".freeze, "tests/proc_compose_test.rb".freeze, "tests/minimize_test.rb".freeze, "tests/subhash_test.rb".freeze, "tests/delegate_test.rb".freeze, "tests/time_dummy_test.rb".freeze, "tests/limited_test.rb".freeze, "tests/duration_test.rb".freeze, "tests/method_description_test.rb".freeze, "tests/to_test.rb".freeze, "tests/file_binary_test.rb".freeze, "tests/partial_application_test.rb".freeze, "tests/date_time_dummy_test.rb".freeze, "tests/expose_test.rb".freeze, "tests/rotate_test.rb".freeze, "tests/module_group_test.rb".freeze, "tests/unit_test.rb".freeze, "tests/string_underscore_test.rb".freeze, "tests/named_test.rb".freeze, "tests/from_module_test.rb".freeze, "tests/string_version_test.rb".freeze, "tests/require_maybe_test.rb".freeze, "tests/uniq_by_test.rb".freeze, "tests/secure_write_test.rb".freeze, "tests/blank_full_test.rb".freeze, "tests/scope_test.rb".freeze, "tests/annotate_test.rb".freeze, "tests/go_test.rb".freeze]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tins
 version: !ruby/object:Gem::Version
-  version: 1.21.1
+  version: 1.22.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -400,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Useful stuff.