citeproc 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cf4d8a6186f5ddd346d49c1af523c4c98d42f817
-  data.tar.gz: 63ea3ff389fc935b0c2ec339e28c77dcdbc90d73
+SHA256:
+  metadata.gz: 20a2ab14fd3b94de5314f42db4bd136c846439ec469536c1f81eff599d47773f
+  data.tar.gz: b6a2ddded0041d6ae7ca23f93de114adad73398a277905f6e0b4c9699c2c3d90
 SHA512:
-  metadata.gz: fb7d96ea9e9bd12dc4579c80c0baa8881349857e24ff3a65c47566cab2a9d19794de68c5a13cac63f86ade49544d3b3f88caf8e29b373b8855e9f3ac7f17401b
-  data.tar.gz: 2408ad6fe369a0ab086b0b27dbb609d9070292732d3803d6f8052df065b92bcfe50ed10112f45be4013e5c8f0a3a997f836a58aa256cbf65af2dc9cefd4cd93e
+  metadata.gz: 54b1fd589e6d2c789857b0a62587998b5545a4fb81f22ef3b31e85c688f4320ade9c883414858fa12cf7b57352970ddf8135792964bdd626e07332ed2cfdf955
+  data.tar.gz: 7b7252e7a1a0687f0921e8d3b3570f9d7977a170ab2942c4646f0781344840d32520f251aa54fb42bd36bdd84f3d32cd4ddcd6a41895f8ec64d0fc0d03fadef1

data/Gemfile

@@ -20,6 +20,7 @@ group :development do
   gem 'rake'
   gem 'cucumber'
   gem 'rspec'
+  gem 'unicode_utils', require: false unless RUBY_VERSION >= '2.4'
   gem 'csl-styles', '~>1.0.1', require: false
 end
 

data/lib/citeproc/compatibility.rb

@@ -10,7 +10,6 @@ if RUBY_PLATFORM =~ /java/i
   puts java.lang.System.getProperty('file.encoding')
 
   module CiteProc
-
     def upcase(string)
       java.lang.String.new(string).to_upper_case(java.util.Locale::ENGLISH).to_s
     end
@@ -23,7 +22,7 @@ if RUBY_PLATFORM =~ /java/i
 else
 
   module CiteProc
-    if RUBY_VERSION >= '2.3'
+    if RUBY_VERSION >= '2.4'
       def upcase(string)
         string.upcase
       end
@@ -32,48 +31,28 @@ else
         string.downcase
       end
     else
+      # Ruby 2.3 and older require extra Gems
       begin
-        require 'unicode'
-
+        require 'unicode_utils'
         def upcase(string)
-          Unicode.upcase(string)
+          UnicodeUtils.upcase(string)
         end
 
         def downcase(string)
-          Unicode.downcase(string)
+          UnicodeUtils.downcase(string)
         end
       rescue LoadError
         begin
-          require 'unicode_utils'
-
+          require 'unicode'
           def upcase(string)
-            UnicodeUtils.upcase(string)
+            Unicode.upcase(string)
           end
 
           def downcase(string)
-            UnicodeUtils.downcase(string)
-          end
-        rescue
-          begin
-            require 'active_support/multibyte/chars'
-
-            def upcase(string)
-              ActiveSupport::Multibyte::Chars.new(string).upcase.to_s
-            end
-
-            def downcase(string)
-              ActiveSupport::Multibyte::Chars.new(string).downcase.to_s
-            end
-          rescue
-
-            def upcase(string)
-              string.upcase
-            end
-
-            def downcase(string)
-              string.downcase
-            end
+            Unicode.downcase(string)
           end
+        rescue LoadError
+          warn "CiteProc requires the `unicode_utils` or `unicode` Gem on Ruby 2.3"
         end
       end
     end

data/lib/citeproc/version.rb

@@ -1,3 +1,3 @@
 module CiteProc
-  VERSION = '1.0.8'.freeze
+  VERSION = '1.0.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: citeproc
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A cite processor interface.