trinkets 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b68e75535021ee65a9f04019645b52a4ef1a76f1c2dfa2d5d625790bef4823a
-  data.tar.gz: dedc7394900033d803cc47fd212cf1601ea89c874b328963719f500beea9127e
+  metadata.gz: cb82b9c6f72cce48f7d303e989870bc05e77429508c17f266428d15bc0821628
+  data.tar.gz: 1dc0a8334a869e8be5b4e397caeed6be9ff16b495514425e184938d538b0b2e1
 SHA512:
-  metadata.gz: 947b91b9cd3497dce4fe4fa89d840424cb5cc7bde7e69812a84726127f1b650aae25ea6c83b36df1bce27c1b2c85c93decdf7d54512104b411f4ad0924637174
-  data.tar.gz: a0d74ade3287d9bdc31a43556f148a7c82356da2a0c2e82f03d38d27ad9abc7fdf5165424a676cfba20e808c5e8f0ea6076b5e0098ebc9c6a45fc150ce226dda
+  metadata.gz: 4b57aecbcc07de7c710804302accad6fe49d610c133fabf74040a0cca376129258dc064eb967c0ff50570d72b46d641160fda6485222d29f47f06117b57db55c
+  data.tar.gz: 7714dbbd7e295d87d9f6c98aac8d6aade0d6a57d86e69368c039e8022824511f897f1a2d8f90f5f70b1fb598741b4bfbfdbb5308a164f40dc2fcb6da01491148

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+
+### [0.3.1](https://github.com/SilverPhoenix99/trinkets/tree/v0.3.1)
+* Fixed repeated arguments in `Class::init`.
+
+### [0.3.0](https://github.com/SilverPhoenix99/trinkets/tree/v0.3.0)
+* Restructured folders to default to `/refine/`.
+* Added `Enumerable#each_with_hash`/`Enumerator#with_hash`.
+
+### [0.2.0](https://github.com/SilverPhoenix99/trinkets/tree/v0.2.0)
+* Added `attr: :none` as an option for `Class::init`.
+
+### [0.1.0](https://github.com/SilverPhoenix99/trinkets/tree/v0.1.0)
+* Added `Class::init`.

data/README.md

@@ -1,53 +1,97 @@
-# Trinkets
-
-It's the bootleg [facets](https://github.com/rubyworks/facets?tab=readme-ov-file#ruby-facets).
-
-## Installation
-
-```
-gem install trinkets
-```
-
-## Usage
-
-There are 3 ways to load trinkets:
-* As refinements;
-* As explicit `include` or `extend`;
-* As implicit `include` or `extend`, a.k.a. monkey-patching.
-
-### Refinement
-
-```ruby
-require 'trinkets/refine/class/init'
-
-using ::Trinkets::Class::Init
-```
-
-### Extend
-
-```ruby
-require 'trinkets/extend/class/init'
-
-class Test
-  extend ::Trinkets::Class::Init
-end
-```
-
-### Mokey Patching
-
-```ruby
-require 'trinkets/patch/class/init'
-```
-
-## Available modules
-
-|Trinket|
-|---|
-|[class/init](doc/class/init.md)|
-
-[//]: # (TODO: Development)
-[//]: # (TODO: Contributing)
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+# Trinkets
+
+It's the bootleg [facets](https://github.com/rubyworks/facets?tab=readme-ov-file#ruby-facets).
+
+## Installation
+
+### RubyGems
+```
+gem install trinkets
+```
+
+### Bundler
+```ruby
+gem 'trinkets', require: false
+```
+
+## Usage
+
+The trinkets are loaded with the following structure:
+```ruby
+require 'trinkets/{how-to-patch}/{class}/{method}'
+```
+
+There are 3 ways to load trinkets, which are represented by the `{how-to-patch}` portion in the requires:
+* `refine` : As refinements;
+* `extend`/`include` : As explicit `extend` or `include`;
+* `patch` : As implicit `include` or `extend`, a.k.a. monkey-patching.
+
+### Refinement
+
+```ruby
+require 'trinkets/class/init'
+
+using ::Trinkets::Class::Init
+```
+
+The `refine` subdirectory is the default, and it can be omitted from `require`. The above is the same as:
+
+```ruby
+require 'trinkets/refine/class/init'
+```
+
+### Extend / Include
+
+```ruby
+require 'trinkets/extend/class/init'
+
+class Test
+  extend ::Trinkets::Class::Init
+end
+```
+
+```ruby
+require 'trinkets/include/enumerable/each_with_hash'
+
+class Test
+  include Enumerable
+  include ::Trinkets::Enumerable::WithHash
+end
+```
+
+### Mokey Patching
+
+```ruby
+require 'trinkets/patch/class/init'
+```
+
+## Available modules
+
+|Trinket|
+|---|
+|[class/init](doc/class/init.md)|
+|[enumerable/each_with_hash](doc/enumerable/each_with_hash.md)|
+
+## Versioning
+
+Versions follow semantic versioning: `major.minor.patch`
+* `major`: breaking changes.
+* `minor`: improvements and new features that are backwards compatible.
+* `patch`: backwards compatible fixes to existing features, or documentation improvements.
+
+[//]: # (TODO: Development)
+
+## Contributing
+
+Steps to include when developing the feature/fix:
+* Add or change the appropriate RSpec tests.
+* Document the feature.
+  * Might not apply to fixes if the feature didn't change.
+* Bump the [version](lib/trinkets/version.rb).
+* Update the Changelog.
+
+[//]: # (TODO: Contributing)
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/doc/class/init.md

@@ -1,130 +1,181 @@
-# Description
-
-It allows generating simple `#initialize` methods.
-
-To use it define a class and call `::init` like you would call `::attr` methods:
-* pass the name of the arguments as symbols
-* pass options at the end:
-  * `attr` : what getters and/or setters to define
-    * can be `:accessor`, `:reader`, `:writer` or `:none` 
-    * defaults to `:accessor`
-  * `kw` : if arguments are to be set as keyword arguments
-    * defaults to `false`
-
-The same options can be used per individual argument
-
-# Examples
-
-## Simple Initialize
-```ruby
-class Test
-  init :a, :b
-end
-
-# would be the same as
-class Test
-  attr_accessor :a, :b
-  def initialize(a, b)
-    @a = a
-    @b = b
-  end
-end
-
-test = Test.new(1, 2)
-test.a
-# 1
-
-test.b
-# 2
-
-test.a = 3
-test.a
-# 3
-```
-
-## Read only access to instance variables
-```ruby
-class TestAttr
-  init :a, :b, attr: :reader
-end
-
-# would be the same as
-class Test
-  attr_reader :a, :b
-  def initialize(a, b)
-    @a = a
-    @b = b
-  end
-end
-
-test = Test.new(1, 2)
-test.a
-# 1
-
-test.b
-# 2
-
-test.a = 3
-# => raises NoMethodError
-```
-
-## Initialize uses keyword arguments
-```ruby
-class TestKW
-  init :a, :b, kw: :true
-end
-
-# would be the same as
-class Test
-  attr_accessor :a, :b
-  def initialize(a:, b:)
-    @a = a
-    @b = b
-  end
-end
-
-test = Test.new(a: 1, b: 2)
-test.a
-# 1
-
-test.b
-# 2
-```
-
-## Individual argument options
-```ruby
-class TestIndividualArgsOptions
-  init [:a, kw: true, attr: :reader],
-       :b,
-       [:c, kw: true],
-       [:d, attr: :none]
-end
-
-# would be the same as
-class Test
-  attr_reader :a
-  attr_accessor :b, :c
-  def initialize(b, d, a:, c:)
-    @a = a
-    @b = b
-    @c = c
-    @d = d
-  end
-end
-
-test = Test.new(2, 4, a: 1, c: 3)
-test.a
-# 1
-
-test.b
-# 2
-
-test.c
-# 3
-
-test.d
-# => raises NoMethodError
-
-test.a = 5
-# => raises NoMethodError
-```
+# Description
+
+It allows generating simple `#initialize` methods.
+
+To use it, define a class and call `::init` like you would call `::attr` methods:
+* pass the name of the arguments as symbols
+* pass options at the end:
+  * `attr` : what getters and/or setters to define
+    * can be `:accessor`, `:reader`, `:writer` or `:none` 
+    * defaults to `:accessor`
+  * `kw` : if arguments are to be set as keyword arguments
+    * defaults to `false`
+
+The same options can be used per individual argument.
+
+# Requiring
+
+```ruby
+# As a refinement
+require 'trinkets/class/init' # implicit
+# or
+require 'trinkets/refine/class/init' # explicit 
+
+# As extend
+require 'trinkets/extend/class/init'
+
+# As monkey-patch
+require 'trinkets/patch/class/init'
+```
+
+# Examples
+
+## Simple Initialize
+```ruby
+class Test
+  init :a, :b
+end
+
+# would be the same as
+class Test
+  attr_accessor :a, :b
+  def initialize(a, b)
+    @a = a
+    @b = b
+  end
+end
+
+test = Test.new(1, 2)
+
+test.a
+# 1
+
+test.b
+# 2
+
+test.a = 3
+# 3
+```
+
+## Read only access to instance variables
+```ruby
+class TestAttr
+  init :a, :b, attr: :reader
+end
+
+# would be the same as
+class TestAttr
+  attr_reader :a, :b
+  def initialize(a, b)
+    @a = a
+    @b = b
+  end
+end
+
+test = TestAttr.new(1, 2)
+
+test.a
+# 1
+
+test.b
+# 2
+
+test.a = 3
+# => raises NoMethodError
+```
+
+## Initialize uses keyword arguments
+```ruby
+class TestKW
+  init :a, :b, kw: :true
+end
+
+# would be the same as
+class TestKW
+  attr_accessor :a, :b
+  def initialize(a:, b:)
+    @a = a
+    @b = b
+  end
+end
+
+test = TestKW.new(a: 1, b: 2)
+
+test.a
+# 1
+
+test.b
+# 2
+```
+
+## Individual attribute options
+```ruby
+class TestAttrOptions
+  init [:a, kw: true, attr: :reader],
+       :b,
+       [:c, kw: true],
+       [:d, attr: :none]
+end
+
+# would be the same as
+class TestAttrOptions
+  attr_reader :a
+  attr_accessor :b, :c
+  def initialize(b, d, a:, c:)
+    @a = a
+    @b = b
+    @c = c
+    @d = d
+  end
+end
+
+test = TestAttrOptions.new(2, 4, a: 1, c: 3)
+
+test.a
+# 1
+
+test.b
+# 2
+
+test.c
+# 3
+
+test.d
+# => raises NoMethodError
+
+test.a = 5
+# => raises NoMethodError
+```
+
+## Mixed together
+```ruby
+class TestMixed
+  init [:a, attr: :reader],
+       :b,
+       kw: true
+end
+
+# would be the same as
+class TestMixed
+  attr_reader :a
+  attr_accessor :b
+  def initialize(a:, b:)
+    @a = a
+    @b = b
+  end
+end
+
+test = TestMixed.new(1, 2)
+
+test.a
+# 1
+
+test.b
+# 2
+
+test.b = 3
+# 3
+
+test.a = 4
+# => raises NoMethodError
+```

data/doc/enumerable/each_with_hash.md

@@ -0,0 +1,47 @@
+# Description
+
+It defines `Enumerable#each_with_hash`, which is a simple wrapper for `Enumerable#each_with_object({})`.
+
+It also includes the alias `Enumerator#with_hash(&)`.
+
+# Requiring
+
+```ruby
+# As a refinement
+require 'trinkets/enumerable/each_with_hash' # implicit
+# or
+require 'trinkets/refine/enumerable/each_with_hash' # explicit 
+
+# As include
+require 'trinkets/include/enumerable/each_with_hash'
+
+# As monkey-patch
+require 'trinkets/patch/enumerable/each_with_hash'
+```
+
+# Examples
+
+These examples are all equivalent.
+
+```ruby
+[2, 3, 4, 5].each_with_hash { |value, hash| hash[value] = value * value }
+# => {2=>4, 3=>9, 4=>16, 5=>25}
+
+[2, 3, 4, 5].each_with_hash
+# => #<Enumerator: [2, 3, 4, 5]:each_with_object({})>
+```
+
+```ruby
+[2, 3, 4, 5].each
+  .with_hash { |value, hash| hash[value] = value * value }
+
+# => {2=>4, 3=>9, 4=>16, 5=>25}
+```
+
+```ruby
+[2, 3, 4, 5].each
+  .with_hash
+  .each { |value, hash| hash[value] = value * value }
+
+# => {2=>4, 3=>9, 4=>16, 5=>25}
+```

data/lib/{trinkets → explicit/trinkets}/extend/class/init.rb

@@ -11,16 +11,7 @@ module Trinkets
 
         default_attr_options = { attr: attr, kw: kw }
 
-        # Normalize attrs into a hash: { :name => **options }
-        # @type [Hash[Symbol, Hash]]
-        attrs = attrs.map { |a| [*a] }
-          .map { |a| a.size == 1 ? a << {} : a }
-          .each_with_object({}) do |(name, opts), h|
-            # name, opts = a
-            name = name.to_s.sub(/^@/, '').to_sym
-            opts = default_attr_options.merge(opts)
-            h[name] = opts
-          end
+        attrs = ::Trinkets::Class.send(:sanitize_attrs, attrs, default_attr_options)
 
         attr_methods = (ATTR - [:none])
           .each_with_object({}) do |name, h|
@@ -43,12 +34,32 @@ module Trinkets
           .partition { |_, kw_opt| kw_opt }
           .map(&:to_h)
 
-        init_method = ::Trinkets::Class.send :define_initialize, attrs, kw_attrs
+        init_method = ::Trinkets::Class.send(:define_initialize, attrs, kw_attrs)
         define_method :initialize, init_method
       end
     end
 
     class << self
+      private def sanitize_attrs(attrs, default_attr_options)
+        # Normalize attrs into an array: [[:name, **options], ...]
+        # @type [Array[Array[Symbol, Hash]]]
+        attrs = attrs.map do |a|
+          name, opts = [*a]
+          name = name.to_s.sub(/^@/, '').to_sym
+          opts = default_attr_options.merge(opts || {})
+          [name, opts]
+        end
+
+        repeated_attrs = attrs.map(&:first)
+          .tally
+          .select { |_, count| count > 1 }
+          .keys
+
+        raise ArgumentError, "duplicated argument names: #{repeated_attrs.join(', ')}" if repeated_attrs.any?
+
+        attrs.to_h
+      end
+
       # @param [Hash[Symbol  Boolean]] attrs
       # @param [Hash[Symbol  Boolean]] kw_attrs
       private def define_initialize(attrs, kw_attrs)

data/lib/explicit/trinkets/include/enumerable/each_with_hash.rb

@@ -0,0 +1,14 @@
+module Trinkets
+
+  module Enumerable
+    module WithHash
+      def each_with_hash(&) = each_with_object({}, &)
+    end
+  end
+
+  module Enumerator
+    module WithHash
+      def with_hash(&) = each_with_hash(&)
+    end
+  end
+end

data/lib/explicit/trinkets/patch/enumerable/each_with_hash.rb

@@ -0,0 +1,9 @@
+require_relative '../../include/enumerable/each_with_hash'
+
+module ::Enumerable
+  include ::Trinkets::Enumerable::WithHash
+end
+
+class ::Enumerator
+  include ::Trinkets::Enumerator::WithHash
+end

data/lib/explicit/trinkets/refine/enumerable/each_with_hash.rb

@@ -0,0 +1,15 @@
+require_relative '../../include/enumerable/each_with_hash'
+
+module Trinkets
+  module Enumerable
+    module WithHash
+      refine ::Enumerable do
+        import_methods ::Trinkets::Enumerable::WithHash
+      end
+
+      refine ::Enumerator do
+        import_methods ::Trinkets::Enumerator::WithHash
+      end
+    end
+  end
+end

data/lib/implicit/trinkets/class/init.rb

@@ -0,0 +1 @@
+require_relative '../../../explicit/trinkets/refine/class/init'

data/lib/implicit/trinkets/enumerable/each_with_hash.rb

@@ -0,0 +1 @@
+require_relative '../../../explicit/trinkets/refine/enumerable/each_with_hash'

data/lib/trinkets/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Trinkets
-  VERSION = "0.2.0"
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trinkets
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - SilverPhoenix99
@@ -9,9 +9,37 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-28 00:00:00.000000000 Z
-dependencies: []
-description: Truly outrageous trinkets.
+date: 2024-02-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
+description: Truly outrageous bootleg facets in your trinkets box.
 email:
 - antoniopedrosilvapinto@gmail.com
 - pedro.at.miranda@gmail.com
@@ -19,40 +47,48 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".rspec"
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
-- Rakefile
 - doc/class/init.md
-- lib/trinkets.rb
-- lib/trinkets/extend/class/init.rb
-- lib/trinkets/patch/class/init.rb
-- lib/trinkets/refine/class/init.rb
+- doc/enumerable/each_with_hash.md
+- lib/explicit/trinkets/extend/class/init.rb
+- lib/explicit/trinkets/include/enumerable/each_with_hash.rb
+- lib/explicit/trinkets/patch/class/init.rb
+- lib/explicit/trinkets/patch/enumerable/each_with_hash.rb
+- lib/explicit/trinkets/refine/class/init.rb
+- lib/explicit/trinkets/refine/enumerable/each_with_hash.rb
+- lib/implicit/trinkets/class/init.rb
+- lib/implicit/trinkets/enumerable/each_with_hash.rb
 - lib/trinkets/version.rb
-- trinkets.gemspec
-homepage: http://nowhere.example.com
+homepage: https://github.com/SilverPhoenix99/trinkets
 licenses:
 - MIT
 metadata:
-  homepage_uri: http://nowhere.example.com
+  homepage_uri: https://github.com/SilverPhoenix99/trinkets
+  source_code_uri: https://github.com/SilverPhoenix99/trinkets
+  changelog_uri: https://github.com/SilverPhoenix99/trinkets/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://github.com/SilverPhoenix99/trinkets/issues
+  documentation_uri: https://github.com/SilverPhoenix99/trinkets/blob/master/README.md
 post_install_message:
 rdoc_options: []
 require_paths:
-- lib
+- lib/explicit
+- lib/implicit
+- lib/trinkets
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.5
 signing_key:
 specification_version: 4
-summary: Trinkets in your box.
+summary: Bootleg facets, with new trinkets.
 test_files: []

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/Rakefile

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/lib/trinkets.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'trinkets/version'

data/trinkets.gemspec

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'lib/trinkets/version'
-
-Gem::Specification.new do |spec|
-  spec.name = 'trinkets'
-  spec.version = Trinkets::VERSION
-  spec.authors = %w[SilverPhoenix99 P3t3rU5]
-  spec.email = %w[antoniopedrosilvapinto@gmail.com pedro.at.miranda@gmail.com]
-
-  spec.summary = 'Trinkets in your box.'
-  spec.description = 'Truly outrageous trinkets.'
-  spec.homepage = 'http://nowhere.example.com'
-  spec.license = 'MIT'
-  spec.required_ruby_version = '>= 3.2.0'
-
-  # spec.metadata['allowed_push_host'] = 'TODO: Set to your gem server "https://example.com"'
-
-  spec.metadata['homepage_uri'] = spec.homepage
-  # spec.metadata['source_code_uri'] = "TODO: Put your gem's public repo URL here."
-  # spec.metadata['changelog_uri'] = "TODO: Put your gem's CHANGELOG.md URL here."
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (File.expand_path(f) == __FILE__) ||
-        f.start_with?(*%w[bin/ test/ spec/ features/ .git appveyor Gemfile])
-    end
-  end
-  spec.require_paths = ['lib']
-end