citeproc-ruby 0.0.3 → 0.0.4

data/README.md

@@ -14,11 +14,19 @@ and `citeproc-js` gems; meanwhile, however, these gems are not compatible, so if
 you want to use the current `citeproc-ruby` gem, make sure that neither of the
 other gems is installed.
 
+Unicode support may be provided by the `unicode-utils` gem (on Ruby 1.9 only),
+by ActiveSupport, by the `unicode` gem (on Ruby 1.8 only), by the Java-based
+support in JRuby, or naively by the `upcase` and `downcase` methods present
+in Ruby by default.  These gems are not installed automatically; install one
+manually if you want enhanced Unicode support.
+
 
 Quickstart
 ----------
 
 		$ [sudo] gem install citeproc-ruby
+		$ [sudo] gem install unicode-utils # Ruby 1.9
+		$ [sudo] gem install unicode # Ruby 1.8
 		$ irb
 		>> require 'citeproc'
 		>> book = {

data/lib/citeproc.rb

@@ -1,17 +1,14 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+$KCODE = 'UTF-8' if RUBY_VERSION < '1.9.0' && $KCODE.nil?
+
 require 'open-uri'
 
 require 'logging'
 require 'nokogiri'
 require 'json'
 
-#require 'activesupport'
-
-require 'unicode_utils/upcase'
-require 'unicode_utils/downcase'
-
 module CiteProc
 
   @log = Logging.logger[self.name]
@@ -39,6 +36,7 @@ end
 require 'extensions/core'
 require 'support/attributes'
 require 'support/tree'
+require 'support/compatibility'
 
 require 'csl/node'
 require 'csl/term'

data/lib/citeproc/version.rb

@@ -1,3 +1,3 @@
 module CiteProc
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'.freeze
 end

data/lib/csl/nodes.rb

@@ -368,7 +368,8 @@ module CSL
       def format_page_range(value, format)
         return value unless value.match(/([a-z]*)(\d+)\s*\D\s*([a-z]*)(\d+)/i)
 
-        tokens = [$1, $2, "\u2013", $3, $4]
+        tokens = [$1, $2, "\xe2\x80\x93", $3, $4]
+        tokens[2].force_encoding("UTF-8") if RUBY_VERSION >= '1.9.0'
 
         # normalize page range to expanded form
         f, t = tokens[1].chars.to_a, tokens[4].chars.to_a
@@ -620,7 +621,10 @@ module CSL
       protected
       
       def set_defaults
-        self['range-delimiter'] ||= "\u2013"
+        unless self['range-delimiter']
+          self['range-delimiter'] = "\xe2\x80\x93"
+          self['range-delimiter'].force_encoding("UTF-8") if RUBY_VERSION >= '1.9.0'
+        end
       end
     end
 

data/lib/csl/sort.rb

@@ -11,7 +11,15 @@ module CSL
         keys.each do |key|
           this, that = key.convert(a, processor), key.convert(b, processor)
 
-          comparison = this <=> that
+          # Duplicate Ruby 1.9's <=> behavior for nil
+          if this.nil? && that.nil?
+            comparison = 0
+          elsif this.nil? || that.nil?
+            comparison = nil
+          else
+            comparison = this <=> that
+          end
+          
           comparison = comparison * -1 if comparison && key.descending?
 
           comparison = comparison ? comparison : that.nil? ? -1 : 1

data/lib/plugins/formats/default.rb

@@ -102,14 +102,14 @@ module CiteProc
         
         case text_case
         when 'lowercase'
-          @tokens.each { |token| token.content = UnicodeUtils ? UnicodeUtils.downcase(token.content) : token.content.downcase }
+          @tokens.each { |token| token.content = Support.downcase(token.content) }
           
         when 'uppercase'
-          @tokens.each { |token| token.content = UnicodeUtils ? UnicodeUtils.upcase(token.content) : token.content.upcase }
+          @tokens.each { |token| token.content = Support.upcase(token.content) }
           
         when 'capitalize-first'
           token = @tokens.detect { |token| !token.annotations.include?('nocase') }
-          token.content.sub!(/^./) { UnicodeUtils ? UnicodeUtils.upcase($&) : $&.upcase }
+          token.content.sub!(/^./) { Support.upcase($&) }
           
         when 'capitalize-all'
           # @tokens.each { |token| token.content.gsub!(/\b\w/) { $&.upcase } unless token.annotations.include?('nocase') }
@@ -117,7 +117,7 @@ module CiteProc
           
         # TODO exact specification?
         when 'title'
-          @tokens.each { |token| token.content = token.content.split(/(\s+)/).map { |w| w.match(/^(and|of|a|an|the)$/i) ? w : w.gsub(/\b\w/) { UnicodeUtils ? UnicodeUtils.upcase($&) : $&.upcase } }.join.sub(/^(\w)/) {$&.upcase} unless token.annotations.include?('nocase') }
+          @tokens.each { |token| token.content = token.content.split(/(\s+)/).map { |w| w.match(/^(and|of|a|an|the)$/i) ? w : w.gsub(/\b\w/) { Support.upcase($&) } }.join.sub(/^(\w)/) {$&.upcase} unless token.annotations.include?('nocase') }
 
         # TODO exact specification?
         when 'sentence'

data/lib/support/compatibility.rb

@@ -0,0 +1,83 @@
+
+# Remove the 'id' and 'type' methods in Ruby 1.8, as they're used all over
+# the source
+if RUBY_VERSION < "1.9.0"
+  class Object
+    undef_method :id
+    undef_method :type
+  end
+end
+
+# Robust solutions for Unicode
+if RUBY_PLATFORM == 'java'
+  require 'java'
+  
+  module Support
+    def self.upcase(string)
+      java.lang.String.new(string).to_upper_case(java.util.Locale::ENGLISH).to_s
+    end
+    
+    def self.downcase(string)
+      java.lang.String.new(string).to_lower_case(java.util.Locale::ENGLISH).to_s
+    end
+  end
+  
+else
+
+  begin
+    require 'unicode'
+    
+    module Support
+      def self.upcase(string)
+        Unicode.upcase(string)
+      end
+      
+      def self.downcase(string)
+        Unicode.downcase(string)
+      end
+    end
+    
+  rescue LoadError
+    begin
+      require 'unicode_utils'
+
+      module Support
+        def self.upcase(string)
+          UnicodeUtils.upcase(string)
+        end
+    
+        def self.downcase(string)
+          UnicodeUtils.downcase(string)
+        end
+      end
+  
+    rescue LoadError
+      begin
+        require 'active_support/multibyte/chars'
+    
+        module Support
+          def self.upcase(string)
+            ActiveSupport::Multibyte::Chars.new(string).upcase.to_s
+          end
+      
+          def self.downcase(string)
+            ActiveSupport::Multibyte::Chars.new(string).downcase.to_s
+          end
+        end
+    
+      rescue LoadError
+    
+        module Support
+          def self.upcase(string)
+            string.upcase
+          end
+      
+          def self.downcase(string)
+            string.downcase
+          end
+        end
+      
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: citeproc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000Z
+date: 2012-02-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &2156697820 !ruby/object:Gem::Requirement
+  requirement: &2152765020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2156697820
+  version_requirements: *2152765020
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2156696820 !ruby/object:Gem::Requirement
+  requirement: &2152764360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2156696820
-- !ruby/object:Gem::Dependency
-  name: unicode_utils
-  requirement: &2156695620 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2156695620
+  version_requirements: *2152764360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156694820 !ruby/object:Gem::Requirement
+  requirement: &2152763640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2156694820
+  version_requirements: *2152763640
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2156693940 !ruby/object:Gem::Requirement
+  requirement: &2152762940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +54,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2156693940
+  version_requirements: *2152762940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156693120 !ruby/object:Gem::Requirement
+  requirement: &2152762240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: 0.8.0
   type: :development
   prerelease: false
-  version_requirements: *2156693120
+  version_requirements: *2152762240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156692500 !ruby/object:Gem::Requirement
+  requirement: &2152761540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +76,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2156692500
+  version_requirements: *2152761540
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156691860 !ruby/object:Gem::Requirement
+  requirement: &2152761000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +87,7 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *2156691860
+  version_requirements: *2152761000
 description: A CSL (Citation Style Language) Processor
 email:
 - http://sylvester.keil.or.at
@@ -130,6 +119,7 @@ files:
 - lib/plugins/formats/default.rb
 - lib/plugins/formats/html.rb
 - lib/support/attributes.rb
+- lib/support/compatibility.rb
 - lib/support/tree.rb
 - resource/locale/locales-af-ZA.xml
 - resource/locale/locales-ar-AR.xml