tins 1.36.0 → 1.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3d0d3b142299555332881bdd390e8cb2fc4137cbbb92864e96c835790d1f943
-  data.tar.gz: c287721ce6b44fb9a1cc4faed1eee2d6f0df250a92c389e811bc033b9c24a48a
+  metadata.gz: '049e3bf81de447eec53664f5555656602906bbd44a5f98b2e0e953318aadff77'
+  data.tar.gz: 14debef966e248366ec1ef72b39b8ccc094a91049ed6cd44e9ee2550c607ae02
 SHA512:
-  metadata.gz: 6a950643986122ff5e47e419657dbe5f76ffe1d1c80927ab9767297672a5296d08b84479b0ae03fcf7d5112c5297cdc3d8993425488c203321615dad441d7c6d
-  data.tar.gz: abec6e88bb19153688f7e5c8069c3ac13fcff850aa9860f4924b360bdb53608d82deabbb8d0d35a234ff84e8149869861fe94b8963ba1187e7ae252d1bafe7af
+  metadata.gz: c93d9b5b23c3305f422f0efd81e0828591682331532b51f4de1a84e305f77bb3f9374abcf8b725cd665a74ef352cabb525f49b4dfa68fc78f5568e87a5e78012
+  data.tar.gz: 4b8d5d1da5bffb1b26449f96aa0f292a28582e5409d734ba5cdc18c428a2e6b57f577662773b776abcbb5464d505ae6726b60bba54f2142ddf5a32faae5fd9e9

data/CHANGES.md

@@ -1,11 +1,29 @@
 # Changes
 
+## 2024-10-19 v1.37.0
+
+* Add support for module prepended blocks in **Tins::Concern**:
+  * Added `prepend_features` method to Tins concern
+  * Updated ConcernTest to test prepend feature
+  * Raise StandardError for duplicate block definitions for included and 
+    prepended blocks
+* Added `class_methods` method to Tins concern:
+  * Added `class_methods` method to lib/tins/concern.rb
+    - Creates or retrieves ClassMethods module for defining class-level methods
+  * Updated tests in `tests/concern_test.rb`
+    - Added test for new `baz1` and `baz2` methods
+      + Tested availability of `bar`, `baz1`, and `baz2` methods on A
+
+## 2024-10-11 v1.36.1
+
+* Fixed a typo in the code
+
 ## 2024-10-11 v1.36.0
 
 ### Significant Changes
 
 * Refactor bfs method in `hash_bfs.rb`:
-  + Rename `include_nodes` variable to `visit_interal`
+  + Rename `include_nodes` variable to `visit_internal`
   + Update test cases in `hash_bfs_test.rb` to use new method signature
   + Update method signature and docstring to reflect new behavior
 * Update hash conversion logic:

data/lib/tins/concern.rb

@@ -19,12 +19,48 @@ module Tins
       end
     end
 
+    def prepend_features(base)
+      if base.instance_variable_defined?("@_dependencies")
+        base.instance_variable_get("@_dependencies") << self
+        false
+      else
+        return false if base < self
+        @_dependencies.each { |dep| base.send(:include, dep) }
+        super
+        base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
+        base.class_eval(&@_prepended_block) if instance_variable_defined?("@_prepended_block")
+        Thread.current[:tin_concern_args] = nil
+        true
+      end
+    end
+
     def included(base = nil, &block)
       if base.nil?
+        instance_variable_defined?(:@_included_block) and
+          raise StandardError, "included block already defined"
         @_included_block = block
       else
         super
       end
     end
+
+    def prepended(base = nil, &block)
+      if base.nil?
+        instance_variable_defined?(:@_prepended_block) and
+          raise StandardError, "prepended block already defined"
+        @_prepended_block = block
+      else
+        super
+      end
+    end
+
+    def class_methods(&block)
+      modul = const_get(:ClassMethods) if const_defined?(:ClassMethods, false)
+      unless modul
+        modul = Module.new
+        const_set(:ClassMethods, modul)
+      end
+      modul.module_eval(&block)
+    end
   end
 end

data/lib/tins/hash_bfs.rb

@@ -9,7 +9,7 @@ module Tins
     # The bfs method performs a breadth-first search on the object's structure,
     # visiting all elements and yielding their indices and values to the block.
     #
-    # @param visit_interal [ true, false ] whether to visit internal hashes or arrays
+    # @param visit_internal [ true, false ] whether to visit internal hashes or arrays
     # @yield [ index, value ] yields each element's index and value to the block
     #
     # @raise [ ArgumentError ] if no &block argument was provided
@@ -17,7 +17,7 @@ module Tins
     # @example bfs { |index, value| … } # performs a breadth-first search on the object's structure
     #
     # @return [ self ] returns the receiver
-    def bfs(visit_interal: false, &block)
+    def bfs(visit_internal: false, &block)
       block or raise ArgumentError, 'require &block argument'
       self.seen = {}
       queue     = []
@@ -31,13 +31,13 @@ module Tins
           object.each do |k, v|
             queue.push([ k, convert_to_hash_or_ary(v) ])
           end
-          visit_interal or next
+          visit_internal or next
         when Array === object
           seen[object.__id__] = true
           object.each_with_index do |v, i|
             queue.push([ i, convert_to_hash_or_ary(v) ])
           end
-          visit_interal or next
+          visit_internal or next
         end
         block.(index, object)
       end

data/lib/tins/version.rb

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

data/tests/concern_test.rb

@@ -8,27 +8,65 @@ class ConcernTest < Test::Unit::TestCase
       $included = self
     end
 
+    prepended do
+      $prepended = self
+    end
+
     def foo
       :foo
     end
 
+    class_methods do
+      def baz1
+        :baz1
+      end
+    end
+
     module ClassMethods
       def bar
         :bar
       end
     end
+
+    class_methods do
+      def baz2
+        :baz2
+      end
+    end
   end
 
   $included = nil
+  $prepended = nil
 
   class A
     include AC
   end
 
-  def test_concern
+  class B
+    prepend AC
+  end
+
+  def test_concern_include
     a = A.new
     assert_equal A, $included
     assert_equal :foo, a.foo
     assert_equal :bar, A.bar
+    assert_equal :baz1, A.baz1
+    assert_equal :baz2, A.baz2
+    assert_raise(StandardError) do
+      AC.module_eval { included {} }
+    end
+  end
+
+  def test_concern_prepend
+    a = B.new
+    assert_equal B, $prepended
+    assert_equal :foo, a.foo
+    assert_equal :bar, B.bar
+    assert_equal :baz1, B.baz1
+    assert_equal :baz2, B.baz2
+    assert_raise(StandardError) do
+      AC.module_eval { prepended {} }
+    end
   end
 end

data/tests/hash_bfs_test.rb

@@ -15,7 +15,7 @@ module Tins
 
     def test_with_nodes
       results = []
-      @hash.bfs(visit_interal: true) { |*a| results.push(a) }
+      @hash.bfs(visit_internal: true) { |*a| results.push(a) }
       assert_equal(
         [[nil, {a:"foo", b:[{c:"baz"}, {d:"quux"}, ["blub"]]}], [:a, "foo"],
          [:b, [{c:"baz"}, {d:"quux"}, ["blub"]]], [0, {c:"baz"}], [1, {d:"quux"}],
@@ -27,7 +27,7 @@ module Tins
     def test_with_nodes_with_circle
       results = []
       @hash[:b].last << @hash
-      @hash.bfs(visit_interal: true) { |*a| results.push(a) }
+      @hash.bfs(visit_internal: true) { |*a| results.push(a) }
       assert_equal 9, results.size
     end
   end

data/tins.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: tins 1.36.0 ruby lib
+# stub: tins 1.37.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tins".freeze
-  s.version = "1.36.0".freeze
+  s.version = "1.37.0".freeze
 
   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 = "2024-10-11"
+  s.date = "2024-10-19"
   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/deprecate.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_bfs.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/lru_cache.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/timed_cache.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/deprecate.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_bfs.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]
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.18.0".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.19".freeze])
   s.add_development_dependency(%q<all_images>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<debug>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<term-ansicolor>.freeze, [">= 0".freeze])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tins
 version: !ruby/object:Gem::Version
-  version: 1.36.0
+  version: 1.37.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-11 00:00:00.000000000 Z
+date: 2024-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: '1.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement