verbal_expressions 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NmE5MjQzNTVkNWViNDgxN2VlMWEyOWViMTViOTJiZjIyZDhkNjVjYw==
-  data.tar.gz: !binary |-
-    MjI0ZmNhYzA4YTY2Y2ExMTI1MzBmNzE5M2NkNDlmN2ExNmQ4ZDcyNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MjJhNGI0ZWFmZTMxY2NiYzVlZmQ0ZDI2YWQ2OTdkMWY3NWVjMDc1MWNiM2Nj
-    MmMxMzliMjFhZDNhNWM4ZTRlZGYyYWQxMGMzY2RmZjAwOWEyNzMyMzRjOTI1
-    NjUyMzYyNGEyZWMzNzdlNTE5NzViY2RiYzFiYzhmNDVmYzAxZGE=
-  data.tar.gz: !binary |-
-    NzNhZWMzMDczMGJkYTBhMmNkNzliYjYyN2U4ZWJhOWE3MDQ5Njc5NTM4Nzcw
-    ZjQ0ODk1MGJmNTU0YTY2YjU1Y2Y4NzM0YjEwOWRmYjdhMDQ1MTAyYTk1Zjg5
-    OTdkOTQwYzU1MzZlYmJlNWYxZmQ3ZDljNzEwNzI2YWQ5OGUwODE=
+SHA1:
+  metadata.gz: 3f18e8d812f0b89607ca041928b731ae10e977e9
+  data.tar.gz: 5b4d87a27b4de07bec27ecd40eb2b090ab5f3d63
+SHA512:
+  metadata.gz: 194d21467e51bf6c7e52f8baa7f053f95a08bfbc3fb2c0458cca10897283e973e1832517b4d9f6be7d70f0fc2c800a62389927c6af1eacd02671f20cb7dbe4a3
+  data.tar.gz: 00eba0ae42979cb3e4161535da5717e7380ef52c06f5d14d65c1c11ec7e3c8ae364d85e823ffad740ce0a7892df8ed88592fc941ccd2d3c403cb1ac9c1edc06a

data/README.md

@@ -38,7 +38,7 @@ puts 'Hooray!  It works!' if tester.match(test_url)
 puts 'This works too!' if tester =~ test_url
 
 # Print the generated regex:
-puts tester.source # => /^(http)(s)?(\:\/\/)(www\.)?([^\ ]*)$/ 
+puts tester.source # => /^(http)(s)?(\:\/\/)(www\.)?([^\ ]*)$/
 ```
 
 ### Replacing strings
@@ -70,6 +70,13 @@ end
 
 match = tester.match('Jerry scored 5 goals!')
 puts match['goals'] # => 5
+
+# Alternative capture syntax
+
+tester = VerEx.new do
+  find 'scored '
+  capture('goals') { word }
+end
 ```
 
 ## API documentation
@@ -77,7 +84,7 @@ puts match['goals'] # => 5
 I haven't added much documentation to this repo yet, but you can find the documentation for the original JavaScript repo on their [wiki](https://github.com/jehna/VerbalExpressions/wiki).  Most of the methods have been ported as of v0.1.0 of the JavaScript repo.  Just be sure to use the syntax explained above rather than the dot notation :)
 
 ## Contributions
-Clone the repo and fork!  
+Clone the repo and fork!
 Pull requests are warmly welcomed!
 
 ## Issues
@@ -87,3 +94,7 @@ Pull requests are warmly welcomed!
 ## Thanks!
 Thank you to @jehna for coming up with the awesome original idea!
 
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ryan-endacott/verbal_expressions/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/verbal_expressions.rb

@@ -71,9 +71,29 @@ class VerEx < Regexp
     add('\t')
   end
 
-  # Any alphanumeric
+  # Any single alphanumeric
+  def letter
+    add('\w')
+  end
+
+  # Any word (multiple alphanumerics)
   def word
-    add('\w+')
+    one_or_more { letter }
+  end
+
+  # Any single digit
+  def digit
+    add('\d')
+  end
+
+  # Any integer (multiple digits)
+  def integer
+    one_or_more { digit }
+  end
+
+  # Any whitespace character
+  def whitespace()
+    add('\s+')
   end
 
   # Any given character
@@ -82,6 +102,19 @@ class VerEx < Regexp
     add("[#{value}]")
   end
 
+  #At least one of some other thing
+  def one_or_more(&b)
+    add("(?:")
+    yield
+    add(")+")
+  end
+
+  def zero_or_more(&b)
+    add("(?:")
+    yield
+    add(")*")
+  end
+
   alias_method :any, :any_of
 
   # Usage: range( from, to [, from, to ... ] )
@@ -113,7 +146,6 @@ class VerEx < Regexp
     find(value) if value
   end
 
-
   # Capture groups (can optionally name)
   def begin_capture(name = nil)
     if name

data/spec/verbal_expressions_spec.rb

@@ -219,6 +219,129 @@ describe VerEx do
     end
   end
 
+  describe '#one_or_more' do
+    it 'works with one word' do
+	  matcher = VerEx.new do
+		  one_or_more{ word }
+	  end
+
+	  matcher.match('hello').should be_true
+	end
+
+    it 'works with multiple words separated with whitespace' do
+	  matcher = VerEx.new do
+		  one_or_more{ 
+			  word 
+			  zero_or_more{ whitespace }
+		  }
+	  end
+
+	  matcher.match('this is sparta')[0].should == "this is sparta"
+	end
+
+    it 'works with multiple words separated with whitespace' do
+	  matcher = VerEx.new do
+		  one_or_more{ 
+			  word 
+			  zero_or_more{ whitespace }
+		  }
+	  end
+
+	  matcher.match('111 333 777')[0].should == "111 333 777"
+	end
+  end
+
+  describe '#zero_or_more' do
+	it 'works with zero things' do
+	  matcher = VerEx.new do
+		  zero_or_more{ 
+			  word 
+		  }
+	  end
+	  matcher.match('<><>').should be_true 
+	end
+
+	it 'works with multiple things' do
+	  matcher = VerEx.new do
+		  zero_or_more{ 
+			  word 
+			  zero_or_more{ whitespace }
+		  }
+	  end
+	  matcher.match('eye of the tiger')[0].should == "eye of the tiger" 
+	end
+  end
+  
+  describe '#letter' do
+
+    it 'works with a single alphanumeric' do
+      matcher = VerEx.new do
+        start_of_line
+        letter
+        end_of_line
+      end
+      matcher.match('a').should be_true
+      matcher.match('A').should be_true
+      matcher.match('0').should be_true
+      matcher.match('_').should be_true
+    end
+    
+    it 'fails with a non-alphanumeric' do
+      matcher = VerEx.new do
+        start_of_line
+        letter
+        end_of_line
+      end
+      matcher.match('!').should be_false
+      matcher.match('/').should be_false
+      matcher.match('(').should be_false
+    end
+    
+    it 'fails with multiple alphanumerics' do
+      matcher = VerEx.new do
+        start_of_line
+        letter
+        end_of_line
+      end
+      matcher.match('abc').should be_false
+    end
+  end
+  
+    describe '#word' do
+
+    it 'works with a single alphanumeric' do
+      matcher = VerEx.new do
+        start_of_line
+        word
+        end_of_line
+      end
+      matcher.match('a').should be_true
+      matcher.match('A').should be_true
+      matcher.match('0').should be_true
+      matcher.match('_').should be_true
+    end
+    
+    it 'fails with a non-alphanumeric' do
+      matcher = VerEx.new do
+        start_of_line
+        word
+        end_of_line
+      end
+      matcher.match('!').should be_false
+      matcher.match('/').should be_false
+      matcher.match('(').should be_false
+    end
+    
+    it 'works with multiple alphanumerics' do
+      matcher = VerEx.new do
+        start_of_line
+        word
+        end_of_line
+      end
+      matcher.match('abc').should be_true
+    end
+  end
+
   describe 'URL Regex Test' do
 
     let(:matcher) do

data/verbal_expressions.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: verbal_expressions 0.1.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "verbal_expressions"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Ryan Endacott"]
-  s.date = "2013-08-06"
+  s.date = "2014-06-04"
   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 = [
@@ -33,8 +35,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/ryan-endacott/verbal_expressions"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.5"
+  s.rubygems_version = "2.2.2"
   s.summary = "Library that makes difficult regular expressions easy!"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: verbal_expressions
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ryan Endacott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Verbal Expressions is a library that makes constructing difficult regular
@@ -89,9 +89,9 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .document
-- .rspec
-- .travis.yml
+- ".document"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -112,17 +112,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Library that makes difficult regular expressions easy!