scout-essentials 1.3.1 → 1.5.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-07 00:00:00.000000000 Z
+date: 2024-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -124,6 +124,10 @@ files:
 - Rakefile
 - VERSION
 - lib/scout-essentials.rb
+- lib/scout/annotation.rb
+- lib/scout/annotation/annotated_object.rb
+- lib/scout/annotation/annotation_module.rb
+- lib/scout/annotation/array.rb
 - lib/scout/cmd.rb
 - lib/scout/concurrent_stream.rb
 - lib/scout/config.rb
@@ -139,13 +143,13 @@ files:
 - lib/scout/log/progress/report.rb
 - lib/scout/log/progress/util.rb
 - lib/scout/log/trap.rb
-- lib/scout/meta_extension.rb
 - lib/scout/misc.rb
 - lib/scout/misc/digest.rb
 - lib/scout/misc/filesystem.rb
 - lib/scout/misc/format.rb
 - lib/scout/misc/helper.rb
 - lib/scout/misc/insist.rb
+- lib/scout/misc/math.rb
 - lib/scout/misc/monitor.rb
 - lib/scout/misc/system.rb
 - lib/scout/named_array.rb
@@ -182,6 +186,8 @@ files:
 - share/color/color_names
 - share/color/diverging_colors.hex
 - share/software/install_helpers
+- test/scout/annotation/test_annotated_object.rb
+- test/scout/annotation/test_array.rb
 - test/scout/indiferent_hash/test_case_insensitive.rb
 - test/scout/indiferent_hash/test_options.rb
 - test/scout/log/test_color.rb
@@ -189,7 +195,9 @@ files:
 - test/scout/log/test_progress.rb
 - test/scout/misc/test_digest.rb
 - test/scout/misc/test_filesystem.rb
+- test/scout/misc/test_helper.rb
 - test/scout/misc/test_insist.rb
+- test/scout/misc/test_math.rb
 - test/scout/misc/test_system.rb
 - test/scout/open/test_lock.rb
 - test/scout/open/test_remote.rb
@@ -208,12 +216,12 @@ files:
 - test/scout/simple_opt/test_get.rb
 - test/scout/simple_opt/test_parse.rb
 - test/scout/simple_opt/test_setup.rb
+- test/scout/test_annotation.rb
 - test/scout/test_cmd.rb
 - test/scout/test_concurrent_stream.rb
 - test/scout/test_config.rb
 - test/scout/test_indiferent_hash.rb
 - test/scout/test_log.rb
-- test/scout/test_meta_extension.rb
 - test/scout/test_misc.rb
 - test/scout/test_named_array.rb
 - test/scout/test_open.rb
@@ -241,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
+rubygems_version: 3.5.10
 signing_key: 
 specification_version: 4
 summary: Scout essential tools

data/lib/scout/meta_extension.rb

@@ -1,101 +0,0 @@
-module MetaExtension
-  def self.extended(base)
-    meta = class << base; self; end
-
-    base.class_variable_set("@@extension_attrs", []) unless base.class_variables.include?("@@extension_attrs")
-
-    meta.define_method(:extension_attr) do |*attrs|
-      self.class_variable_get("@@extension_attrs").concat attrs
-      attrs.each do |a|
-        self.attr_accessor a
-      end
-    end
-
-    meta.define_method(:extended) do |obj|
-      attrs = self.class_variable_get("@@extension_attrs")
-
-      obj.instance_variable_set(:@extension_attrs, []) unless obj.instance_variables.include?(:@extension_attrs)
-      extension_attrs = obj.instance_variable_get(:@extension_attrs)
-      extension_attrs.concat attrs
-    end
-
-    meta.define_method(:setup) do |*args,&block|
-      if block_given?
-        obj, rest = block, args
-      else
-        obj, *rest = args
-      end
-      obj = block if obj.nil?
-      obj.extend base unless base === obj
-
-      attrs = self.class_variable_get("@@extension_attrs")
-
-      return if attrs.nil? || attrs.empty?
-
-      if rest.length == 1 && Hash === (rlast = rest.last) && 
-          ((! (rlkey = rlast.keys.first).nil? && attrs.include?(rlkey.to_sym)) ||
-           (! attrs.length != 1 ))
-
-        pairs = rlast
-      else
-        pairs = attrs.zip(rest)
-      end
-
-      pairs.each do |name,value|
-        obj.instance_variable_set("@#{name}", value)
-      end
-
-      obj
-    end
-
-    base.define_method(:extension_attr_hash) do 
-      attr_hash = {}
-      @extension_attrs.each do |name|
-        attr_hash[name] = self.instance_variable_get("@#{name}")
-      end
-      attr_hash
-    end
-
-    base.define_method(:annotate) do |other|
-      attr_values = @extension_attrs.collect do |a|
-        self.instance_variable_get("@#{a}")
-      end
-      base.setup(other, *attr_values)
-    end
-
-    base.define_method(:purge) do
-      new = self.dup
-
-      if new.instance_variables.include?(:@extension_attrs)
-        new.instance_variable_get(:@extension_attrs).each do |a|
-          var_name = "@#{a}".to_sym
-          new.remove_instance_variable(var_name) if new.instance_variables.include? var_name
-        end
-        new.remove_instance_variable("@extension_attrs")
-      end
-
-      new
-    end
-  end
-
-  def self.is_extended?(obj)
-    obj.respond_to?(:extension_attr_hash)
-  end
-
-  def self.purge(obj)
-    case obj
-    when nil
-      nil
-    when Array
-      obj.collect{|e| purge(e) }
-    when Hash
-      new = {}
-      obj.each do |k,v|
-        new[k] = purge(v)
-      end
-      new
-    else
-      is_extended?(obj) ? obj.purge : obj
-    end
-  end
-end

data/test/scout/test_meta_extension.rb

@@ -1,80 +0,0 @@
-require File.expand_path(__FILE__).sub(%r(/test/.*), '/test/test_helper.rb')
-require File.expand_path(__FILE__).sub(%r(.*/test/), '').sub(/test_(.*)\.rb/,'\1')
-
-class TestMetaExtension < Test::Unit::TestCase
-  module ExtensionClass
-    extend MetaExtension
-
-    extension_attr :code, :code2
-  end
-
-  module ExtensionClass2
-    extend MetaExtension
-
-    extension_attr :code3, :code4
-  end
-
-
-  def test_setup_annotate
-    str = "String"
-    ExtensionClass.setup(str, :code)
-    assert ExtensionClass === str
-    assert_equal :code, str.code
-
-    str2 = "String2"
-    str.annotate(str2)
-    assert_equal :code, str2.code
-  end
-
-  def test_marshal
-    str = "String"
-    ExtensionClass.setup(str, :code)
-    assert ExtensionClass === str
-    assert_equal :code, str.code
-
-    str2 = Marshal.load(Marshal.dump(str))
-    assert_equal :code, str2.code
-  end
-
-  def test_setup_alternatives
-    str = "String"
-
-    ExtensionClass.setup(str, :code2 => :code)
-    assert_equal :code, str.code2
-
-    ExtensionClass.setup(str, code2: :code)
-    assert_equal :code, str.code2
-
-    ExtensionClass.setup(str, "code2" => :code)
-    assert_equal :code, str.code2
-
-  end
-
-  def test_setup_block
-    o = ExtensionClass.setup nil, :code => :c, :code2 => :c2 do
-      puts 1
-    end
-
-    assert o.extension_attr_hash.include?(:code)
-    assert o.extension_attr_hash.include?(:code2)
-  end
-
-  def test_twice
-    str = "String"
-
-    ExtensionClass.setup(str, :code2 => :code)
-    assert_equal :code, str.code2
-    assert_include str.instance_variable_get(:@extension_attrs), :code
-
-    str.extend ExtensionClass2
-    str.code3 = :code_alt
-    assert_equal :code, str.code2
-    assert_equal :code_alt, str.code3
-    assert_include str.instance_variable_get(:@extension_attrs), :code
-    assert_include str.instance_variable_get(:@extension_attrs), :code3
-
-    assert_include str.extension_attr_hash, :code
-    assert_include str.extension_attr_hash, :code3
-  end
-end
-