js_regex 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2abae347b737c7635396c45a3a1489c72d6957e5
-  data.tar.gz: 5b674eaf6902686ab94648000308090fa154783c
+  metadata.gz: f0d3967319afceb3aaf95fbb0b107f4c2facf675
+  data.tar.gz: 40ade866a8c49d767f9006fc9db8a3a52b43732a
 SHA512:
-  metadata.gz: 3406867e15cb70cbc0a9f137f2449fce1af94fb448bcdbee3cfa6e439f64c92d4df9a5407fee251ea127a59faf8f6cbf81d55b38279d79e1a6de24e5b1c6673a
-  data.tar.gz: d0e63535e25eb8adb3e8d95859a884ce0eaec81ba25f1da8970213f4572fd558b9cbb7e3b25dc59d261213a9a0d7f9e0e7bb29b4f14cffba5fa9df49b0ec4780
+  metadata.gz: 4e8c66d97c6564e4c72f75f38e28ac6dfbdeddd03d7906c7ce81b497b064b0ef65b17c6452c8ac1d23393f56dcfef5c4102c48838fe9601d26e6552620483b44
+  data.tar.gz: 35e0bea37b8d7f1142f216c1168ec449dfaf8cb8fd0718edc2198eaa15cd132e0bce99bb20943c43b5ab4ab676f287ec5f3427eae2457f070ed1d48ab5e64846

data/lib/js_regex/converter/backreference_converter.rb

@@ -24,8 +24,7 @@ class JsRegex
       end
 
       def convert_number_ref
-        # after regexp_parser update, replace data[/\d+/] with expression.number
-        "\\#{context.new_capturing_group_position(Integer(data[/\d+/]))}"
+        "\\#{context.new_capturing_group_position(Integer(expression.number))}"
       end
 
       def convert_number_rel_ref

data/lib/js_regex/converter/context.rb

@@ -10,10 +10,10 @@ class JsRegex
     class Context
       attr_reader :buffered_set_extractions,
                   :buffered_set_members,
+                  :case_insensitive_root,
                   :in_atomic_group,
                   :named_group_positions,
                   :negative_base_set,
-                  :root_options,
                   :warnings
 
       def initialize(ruby_regex)
@@ -22,14 +22,8 @@ class JsRegex
         self.named_group_positions = {}
         self.warnings = []
 
-        self.root_options = {}
-        root_options[:m] = !(ruby_regex.options & Regexp::MULTILINE).equal?(0)
-      end
-
-      # option context
-
-      def multiline?
-        root_options.fetch(:m)
+        self.case_insensitive_root =
+          !(ruby_regex.options & Regexp::IGNORECASE).equal?(0)
       end
 
       # set context
@@ -96,10 +90,10 @@ class JsRegex
 
       attr_writer :buffered_set_extractions,
                   :buffered_set_members,
+                  :case_insensitive_root,
                   :in_atomic_group,
                   :named_group_positions,
                   :negative_base_set,
-                  :root_options,
                   :warnings
     end
   end

data/lib/js_regex/converter/group_converter.rb

@@ -41,8 +41,12 @@ class JsRegex
       end
 
       def build_options_group
-        warn_of_unsupported_feature('group-specific options')
-        build_group(head: '(')
+        unless (encoding_options = data.scan(/[adu]/)).empty?
+          warn_of_unsupported_feature("encoding options #{encoding_options}")
+        end
+        # TODO: replace this check in Regexp::Parser v1
+        switch_only = !data.include?(':')
+        switch_only ? drop_without_warning : build_group(head: '(')
       end
 
       def build_passive_group

data/lib/js_regex/converter/literal_converter.rb

@@ -43,7 +43,20 @@ class JsRegex
       private
 
       def convert_data
-        self.class.convert_data(data)
+        result = self.class.convert_data(data)
+        if context.case_insensitive_root && !expression.case_insensitive?
+          warn_of_unsupported_feature('nested case-sensitive literal')
+        elsif !context.case_insensitive_root && expression.case_insensitive?
+          return handle_locally_case_insensitive_literal(result)
+        end
+        result
+      end
+
+      HAS_CASE_PATTERN = /[\p{lower}\p{upper}]/
+
+      def handle_locally_case_insensitive_literal(literal)
+        return literal unless literal =~ HAS_CASE_PATTERN
+        "[#{literal}#{literal.swapcase}]"
       end
     end
   end

data/lib/js_regex/converter/meta_converter.rb

@@ -15,7 +15,7 @@ class JsRegex
         when :alternation
           convert_alternation
         when :dot
-          context.multiline? ? '(?:.|\n)' : '.'
+          expression.multiline? ? '(?:.|\n)' : '.'
         else
           warn_of_unsupported_feature
         end

data/lib/js_regex/converter/set_converter.rb

@@ -52,8 +52,7 @@ class JsRegex
         when PROPERTY_PATTERN
           handle_property($1, $2, $3)
         else
-          literal_conversion = LiteralConverter.convert_data(utf8_data)
-          buffer_set_member(literal_conversion)
+          handle_literal(utf8_data)
         end
       end
 
@@ -85,6 +84,31 @@ class JsRegex
         end
       end
 
+      def handle_literal(utf8_data)
+        conversion = LiteralConverter.convert_data(utf8_data)
+        if context.case_insensitive_root && !expression.case_insensitive?
+          warn_of_unsupported_feature('nested case-sensitive set member')
+        elsif !context.case_insensitive_root && expression.case_insensitive?
+          return handle_locally_case_insensitive_literal(conversion)
+        end
+        buffer_set_member(conversion)
+      end
+
+      DESCENDING_CASE_RANGE_PATTERN = /\p{upper}-\p{lower}/
+
+      def handle_locally_case_insensitive_literal(literal)
+        buffer_set_member(
+          if literal =~ DESCENDING_CASE_RANGE_PATTERN
+            warn_of_unsupported_feature(
+              'nested case-insensitive range going from upper to lower case'
+            )
+            literal
+          else
+            [literal, literal.swapcase].uniq
+          end
+        )
+      end
+
       def standardize_property_name(name)
         Regexp::Parser.parse("\\p{#{name}}").expressions.first.token
       end

data/lib/js_regex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class JsRegex
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js_regex
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Janosch Müller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: regexp_parser
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.7
     - - "<="
       - !ruby/object:Gem::Version
         version: 0.5.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.7
     - - "<="
       - !ruby/object:Gem::Version
         version: 0.5.0