phc_string_format 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95e7a26c44ec35184f4fb1ca0be50e7a6c29d99b738016ed7cd03e82f9b67694
-  data.tar.gz: 76c006ce54750252df08eeba8dba21c4ff5ee89ea8236eb5393e5cb4c474ba4a
+  metadata.gz: 33dff8312aa061f66c90fdabb7d4630ffdb322c2d770e1714fd7f8115335a72e
+  data.tar.gz: 87d4da1c7bd827cad52cf8f748184d11d661f7d1757627b87be932aaeaf16728
 SHA512:
-  metadata.gz: 8932e026c805b7e9cc1a04d9b28ab9cab7c6410ae3ca12c776765c143c33a0db4cc350def716dc4fc4d5af5aff06c1dc2d286098a0058676877385314b074dd5
-  data.tar.gz: 39c415ecd8487e4c99182dd8f3bb008d6b952b0b5a39479fe99233895b2e4422f5efc3e0362cf272ebe1f101e9ce7f18c278b53749445414aa79cea6fe0fb976
+  metadata.gz: bb3038a561c2b36c94d064fa101dec7aa6dd7c49fd4df7b3da269e3d3595ccd8a54b79c1eebd905a42ea1abec0bcfb2fabe4f6cb54cc728d7a172485ced83105
+  data.tar.gz: a4c5bc3223bf5a614b485fe3a55afaf04f039d0123a734bef209d7db42ba85e076b7dfaed2685076433a87189762f43d314b5607c304706b3b41283d1ae5b527

data/Gemfile.lock

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

data/lib/phc_string_format/formatter.rb

@@ -8,7 +8,7 @@ module PhcStringFormat
     end
 
     def self.parse(string, hint: {}, pick: nil)
-      PhcString.parse(string, hint: hint).to_h(pick)
+      PhcString.parse(string).to_h(pick: pick, hint: hint)
     end
   end
 end

data/lib/phc_string_format/phc_string.rb

@@ -3,20 +3,30 @@ module PhcStringFormat
   # Parser for parsing PHC-string-format.
   #
   class PhcString
-    def self.validates(name, **validator)
-      @validators ||= {}
-      @validators[name] = validator
+    def self.validates(name, **options)
+      @validators ||= []
+      @validators << lambda { |object|
+        value = object.instance_variable_get(name)
+        return if options[:allow_nil] && !value
+        regex = options.dig(:format, :with)
+        raise ArgumentError, options[:message] unless !regex || value =~ regex
+      }
     end
 
-    def self.validate(object)
-      @validators.each do |name, validator|
-        raise ArgumentError, validator[:message] \
-          unless validator[:unless].call(object.instance_variable_get(name))
-      end
+    def self.validate(name, **options)
+      @validators ||= []
+      @validators << ->(object) { raise ArgumentError, options[:message] unless object.send(name) }
+    end
+
+    def self.do_validate(that)
+      @validators.each { |validator| validator.call(that) }
+      that
     end
 
+    private_class_method :validates, :validate
+
     # :reek:DuplicateMethodCall { allow_calls: ['elements.shift', 'elements.first'] }
-    def self.parse(string, hint: {})
+    def self.parse(string)
       string ||= ''
       elements = string.split(/\$/, 6)
       elements.shift
@@ -26,7 +36,7 @@ module PhcStringFormat
       salt = elements.shift
       hash = elements.shift
       begin
-        PhcString.new(id, version, params, salt, hash, hint)
+        PhcString.new(id, version, params, salt, hash)
       rescue ArgumentError
         raise ParseError
       end
@@ -38,44 +48,37 @@ module PhcStringFormat
         ("v=#{version}" if version),
         (params.map { |entry| entry.join '=' }.join(',') if params),
         hint.dig(:salt, :encoding) == '7bit' ? salt : B64.encode(salt),
-        B64.encode(hash),
-        hint
+        B64.encode(hash)
       )
     end
 
-    validates :@id, message: 'id is non-compliant', unless: ->(id) { id && id =~ /\A[a-z0-9-]{1,32}\z/ }
+    validates :@id, message: 'id is non-compliant', format: { with: /\A[a-z0-9-]{1,32}\z/ }
     validates \
       :@version_string,
       message: 'version is non-compliant',
-      unless: ->(version_string) { !version_string || version_string =~ /\Av=\d+\z/ }
-    validates \
-      :@params_string,
-      message: 'parameters is non-compliant',
-      unless: proc { |params_string|
-        !params_string || !params_string.empty? && params_string.split(',').all? \
-          { |param| param =~ %r{\A[a-z0-9-]{1,32}=[a-zA-Z0-9/+.-]+\z} }
-      }
+      allow_nil: true,
+      format: { with: /\Av=\d+\z/ }
+    validate :validate_params_string, message: 'parameters is non-compliant'
     validates \
       :@encoded_salt,
       message: 'encoded salt is non-compliant',
-      unless: ->(encoded_salt) { !encoded_salt || encoded_salt =~ %r{\A[a-zA-Z0-9/+.-]+\z} }
+      allow_nil: true,
+      format: { with: %r{\A[a-zA-Z0-9/+.-]+\z} }
     validates \
       :@encoded_hash,
       message: 'encoded hash is non-compliant',
-      unless: ->(encoded_hash) { !encoded_hash || encoded_hash =~ %r{\A[a-zA-Z0-9/+]+\z} }
+      allow_nil: true,
+      format: { with: %r{\A[a-zA-Z0-9/+]+\z} }
+    validate :validate_salt_and_hash, message: 'hash needs salt'
 
-    # :reek:DuplicateMethodCall { allow_calls: ['!encoded_salt', '!encoded_hash'] }
-    def initialize(id, version_string, params_string, encoded_salt, encoded_hash, hint)
+    def initialize(id, version_string, params_string, encoded_salt, encoded_hash)
       @id = id
       @version_string = version_string
       @params_string = params_string
       @encoded_salt = encoded_salt
       @encoded_hash = encoded_hash
-      @hint = hint
 
-      self.class.validate self
-      raise ArgumentError, 'hash needs salt' \
-        if (!encoded_salt || encoded_salt.empty?) && !(!encoded_hash || encoded_hash.empty?)
+      self.class.do_validate self
     end
 
     def to_s
@@ -88,7 +91,7 @@ module PhcStringFormat
       ].reject { |element| !element || element.empty? }.join('$')
     end
 
-    def to_h(pick = nil)
+    def to_h(pick: nil, hint: {})
       pick ||= %i[id version params salt hash]
       {
         id: (@id if pick.include?(:id)),
@@ -96,7 +99,7 @@ module PhcStringFormat
         params: (parse_params(@params_string) if pick.include?(:params)),
         salt:
           if pick.include?(:salt)
-            @hint.dig(:salt, :encoding) == '7bit' ? e : B64.decode(@encoded_salt)
+            hint.dig(:salt, :encoding) == '7bit' ? @encoded_salt : B64.decode(@encoded_salt)
           end,
         hash: (B64.decode(@encoded_hash) if pick.include?(:hash))
       }.select { |_, value| value }
@@ -109,6 +112,15 @@ module PhcStringFormat
 
     private
 
+    def validate_params_string
+      !@params_string || !@params_string.empty? && @params_string.split(',').all? \
+        { |param| param =~ %r{\A[a-z0-9-]{1,32}=[a-zA-Z0-9/+.-]+\z} }
+    end
+
+    def validate_salt_and_hash
+      !((!@encoded_salt || @encoded_salt.empty?) && !(!@encoded_hash || @encoded_hash.empty?))
+    end
+
     def parse_version(version_string)
       parse_params(version_string)['v']
     end

data/lib/phc_string_format/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phc_string_format
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - naokikimura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler