merge_params 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 60f0644a975a59c156bcd0324be1f7a08e07d1bc
-  data.tar.gz: d2bdd9e4ab258fabb6025bfd49415014a94aa818
+SHA256:
+  metadata.gz: d02292b14bbd8378da9306edaaf9ba131f54bf7a638ce247c96db14f10ef7e80
+  data.tar.gz: f86ffa29a81b4d8d427f99757f18ee4b505727830c7fb8b8e3459bd8fe4e3d1b
 SHA512:
-  metadata.gz: 575ceab7b08f14f19aa7609709f64299effeaf21925d0dc4cedbdf4a776542cc237dfacea2983864c30e98aae752825444c8a37184e7feec3033158851fb6725
-  data.tar.gz: db13d502675945cad348f8ba5d0467c225a6abe513a8c89603ea47da9407bd2670ea2b2d81a5ada876603d5adf4da1ae5a1e39fe42f2adfb6310d925706eec17
+  metadata.gz: f14c18536515ec20bc11ab826acb0eabf8b417ee485a844eb3cb9fbf9e0d7ee24428e146f2f42ca79f10281cb68d12c1d0faca6159869634c65e3b9292827cac
+  data.tar.gz: e4c02db3a74fdb11ecc5b2ff4aa8a0ad65e0c2615af1c6338a6df4afc67e968391e1aa5a7f76b37c2f90f2b5f3e03e5aef8abe82ab8a005a53cbdea2acc0169f

data/Changelog.md

@@ -0,0 +1,32 @@
+# Changelog
+
+This project follows [semver 2.0.0](http://semver.org/spec/v2.0.0.html) and the
+recommendations of [keepachangelog.com](http://keepachangelog.com/).
+
+## (Unreleased)
+
+
+## 0.3.0 (2019-01-24)
+
+### Fixed
+- Fix `merge_url_for` to not try to add a param as a query param if it's been recognized as a route
+  param (part of the route path). We don't want the same param to be passed both via the route path
+  *and* the query string.
+
+### Added
+- `merge_url_for`: Allow keys that are currently in `query_params` to be deleted by setting their
+  value to `nil`.
+
+
+## 0.2.0 (2018-12-05)
+
+### Fixed
+- Fix `add_params` to not inadvertently add a '?' to the end of the URI if there are no params to add
+
+### Added
+- Add `slice_params` helper
+
+
+## 0.1.0 (2018-11-16)
+
+Initial release

data/Readme.md

@@ -1,5 +1,7 @@
 # MergeParams
 
+[![Gem Version](https://badge.fury.io/rb/merge_params.svg)](https://badge.fury.io/rb/merge_params)
+
 ## Why do we need it?
 
 Have you ever wanted to take the current route and change just one parameter in the route to

data/lib/merge_params/helpers.rb

@@ -79,13 +79,22 @@ module MergeParams::Helpers
 
   # Safely merges the given params with the params from the current request, then generates a route
   # from the merged params.
+  # You can remove a key by passing nil as the value, for example {key: nil}.
   def merge_url_for(new_params = {})
     url = url_for(merge_params(new_params))
 
     # Now pass along in the *query string* any params that we couldn't pass to url_for because they
     # were reserved options.
     query_params_already_added = parse_nested_query(URI(url).query || '')
-    query_params_to_add = query_params.except(*query_params_already_added.keys)
+    # Some params from new_params (like company_id) that we pass in may be recognized by a route and
+    # therefore no longer be query params. We use recognize_path to find those params that ended up
+    # as route params instead of query_params but are nonetheless aready added to the url.
+    params_already_added = Rails.application.routes.recognize_path(url).merge(query_params_already_added)
+    keys_already_added = params_already_added.keys
+    # Allow keys that are currently in query_params to be deleted by setting their value to nil in
+    # new_params.
+    keys_to_delete = new_params.select {|k,v| v.nil?}.keys
+    query_params_to_add = query_params.except(*keys_already_added + keys_to_delete)
     add_params(query_params_to_add, url)
   end
 

data/lib/merge_params/version.rb

@@ -1,5 +1,5 @@
 module MergeParams
   def self.version
-    "0.2.0"
+    "0.3.0"
   end
 end

data/merge_params.gemspec

@@ -11,11 +11,11 @@ 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      = "http://github.com/TylerRick/merge_params"
+  spec.homepage      = "https://github.com/TylerRick/merge_params"
 
   spec.metadata["homepage_uri"]    = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "TODO: Put your gem's Changelog.md URL here."
+  spec.metadata["changelog_uri"] = "#{spec.metadata["source_code_uri"]}/blob/master/Changelog.md"
 
   # 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.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merge_params
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tyler Rick
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -102,6 +102,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Changelog.md
 - Gemfile
 - License
 - Rakefile
@@ -112,13 +113,13 @@ files:
 - lib/merge_params/helpers.rb
 - lib/merge_params/version.rb
 - merge_params.gemspec
-homepage: http://github.com/TylerRick/merge_params
+homepage: https://github.com/TylerRick/merge_params
 licenses:
 - MIT
 metadata:
-  homepage_uri: http://github.com/TylerRick/merge_params
-  source_code_uri: http://github.com/TylerRick/merge_params
-  changelog_uri: 'TODO: Put your gem''s Changelog.md URL here.'
+  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: 
 rdoc_options: []
 require_paths:
@@ -134,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Safely merge params for use with url_for or for the query string