merge_params 0.4.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 01063ec1c21ddfa54b1e23325be36ce1fe86dcea
-  data.tar.gz: 7119ef72e5aa76760f1330efe684da9529a060ee
+SHA256:
+  metadata.gz: 806521ab02c7dda58ef92130ff2d475a47d4385fef19d34d00d3a2d42620a439
+  data.tar.gz: 33e565be0a0d56d44511525b8acdfb66648254c14c4abaff8f888f929ee9f56c
 SHA512:
-  metadata.gz: 23b3730b8c340aa2b85b3b671287b15c106fd5dc25ac8839fea7764dd0f135fcddcef34a6180e2e5b25590e34f495c0d6ba75abb1fd959fc4fb07020b9bee071
-  data.tar.gz: cf7704f58636d5215cfd242a59ce0ba0341df05bf61b61dad6de76820a129ddb22f813c0eff4200512d0888837f488b3565d8066163bbe76391c431b357039f1
+  metadata.gz: 679b82bc4acf185576dc8d2032463051e9e9ae030c64d8188d9183eb717a017c8634ce47030dd87d9f80fd4fb5853608675eb7ef698307c01dd6040904dc3583
+  data.tar.gz: 49f7b0e2d322fb836dfbe2ec78421d6361a8032ce783409041753e632becb87486b6cebc4383f18f40fe0ccf5acefba9a1eaf004cdb8ce27976df716c847c9d3

data/Changelog.md

@@ -5,6 +5,18 @@ recommendations of [keepachangelog.com](http://keepachangelog.com/).
 
 ## (Unreleased)
 
+## 0.6.0 (2026-07-15)
+
+- Loosen the `activesupport` / `actionpack` dependency cap (was `< 5.3`) so the gem installs on
+  modern Rails (6/7/8). The code itself was already compatible.
+- Modernize the gemspec (`require_relative` for the version file, derive the homepage from the gem
+  name).
+
+## 0.5.0 (2020-08-25)
+- Change the order of arguments for `add_params` to `add_params(url, query_params_to_add)`.
+  This feels more natural, since you are adding the new query params to the _end_ of the given URL.
+  It is also more consistent with the Rails route helpers, like `something_path(query_params_to_add)`.
+
 ## 0.4.2 (2019-02-10)
 - Fix `merge_url_for` to not pass on reserved options like only_path (which were only intended for
   consumption by `url_for`) to `add_params`. It was adding it to the end of the URL, like

data/License

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Tyler Rick
+Copyright (c) 2020-2026 Tyler Rick
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
 associated documentation files (the "Software"), to deal in the Software without restriction,

data/lib/merge_params/helpers.rb

@@ -104,12 +104,12 @@ module MergeParams::Helpers
           [k, v]
         end
       }
-    add_params(query_params_to_add, url)
+    add_params(url, query_params_to_add)
   end
 
   # Adds params to the query string
   # (Unlike url_for_merge, which tries to generate a route from the params.)
-  def add_params(new_params = {}, url = request.fullpath)
+  def add_params(url = request.fullpath, new_params = {})
     uri = URI(url)
     # Allow keys that are currently in query_params to be deleted by setting their value to nil in
     # new_params (including in nested hashes).

data/lib/merge_params/version.rb

@@ -1,5 +1,5 @@
 module MergeParams
   def self.version
-    "0.4.2"
+    "0.6.0"
   end
 end

data/merge_params.gemspec

@@ -1,6 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "merge_params/version"
+require_relative 'lib/merge_params/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "merge_params"
@@ -11,7 +9,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Safely merge params for use with url_for or for the query string}
   spec.description   = spec.summary
-  spec.homepage      = "https://github.com/TylerRick/merge_params"
+  spec.homepage      = "https://github.com/TylerRick/#{spec.name}"
 
   spec.metadata["homepage_uri"]    = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -27,11 +25,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.3.0"
-  spec.add_dependency "activesupport", [">= 4.2", "< 5.3"]
-  spec.add_dependency "actionpack", [">= 4.2", "< 5.3"]
+  spec.add_dependency "activesupport", ">= 4.2"
+  spec.add_dependency "actionpack", ">= 4.2"
   spec.add_dependency "facets"
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merge_params
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Tyler Rick
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2026-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,9 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: facets
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +123,7 @@ metadata:
   homepage_uri: https://github.com/TylerRick/merge_params
   source_code_uri: https://github.com/TylerRick/merge_params
   changelog_uri: https://github.com/TylerRick/merge_params/blob/master/Changelog.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,9 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
-signing_key: 
+rubygems_version: 3.5.1
+signing_key:
 specification_version: 4
 summary: Safely merge params for use with url_for or for the query string
 test_files: []