hmap 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ad321ffc1bab03aa6a94f4e528c10b0c2cdc53a803a422f6327d12ab1abe9d4
-  data.tar.gz: 8faaec21ec0526bd3ea5fc3189045ec1cf2adcac7740352691e9b8a0a1cc6923
+  metadata.gz: 77e9c393f40df641e51a65b9279fc479c5b3e85bb90e74cd6d13a836147c1b56
+  data.tar.gz: f1f9f8c51498c80c4de446917dc60462aa020e74a5721684de983d5b2a728211
 SHA512:
-  metadata.gz: e6eec1dd98f07ca4d3f4da63bc1c8a31bf95d0edddc0265b8f259cdd84d05ad904c7b5c2bd2df78c44e8d3957492019f31dba6faa038eeaf6b3e8f4836770b14
-  data.tar.gz: 800788420878ef4950b798bdee053380deeb981638594299ef26bf35b9bbb901fc731c73e734b3292f25f6bdef5ffc9c1f8947ead4ae949817a8f71d23e488af
+  metadata.gz: e925a388dcc787b0b5413d894b363e65f09ebdadf3dd3e25f9f33430421f5b350e494b1aed3d896ad11165555b72a711cd4c8488556dc539b82d9b12191684a2
+  data.tar.gz: 98b1d1082abf8af745cda978df664ecfd0565d685beb835ed0e4fd2fd68278d47ef969068d566de061c26086e1aef4492a7e7da29520885c232d99edcd3de68c

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 1.1.0  (2026-11-03)
+- require Ruby >= 3.2
+- fix FrozenError from hmap, kmap, and vmap on frozen hashes
+- raise ArgumentError when called without a block
+- hmap and Hash.hmap raise on malformed pairs, e.g. [key], instead of filling in a nil value
+- kmap and vmap pass the key and value to blocks with an optional second param, e.g. |k, v = nil|
+
 ###  1.0.1  (2024-07-12)
 - fix changelog
 - rebuild

data/Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec

data/Gemfile.lock

@@ -1,41 +1,65 @@
 PATH
   remote: .
   specs:
-    hmap (1.0.1)
+    hmap (1.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    byebug (11.1.3)
-    diff-lcs (1.5.1)
-    docile (1.4.0)
-    rspec (3.13.0)
+    debug (1.11.1)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
+    diff-lcs (1.6.2)
+    erb (6.0.7)
+    io-console (0.9.5)
+    irb (1.18.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    logger (1.7.0)
+    pp (0.6.4)
+      prettyprint
+    prettyprint (0.2.1)
+    prism (2.1.0)
+    rbs (4.2.0)
+      logger
+      prism (>= 1.6.0)
+      tsort
+    rdoc (8.1.0)
+      erb
+      prism (>= 1.6.0)
+      rbs (>= 4.0.0)
+      tsort
+    reline (0.7.0)
+      io-console (~> 0.5)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-debugging (0.0.5)
+      debug (>= 1.10)
+      rspec-core (>= 3.10)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
+    rspec-support (3.13.7)
+    simplecov (1.3.2)
+    tsort (0.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  byebug (>= 11)
+  debug (>= 1)
   hmap!
   rspec (>= 3.10)
+  rspec-debugging
   simplecov (>= 0.22)
 
 BUNDLED WITH

data/README.md

@@ -9,7 +9,7 @@ Improved Hash mapping functions
 
 ### Usage
 #### Hash.map
-Create a Hash using an Enumerable by mapping it's items into corresponding hash values
+Create a Hash using an Enumerable by mapping its items into corresponding hash values
 ```ruby
 Hash.map [:a, :bb, :ccc] {|v| v.length }
 => { a: 1, bb: 2, ccc: 3 }
@@ -44,7 +44,7 @@ Transform the values of a Hash
   b: 2,
   c: 3,
 }.vmap &:to_s
-=> { a: '2', b: '4', c: '6' }
+=> { a: '1', b: '2', c: '3' }
 ```
 
 #### kmap

data/hmap.gemspec

@@ -1,16 +1,19 @@
+require_relative "lib/hmap/version"
+
 Gem::Specification.new do |s|
   s.authors     = ["Daniel Pepper"]
   s.description = "Improved Hash mapping functions"
   s.files       = `git ls-files * ":!:spec"`.split("\n")
   s.homepage    = "https://github.com/dpep/rb_hmap"
   s.license     = "MIT"
-  s.name        = File.basename(__FILE__, ".gemspec")
+  s.name        = "hmap"
   s.summary     = "Hmap"
-  s.version     = "1.0.1"
+  s.version     = Hmap::VERSION
 
-  s.required_ruby_version = ">= 3"
+  s.required_ruby_version = ">= 3.2"
 
-  s.add_development_dependency "byebug", ">= 11"
+  s.add_development_dependency "debug", ">= 1"
   s.add_development_dependency "rspec", ">= 3.10"
+  s.add_development_dependency "rspec-debugging"
   s.add_development_dependency "simplecov", ">= 0.22"
 end

data/lib/hmap/hmap.rb

@@ -1,20 +1,22 @@
 module Hmap
   # create Hash from given keys and mapped values
   def map(obj, &block)
-    res = obj.map do |*args|
-      block.call(*args)
-    end
+    raise ArgumentError, "no block given" unless block
 
-    Hash[obj.zip res]
+    obj.zip(obj.map(&block)).to_h
   end
 
-  # map an Enumerable into a Hash, like Hash[obj.map ... ]
+  # map an Enumerable into a Hash, like obj.map { ... }.to_h
   def hmap(obj, &block)
-    Hash[
-      obj.map do |*args|
-        block.call(*args)
-      end.compact
-    ]
+    raise ArgumentError, "no block given" unless block
+
+    obj.map(&block).compact.to_h
+  end
+
+  # call with (key, value) if the block takes both, else just the one
+  def self.yield_pair(block, one, key, value)
+    positional = block.parameters.count { |type, _| type == :req || type == :opt }
+    positional >= 2 ? block.call(key, value) : block.call(one)
   end
 
   def self.extended(base)
@@ -24,7 +26,7 @@ module Hmap
   module InstanceMethods
     # map the block's results back to a hash
     def hmap(&block)
-      clone.hmap!(&block)
+      dup.hmap!(&block)
     end
 
     def hmap!(&block)
@@ -36,24 +38,28 @@ module Hmap
     # map keys, but preserve associated values
     # ie. http://apidock.com/rails/v4.2.7/Hash/transform_keys
     def kmap(&block)
-      clone.kmap!(&block)
+      dup.kmap!(&block)
     end
 
     def kmap!(&block)
+      raise ArgumentError, "no block given" unless block
+
       hmap! do |k, v|
-        [ block.arity <= 1 ? block.call(k) : block.call(k, v), v ]
+        [ Hmap.yield_pair(block, k, k, v), v ]
       end
     end
 
     # map values, but preserve associated keys
     # ie. http://apidock.com/rails/v4.2.7/Hash/transform_values
     def vmap(&block)
-      clone.vmap!(&block)
+      dup.vmap!(&block)
     end
 
     def vmap!(&block)
+      raise ArgumentError, "no block given" unless block
+
       each do |k, v|
-        self[k] = block.arity <= 1 ? block.call(v) : block.call(k, v)
+        self[k] = Hmap.yield_pair(block, v, k, v)
       end
     end
   end

data/lib/hmap/version.rb

@@ -1,3 +1,3 @@
 module Hmap
-  VERSION = Gem.loaded_specs["hmap"].version.to_s
+  VERSION = "1.1.0"
 end

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: hmap
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Daniel Pepper
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +37,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: rspec-debugging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +66,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.22'
 description: Improved Hash mapping functions
-email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -71,7 +83,6 @@ homepage: https://github.com/dpep/rb_hmap
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -79,15 +90,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.15
-signing_key:
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Hmap
 test_files: []