phc_string_format 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab5bc37e57a1b618555f9327bd4f39f8c88517f0
-  data.tar.gz: 5490d74428f42107e165497c54baba19a2c08984
+  metadata.gz: 387297ecdd03a3f1a103a1c852be5a2ecd07abc3
+  data.tar.gz: 83a0e1784b853a92de75aa9c75829b5999409cab
 SHA512:
-  metadata.gz: '018370ed5b2bac8d835e48184a0384ea0523a28bb6d7311b96370364abc37bf3cdf9884a3838c6d5879b2548ee64850495fa82a8ba560da5d4c2c1e22b73e23e'
-  data.tar.gz: 44c32560f5a43007cd512ab5f21371df00858e1522c1881a47b234c9882281afcb27e6abcd987efca8bdd731b4a456b42ce7268593bcb61e9cf81612a0745802
+  metadata.gz: e2d21cde31f35746242a8eaf48bd996b01adc3aa24698133cbf82f1104dbbf6aa304d125d1e767662d7498c2ead5ea8a5e75ae704e93a489a91779fadf958189
+  data.tar.gz: 46daddb661e5f9b879cdfd2e8487fbd570b20a3aa88165cabe4c205ea6557e6819db0bbc98d46a7dc9e3df0a6c41b08c13d7ba3efee4c369f43af837abd3d625

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phc_string_format (0.1.3)
+    phc_string_format (0.1.4)
 
 GEM
   remote: https://rubygems.org/

data/lib/phc_string_format.rb

@@ -9,24 +9,20 @@ require "base64"
 #  ```
 #
 module PhcStringFormat
-
   module Formatter
-
-    #
     def self.format(id:, params: {}, salt: '', hash: '', hint: {salt: {encoding: 'base64'}})
       raise ArgumentError.new, 'id is required' if id.nil?
       raise ArgumentError.new, 'hash needs salt' if (salt.nil? || salt.empty?) && !(hash.nil? || hash.empty?)
 
       elements = [
         id,
-        (params.map {|e| e.join '='}.join(',') if params),
+        (params.map{|e| e.join '='}.join(',') if params),
         hint.dig(:salt, :encoding) == '7bit' ? salt : short_strict_encode64(salt),
         short_strict_encode64(hash)
       ]
-      "$#{elements.select {|e| !(e.nil? || e.empty?)} .join('$')}"
+      "$#{elements.select{|e| !(e.nil? || e.empty?)}.join('$')}"
     end
 
-    #
     def self.parse(string, hint: {salt: {encoding: 'base64'}})
       elements = string.split(/\$/, 5)
       elements.shift
@@ -34,11 +30,11 @@ module PhcStringFormat
       params = parse_parameter_string(elements.shift) if (elements.first || '').include?('=')
       salt = hint.dig(:salt, :encoding) == '7bit' ? elements.shift : short_strict_decode64(elements.shift)
       hash = short_strict_decode64(elements.shift)
-      {id: id, params: params, salt: salt, hash: hash }
+      {id: id, params: params, salt: salt, hash: hash}.select {|_,v| v}
     end
 
     def self.parse_parameter_string(string)
-      string.split(/,/).map {|e| e.split '='}.each_with_object({}) {|e, h| k, v = e; h[k.to_sym] = (/\A-?\d+(.\d+)?\Z/.match(v) ? v.to_i : v)}
+      string.split(/,/).map {|e| e.split '='}.each_with_object({}){|e, h| k, v = e; h[k] = (/\A-?\d+(.\d+)?\Z/.match(v) ? v.to_i : v)}
     end
 
     def self.short_strict_encode64(bin)
@@ -52,7 +48,5 @@ module PhcStringFormat
     end
 
     private_class_method :short_strict_encode64, :short_strict_decode64, :parse_parameter_string
-
   end
-
 end

data/lib/phc_string_format/version.rb

@@ -1,3 +1,3 @@
 module PhcStringFormat
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phc_string_format
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - naokikimura