regexy 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 598e3dce59c516054e30d9b079a7dd93ee8c8ee9
-  data.tar.gz: 5d861d4f7b6cc4d0d36d6629cf254bce7e9b3696
+  metadata.gz: 740a4e8636dc31c08edce639aebe64da44275883
+  data.tar.gz: 0385b4f2e8873f0bc9e5e926c5e8c023df03b945
 SHA512:
-  metadata.gz: 977c292fcbe5a7a74966006c6580ecc48d4562c89d52e1994be3dd0d227fc18b5b3ab93d813c402c8b1a2f351214971f2314d285731249350e28e86170c6a50a
-  data.tar.gz: fe3faba108f11c13221a7a9819fa89923ddcdfdf53019ed7c417dc7d809604d0e631749f7b801b86c063e2e571ca728080c28b9b47645d20eba4ccc0b9f87634
+  metadata.gz: 2277af27c4c61f1d451941314f157e2a21a629bb73ffd73756f4b7169ac2d5c0b004a054c1c80ca47f05b66de43943f4692b702b394b8e267967261ae767efa0
+  data.tar.gz: 89bc96b9096413f9fcc01e513bb2659c1c76724070d0b585d9fedd03922d0f1469b0e9a8ab691ced575313bb9615790576580dabb7eda652edd3228005846f02

data/README.md

@@ -12,11 +12,16 @@ Regexy is the ruby gem that contains a lot of common-use regular expressions (su
 - [Installation](#installation)
 - [Usage](#usage)
     * [General usage](#regexyregexp)
+    * [Getting the original regexp](#getting-the-original-regexp)
     * [Combining expressions](#combining-regular-expressions)
+    * [Bound and unbound regex](#bound-and-unbound-regular-expressions)
     * [Email addresses](#regexywebemail)
     * [Hashtag](#regexywebhashtag)
     * [IP addresses](#regexywebipv4)
     * [Url](#regexyweburl)
+    * [Hostname](#regexywebhostname)
+    * [Smiles](#regexytextsmile)
+    * [Emojis](#regexytextemoji)
 - [Contributing](#contributing)
 
 ## Installation
@@ -49,6 +54,13 @@ r4 = Regexy::Regexp.new('foo', Regexp::IGNORECASE) # pass additional configurati
 'abcfoocde' =~ r1    # => 3
 r2.match 'abcfoocde' # => #<MatchData "foo">
 ```
+### Getting the original regexp
+For methods, that checks if it's arguments `is_a` Regexp instances (for example `String#scan`) you can use `internal_regexp` method.
+```ruby
+str = 'Email me at first@mail.com or second@mail.com'
+str.scan(Regexy::Web::Email.new.unbound.internal_regexp).map(&:first) # => ["first@mail.com", "second@mail.com"]
+```
+
 ### Combining regular expressions
 
 You can combine your regular expressions with `|` operator using `|` method (or `or`, which is alias for it). Note, that regexp options will be combined too.
@@ -61,11 +73,21 @@ any_ipv4 = Regexy::Web::IPv4.new(:normal) | Regexy::Web::IPv4.new(:with_port) #
 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\z/i) | /bar/ # => /foobar/i
-Regexy::Regexp.new(/foo/).or '\Abar' # => /foobar/
-Regexy::Regexp.new(/\Afoo\z/).or '\Abar\z' # => /\Afoobar\z/
+Regexy::Regexp.new(/foo\z/i) + /bar/ # => /foobar/i
+Regexy::Regexp.new(/foo/).and_then '\Abar' # => /foobar/
+Regexy::Regexp.new(/\Afoo\z/).and_then '\Abar\z' # => /\Afoobar\z/
 ```
+### Bound and unbound regular expressions
+All build-in regular expressions provided in a form of `\A...\z`, which means that they match entire string only. You can remove or add string boundaries using `bound` and `unbound` methods.
+Optional argument `method` available (`:both` by default) - `:left` for manipulating only leading `\A` and `:right` for trailing `\z`.
+```ruby
+Regexy::Regexp.new('/Afoo/z').unbound(:left) # => /foo\z/
+Regexy::Regexp.new(/foo/i).bound # => /\Afoo\z/i
 
+# Example - find all ip addresses in the string
+str = '0.0.0.0 and 255.255.255.255 are both valid ip addresses'
+str.scan(Regexy::Web::IPv4.new.unbound.internal_regexp).flatten # => ["0.0.0.0", "255.255.255.255"]
+```
 ### Regexy::Web::Email
 
 Generates regular expressions for email addresses validation (with unicode support). Available options: `:relaxed` for general sanity check, `:normal` (which is default) with some additional length and ip addresses validations and `:strict` for the paranoids.
@@ -110,5 +132,32 @@ Generates regular expressions for matching Url addresses (with unicode support).
 r1 = Regexy::Web::Url.new # matches 'http://foo.com', 'www.foo.com' and 'foo.com'
 ```
 
+### Regexy::Web::HostName
+
+Generates regular expressions for matching hostname (with unicode support).
+
+```ruby
+r1 = Regexy::Web::HostName.new # matches 'foo.com', 'www.foo.com' and 'киррилический.домен.рф'
+```
+### Regexy::Text::Smile
+
+Generates regular expressions for matching smiles.
+```ruby
+r = Regexy::Text::Smile.new # matches ':)', ':=)', 'xD' and so on
+# Find all smiles in text
+str = "Check out http://foo.com :). It's awesome :D"
+str.scan(r.unbound.internal_regexp).map(&:first) # => [":)", ":D"] 
+```
+
+### Regexy::Text::Emoji
+
+Generates regular expressions for matching emojis.
+```ruby
+r = Regexy::Text::Emoji.new # matches '😀','😄' and so on
+# Replace all emojis with 'x_x' 
+str = "Check out http://foo.com 😀. It's awesome 😼"
+str.gsub(r.internal_regexp, 'x_x') # => "Check out http://foo.com x_x. It's awesome x_x"
+```
+
 ## Contributing
 Have an idea of new regular expression? Create an [issue](https://github.com/vladimir-tikhonov/regexy/issues) (some test cases will be much appreciated) or open a [pull request](https://github.com/vladimir-tikhonov/regexy/pulls).

data/lib/regexy.rb

@@ -1,7 +1,8 @@
 require 'regexy/version'
 
 module Regexy
-  autoload :Regexp, 'regexy/regexp'
+  autoload :Regexp,         'regexy/regexp'
   autoload :RegexpWithMode, 'regexy/regexp'
-  autoload :Web,    'regexy/web'
+  autoload :Web,            'regexy/web'
+  autoload :Text,           'regexy/text'
 end

data/lib/regexy/regexp.rb

@@ -32,6 +32,32 @@ module Regexy
 
     alias_method :and_then, :+
 
+    def bound(method = :both)
+      new_regexp = source
+      method = method.to_sym
+      if method == :left || method == :both
+        new_regexp.prepend('\A')
+      end
+      if method == :right || method == :both
+        new_regexp.concat('\z')
+      end
+      new_regexp = additional_bound(method, new_regexp)
+      ::Regexy::Regexp.new(new_regexp, options)
+    end
+
+    def unbound(method = :both)
+      new_regexp = source
+      method = method.to_sym
+      if method == :left || method == :both
+        new_regexp.sub!(/\A\\A/, '')
+      end
+      if method == :right || method == :both
+        new_regexp.sub!(/\\z\s*\z/, '')
+      end
+      new_regexp = additional_unbound(method, new_regexp)
+      ::Regexy::Regexp.new(new_regexp, options)
+    end
+
     protected
 
     def normalize_regexp(regexp, *args)
@@ -41,6 +67,14 @@ module Regexy
       else regexp
       end
     end
+
+    def additional_bound(method, regex) # You can override this methods if your regular expression needs additional bound/unbound logic
+      regex
+    end
+
+    def additional_unbound(method, regex)
+      regex
+    end
   end
 
   class RegexpWithMode < ::Regexy::Regexp

data/lib/regexy/text.rb

@@ -0,0 +1,6 @@
+module Regexy
+  module Text
+    autoload :Smile, 'regexy/text/smile'
+    autoload :Emoji, 'regexy/text/emoji'
+  end
+end

data/lib/regexy/text/emoji.rb

@@ -0,0 +1,13 @@
+# encoding: UTF-8
+
+module Regexy
+  module Text
+    class Emoji < Regexy::Regexp
+      SMILE_REGEX = /([\u{1F600}-\u{1F6FF}])/i
+
+      def initialize(*args)
+        super(SMILE_REGEX, *args)
+      end
+    end
+  end
+end

data/lib/regexy/text/smile.rb

@@ -0,0 +1,11 @@
+module Regexy
+  module Text
+    class Smile < Regexy::Regexp
+      SMILE_REGEX = /\A((?<![\\:;x])[:8bx;][-=]?[dx\)\(0op\*\#s\\\/](?![\)\(\*\/\\\#]))\z/i
+
+      def initialize(*args)
+        super(SMILE_REGEX, *args)
+      end
+    end
+  end
+end

data/lib/regexy/version.rb

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

data/lib/regexy/web.rb

@@ -1,9 +1,10 @@
 module Regexy
   module Web
-    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'
+    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'
+    autoload :HostName, 'regexy/web/host_name'
   end
 end

data/lib/regexy/web/email.rb

@@ -3,9 +3,9 @@
 module Regexy
   module Web
     class Email < ::Regexy::RegexpWithMode
-      EMAIL_RELAXED = /\A\s*[^@\s]+@([^@\s]+\.)+[^@\s]+\s*\z/i.freeze
-      EMAIL_NORMAL =  /\A\s*([^@\s]{1,64})@((?:[-\p{L}\d]+\.)+\p{L}{2,})\s*\z/i.freeze
-      EMAIL_STRICT =  /\A\s*([-\p{L}\d+._]{1,64})@((?:[-\p{L}\d]+\.)+\p{L}{2,})\s*\z/i.freeze
+      EMAIL_RELAXED = /\A\s*(([^@\s]+)@(([^@\s]+\.)+[^@\s]+))\s*\z/i.freeze
+      EMAIL_NORMAL =  /\A\s*(([^@\s]{1,64})@((?:[-\p{L}\d]+\.)+\p{L}{2,}))\s*\z/i.freeze
+      EMAIL_STRICT =  /\A\s*(([-\p{L}\d+._]{1,64})@((?:[-\p{L}\d]+\.)+\p{L}{2,}))\s*\z/i.freeze
 
       protected
 

data/lib/regexy/web/hashtag.rb

@@ -3,7 +3,7 @@
 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
+      HASHTAG = /\A(#(?=.{2,140}\z)([0-9_\p{L}]*[_\p{L}][0-9_\p{L}]*))\z/ui.freeze
 
       def initialize(*args)
         super(HASHTAG, *args)

data/lib/regexy/web/host_name.rb

@@ -0,0 +1,13 @@
+# encoding: UTF-8
+
+module Regexy
+  module Web
+    class HostName < ::Regexy::Regexp
+      HOST_NAME = /\A([\p{L}\d_]([\p{L}\d\-_]{0,61}[\p{L}\d])?\.)+[\p{L}]{2,6}\z/i.freeze
+
+      def initialize(*args)
+        super(HOST_NAME, *args)
+      end
+    end
+  end
+end

data/lib/regexy/web/ip.rb

@@ -3,7 +3,7 @@ module Regexy
     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 = /\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_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,13 +18,13 @@ module Regexy
     end
 
     class IPv6 < ::Regexy::RegexpWithMode
-      IPV6_NORMAL = /\A(?:(?:(?:[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])\z
+                     |:)|(?:[A-F0-9]{1,4}:){7}:|:(:[A-F0-9]{1,4}){7})(?![:.\w]))\z
                     /ix.freeze
 
       IPV6_WITH_PORT = (::Regexy::Regexp.new(/\A\[/) + IPV6_NORMAL + /\]/ + PORT.source).freeze

data/lib/regexy/web/url.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regexy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Vladimir Tikhonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -84,10 +84,14 @@ files:
 - Rakefile
 - lib/regexy.rb
 - lib/regexy/regexp.rb
+- lib/regexy/text.rb
+- lib/regexy/text/emoji.rb
+- lib/regexy/text/smile.rb
 - lib/regexy/version.rb
 - lib/regexy/web.rb
 - lib/regexy/web/email.rb
 - lib/regexy/web/hashtag.rb
+- lib/regexy/web/host_name.rb
 - lib/regexy/web/ip.rb
 - lib/regexy/web/url.rb
 - regexy.gemspec