js_regex 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c4a6863b83e153ca634f1bacc95617a69714079
-  data.tar.gz: 167deca0ba9f16ee72ebcb515c96a6633c2e37f1
+  metadata.gz: 6f7c9a503a4ccb3152c6420bc351830c9ac1be24
+  data.tar.gz: 7b32c73207f49ac9417bc002a2196036af413f90
 SHA512:
-  metadata.gz: 2c75ae7b1fdb1efb48fa59a12cfe5f17d1475a8a2087f6f73b062dec88b7cb5b87e4d42ad8786d77d4bfae3f8c00d53bdf8496f34e935ae61876c000b6901476
-  data.tar.gz: bcd94e25831bb768e86c51cdd2aabf3952ec84580b76495a70710a58a2d926aa97443112df05730b3a5101fec7560da36c3236e30d1391261ce4ef8401b2f540
+  metadata.gz: 7cde6b670649bf911692408b718785bd523d30d35d01e82c9b6b3ac3ea37dac84d43a2ec28b712f9681c828ec522f54f39098e7cc7ccbbd61cfee09f2b08bcc6
+  data.tar.gz: 14fe5c44dbd8613f45dbdb8a3ffa7792721a7c9db80a8088027e7e78f69aa3c96b351e688f1347d22ee3437951a86509566fa979c9dfa69a88b110e0fed34473

data/lib/js_regex/converter/assertion_converter.rb

@@ -13,13 +13,12 @@ class JsRegex
       def convert_data
         case subtype
         when :lookahead, :nlookahead
-          open_assertion
+          open_group(non_capturing: true)
         when :nlookbehind
           context.negative_lookbehind = true
           warn_of_unsupported_feature('negative lookbehind assertion')
         else # :lookbehind, ...
-          warn_of_unsupported_feature
-          open_group('(?:')
+          open_unsupported_group
         end
       end
     end

data/lib/js_regex/converter/context.rb

@@ -8,11 +8,10 @@ class JsRegex
     class Context
       attr_accessor :buffered_set_members,
                     :buffered_set_extractions,
-                    :captured_groups,
+                    :captured_group_count,
                     :group_count_changed,
                     :group_level,
                     :group_level_for_backreference,
-                    :group_number_for_backreference,
                     :negative_lookbehind,
                     :negative_set_levels,
                     :previous_quantifier_subtype,
@@ -22,7 +21,7 @@ class JsRegex
       def initialize
         self.buffered_set_members = []
         self.buffered_set_extractions = []
-        self.captured_groups = 0
+        self.captured_group_count = 0
         self.group_count_changed = false
         self.group_level = 0
         self.negative_lookbehind = false

data/lib/js_regex/converter/group_converter.rb

@@ -14,39 +14,44 @@ class JsRegex
         when :capture then open_group
         when :close then close_group
         when :comment then '' # drop whole group w/o warning
-        when :named_ab, :named_sq then open_group('(') # drop name w/o warning
+        when :named_ab, :named_sq then open_named_group
         when :options then open_options_group
-        when :passive then open_group('(?:', false)
-        else
-          warn_of_unsupported_feature
-          open_group('(')
+        when :passive then open_passive_group
+        else open_unsupported_group
         end
       end
 
       def open_atomic_group
-        # Atomicity is achieved with backreferenced lookahead groups:
+        # Atomicity is emulated using backreferenced lookahead groups:
         # http://instanceof.me/post/52245507631
         # regex-emulate-atomic-grouping-with-lookahead
         context.group_level_for_backreference = context.group_level
-        context.group_number_for_backreference = context.captured_groups + 1
-        open_assertion('(?=(')
+        open_group(head: '(?=(')
+      end
+
+      def open_named_group
+        # drop name w/o warning
+        open_group(head: '(')
       end
 
       def open_options_group
         warn_of_unsupported_feature('group-specific options')
-        open_group('(')
+        open_group(head: '(')
       end
 
-      def open_group(group_head = pass_through, capturing = true)
-        context.group_level += 1
-        context.captured_groups += 1 if capturing
-        group_head
+      def open_passive_group
+        open_group(head: '(?:', non_capturing: true)
+      end
+
+      def open_unsupported_group
+        warn_of_unsupported_feature
+        open_passive_group
       end
 
-      def open_assertion(assertion_head = pass_through)
-        # these don't count as opened groups for backreference purposes
+      def open_group(options = {})
         context.group_level += 1
-        assertion_head
+        context.captured_group_count += 1 unless options[:non_capturing]
+        options[:head] || pass_through
       end
 
       def close_group
@@ -74,7 +79,7 @@ class JsRegex
         context.group_level_for_backreference = nil
         context.group_count_changed = true
         # the empty passive group (?:) is appended in case literal digits follow
-        "))\\#{context.group_number_for_backreference}(?:)"
+        "))\\#{context.captured_group_count}(?:)"
       end
     end
   end

data/lib/js_regex/converter/set_converter.rb

@@ -126,7 +126,8 @@ class JsRegex
         case buffered_extractions.count
         when 0 then ''
         when 1 then buffered_extractions.first
-        else "(?:#{buffered_extractions.join('|')})" end
+        else "(?:#{buffered_extractions.join('|')})"
+        end
       end
 
       def build_set(members, negative)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js_regex
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Janosch Müller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: regexp_parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -129,8 +129,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Converts Ruby regexes to JavaScript regexes.
 test_files: []
+has_rdoc: