regexy 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40966cc63071e62d563e7a5de1a924c8daa34aae
-  data.tar.gz: d664c37af40dcd7d9089cf115c67c6f91df1ec66
+  metadata.gz: 598e3dce59c516054e30d9b079a7dd93ee8c8ee9
+  data.tar.gz: 5d861d4f7b6cc4d0d36d6629cf254bce7e9b3696
 SHA512:
-  metadata.gz: d405294eeba9f227606523f9829085fd40eb99ba581e80a63610d380cc7f58509cbca8d234d4f924a83fad781947511bae8f6b2f712d9d5e309931c03c9ee466
-  data.tar.gz: f3a33ef9791a26ae03c509fbf910148a4ebe597789f746c48d1de45c470ace6fbe5bafb744bcd06dd8108093b34c9d17c229f57eb6449867d5fe448807cd24ef
+  metadata.gz: 977c292fcbe5a7a74966006c6580ecc48d4562c89d52e1994be3dd0d227fc18b5b3ab93d813c402c8b1a2f351214971f2314d285731249350e28e86170c6a50a
+  data.tar.gz: fe3faba108f11c13221a7a9819fa89923ddcdfdf53019ed7c417dc7d809604d0e631749f7b801b86c063e2e571ca728080c28b9b47645d20eba4ccc0b9f87634

data/README.md

@@ -14,6 +14,7 @@ Regexy is the ruby gem that contains a lot of common-use regular expressions (su
     * [General usage](#regexyregexp)
     * [Combining expressions](#combining-regular-expressions)
     * [Email addresses](#regexywebemail)
+    * [Hashtag](#regexywebhashtag)
     * [IP addresses](#regexywebipv4)
     * [Url](#regexyweburl)
 - [Contributing](#contributing)
@@ -57,12 +58,12 @@ Regexy::Regexp.new(/foo/i) | /bar/x # => /foo|bar/ix
 Regexy::Regexp.new(/foo/i).or 'bar' # => /foo|bar/i
 any_ipv4 = Regexy::Web::IPv4.new(:normal) | Regexy::Web::IPv4.new(:with_port) # matches ip w\ and w\o port
 ```
-Also you could simply join two expressions using `+` method, or it's alias `and_then`. Note, that it will __remove__ trailing `$` from first regex and leading `^` from second regex.
+Also you could simply join two expressions using `+` method, or it's alias `and_then`. Note, that it will __remove__ trailing `\z` from first regex and leading `\A` from second regex.
 ```ruby
 Regexy::Regexp.new('foo') + Regexy::Regexp.new(/bar/) # => /foobar/
-Regexy::Regexp.new(/foo$/i) | /bar/ # => /foobar/i
-Regexy::Regexp.new(/foo/).or '^bar' # => /foobar/
-Regexy::Regexp.new(/^foo$/).or '^bar$' # => /^foobar$/
+Regexy::Regexp.new(/foo\z/i) | /bar/ # => /foobar/i
+Regexy::Regexp.new(/foo/).or '\Abar' # => /foobar/
+Regexy::Regexp.new(/\Afoo\z/).or '\Abar\z' # => /\Afoobar\z/
 ```
 
 ### Regexy::Web::Email
@@ -74,6 +75,15 @@ r1 = Regexy::Web::Email.new(:relaxed)
 r2 = Regexy::Web::Email.new(:normal)  # does not match 'f@s.c' and 'invalid-ip@127.0.0.1.26'
 r2 = Regexy::Web::Email.new(:strict)  # does not match 'hans,peter@example.com' and "partially.\"quoted\"@sld.com"
 ```
+### Regexy::Web::Hashtag
+
+Generates regular expressions for matching Hashtags.
+A hashtag can contain any UTF-8 alphanumeric character, plus the underscore symbol.
+A hashtag can't be only numeric, it must have at least one alpahanumeric character or the underscore symbol.
+
+```ruby
+r1 = Regexy::Web::Hashtag.new # matches '#hash_tags'
+```
 ### Regexy::Web::IPv4
 
 Generates regular expressions for matching IPv4 addresses. Available options: `:normal` (by default) for matching ip without port and `:with_port` for guess what.

data/lib/regexy/regexp.rb

@@ -23,7 +23,9 @@ module Regexy
 
     def + other
       other = ::Regexy::Regexp.new(other)
-      new_regexp = source.chomp('$') + other.source.sub(/^\^/, '')
+      first_regex = source.length > 2 ? source.sub(/\\z\s*\z/, '') : source
+      second_regex = other.source.length > 2 ? other.source.sub(/\A\\A/, '') : other.source
+      new_regexp = first_regex + second_regex
       new_options = options | other.options
       ::Regexy::Regexp.new(new_regexp, new_options)
     end

data/lib/regexy/version.rb

@@ -1,3 +1,3 @@
 module Regexy
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/regexy/web/hashtag.rb

@@ -0,0 +1,13 @@
+# encoding: UTF-8
+
+module Regexy
+  module Web
+    class Hashtag < ::Regexy::Regexp
+      HASHTAG = /\A#(?=.{2,140}\z)([0-9_\p{L}]*[_\p{L}][0-9_\p{L}]*)\z/u.freeze
+
+      def initialize(*args)
+        super(HASHTAG, *args)
+      end
+    end
+  end
+end

data/lib/regexy/web/ip.rb

@@ -1,10 +1,10 @@
 module Regexy
   module Web
-    PORT = /:([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$/i.freeze
+    PORT = /:([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])\z/i.freeze
 
     class IPv4 < ::Regexy::RegexpWithMode
-      IPV4_NORMAL = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i.freeze
-      IPV4_WITH_PORT = ::Regexp.new(IPV4_NORMAL.source.chomp('$') + PORT.source).freeze
+      IPV4_NORMAL = /\A(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\z/i.freeze
+      IPV4_WITH_PORT = (::Regexy::Regexp.new(IPV4_NORMAL) + PORT.source).freeze
 
       protected
 
@@ -18,16 +18,16 @@ module Regexy
     end
 
     class IPv6 < ::Regexy::RegexpWithMode
-      IPV6_NORMAL = /^(?:(?:(?:[A-F0-9]{1,4}:){6}|(?=(?:[A-F0-9]{0,4}:){0,6}(?:[0-9]{1,3}\.){3}
+      IPV6_NORMAL = /\A(?:(?:(?:[A-F0-9]{1,4}:){6}|(?=(?:[A-F0-9]{0,4}:){0,6}(?:[0-9]{1,3}\.){3}
                      [0-9]{1,3}(?![:.\w]))(([0-9A-F]{1,4}:){0,5}|:)((:[0-9A-F]{1,4}){1,5}:|:)
                      |::(?:[A-F0-9]{1,4}:){5})(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|
                      [1-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|
                      (?:[A-F0-9]{1,4}:){7}[A-F0-9]{1,4}|(?=(?:[A-F0-9]{0,4}:){0,7}
                      [A-F0-9]{0,4}(?![:.\w]))(([0-9A-F]{1,4}:){1,7}|:)((:[0-9A-F]{1,4}){1,7}
-                     |:)|(?:[A-F0-9]{1,4}:){7}:|:(:[A-F0-9]{1,4}){7})(?![:.\w])$
+                     |:)|(?:[A-F0-9]{1,4}:){7}:|:(:[A-F0-9]{1,4}){7})(?![:.\w])\z
                     /ix.freeze
 
-      IPV6_WITH_PORT = ::Regexp.new('[' + IPV6_NORMAL.source.chomp('$') + ']' + PORT.source).freeze
+      IPV6_WITH_PORT = (::Regexy::Regexp.new(/\A\[/) + IPV6_NORMAL + /\]/ + PORT.source).freeze
 
       protected
 

data/lib/regexy/web/url.rb

@@ -3,13 +3,13 @@
 module Regexy
   module Web
     class Url < ::Regexy::Regexp
-      URL = /^([a-z][a-z\d+\-.]*:(\/\/([\p{L}\d\-._~%!$&'()*+,;=]+@)?([\p{L}\d\-._~%]+|
+      URL = /\A([a-z][a-z\d+\-.]*:(\/\/([\p{L}\d\-._~%!$&'()*+,;=]+@)?([\p{L}\d\-._~%]+|
              \[[\p{L}\d:.]+\]|\[v[a-f0-9][\p{L}\d\-._~%!$&'()*+,;=:]+\])(:[0-9]+)?
              (\/[\p{L}\d\-._~%!$&'()*+,;=:@]+)*\/?|(\/?[\p{L}\d\-._~%!$&'()*+,;=:@]+
              (\/[\p{L}\d\-._~%!$&'()*+,;=:@]+)*\/?)?)|([\p{L}\d\-._~%!$&'()*+,;=@]+
              (\/[\p{L}\d\-._~%!$&'()*+,;=:@]+)*\/?|(\/[\p{L}\d\-._~%!$&'()*+,;=:@]+)
              +\/?))
-             (\?[\p{L}\d\-._~%!$&'()*+,;=:@\/?]*)?(\#[\p{L}\d\-._~%!$&'()*+,;=:@\/?]*)?$
+             (\?[\p{L}\d\-._~%!$&'()*+,;=:@\/?]*)?(\#[\p{L}\d\-._~%!$&'()*+,;=:@\/?]*)?\z
             /ix.freeze
 
       def initialize(*args)

data/lib/regexy/web.rb

@@ -1,8 +1,9 @@
 module Regexy
   module Web
-    autoload :Email, 'regexy/web/email'
-    autoload :IPv4,  'regexy/web/ip'
-    autoload :IPv6,  'regexy/web/ip'
-    autoload :Url,   'regexy/web/url'
+    autoload :Email,   'regexy/web/email'
+    autoload :Hashtag, 'regexy/web/hashtag'
+    autoload :IPv4,    'regexy/web/ip'
+    autoload :IPv6,    'regexy/web/ip'
+    autoload :Url,     'regexy/web/url'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regexy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Vladimir Tikhonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -87,6 +87,7 @@ files:
 - lib/regexy/version.rb
 - lib/regexy/web.rb
 - lib/regexy/web/email.rb
+- lib/regexy/web/hashtag.rb
 - lib/regexy/web/ip.rb
 - lib/regexy/web/url.rb
 - regexy.gemspec