caius-regex_concat 1.0.1 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/lib/regex_concat.rb

@@ -7,37 +7,10 @@ module RegexpConcatenation
   #   Regexp.concat(/foo/i, /bar/) # => /foobar/i
   #   Regexp.concat(/foo/ix, /bar/m) # => /foobar/mix
   # 
-  def concat *regexes
-    # We need somewhere to store the flags from each regex
-    @flags = ""
-    # Run through the regexes in a map!
-    regexes.map! do |regex|
-      # Separate out the flags and the actual regex itself
-      flags, str = regex.to_s.scan(/(?:^\(\?(m?i?x?)-?m?i?x?:(.*?)\)$)/).first
-      # Add the flags to our store
-      @flags += flags
-      # And map this element to just the regex str
-      str
-    end
-    # Run through the flags, strip any duplicates
-    # and then convert them into the numerical counterpart
-    @flags = @flags.split("").uniq.inject(0) do |sum, flag|
-      sum += case flag
-      when "i"
-        1
-      when "x"
-        2
-      when "m"
-        4
-      else
-        0
-      end
-    end
-    # Get rid of the instance variable
-    f = @flags; @flags = nil;
-    # And return a Regexp object created from the regex strings
-    # complete with any flags we need specified.
-    Regexp.new(regexes.join(""), f)
+  def concat(*regexes)
+    allflags = regexes.inject(0) { |flags, re| flags | re.options }
+    patterns = regexes.map { |re| re.source }
+    Regexp.new(patterns.join, allflags)
   end
 end
 

data/regex_concat.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{regex_concat}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Caius Durling"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: caius-regex_concat
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Caius Durling