str_quote 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7a6a1612b395c4d61c9e953e99c576b9e0f2548
-  data.tar.gz: a4c0766846005e9f2a69f6e173cb896009fc78ea
+  metadata.gz: c7eae570eb1a81fb9456dcfb260b9064a8bafd70
+  data.tar.gz: 4d95cf1a67d2e01db773ddf0cf7566f8a5a50110
 SHA512:
-  metadata.gz: add3fd56a271d3cfbad75c28cbb420541bd4d7a80f6282840bc527c507a2754eafad642851a0c59dafd9178fc8f07a83353b22c17c4f95c5a44ebca50cff36cb
-  data.tar.gz: 07de6d0458702b2b060c19102a80511c478fa629c26c6d607875f486f02a5e0ba0cee8ceb3cfea8c70bc87497b017e8878802ee6bd0549dc954e9fc88d308ee3
+  metadata.gz: 5be8d4a907594103f1d8a5d055c4e8b3d2af81b12bddad6539349365945e29fc104cf06bf52bd3bde523407c907e5a2c8c4fcd60968a4fba2af2e106fa98eee0
+  data.tar.gz: 636d916099d7bc518ce99246490bdb46a6780e21953a2c84ef1aee35828270636285e402ae411423913898d4d9a76cf808a0c1c766d5033c5d97c8b376d79344

data/lib/str_quote/quote.rb

@@ -1,22 +1,46 @@
 module StrQuote
  module Quote
-   def quote(quote_char = '"', escape_char = '\\')
-     unless escape_char.nil?
-       e = self.gsub(quote_char, "#{escape_char}#{quote_char}")
+   def quote(opts = {})
+     opts = {quote_char: '"', escape_char: '\\'}.merge opts
+     unless opts[:escape_char].nil?
+       e = self.gsub(opts[:quote_char], "#{opts[:escape_char]}#{opts[:quote_char]}")
      else
        e = self
      end
-     "#{quote_char}#{e}#{quote_char}"
+     "#{opts[:quote_char]}#{e}#{opts[:quote_char]}"
    end
    
-   def unquote(quote_char = '"', escape_char = '\\')
-     return self if self.length < 2 or self[0] != quote_char or self[-1] != quote_char
-     
-     unless escape_char.nil?
-       self[1..-2].gsub("#{escape_char}#{quote_char}", quote_char)
+   def unquote(opts = {})
+    opts = {quote_char: ['"',"'"], strip: true, escape_char: '\\'}.merge opts
+    
+     # Should we strip this string first?     
+     if opts[:strip]
+       s = self.strip
      else
-       self[1..-2]
+       s = self
+     end
+     
+     # Get the quote string into an array, to simplify the logic below
+     if opts[:quote_char].is_a? String
+       opts[:quote_char] = [ opts[:quote_char] ]
      end
+     
+     # If it's too short to quote, we're done.
+     return s if s.length < 2
+     
+     # Now it has to be quoted before we do anything.
+     opts[:quote_char].each do |qc|
+       if s[0..qc.length-1] == qc and s[0-qc.length..-1] == qc
+         unless opts[:escape_char].nil?
+           return s[qc.length..0-(qc.length+1)].gsub("#{opts[:escape_char]}#{qc}", qc)
+         else
+           return s[qc.length..0-(qc.length+1)]
+         end
+       end
+     end
+     
+     # Not quoted according to the rules passed to us
+     s
    end
    
    alias dequote unquote

data/lib/str_quote/version.rb

@@ -1,3 +1,3 @@
 module StrQuote
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/str_quote_test.rb

@@ -10,15 +10,15 @@ class StrQuoteTest < Test::Unit::TestCase
     assert_equal 'Hello'.quote, '"Hello"'
     assert_equal 'Hello world'.quote, '"Hello world"'
     assert_equal 'Embed"ded'.quote, '"Embed\"ded"'
-    assert_equal "zz zz".quote("'"), "'zz zz'"
-    assert_equal "gr&t".quote('&','#'), '&gr#&t&'
+    assert_equal "zz zz".quote(quote_char:"'"), "'zz zz'"
+    assert_equal "gr&t".quote(quote_char:'&',escape_char:'#'), '&gr#&t&'
   end
   
   def test_dequote
     assert_equal 'foobar', '"foobar"'.dequote
     assert_equal '"Hello world"'.unquote, 'Hello world'
     assert_equal '"Embed\"ded"'.unquote, 'Embed"ded'
-    assert_equal "'zz zz'".unquote("'"), "zz zz"
-    assert_equal '&gr#&t&'.dequote('&', '#'), "gr&t"
+    assert_equal "'zz zz'".unquote(quote_char:"'"), "zz zz"
+    assert_equal '&gr#&t&'.dequote(quote_char:'&', escape_char:'#'), "gr&t"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: str_quote
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Doug Wiegley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies: []
 description: Quoting/unquoting of strings, including escaping
 email:
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: String quoting