regularity 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22344c2dea3e06de87e19734043692518fd889d0
-  data.tar.gz: 4399ef19020b4f183a5d989270eece627dd35835
+  metadata.gz: 48cd1ab7ec0e574a8bfac514862124f6c5d3212c
+  data.tar.gz: befa666012c4d5f3c728f21dbeff5be08320551b
 SHA512:
-  metadata.gz: 7fff9de17ab25f58f59293c038e232bf2625e70f6df3bb529f782b8219ce3bd2e0aaa41c412511b900cad0e981b8555c58478f04754d74cbe2d0b0e239f8ddc1
-  data.tar.gz: c1ececc9d8080212871bd642d4e0d9c64b95419d556790bc344956addff1c4b00f61a58cab961b0e8bb575a3a2b9dab71ee1246937c75de67c4dce9d706a1f37
+  metadata.gz: 35b602aab30776439e94a915b9e769723923c7a1e8aacee8c278ab7b76186696657607e37033791f35f1f152822a0ba76ebdefcefaa8370fd4ed9638a63ef8e4
+  data.tar.gz: 411b92a0e28adc7dd629a15309d9916dd5e5bcab94d940970bb076fbae1d20891361931cdbc061a6a9eda2d406b3a57c494460f2b4c57099a462604f3d650968

data/lib/regularity.rb

@@ -19,11 +19,12 @@ class Regularity
 
   def initialize
     @str = ''
+    @ended = false
   end
 
   def start_with(*args)
     raise Regularity::Error.new('#start_with? called multiple times') unless @str.empty?
-    write '^%s' % interpret(*args)
+    write '^%s', args
   end
 
   def append(*args)
@@ -32,11 +33,17 @@ class Regularity
   alias_method :then, :append
 
   def end_with(*args)
-    write '%s$' % interpret(*args)
+    write '%s$', args
+    @ended = true
+    self
   end
 
   def maybe(*args)
-    write '%s?' % interpret(*args)
+    write '%s?', args
+  end
+  
+  def not(*args)
+    write '(?!%s)', args
   end
 
   def one_of(ary)
@@ -44,17 +51,36 @@ class Regularity
   end
 
   def between(range, pattern)
-    raise Regularity:Error.new('must provide an array of 2 integers') unless range.length == 2
+    unless range.length == 2 && range.any? { |i| i.is_a?(Integer) }
+      raise Regularity:Error.new('must provide an array of 2 elements, one of them must be an integer')
+    end
+
     write '%s{%s,%s}' % [interpret(pattern), range[0], range[1]]
   end
 
+  def at_least(times, pattern)
+    between [times, nil], pattern
+  end
+
+  def at_most(times, pattern)
+    between [nil, times], pattern
+  end
+
+  def zero_or_more(pattern)
+    write '%s*', pattern
+  end
+
+  def one_or_more(pattern)
+    write '%s+', pattern
+  end
+
   def regex
     Regexp.new(@str)
   end
   alias_method :get, :regex
 
   def =~(other)
-    regex.=~(other)
+    regex =~ other
   end
 
   def method_missing(meth, *args, &block)
@@ -75,8 +101,9 @@ class Regularity
 
   private
 
-  def write(str)
-    @str << str
+  def write(str, args=nil)
+    raise Regularity::Error.new('#end_with has already been called') if @ended
+    @str << (args.nil? ? str : str % interpret(*args))
     self
   end
 

data/lib/regularity/version.rb

@@ -1,3 +1,3 @@
 class Regularity
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: regularity
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Berls
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A friendly regular expression builder for Ruby