joined 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dd36033f9acabd1327c4bbd212c9fd6c76fe3f525de7d0f7f64431ac3c97205
-  data.tar.gz: 9de8199c4b2b5b1d88b82f6864e839b7aba336500ea8638af2768d2e57480513
+  metadata.gz: bf39163ca7677fe7c82b64f86a58ed1960ab37ff099a3d3530a98604d0db8d2f
+  data.tar.gz: cac313f36a472d3543f1f61b0d23e428484ebf26dcdf78a8ee8e7001527a17ce
 SHA512:
-  metadata.gz: e98eca82e38a6a82284a17b33556d84f06aec3c7954b6e4d2a59a514352c76512933628be44e171e3e47be4870c4303e10f528daeb2dce0e197c23bf3d4fe6d3
-  data.tar.gz: 38298fde467ae58616c81b8daea4a9f31989a768010965613c0acb51c28f12737fd789b8388d4ee90fb75d22dba5e35c04a83c09570c3d5d2c55a3e858a3bc77
+  metadata.gz: 17ac3bfd0677cde3c1caf8e49b52c24addeaa3512053e6aa60b21a36b9c574b67df9834bdd5068159c78186bc3c3ab40b87d02cb7d9e6ff1074492bf3bbdf047
+  data.tar.gz: 978bbf113d2e52aa15dfc935c219dc2cca47fdc0cea9f84671f6083bc472b193c8085ea4251a0f58a79027c3348d26e23734ff725cfce799c0cdb712f77779ae

data/Gemfile.lock

@@ -29,7 +29,7 @@ GEM
     rake (13.2.1)
     regexp_parser (2.10.0)
     rexml (3.4.1)
-    rubocop (1.75.5)
+    rubocop (1.75.6)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)

data/README.md

@@ -32,17 +32,19 @@ That's it.
 The `joined` method supports the following parameters:
 
 * `words_connector` (String) (defaults to: ', ') -
-  the sign or word used to join all but the last element
-  in arrays with three or more elements.
+  the string used to join all but the last element of the list.
 * `last_word_connector` (String) (defaults to: ', and ') -
-  the sign or word used to join the last element in arrays
-  with three or more element.
+  the string used to join the last element of the list.
 * `oxford` (Boolean) (defaults to: true) -
   should we place a comma before the `last_word_connector`?
-  If false, it will remove a leading comma from the `last_word_connector`,
-  however, it does not add a comma if one is not already specified in the `last_word_connector`.
-
-See the [Yard docs](https://rubydoc.info/github/yegor256/joined/master/frames) for full gem documentation.
+  If false, it will remove a leading comma from the `last_word_connector`.
+  If true, it will preserve the leading comma specified
+  in the `last_word_connector`, but it will not insert one
+  if not already present.
+
+See the
+[Yard docs](https://rubydoc.info/github/yegor256/joined/master/frames)
+for full gem documentation.
 
 ## How to contribute
 

data/joined.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=3.2'
   s.name = 'joined'
-  s.version = '0.2.0'
+  s.version = '0.3.0'
   s.license = 'MIT'
   s.summary = 'A simple Ruby gem that adds a .joined() method to Array'
   s.description =

data/lib/joined.rb

@@ -13,23 +13,30 @@ class Array
   # and placing "AND" between the last two items.
   #
   # @param [String] words_connector
-  #   The sign or word used to join all but the last element
-  #   in arrays with three or more elements.
+  #   The string used to join all but the last element of the list
   # @param [String] last_word_connector
-  #   The sign or word used to join the last element in arrays
-  #   with three or more element.
+  #   The string used to join the last element of the list.
   # @param [Boolean] oxford
   #   Should we place a comma before the :last_word_connector?
-  #   If false, it will remove a leading comma from the :last_word_connector,
-  #   however it does not add a comma if one is not already specified in the :last_word_connector.
+  #   If false, it will remove a leading comma from the :last_word_connector.
+  #   If true, it will preserve the leading comma specified
+  #   in the :last_word_connector, but it will not insert one
+  #   if not already present.
+  # @param [Boolean] comma_before
+  #   Should we move comma before the quotes symbol
+  #   If false, it will do nothing
+  #   If true, it will move all commas before the quotes
   # @return [String] The text generated (with items joined)
-  def joined(oxford: true, words_connector: ', ', last_word_connector: ', and ')
+  def joined(oxford: true, words_connector: ', ', last_word_connector: ', and ', comma_before: false)
     return '' if empty?
     return first if length == 1
 
     final_connector = (last_word_connector || '').dup
     final_connector.sub!(/^,/, '') unless oxford && length > 2
 
-    "#{self[0...-1].join(words_connector)}#{final_connector}#{self[-1]}"
+    result = "#{self[0...-1].join(words_connector)}#{final_connector}#{self[-1]}"
+    return result.gsub(/"([^"]+)"\s*,/, '"\1,"') if comma_before
+
+    result
   end
 end

data/test/test_joined.rb

@@ -64,4 +64,8 @@ class Testjoined < Minitest::Test
 
     assert_equal 'unknown keyword: :passing', exception.message
   end
+
+  def test_with_comma_before
+    assert_equal '"one," "two," and "three"', %w[one two three].map { |f| "\"#{f}\"" }.joined(comma_before: true)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joined
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Yegor Bugayenko