character_set 1.1.0-java → 1.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fece5a2996a5fc0d52e31fa16768258de696a23a056c9ce18c73f14b0f1b43d
-  data.tar.gz: 5d10e4b4039ff533d18dd30978fb3f225b585fb9f321f44ac151fb8a8965b6c5
+  metadata.gz: 5131673e07f2c626253f2b095622872c22f7064cbf46d1a8aef699dcb448c5a1
+  data.tar.gz: 45300c3e00fe0940b71c6caad8a679dc0b1551d507b7fbc693d1c9668c5dad65
 SHA512:
-  metadata.gz: ebf2dbbdfc0c0200ea69cea53491428023875854c3d6f71c8583d32217401b7ceecca1709b7aab3a443c1cd175ac1e5ab57a1e73be336e4a31278ac1a10e8a58
-  data.tar.gz: d9452b03bbb32ee36f8d2d0f7fe158626cc35a7c34a1c21ba07487dd8afe324d499573a043c94a1762610db73f4ff8ffaf02e459f60ed067603c9ac4fafa1cdc
+  metadata.gz: 251f684a1f720b164041f66489288f8848183f39038fe8d975564d9ec87dd74ad45d4517bc89ed883a3ee7ff672b97d4a65d37ac2e9c8fd1d1e40d3c3717dcfd
+  data.tar.gz: e1a283f28e72e87c29e81e774059db63766bd2c5a912b66e9b56d047286fd0d9e272a8717c1b5832308ca3004160ed2796f854ad56ce05f36bcac2cb1e7661e8

data/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.1.1] - 2018-09-24
+
+### Fixed
+- improved messages for missing optional dependencies
+- made `range_compressor` an optional dependency as it is almost never needed
+
 ## [1.1.0] - 2018-09-21
 
 ### Added

data/README.md

@@ -160,6 +160,8 @@ set.to_s(abbreviate: false) # => "abc\u0258\u{1F929}"
 set.to_s_with_surrogate_alternation # => '(?:[\u0258]|\ud83e\udd29)'
 ```
 
+Note: If you run JRuby or another Ruby without C support, you will also need to install [`range_compressor`](https://github.com/janosch-x/range_compressor) for these writing operations.
+
 ### Unicode plane methods
 
 There are some methods to check for planes and to handle [BMP](https://en.wikipedia.org/wiki/Plane_%28Unicode%29#Basic_Multilingual_Plane) and astral parts:

data/character_set.gemspec

@@ -22,13 +22,12 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.1.0'
 
-  s.add_dependency 'range_compressor', '~> 1.0'
-
   s.add_development_dependency 'benchmark-ips', '~> 2.7'
   s.add_development_dependency 'bundler', '~> 1.16'
-  s.add_development_dependency 'rake', '~> 10.0'
+  s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rake-compiler', '~> 1.0'
+  s.add_development_dependency 'range_compressor', '~> 1.0'
   s.add_development_dependency 'regexp_parser', '~> 1.1'
-  s.add_development_dependency 'regexp_property_values', '~> 0.3.2'
-  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'regexp_property_values', '~> 0.3.4'
+  s.add_development_dependency 'rspec', '~> 3.8'
 end

data/lib/character_set/expression_converter.rb

@@ -5,7 +5,7 @@ class CharacterSet
     Error = Class.new(ArgumentError)
 
     def convert(expression)
-      @regexp_parser_required ||= require 'regexp_parser'
+      CharacterSet.require_optional_dependency('regexp_parser')
 
       case expression
       when Regexp::Expression::Root

data/lib/character_set/ruby_fallback/character_set_methods.rb

@@ -31,7 +31,7 @@ class CharacterSet
       end
 
       def ranges
-        @range_compressor_required ||= require 'range_compressor'
+        CharacterSet.require_optional_dependency('range_compressor')
         RangeCompressor.compress(self)
       end
 

data/lib/character_set/shared_methods.rb

@@ -8,33 +8,55 @@ class CharacterSet
   module SharedMethods
     def self.included(klass)
       klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def self.[](*args)
-          new(Array(args))
-        end
+        LoadError = Class.new(::LoadError)
 
-        def self.parse(string)
-          codepoints = Parser.codepoints_from_bracket_expression(string)
-          result = new(codepoints)
-          string.start_with?('[^') ? result.inversion : result
-        end
+        class << self
+          def [](*args)
+            new(Array(args))
+          end
 
-        def self.of_property(property_name)
-          @regexp_property_values_required ||= require 'regexp_property_values'
+          def parse(string)
+            codepoints = Parser.codepoints_from_bracket_expression(string)
+            result = new(codepoints)
+            string.start_with?('[^') ? result.inversion : result
+          end
 
-          property = RegexpPropertyValues[property_name.to_s]
-          from_ranges(*property.matched_ranges)
-        end
+          def of_property(property_name)
+            require_optional_dependency('regexp_property_values')
 
-        def self.of_regexp(regexp)
-          @regexp_parser_required ||= require 'regexp_parser'
+            property = RegexpPropertyValues[property_name.to_s]
+            from_ranges(*property.matched_ranges)
+          end
 
-          root = ::Regexp::Parser.parse(regexp)
-          of_expression(root)
-        end
+          def of_regexp(regexp)
+            require_optional_dependency('regexp_parser')
 
-        def self.of_expression(expression)
-          ExpressionConverter.convert(expression)
-        end
+            root = ::Regexp::Parser.parse(regexp)
+            of_expression(root)
+          end
+
+          def of_expression(expression)
+            ExpressionConverter.convert(expression)
+          end
+
+          def require_optional_dependency(name)
+            required_optional_dependencies[name] ||= begin
+              require name
+              true
+            rescue ::LoadError
+              entry_point = caller_locations.reverse.find do |loc|
+                loc.absolute_path.to_s.include?('/lib/character_set')
+              end
+              method = entry_point && entry_point.label
+              raise LoadError, 'You must the install the optional dependency '\
+                               "'\#{name}' to use the method `\#{method}'."
+            end
+          end
+
+          def required_optional_dependencies
+            @required_optional_dependencies ||= {}
+          end
+        end # class << self
 
         def initialize(enumerable = [])
           merge(Parser.codepoints_from_enumerable(enumerable))
@@ -150,6 +172,6 @@ class CharacterSet
           ext_inversion(include_surrogates, upto)
         end
       RUBY
-    end
-  end
+    end # self.included
+  end # SharedMethods
 end

data/lib/character_set/version.rb

@@ -1,3 +1,3 @@
 class CharacterSet
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,73 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: character_set
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: java
 authors:
 - Janosch Müller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: range_compressor
+  name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '2.7'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: benchmark-ips
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: range_compressor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
 description: 
 email:
 - janosch84@gmail.com