verbal_expressions 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDQwNTk5MTdlNmMyMmE5YTRlMTFmNDk1MjQ2Yzc5MGY4Zjg1NzVmZQ==
+    OGQ5YmI1NTlhNGRmNzRmOTc4YzNkZWUzNDJhZGI0OGRlNDQ5NDA1MQ==
   data.tar.gz: !binary |-
-    MDM1ZGM3ZmNhYzFhNzc4ZDg0YjdhY2M5MGMwMGU4NjNjYTk4NDFkNg==
+    ODVjNzM2YTUzMDI1YWQ0MDYwYjNmOWY2NWU2MDBhOGExYjZmYTFlNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmU0NDUxYjBjNGRkNzZhNDc0MzRmNWNiZjdlYWMyNmMyNTY4ZTVkYTJmMWNl
-    MmZkNDg4NjdkYTcxZDc4NWJmMDc0ZjM2OWZjODE1MjNjZjcwMDFiYWZmNTQ4
-    ZmNmYmZhMmVkMDhjYjZkZDcyM2NkZWZkOTZjOTU0YTA4ZWFhODI=
+    YmMzMGI2OWFmNDg5N2I4Yjc3Njc3MmIyYjdmNjcxNTIwOTQxYjI4NjRjMTgx
+    ZmFjNGJjMWE1NDAwYjM3OGQzNDk5MTE5NzdkMDM0YzkyM2FlMDJhODU4MzJm
+    ODE4OGIxNTBiNTZmNTlkMzcwN2M4YTY5NGZiYTAwNDhhOTM2MWY=
   data.tar.gz: !binary |-
-    MjI3ZWY1MmVmZjM2NWY4MWFmMGY1NjNjZjIxMTM1MGUzMmFmZjk5NjUzZmEx
-    MzRiYzRjNjhiMjVkYWUzM2RlYjEwNzJhZWEzNTBlZTU4OTMzOWVlNDQzYjQw
-    ZTk3M2U4MzJiOTc3OWM1MDk4ODAxMzhiYWY1Y2U5ODVhOGU0OWU=
+    MjQzZDRlZjA1YWRmOTgxNzlmMWY0MzRmNGNiODIyYzg4MWM3MmY5ZmY5M2Q1
+    OWQ0M2FiNDlmNDY3YmVlMGIwOTAxM2RiODczYzAwN2RmZWJjMWVlYjAwYjRi
+    NWUyMzJjOGU5YWQ4Y2FlNzA1ZTA5ZDlhYjc2ZGE2ZWI0NmM0ZmY=

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 1.9.3

data/README.md

@@ -1,6 +1,7 @@
-VerbalExpressions.rb v0.1.0
+verbal_expressions
 =====================
-
+[![Build Status](https://travis-ci.org/ryan-endacott/verbal_expressions.png)](https://travis-ci.org/ryan-endacott/verbal_expressions)
+[![Gem Version](https://badge.fury.io/rb/verbal_expressions.png)](http://badge.fury.io/rb/verbal_expressions)
 ## Ruby Regular Expressions made easy
 VerbalExpressions is a Ruby library that helps to construct difficult regular expressions - ported from the awesome JavaScript [VerbalExpressions](https://github.com/jehna/VerbalExpressions).
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/verbal_expressions.rb

@@ -1,10 +1,10 @@
 # Ruby Verbal Expressions, based on the awesome JavaScript repo by @jehna: https://github.com/jehna/VerbalExpressions
 
-# For documentation and install instructions, 
+# For documentation and install instructions,
 # see the main Ruby repo: https://github.com/ryan-endacott/VerbalExpressions.rb
 
 class VerEx < Regexp
-    
+
   def initialize(&block)
     @prefixes = ""
     @source = ""
@@ -14,11 +14,11 @@ class VerEx < Regexp
     instance_eval &block
     super(@prefixes + @source + @suffixes, @modifiers)
   end
-  
+
   def method_missing(method, *args, &block)
     @self_before_instance_eval.send method, *args, &block
   end
-  
+
   # We try to keep the syntax as
   # user-friendly as possible.
   # So we can use the "normal"
@@ -27,63 +27,63 @@ class VerEx < Regexp
   # TODO: then is reserved in ruby, so use find or think of a better name
   def find(value)
     value = sanitize(value)
-    add("(#{value})")
+    add("(?:#{value})")
   end
-  
+
   # start or end of line
-  
+
   def start_of_line(enable = true)
     @prefixes = '^' if enable
   end
-        
+
   def end_of_line(enable = true)
     @suffixes = '$' if enable
   end
-  
+
   # Maybe is used to add values with ?
   def maybe(value)
     value = sanitize(value)
-    add("(#{value})?")
+    add("(?:#{value})?")
   end
-        
+
   # Any character any number of times
   def anything
-    add("(.*)")
+    add("(?:.*)")
   end
 
   # Anything but these characters
   def anything_but(value)
     value = sanitize(value)
-    add("([^#{value}]*)")
+    add("(?:[^#{value}]*)")
   end
 
   # Regular expression special chars
-  
-  
+
+
   def line_break
-    add("(\\n|(\\r\\n))")
+    add('(?:\n|(?:\r\n))')
   end
-  
+
   # And a shorthand for html-minded
   alias_method :br, :line_break
 
   def tab
-    add("\\t")
+    add('\t')
   end
-  
+
   # Any alphanumeric
   def word
-    add("\\w+")
+    add('\w+')
   end
-  
+
   # Any given character
   def any_of(value)
     value = sanitize(value)
     add("[#{value}]")
   end
-  
+
   alias_method :any, :any_of
-  
+
   # Usage: range( from, to [, from, to ... ] )
   def range(*args)
     value = "["
@@ -95,9 +95,9 @@ class VerEx < Regexp
     value += "]"
     add(value)
   end
-  
+
   # Loops
-  
+
   def multiple(value)
     value = sanitize(value)
     value += "+" unless ["+", "*"].include?(value.chars.first)
@@ -107,14 +107,30 @@ class VerEx < Regexp
   # Adds alternative expressions
   # TODO: or is a reserved keyword in ruby, think of better name
   def alternatively(value = nil)
-    @prefixes += "(" unless @prefixes.include?("(")
+    @prefixes += "(?:" unless @prefixes.include?("(")
     @suffixes = ")" + @suffixes unless @suffixes.include?(")")
-    add(")|(")
+    add(")|(?:")
     find(value) if value
   end
-  
+
+
+  # Capture groups (can optionally name)
+  def begin_capture(name = nil)
+    if name
+      add("(?<#{name}>")
+    else
+      add("(")
+    end
+  end
+
+  def end_capture
+    add(")")
+  end
+
+
+
   private
-    
+
     # Sanitation function for adding
     # anything safely to the expression
     def sanitize(value)
@@ -122,10 +138,10 @@ class VerEx < Regexp
       when Regexp, VerEx
         value.source
       else
-        value.gsub(/([^\w])/) { "\\#{$1}" } # Escape non word chars
+        Regexp.quote(value)
       end
     end
-    
+
     # Function to add stuff to the
     # expression. Also compiles the
     # new expression so it's ready to
@@ -133,5 +149,5 @@ class VerEx < Regexp
     def add(value = '')
       @source += value
     end
-    
+
 end

data/spec/spec_helper.rb

@@ -5,8 +5,8 @@ require 'verbal_expressions'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  
+
 end

data/spec/verbal_expressions_spec.rb

@@ -11,7 +11,7 @@ describe VerEx do
     end
 
     it 'should correctly build find regex' do
-      matcher.source.should == '(lions)'
+      matcher.source.should == '(?:lions)'
     end
 
     it 'should correctly match find' do
@@ -42,7 +42,7 @@ describe VerEx do
     end
 
     it 'successfully builds regex for matching URLs' do
-      matcher.source.should == '^(http)(s)?(\:\/\/)(www\.)?([^\ ]*)$'
+      matcher.source.should == '^(?:http)(?:s)?(?:://)(?:www\\.)?(?:[^\\ ]*)$'
     end
 
     it 'matches regular http URL' do

data/verbal_expressions.gemspec

@@ -0,0 +1,61 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "verbal_expressions"
+  s.version = "0.1.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ryan Endacott"]
+  s.date = "2013-07-30"
+  s.description = "Verbal Expressions is a library that makes constructing difficult regular expressions simple and easy!"
+  s.email = "rzeg24@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    ".travis.yml",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/verbal_expressions.rb",
+    "spec/spec_helper.rb",
+    "spec/verbal_expressions_spec.rb",
+    "verbal_expressions.gemspec"
+  ]
+  s.homepage = "http://github.com/ryan-endacott/verbal_expressions"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.0.5"
+  s.summary = "Library that makes difficult regular expressions easy!"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 2.14.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2.14.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["~> 1.3.5"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2.14.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["~> 1.3.5"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verbal_expressions
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryan Endacott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -77,6 +77,7 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -86,6 +87,7 @@ files:
 - lib/verbal_expressions.rb
 - spec/spec_helper.rb
 - spec/verbal_expressions_spec.rb
+- verbal_expressions.gemspec
 homepage: http://github.com/ryan-endacott/verbal_expressions
 licenses:
 - MIT