phc_string_format 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0515e210193222efab52644db4ba99e092ab3bd5
-  data.tar.gz: e47d47ad2ab63d3b65397d676f930022df5870ec
+  metadata.gz: 373b8c4868684651da8c936757f35579e3ef3c77
+  data.tar.gz: e529b9855fdb87423ecb7c18b27befbf00358043
 SHA512:
-  metadata.gz: '018471d84a39f7c29718404ecdd82c6e32963f165bdf90738419664fea541e75b4037149423ecdbbe9e470aee08ebcb4b126ce26283530d1a68bc9c4f6248201'
-  data.tar.gz: 2eabb9ebdbb8b4584b11c833ae402de04a5fabbc458d1ff3ad8b0254e82ca2f07adcf81d794da89e3534fc258c1f7929e12ceb6d596658cdd61bc239c91165da
+  metadata.gz: 95200c10a93e1b8e60576af7f48b4198004b0fb9496cb4d8ea389d1eaef367a8baac153268ba43b34fbc9ed855d6ad3ec563a8019230bc8cfa9917cd1a46c33b
+  data.tar.gz: 2dd6b546b3f274c9431937ff4cb7850e4a2b2707a69f36e85dcdc910317c4a512d91a235b667c24c954e91a908a973f2af02625b3d6b675f8692b81625278157

data/Gemfile.lock

@@ -1,12 +1,21 @@
 PATH
   remote: .
   specs:
-    phc_string_format (0.1.0)
+    phc_string_format (0.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    byebug (10.0.2)
+    coderay (1.1.2)
     diff-lcs (1.3)
+    method_source (0.9.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.6.0)
+      byebug (~> 10.0)
+      pry (~> 0.10)
     rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -28,6 +37,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   phc_string_format!
+  pry-byebug (~> 3.6)
   rake (~> 10.0)
   rspec (~> 3.0)
 

data/README.md

@@ -1,5 +1,10 @@
 # PhcStringFormat
 
+[![Gem Version](https://badge.fury.io/rb/phc_string_format.svg)](https://badge.fury.io/rb/phc_string_format)
+[![Build Status](https://travis-ci.org/naokikimura/phc_string_format.svg?branch=master)](https://travis-ci.org/naokikimura/phc_string_format)
+[![Known Vulnerabilities](https://snyk.io/test/github/naokikimura/phc_string_format/badge.svg?targetFile=Gemfile.lock)](https://snyk.io/test/github/naokikimura/phc_string_format?targetFile=Gemfile.lock)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/cbcb6fa3556447a4af16980f3cc6f1eb)](https://app.codacy.com/app/naokikimura/phc_string_format?utm_source=github.com&utm_medium=referral&utm_content=naokikimura/phc_string_format&utm_campaign=badger)
+
 TODO: Describe your gem
 
 ## Installation

data/lib/phc_string_format.rb

@@ -13,30 +13,34 @@ module PhcStringFormat
   module Formatter
 
     #
-    def self.format(id:, params: {}, salt: '', hash: '')
+    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.entries.map { |k, v| "#{k}=#{v}" }.join(','),
-        short_strict_encode64(salt),
+        (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)
-      elements = string.split('$')
+    def self.parse(string, hint: {salt: {encoding: 'base64'}})
+      elements = string.split(/\$/, 5)
       elements.shift
       id = elements.shift
-      params = elements.shift.split(',').map {|e| e.split('=')}.reduce({}) {|h, e| k, v = e; h[k]=v; h}
-      salt = short_strict_decode64(elements.shift)
+      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 }
     end
 
+    def self.parse_parameter_string(string)
+      string.split(/,/).map {|e| e.split '='}.each_with_object({}) {|e, h| k, v = e; h[k]=v}
+    end
+
     def self.short_strict_encode64(bin)
       return nil unless bin
       Base64.strict_encode64(bin).delete('=')
@@ -47,7 +51,7 @@ module PhcStringFormat
       Base64.strict_decode64(bin + '=' * (-bin.size % 4))
     end
 
-    private_class_method :short_strict_encode64, :short_strict_decode64
+    private_class_method :short_strict_encode64, :short_strict_decode64, :parse_parameter_string
 
   end
 

data/lib/phc_string_format/version.rb

@@ -1,3 +1,3 @@
 module PhcStringFormat
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/phc_string_format.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "pry-byebug", "~> 3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phc_string_format
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - naokikimura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
 description: 
 email:
 - n.kimura.cap@gmail.com