phc_string_format 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 33dff8312aa061f66c90fdabb7d4630ffdb322c2d770e1714fd7f8115335a72e
-  data.tar.gz: 87d4da1c7bd827cad52cf8f748184d11d661f7d1757627b87be932aaeaf16728
+SHA1:
+  metadata.gz: 74aad184bd05ef181197a6511faf147117419a36
+  data.tar.gz: 67d273fc6645159868754577049e5c6161454831
 SHA512:
-  metadata.gz: bb3038a561c2b36c94d064fa101dec7aa6dd7c49fd4df7b3da269e3d3595ccd8a54b79c1eebd905a42ea1abec0bcfb2fabe4f6cb54cc728d7a172485ced83105
-  data.tar.gz: a4c5bc3223bf5a614b485fe3a55afaf04f039d0123a734bef209d7db42ba85e076b7dfaed2685076433a87189762f43d314b5607c304706b3b41283d1ae5b527
+  metadata.gz: 727d3a0d2e0d0803f0331b897175cd79e36f17feccee6e0b91a02b0ebef6e9e75b083472b527b5ff04939c135696a620fae06b22159222b775d386c69c27771b
+  data.tar.gz: f1a8cf1788ace3f1ed3c4ad777492d53daf16782f88f4c539b8c3752895c0172dd8673d247cd046d6b74fd2e2052f6f8a5954f891f3ac3745c5a54457b8594c9

data/Gemfile.lock

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

data/lib/phc_string_format/phc_string.rb

@@ -23,23 +23,24 @@ module PhcStringFormat
       that
     end
 
-    private_class_method :validates, :validate
-
-    # :reek:DuplicateMethodCall { allow_calls: ['elements.shift', 'elements.first'] }
     def self.parse(string)
       string ||= ''
+      PhcString.new(*split(string))
+    rescue StandardError => exception
+      raise ParseError, exception.message
+    end
+
+    # :reek:DuplicateMethodCall { allow_calls: ['elements.shift', 'elements.first'] }
+    def self.split(string)
       elements = string.split(/\$/, 6)
       elements.shift
-      id = elements.shift
-      version = elements.shift if (elements.first || '').start_with?('v=')
-      params = elements.shift if (elements.first || '').include?('=')
-      salt = elements.shift
-      hash = elements.shift
-      begin
-        PhcString.new(id, version, params, salt, hash)
-      rescue ArgumentError
-        raise ParseError
-      end
+      [
+        elements.shift,
+        (elements.shift if (elements.first || '').start_with?('v=')),
+        (elements.shift if (elements.first || '').include?('=')),
+        elements.shift,
+        elements.shift
+      ]
     end
 
     def self.create(id:, version: nil, params: nil, salt: nil, hash: nil, hint: {})
@@ -52,6 +53,8 @@ module PhcStringFormat
       )
     end
 
+    private_class_method :validates, :validate, :split
+
     validates :@id, message: 'id is non-compliant', format: { with: /\A[a-z0-9-]{1,32}\z/ }
     validates \
       :@version_string,
@@ -63,12 +66,12 @@ module PhcStringFormat
       :@encoded_salt,
       message: 'encoded salt is non-compliant',
       allow_nil: true,
-      format: { with: %r{\A[a-zA-Z0-9/+.-]+\z} }
+      format: { with: %r{\A[a-zA-Z0-9/+.-]*\z} }
     validates \
       :@encoded_hash,
       message: 'encoded hash is non-compliant',
       allow_nil: true,
-      format: { with: %r{\A[a-zA-Z0-9/+]+\z} }
+      format: { with: %r{\A[a-zA-Z0-9/+]*\z} }
     validate :validate_salt_and_hash, message: 'hash needs salt'
 
     def initialize(id, version_string, params_string, encoded_salt, encoded_hash)
@@ -88,7 +91,7 @@ module PhcStringFormat
         @params_string,
         @encoded_salt,
         @encoded_hash
-      ].reject { |element| !element || element.empty? }.join('$')
+      ].compact.join('$')
     end
 
     def to_h(pick: nil, hint: {})
@@ -118,7 +121,7 @@ module PhcStringFormat
     end
 
     def validate_salt_and_hash
-      !((!@encoded_salt || @encoded_salt.empty?) && !(!@encoded_hash || @encoded_hash.empty?))
+      @encoded_salt || !@encoded_hash
     end
 
     def parse_version(version_string)

data/lib/phc_string_format/version.rb

@@ -1,3 +1,3 @@
 module PhcStringFormat
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phc_string_format
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - naokikimura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: PHC string format implemented by Ruby.