phc_string_format 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb2f0d0c00976c78f68dfc2ebdaa2fa87bbe930aecd1a97a29d41352f6f03bb2
-  data.tar.gz: 98d1aa8ababe727401fe90b8235f645598037c864d23fc67b9992c6adc3aeeb5
+  metadata.gz: 41338e6a8802d92b3e88ce469726ef0c951e00aace68150830af98a5bd61198d
+  data.tar.gz: 48a98362995d3773109c0814a5d6882064a5007892e8b7306b0e4faca0cd1833
 SHA512:
-  metadata.gz: d237ce6fc74598654b30c18b16688e15407d89e3df3d051282a77d4a8ab9be1d6f06da53927083dbf89cbdb238896004f2cbc20e83bbbd1b4206713dcfafb80b
-  data.tar.gz: 3c81d00427397be5fe6357e9478eda86864bb35388430a97d86e83839d92409bc29b72c0f1a2bd3524249e2b7591a014f4cdd995abb4c0bba3162009da115f26
+  metadata.gz: 94a8ad963cb6f812fb3b613a3755a160c54186fbf574de250254f268f0a5ceeb00ea4927eb2b9f1af56a5eec8c3ef5a5f1165705ce52a103d6b780d955e09e89
+  data.tar.gz: bb96c7aff20a6fca4d6707ec03211c27a8748372b3ce8e35c2ae0b8f557a9671909339c8d3cf1d5049e3893ca2f2ad3d386f671d97d05fa6fcb67ac3c7bd113a

data/.reek.yml

@@ -1,21 +1,14 @@
 ---
 detectors:
 
-  FeatureEnvy:
-    exclude:
-      - 'PhcStringFormat::PhcString#parse_params'
-
   LongParameterList:
     max_params: 6
-    overrides:
-      initialize:
-        max_params: 6
 
   TooManyStatements:
     max_statements: 10
 
   TooManyInstanceVariables:
-    max_instance_variables: 6
+    max_instance_variables: 5
 
   UncommunicativeModuleName:
     accept:

data/.rubocop.yml

@@ -17,7 +17,7 @@ Metrics/CyclomaticComplexity:
   Max: 7
 
 Metrics/LineLength:
-   Max: 110
+  Max: 110
 
 Metrics/MethodLength:
   Max: 15

data/Gemfile.lock

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

data/lib/phc_string_format/phc_string.rb

@@ -26,13 +26,12 @@ module PhcStringFormat
     end
 
     def self.create(id:, version: nil, params: nil, salt: nil, hash: nil, hint: {})
-      PhcString.new(
+      PhcString.new \
         id,
-        ("v=#{version}" if version),
-        (params.map { |entry| entry.join '=' }.join(',') if params),
+        (Parameters.to_s(v: version) if version),
+        (Parameters.to_s(params) if params),
         hint.dig(:salt, :encoding) == '7bit' ? salt : B64.encode(salt),
         B64.encode(hash)
-      )
     end
 
     private_class_method :split
@@ -80,8 +79,8 @@ module PhcStringFormat
       pick ||= %i[id version params salt hash]
       {
         id: (@id if pick.include?(:id)),
-        version: (parse_version(@version_string) if pick.include?(:version)),
-        params: (parse_params(@params_string) if pick.include?(:params)),
+        version: (Parameters.to_h(@version_string)['v'] if pick.include?(:version)),
+        params: (Parameters.to_h(@params_string) if pick.include?(:params)),
         salt:
           if pick.include?(:salt)
             hint.dig(:salt, :encoding) == '7bit' ? @encoded_salt : B64.decode(@encoded_salt)
@@ -106,18 +105,23 @@ module PhcStringFormat
       @encoded_salt || !@encoded_hash
     end
 
-    def parse_version(version_string)
-      parse_params(version_string)['v']
-    end
+    #
+    # PHC string parameters
+    #
+    module Parameters
+      def self.to_s(params)
+        params ||= {}
+        params.map { |param| param.join '=' }.join(',')
+      end
 
-    def parse_params(params_string)
-      mapper = ->(param) { param.split '=' }
-      reducer = lambda do |param, params|
-        name, value = param
-        params[name] = value =~ /\A-?\d+(.\d+)?\Z/ ? value.to_i : value
+      def self.to_h(params_string)
+        params_string ||= ''
+        params_string
+          .split(/,/)
+          .map { |param| param.split '=' }
+          .map { |name, value| [name, value =~ /\A-?\d+(.\d+)?\Z/ ? value.to_i : value] }
+          .to_h
       end
-      params_string ||= ''
-      params_string.split(/,/).map(&mapper).each_with_object({}, &reducer)
     end
   end
 

data/lib/phc_string_format/version.rb

@@ -1,3 +1,3 @@
 module PhcStringFormat
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

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