js_regex 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f418197d1c8fea37bd549b701049f1130bfca486c5a11ba25e56d7d0cf990f8
-  data.tar.gz: 8679277fb51aca528933f4727cd0e70f1e1204c78acaf4e20da48d6b790ea7be
+  metadata.gz: 76344824ca1ba10360b72c42fce4fe6b667dd01761665a9b36c4ab071bbaecba
+  data.tar.gz: 37ceeda59137c6871be4d3782110d06c93e0f6be85c0332bad9a8afad0831d71
 SHA512:
-  metadata.gz: ddeadbe690e2928c068d8c2962d80e88c50f5fef46304e46fa98e8dc215c6c57c7790e9ef7ba8b1f640e71c3ca834b7233449c9b7d68466ac76581de73c7ffe3
-  data.tar.gz: 9c10d4e6a529ec54385ed55b34e4a910d354d7665f0831bc65b65bc20f176f4e46f9aa90cff2b36ea8f1306dfa65f7e42f4a93516ab228f206e74db7d708b779
+  metadata.gz: 2199e2674f5187352a9e7a428266e4d35290630e4111c24c4f2f2514d2e64f46fc98512c62d5c97831c3719ca3dd90cccb7dabacb9285faa8c2d8087af94d2ea
+  data.tar.gz: 235c68de51d6dc365f49354a5e79aa73f616ebd6e7386a7a596a3c09817a7a1b242a31024af3eae7206cf89395a8eadfce9c0819a14a62b56104a2c851850082

data/lib/js_regex/conversion.rb

@@ -13,25 +13,27 @@ class JsRegex
     require_relative 'second_pass'
 
     class << self
-      def of(ruby_regex, options: nil)
-        source, warnings = convert_source(ruby_regex)
-        options_string   = convert_options(ruby_regex, options)
+      def of(input, options: nil)
+        source, warnings = convert_source(input)
+        options_string   = convert_options(input, options)
         [source, options_string, warnings]
       end
 
       private
 
-      def convert_source(ruby_regex)
-        tree = Regexp::Parser.parse(ruby_regex)
+      def convert_source(input)
+        tree = Regexp::Parser.parse(input)
         context = Converter::Context.new(case_insensitive_root: tree.i?)
         converted_tree = Converter.convert(tree, context)
         final_tree = SecondPass.call(converted_tree)
         [final_tree.to_s, context.warnings]
       end
 
-      def convert_options(ruby_regex, custom_options)
+      def convert_options(input, custom_options)
         options = custom_options.to_s.scan(/[gimuy]/)
-        options << 'i' if (ruby_regex.options & Regexp::IGNORECASE).nonzero?
+        if input.is_a?(Regexp) && (input.options & Regexp::IGNORECASE).nonzero?
+          options << 'i'
+        end
         options.uniq.sort.join
       end
     end

data/lib/js_regex/converter.rb

@@ -32,18 +32,10 @@ class JsRegex
         MAP[expression.type].new
       end
 
-      # Limit the number of generated surrogate pairs, else the output might
-      # get to large for certain applications. The chosen number is somewhat
-      # arbitrary. 100 pairs make for about 1 KB, uncompressed. The median char
-      # count of all properties supported by Ruby is 92. 75% are below 300 chars.
-      #
-      # Set this to nil if you need full unicode matches and size doesn't matter.
-      attr_writer :surrogate_pair_limit
-
-      def in_surrogate_pair_limit?(&pair_count)
-        @surrogate_pair_limit.nil? || @surrogate_pair_limit >= pair_count.call
+      # Legacy method. Remove in v4.0.0.
+      def surrogate_pair_limit=(_arg)
+        warn '#surrogate_pair_limit= is deprecated and has no effect anymore.'
       end
     end
-    self.surrogate_pair_limit = 300
   end
 end

data/lib/js_regex/converter/property_converter.rb

@@ -15,35 +15,15 @@ class JsRegex
       private
 
       def convert_data
-        content = character_set_of_property
+        content = CharacterSet.of_expression(expression)
 
-        if expression.negative?
-          if content.astral_part?
-            warn_of_unsupported_feature('astral plane negation by property')
-          end
-        elsif Converter.in_surrogate_pair_limit? { content.astral_part.size }
-          return content.to_s_with_surrogate_alternation
-        else
-          warn_of_unsupported_feature('large astral plane match of property')
-        end
-
-        limit_to_bmp_part(content)
-      end
-
-      def character_set_of_property
-        character_set = CharacterSet.of_property(subtype)
         if expression.case_insensitive? && !context.case_insensitive_root
-          character_set.case_insensitive
-        else
-          character_set
+          content = content.case_insensitive
+        elsif !expression.case_insensitive? && context.case_insensitive_root
+          warn_of_unsupported_feature('nested case-sensitive property')
         end
-      end
-
-      def limit_to_bmp_part(content)
-        bmp_part = content.bmp_part
-        return drop if bmp_part.empty?
 
-        "[#{'^' if expression.negative?}#{bmp_part}]"
+        content.to_s_with_surrogate_ranges
       end
     end
   end

data/lib/js_regex/converter/set_converter.rb

@@ -28,11 +28,7 @@ class JsRegex
           warn_of_unsupported_feature('nested case-sensitive set')
         end
 
-        if Converter.in_surrogate_pair_limit? { content.astral_part.size }
-          content.to_s_with_surrogate_alternation
-        else
-          limit_to_bmp_part_with_warning(content)
-        end
+        content.to_s_with_surrogate_ranges
       end
 
       def directly_compatible?
@@ -66,13 +62,9 @@ class JsRegex
       end
 
       def pass_through_with_escaping
-        expression.to_s(:base).gsub(%r{\\?([\f\n\r\t])}) { Regexp.escape($1) }
-      end
-
-      def limit_to_bmp_part_with_warning(content)
-        warn_of_unsupported_feature('large astral plane match of set')
-        bmp_part = content.bmp_part
-        bmp_part.empty? ? drop : bmp_part.to_s(in_brackets: true)
+        expression.to_s(:base).gsub(%r{([\f\n\r\t])|(/)}) do
+          $1 ? Regexp.escape($1) : "\\#{$2}"
+        end
       end
     end
   end

data/lib/js_regex/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js_regex
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Janosch Müller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-26 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: character_set
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: regexp_parser
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: mutant-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: JsRegex converts Ruby's native regular expressions for JavaScript, taking
   care of various incompatibilities and returning warnings for unsolvable differences.
 email: