phc_string_format 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd51561f2a2662deee047aeec5ac9f7eaffdf0b5
-  data.tar.gz: c71044ae647c76af59cd9472431eb702ecb3f74d
+  metadata.gz: 9796f936f745ffb9ab58df7b1369eed449de3511
+  data.tar.gz: 285a076299d2ee829d9db68fd7a1286344999fa0
 SHA512:
-  metadata.gz: 56778712f628f749027aa1143cc77e6e4d0c313335b628fa9ff0f0c0e27d696cb700ad5ae56c9ed2189580eac883ebd2737cde9dc4bcf985753637646f4c8284
-  data.tar.gz: 02f01c1c68610a692bc86c5ac1f0d645bb71cf27bd462285ce96b6915a9a23288ad097b297c9b7c829562352e81440a85ffb0e7d0380749608e1fb29d46c3c69
+  metadata.gz: 32ed90c87744f57f92b96bffc1a408985099e06acfe12f0aebba5763dc9ba9e1dea9a46c594e2067c77b84a103850abb8f6d3ec91563a4b9797f3f078d62735d
+  data.tar.gz: b0bca224d19fce7a6df03f1850f6418aa3d420680c6e16b8d6595c9cf5045e84420bc67b14161d44ecb9bd821c01aebb280da5eb4f4c80aac1bdbe32ca5d166f

data/Gemfile.lock

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

data/lib/phc_string_format.rb

@@ -24,21 +24,33 @@ module PhcStringFormat
       "$#{elements.select{|e| !(e.nil? || e.empty?)}.join('$')}"
     end
 
-    def self.parse(string, hint: {salt: {encoding: 'base64'}})
+    def self.parse(string, pick: nil ,hint: {salt: {encoding: 'base64'}})
+      pick = [:id, :version, :params, :salt, :hash] unless pick
       elements = string.split(/\$/, 6)
       elements.shift
-      id = elements.shift
-      version = parse_parameter_string(elements.shift)['v'] if (elements.first || '').start_with?('v=')
-      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 = shift_and_parse elements, pick.include?(:id), &-> (e) { e }
+      version = shift_and_parse(elements, pick.include?(:version), &@@parse_version) if (elements.first || '').start_with?('v=')
+      params = shift_and_parse(elements, pick.include?(:params), &@@parse_parameter_string) if (elements.first || '').include?('=')
+      salt = shift_and_parse elements, pick.include?(:salt), &-> (e) {
+        hint.dig(:salt, :encoding) == '7bit' ? e : short_strict_decode64(e)
+      }
+      hash = shift_and_parse elements, pick.include?(:hash), &-> (e) { short_strict_decode64(e) }
       {id: id, version: version, 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] = (/\A-?\d+(.\d+)?\Z/.match(v) ? v.to_i : v)}
+    def self.shift_and_parse(elements, picks, &proc)
+      element = elements.shift
+      proc.call(element) if picks
     end
 
+    @@parse_version = -> (string) {
+      @@parse_parameter_string.call(string)['v']
+    }
+
+    @@parse_parameter_string = -> (string) {
+      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)}
+    }
+
     def self.short_strict_encode64(bin)
       return nil unless bin
       Base64.strict_encode64(bin).delete('=')
@@ -49,6 +61,6 @@ module PhcStringFormat
       Base64.strict_decode64(bin + '=' * (-bin.size % 4))
     end
 
-    private_class_method :short_strict_encode64, :short_strict_decode64, :parse_parameter_string
+    private_class_method :short_strict_encode64, :short_strict_decode64
   end
 end

data/lib/phc_string_format/version.rb

@@ -1,3 +1,3 @@
 module PhcStringFormat
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phc_string_format
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - naokikimura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler