reredos 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8adfc52f2ddfb55c386adf71cfbc23e4e1401c5674b8dff8b157bd64fa30ce21
-  data.tar.gz: 2737d510279f2251ca065f82ba3e7caba691e8df37d08c405321197f11cbc78c
+  metadata.gz: 3547add122783213f2b2d21781effdcdbccf443b46faefcbbc8040896b3604e9
+  data.tar.gz: 92f229dfe56e23bd74a0b722f8cd200f5e8631abf37821d749cc56a55f7c97e9
 SHA512:
-  metadata.gz: 5a6dbf7e9c48264672e305fddf747de7c50ec793cb383880ce51f8a1b06a0be57538a3845a7cf35790d8c93a1b75680ea644723ed07e5de7c59e7d22ecf1e88d
-  data.tar.gz: 4750b12690c7094542bf0a471eb94972aa6973144c9626e0b247bad8cd8471d2c8952a0283ac49eb391fad2e3873b6741c8410206ead0f1238ca472c8dac1e30
+  metadata.gz: 899fe67f6ea0adfcc74e257313f09f383accff312b8c701fded469fa8bd81f28d0a95ac1bc42626580666f7234a1edfc2e58c213237e47a8dcf93071152e2d91
+  data.tar.gz: fc9c2e4c6a6ea49b129cb85c52c3f595b197554c0b4b1282441333997d9fb8a76978e2f6d6112c7457bf231b1929bbf3c37ac2912665b9b0cac4930f7e6a344b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    reredos (0.1.1)
+    reredos (0.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -32,4 +32,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/README.md

@@ -48,6 +48,9 @@ The gem is available as open source under the terms of the [MIT License](https:/
 Everyone interacting in the Reredos project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/reredos/blob/master/CODE_OF_CONDUCT.md).
 
 ## Release Notes
+### 0.1.2 - July 29, 2019
+* Fixed a bug, that it accepted dots as first or last character of username
+
 ### 0.1.1 - April 26, 2019
 * Fixed a bug, that it accepted strings including new line
 

data/lib/reredos/version.rb

@@ -1,3 +1,3 @@
 module Reredos
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/reredos.rb

@@ -20,18 +20,42 @@ module Reredos
 
     def valid_domain?(str)
       return false if str.length > DOMAIN_MAX_LENGTH
-      return false if str[-1] == '-' # 末尾は-でない
-
-      labels = str.split('.')
-      return false if labels.map(&:length).any?{ |_| _ > DOMAIN_LABEL_MAX_LENGTH }
-      return false unless labels.map{ |_| /\A[0-9a-zA-Z\-]+\z/ === _ }.all? # ラベルに含まれる文字が1文字以上の英数字orハイフン
+      return false unless str.split('.').all? { |l| valid_label?(l) }
 
       true
     end
 
     def valid_username?(str)
       return false if str.length > USERNAME_MAX_LENGTH
+      return false if str[0] == '.' || str[-1] == '.'
       /\A[0-9a-zA-Z\.\+\-\_]+\z/ === str # 既定の文字のみで構成されている
     end
+
+    # ラベルはアルファベットで始まり、アルファベットか数字かハイフンが続き、アルファベットか数字で終わる
+    def valid_label?(str)
+      return false if str.empty?
+      return false if str.length > DOMAIN_LABEL_MAX_LENGTH
+      return false unless letter?(str[0])
+      return false unless alphanumeric?(str[-1])
+      return true if str[1...-1].empty?
+
+      str[1...-1].chars.all? { |c| hyphen_or_alphanumeric?(c) }
+    end
+
+    def letter?(char)
+      ('a'..'z').include?(char) || ('A'..'Z').include?(char)
+    end
+
+    def digit?(char)
+      ('0'..'9').include?(char)
+    end
+
+    def alphanumeric?(char)
+      letter?(char) || digit?(char)
+    end
+
+    def hyphen_or_alphanumeric?(char)
+      char == '-' || alphanumeric?(char)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reredos
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - expajp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2019-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler