citeproc 1.0.0.pre5 → 1.0.0.pre6

data/citeproc.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.license     = 'AGPL'
   s.date        = Time.now.strftime('%Y-%m-%d')
 
-  s.add_runtime_dependency('multi_json', '~>1.3.5')
+  s.add_runtime_dependency('multi_json', '~>1.5')
   s.add_runtime_dependency('namae', '~>0.3')
   
   s.add_development_dependency 'cucumber', '~>1.2'

data/lib/citeproc/citation_data.rb

@@ -47,7 +47,7 @@ module CiteProc
   	# @!attribute suffix
   	# @return [String] a string to print after cites produced for this item
 
-		attr_predicates :id, :locator, :label, :'suppress-author',
+		attr_predicates :id, :locator, :page, :label, :'suppress-author',
 			:'author-only', :prefix, :suffix
 
 		# Attributes added by processor

data/lib/citeproc/date.rb

@@ -74,7 +74,7 @@ module CiteProc
     # be used in an external context.
     class DateParts < Struct.new(:year, :month, :day)
       include Comparable
-      
+
       def initialize(*arguments)
         if arguments.length == 1 && arguments[0].is_a?(::Date)
           d = arguments[0]
@@ -83,11 +83,11 @@ module CiteProc
           super(*arguments.map(&:to_i))
         end
       end
-      
+
       def initialize_copy(other)
         update(other)
       end
-      
+
       # Update the date parts with the passed-in values.
       # @param parts [Array, #each_pair] an ordered list of date parts (year,
       #   month, day) or a Hash containing the mapping
@@ -96,14 +96,14 @@ module CiteProc
         unless parts.respond_to?(:each_pair)
           parts = Hash[DateParts.members.zip(parts)]
         end
-        
+
         parts.each_pair do |part, value|
           self[part] = value.nil? ? nil : value.to_i
         end
-        
+
         self
       end
-      
+
       # @return [Boolean] whether or not the date parts are unset
       def empty?
         to_citeproc.empty?
@@ -135,7 +135,7 @@ module CiteProc
       #   parts are not a valid date.
       def strftime(format = '%F')
         d = to_date
-        
+
         if d.nil?
           nil
         else
@@ -156,14 +156,14 @@ module CiteProc
           nil
         end
       end
-           
+
       # Convert the date parts into a proper Ruby date object; if the date
       # parts are empty, contain zero or are otherwise invalid, nil will
       # be returned instead.
       # @return [::Date,nil] the date parts as a Ruby date object
       def to_date
         parts = to_citeproc
-        
+
         if parts.empty? || parts.include?(0)
           nil
         else
@@ -175,14 +175,14 @@ module CiteProc
           end
         end
       end
-      
+
       alias to_ruby to_date
-      
+
       # @return [Array<Fixnum>] the list of date parts
       def to_citeproc
         take_while { |p| !p.nil? }
       end
-      
+
       # @return [String] the date parts as a string
       def to_s
         to_citeproc.inspect
@@ -193,19 +193,19 @@ module CiteProc
         "#<DateParts #{to_s}>"
       end
     end
-    
+
 
     include Attributes
 
     alias attributes value
     protected :value, :attributes
-    
+
     undef_method :value=
-    
+
 
     # List of date parsers (must respond to #parse)
     @parsers = []
-    
+
     [%w{ edtf EDTF }, %w{ chronic Chronic }].each do |date_parser, module_id|
       begin
         require date_parser
@@ -216,8 +216,8 @@ module CiteProc
     end
 
     @parsers << ::Date
-    
-    
+
+
     class << self
 
       # @!attribute [r] parsers
@@ -246,19 +246,19 @@ module CiteProc
       rescue ParseError
         nil
       end
-      
+
       # Like #parse but raises a ParseError if the input failed to be parsed.
       #
       # @param date_string [String] the date to be parsed
       # @return [CiteProc::Date] the parsed date
       #
-      # @raise [ParseError] when the string cannot be parsed    
+      # @raise [ParseError] when the string cannot be parsed
       def parse!(date_string)
         @parsers.each do |p|
           date = p.parse(date_string) rescue nil
           return new(date) unless date.nil?
         end
-        
+
         # Subtle: if we get here it means all parsers failed to create a date
         raise ParseError, "failed to parse #{date_string.inspect}"
       end
@@ -269,7 +269,7 @@ module CiteProc
       end
 
       alias now today
-      
+
     end
 
 
@@ -293,7 +293,7 @@ module CiteProc
       super
       convert_parts!
     end
-    
+
     # Replaces the date's value. Typically called by the constructor, this
     # method intelligently converts various input values.
     def replace(value)
@@ -317,7 +317,7 @@ module CiteProc
           @value = attributes.deep_copy
         end
         convert_parts!
-        
+
       when value.is_a?(Array)
         @value = { :'date-parts' => value[0].is_a?(Array) ? value : [value] }
         convert_parts!
@@ -336,7 +336,7 @@ module CiteProc
 
       self
     end
-    
+
     # @return [Array<DateParts>]
     def date_parts
       @value[:'date-parts'] ||= []
@@ -361,24 +361,24 @@ module CiteProc
     # @return [Fixnum] the day (of the start date for ranges)
     [:year, :month, :day].each do |reader|
       writer = "#{reader}="
-      
+
       define_method(reader) do
         d = parts[0] and d.send(reader)
       end
-      
+
       define_method(writer) do |v|
         parts[0] ||= DateParts.new
         parts[0].send(writer, v.to_i)
       end
     end
-    
+
     # @return [Date] a copy of the date with an inverted year
     def -@
       d = dup
       d.year = -1 * year
       d
     end
-    
+
     # @return [::Date,nil] the date (start date if this instance is a range); or nil
     def start_date
       d = parts[0] and d.to_date
@@ -412,8 +412,8 @@ module CiteProc
       parts[1] && !parts[1].empty?
     end
 
-    # Returns true if this date is a range
     alias range? has_end_date?
+		alias plural? has_end_date?
 
     # @return [Boolean] whether or not this date is an open range
     def open_range?
@@ -460,7 +460,7 @@ module CiteProc
     def bc?
       date = parts[0] and date.bc?
     end
-    
+
     # A date is said to be AD when it is in the first millennium, i.e.,
     # between 1 and 1000 AD
     # @return [Boolean, nil] whether or not the date is AD; nil if there is
@@ -472,17 +472,17 @@ module CiteProc
     # @return [Hash] a hash representation of the date.
     def to_citeproc
       cp = @value.stringify_keys
-      
+
       # Convert (or suppress empty) date-parts
       if parts.all?(&:empty?)
         cp.delete('date-parts')
       else
         cp['date-parts'] = cp['date-parts'].map(&:to_citeproc)
       end
-      
+
       cp
     end
-    
+
     # @return [String] the date as a string
     def to_s
       case

data/lib/citeproc/item.rb

@@ -1,5 +1,5 @@
 module CiteProc
-  
+
   # Items are similar to a Ruby Hash but pose a number of constraints on their
   # contents: keys are always (implicitly converted to) symbols and values
   # are strictly {Variable Variables}. When Items are constructed
@@ -24,7 +24,7 @@ module CiteProc
   # Items can be converted to the CiteProc JSON format via {#to_citeproc}
   # and {#to_json}.
   class Item
-    
+
     @types = [
       :article, :'article-journal', :'article-magazine', :'article-newspaper',
       :bill, :book, :broadcast, :chapter, :entry, :'entry-dictionary',
@@ -33,7 +33,7 @@ module CiteProc
       :pamphlet, :'paper-conference', :patent, :personal_communication, :post,
       :'post-weblog', :report, :review, :'review-book', :song, :speech,
       :thesis, :treaty, :webpage].freeze
-    
+
     @bibtex_types = Hash.new { |h,k| :misc }.merge(Hash[*%w{
       pamphlet          booklet
       paper-conference  conference
@@ -49,13 +49,13 @@ module CiteProc
       article-journal   article
       article-magazine  article
     }.map(&:intern)]).freeze
-    
+
     class << self
       attr_reader :types, :bibtex_types
     end
-    
+
     extend Forwardable
-    
+
     include Attributes
     include Enumerable
     include Comparable
@@ -66,38 +66,51 @@ module CiteProc
       *Variable.fields[:all]
 
     def_delegators :attributes, :values_at, :keys, :values
-    
+
     alias fields keys
-    
-    # Hide attributes reader
+
+    # Hide attributes reader:
+    # All access should go through (read|write)_attribute
     protected :attributes
-    
-    
+
+
     def initialize(attributes = nil)
       merge(attributes)
       yield self if block_given?
     end
-    
+
     def initialize_copy(other)
       @attributes = other.attributes.deep_copy
     end
-    
-		# @param name [Symbol] the name of the variable
-		#
-		# @param options [Hash]
-		# @option options [:short] :form (nil) when given, the variable's
-		#   short form will be returned if available.
-		#
-		# @return [Variable, nil] the matching variable
-		def variable(name, options = {})
-			if options.key?(:form) && options[:form].to_sym == :short
-				var = read_attribute "#{name}-short"
-				return var unless var.nil?
-			end
-			
-			read_attribute name
-		end
-		
+
+
+    def observable_read_attribute(key)
+      value = original_read_attribute(key)
+    ensure
+      changed
+      notify_observers :read, key, value
+    end
+
+    alias original_read_attribute read_attribute
+    alias read_attribute observable_read_attribute
+
+
+    # @param name [Symbol] the name of the variable
+    #
+    # @param options [Hash]
+    # @option options [:short] :form (nil) when given, the variable's
+    #   short form will be returned if available.
+    #
+    # @return [Variable, nil] the matching variable
+    def variable(name, options = {})
+      if options.key?(:form) && options[:form].to_sym == :short
+        var = read_attribute "#{name}-short"
+        return var unless var.nil?
+      end
+
+      read_attribute name
+    end
+
     # Calls a block once for each field in the item, passing the field's
     # name-value pair as parameters.
     #
@@ -120,7 +133,7 @@ module CiteProc
         to_enum
       end
     end
-    
+
     alias each_pair each
 
     # Calls a block once for each field in the item, passing the field's
@@ -144,7 +157,7 @@ module CiteProc
         enum_for :each_value
       end
     end
-    
+
     def <=>(other)
       return nil unless other.is_a?(Attributes)
       eql?(other) ? 0 : length <=> other.length
@@ -154,26 +167,26 @@ module CiteProc
     # installed; otherwise returns a BibTeX string.
     def to_bibtex
       # hash = to_hash
-      # 
+      #
       # hash[:type] = Item.bibtex_types[hash[:type]]
-      # 
+      #
       # if hash.has_key?(:issued)
       #   date = hash.delete(:issued)
       #   hash[:year] = date.year
       #   hash[:month] = date.month
       # end
-      # 
+      #
       # Variable.fields[:date].each do |field|
       #   hash[field] = hash[field].to_s if hash.has_key?(field)
       # end
-      # 
+      #
       # Variable.fields[:names].each do |field|
       #   hash[field] = hash[field].to_bibtex
       # end
-      
+
       raise 'not implemented yet'
     end
-    
+
     # @return [Symbol,nil] the item's id
     def to_sym
       if id?
@@ -182,13 +195,13 @@ module CiteProc
         nil
       end
     end
-    
+
     # @return [String] a string containing a human-readable
     #   representation of the item
     def inspect
       "#<CiteProc::Item id=#{id.to_s.inspect} attributes={#{attributes.length}}>"
     end
-    
+
     private
 
     # @private
@@ -196,5 +209,5 @@ module CiteProc
       Variable.create!(value, key)
     end
   end
-  
+
 end

data/lib/citeproc/names.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 module CiteProc
-  
+
   # Names consist of several dependent parts of strings. Simple personal names
   # are composed of family and given elements, containing respectively the
   # family and given name of the individual.
@@ -32,13 +32,13 @@ module CiteProc
   #
   #     Name.new(:family => 'Murakami', :given => 'Haruki').to_s
   #     #-> "Haruki Murakami"
-  #     
+  #
   #     Name.new(:family => 'Murakami', :given => 'Haruki').static_order!.to_s
   #     #-> "Murakami Haruki"
   class Name
-    
+
     extend Forwardable
-    
+
     include Attributes
     include Comparable
 
@@ -59,24 +59,24 @@ module CiteProc
       :'sort-separator' => ', ',
       :'initialize-with' => nil
     }.freeze
-    
+
     @parts = [:family, :given,:literal, :suffix, :'dropping-particle',
       :'non-dropping-particle'].freeze
-      
+
     class << self
       attr_reader :defaults, :parts, :romanesque
     end
 
-    
+
 
     # Method generators
-    
+
     # @!attribute [r] options
     # @return the name's formatting options
     attr_reader :options
-    
+
     attr_predicates :'comma-suffix', :'static-ordering', :multi, *@parts
-    
+
     # Aliases
     [[:particle, :'non_dropping_particle']].each do |a, m|
       alias_method(a, m) if method_defined?(m)
@@ -90,11 +90,11 @@ module CiteProc
       pa, pm = "has_#{a}?", "has_#{m}?"
       alias_method(pa, pm) if method_defined?(pm)
     end
-  
+
     # Names quack sorta like a String
     def_delegators :to_s, :=~, :===,
       *String.instance_methods(false).reject { |m| m =~ /^\W|!$|to_s|replace|first|last/ }
-    
+
     # Delegate bang! methods to each field's value
     String.instance_methods(false).each do |m|
       if m.to_s.end_with?('!')
@@ -107,30 +107,30 @@ module CiteProc
         end
       end
     end
-    
-    
+
+
     # Instance methods
-    
+
     def initialize(attributes = {}, options = {})
       @options = Name.defaults.merge(options)
       @sort_prefix = (/^(the|an?|der|die|das|eine?|l[ae])\s+|^l\W/i).freeze
-      
+
       merge(attributes)
-      
+
       yield self if block_given?
     end
-    
+
     def initialize_copy(other)
       @attributes = other.attributes.deep_copy
       @options = other.options.dup
     end
-    
-    
+
+
     # @return [Boolean] whether or not the Name looks like it belongs to a person
     def personal?
       !empty? && !literal?
     end
-    
+
 
     # A name is `romanesque' if it contains only romanesque characters. This
     # should be the case for the majority of names written in latin- or
@@ -141,9 +141,9 @@ module CiteProc
     def romanesque?
       !!([given, family].join.gsub(Variable.markup, '') =~ Name.romanesque)
     end
-    
+
     alias byzantine? romanesque?
-    
+
     # @return [Boolean] whether or not the name should be printed in static order
     def static_order?
       static_ordering? || !romanesque?
@@ -166,32 +166,32 @@ module CiteProc
     def sort_order?
       !!(options[:'name-as-sort-order'].to_s =~ /^(y(es)?|always|t(rue)?)$/i)
     end
-    
+
     def display_order?
       !sort_order?
     end
-    
+
     # Sets the name to use sort-order. The reverse of {#display_order!}.
     # @return [self]
     def sort_order!
       options[:'name-as-sort-order'] = true
       self
     end
-    
+
     # Sets the name to use display-order. The reverse of {#sort_order!}.
     # @return [self]
     def display_order!
       options[:'name-as-sort-order'] = false
       self
     end
-    
+
     # @return [String] the current sort separator
     def sort_separator
       options[:'sort-separator']
     end
-    
+
     alias comma sort_separator
-    
+
     # @return [Boolean] whether or not the short form will be used for printing
     def short_form?
       options[:form].to_s =~ /short/i
@@ -215,19 +215,19 @@ module CiteProc
       options[:form] = :long
       self
     end
-    
+
     # @return [Boolean] whether or not initials will be used for printing
     def initials?
       !!options[:'initialize-with'] && personal? && romanesque?
     end
-    
+
     def demote_non_dropping_particle?
       always_demote_non_dropping_particle? ||
         !!(sort_order? && options[:'demote-non-dropping-particle'] =~ /^sort(-only)?$/i)
     end
 
     alias demote_particle? demote_non_dropping_particle?
-    
+
     def never_demote_non_dropping_particle?
       !!(options[:'demote-non-dropping-particle'] =~ /^never$/i)
     end
@@ -265,7 +265,7 @@ module CiteProc
       return nil unless other.respond_to?(:sort_order_downcase)
       sort_order_downcase <=> other.sort_order_downcase
     end
-    
+
     # @return [String] the name formatted according to the current options
     def to_s
       case
@@ -286,12 +286,12 @@ module CiteProc
         else
           [family, [given, dropping_particle, particle].compact_join(' '),
             suffix].compact_join(comma)
-        end   
+        end
       else
         [particle, family].compact_join(' ')
       end
     end
-    
+
     # @return [Array<String>] an ordered array of formatted name parts to be used for sorting
     def sort_order
       case
@@ -303,41 +303,41 @@ module CiteProc
         [family, [particle, dropping_particle].compact_join(' '), given, suffix].map(&:to_s)
       end
     end
-    
+
     # @return [String] the name as a string stripped off all markup
     def strip_markup
       gsub(Variable.markup, '')
     end
-    
+
     # @return [self] the name with all parts stripped off markup
     def strip_markup!
       gsub!(Variable.markup, '')
     end
-    
+
     # @return [Array<String>] the sort order array stripped off markup and downcased
     def sort_order_downcase
       sort_order.map { |s| s.downcase.gsub(Variable.markup, '') }
     end
-    
+
     # @return [String] a human-readable representation of the name object
     def inspect
       "#<CiteProc::Name #{to_s.inspect}>"
     end
-    
+
     private
-    
+
     attr_reader :sort_prefix
-            
+
   end
-  
-  
-  
+
+
+
 
   # Represents a {Variable} containing an ordered list of {Name}
   # objects. The names can be formatted using CSL formatting options (see
   # {Names.defaults} for details).
   class Names < Variable
-        
+
     @defaults = {
       :and => ' & ',
       :delimiter => ', ',
@@ -348,7 +348,7 @@ module CiteProc
       :'et-al-subsequent-min' => 5,
       :'et-al-subsequent-use-first' => 3
     }.freeze
-    
+
     class << self
 
       # @!attribute [r] defaults
@@ -388,9 +388,9 @@ module CiteProc
       #      # referencing earlier cited items)
       #    }
       #
-      # @return [Hash] the Names' default formatting options      
+      # @return [Hash] the Names' default formatting options
       attr_reader :defaults
-      
+
       # Parses the passed-in string and returns a Names object. Behaves like
       # parse but returns nil for bad input without raising an error.
       #
@@ -403,7 +403,7 @@ module CiteProc
       rescue ParseError
         nil
       end
-      
+
       # Parses the passed-in string and returns a Names object.
       #
       # @param names [String] the name or names to be parsed
@@ -417,19 +417,19 @@ module CiteProc
       end
 
     end
-    
+
     include Enumerable
 
     # @!attribute [r] options
     # @return [Hash] the current formatting options
 
     attr_reader :options
-    
+
     alias names value
-    
+
     # Don't expose value/names writer
     undef_method :value=
-    
+
     # Delegate bang! methods to each name
     Name.instance_methods(false).each do |m|
       if m.to_s.end_with?('!')
@@ -441,11 +441,11 @@ module CiteProc
         end
       end
     end
-    
+
     # Names quack sorta like an Array
     def_delegators :names, :length, :empty?, :[], :join
 
-    
+
     # Some delegators should return self
 
     # @!method push(name)
@@ -455,26 +455,26 @@ module CiteProc
     # @!method unshift(name)
     #    Inserts the given name at the beginning of the list of names.
     #    @param name [Name] a name
-    #    @return [self]    
+    #    @return [self]
     [:<<, :push, :unshift].each do |m|
       define_method(m) do |*arguments, &block|
         names.send(m, *arguments, &block)
         self
       end
     end
-            
+
     def initialize(*arguments)
       @options = Names.defaults.dup
       super(arguments.flatten(1))
     end
-    
+
     def initialize_copy(other)
       @options, @value = other.options.dup, other.value.map(&:dup)
     end
-    
+
     def replace(values)
       @value = []
-      
+
       [*values].each do |value|
         case
         when value.is_a?(Name)
@@ -488,34 +488,34 @@ module CiteProc
             raise TypeError, $!.message
           end
         else
-          raise TypeError, "failed to create names from #{value.inspect}"       
+          raise TypeError, "failed to create names from #{value.inspect}"
         end
       end
-      
+
       self
     end
-    
+
     # @return [Fixnum] the maximum number of names that should be printed
     def max_names
       [length, options[:'et-al-use-first'].to_i.abs].min
     end
-    
+
     # @return [Boolean] whether or not the Names should be truncate
     def truncate?
       length >= options[:'et-al-min'].to_i.abs
     end
-    
+
     # @return [Boolean] whether ot not the Names, if printed on subsequent
     #   cites, should be truncated
     def truncate_subsequent?
       length >= options[:'et-al-subsequent-min'].to_i
     end
-    
+
     # @return [String] the delimiter between names
     def delimiter
       options[:delimiter]
     end
-    
+
     # @return [String] the delimiter between the penultimate and last name
     # @see #connector
     # @see #delimiter_precedes_last?
@@ -526,26 +526,26 @@ module CiteProc
         connector
       end
     end
-    
+
     # @return [String] the delimiter between the last name printed name and
     #   the 'and others' term
     def truncated_delimiter
       max_names > 1 ? delimiter : ' '
     end
-    
+
     # @return [Boolean] whether or not the delimiter will be inserted between
     #   the penultimate and the last name
     def delimiter_precedes_last?
       case
       when delimiter_never_precedes_last?
-        false 
+        false
       when delimiter_always_precedes_last?
         true
       else
         length > 2
       end
     end
-    
+
     # @return [Boolean] whether or not the should always be inserted between
     #   the penultimate and the last name
     def delimiter_always_precedes_last?
@@ -561,7 +561,7 @@ module CiteProc
 
     alias delimiter_precedes_last! delimiter_always_precedes_last!
 
-    
+
     # @return [Boolean] whether or not the should never be inserted between
     #   the penultimate and the last name
     def delimiter_never_precedes_last?
@@ -587,22 +587,27 @@ module CiteProc
       options[:'delimiter-precedes-last'] = :contextual
       self
     end
- 
+
     # @return [String] the connector between the penultimate and the last name
     def connector
       options[:and]
     end
-    
+
     # @return [false] Names are non-numeric Variables
     def numeric?
       false
     end
 
+    # @return [Boolean] whether or not the variable holds more than one Name
+		def plural?
+			length > 1
+		end
+
     # Calls a block once for each name. If no block is given, an enumerator
     # is returned instead.
     #
     # @yieldparam name [Name] a name in the list
-    # @return [self,Enumerator] self or an enumerator if no block is given    
+    # @return [self,Enumerator] self or an enumerator if no block is given
     def each
       if block_given?
         names.each(&Proc.new)
@@ -611,7 +616,7 @@ module CiteProc
         to_enum
       end
     end
-    
+
     # Compares two lists of Names.
     # @param other [(Name)] a list of names
     # @return [Fixnum,nil] -1, 0, or 1 depending on the result of the
@@ -620,13 +625,15 @@ module CiteProc
       return nil unless other.respond_to?(:to_a)
       to_a <=> other.to_a
     end
-    
+
+		alias to_i length
+
     # Converts the list of names into a formatted string depending on the
     # current formatting options.
     # @return [String] the formatted list of names
     def to_s
       case
-      when truncate? 
+      when truncate?
         [names[0...max_names].join(delimiter), options[:'et-al']].join(truncated_delimiter)
       when length < 2
         names.join(last_delimiter)
@@ -634,22 +641,22 @@ module CiteProc
         [names[0...-1].join(delimiter), names[-1]].join(last_delimiter)
       end
     end
-    
+
     # @return [String] the names in a BibTeX-compatible format
     def to_bibtex
       map { |n| n.dup.sort_order! }.join(' and ')
     end
-    
+
     # @return [Array<Hash>] the list of names converted to hash objects
     def to_citeproc
       map(&:to_citeproc)
     end
-    
+
     # @return [String] a human-readable representation of the Names object
     def inspect
       "#<CiteProc::Names #{to_s.inspect}>"
     end
-    
+
   end
-  
+
 end

data/lib/citeproc/variable.rb

@@ -34,8 +34,8 @@ module CiteProc
         first-reference-note-number genre ISBN ISSN jurisdiction keyword
         locator medium note original-publisher original-publisher-place
         original-title page page-first PMID PMCID publisher publisher-place
-        references section source status title title-short URL version
-        year-suffix
+        references reviewed-author reviewed-title scale section source status
+        title title-short URL version year-suffix
       }
     })
     
@@ -167,6 +167,15 @@ module CiteProc
       @type ||= self.class.name.split(/::/)[-1].downcase.to_sym
     end
 
+		# @return [Boolean] whether or not the variable holds a plural value
+		def plural?
+			if numeric?
+				!!match(/\S\s*[,&-]\s*\S|\df/)
+			else
+				false
+			end
+		end
+
 		# Tests whether the variable contains numeric content. Content is
 		# considered numeric if it solely consists of numbers. Numbers may have
 		# prefixes and suffixes ("D2", "2b", "L2d"), and may be separated by a
@@ -176,9 +185,9 @@ module CiteProc
 		#
     # @return [Boolean] whether or not the variable's value is numeric
     def numeric?
-      !!match(/^\w*\d+\w*(\s*[,&-]\s*\w*\d+\w*)*$/i)
+      !!match(/^[\w\.:;]*\d+[\w\.:;]*(\s*[,&-]\s*[\w\.:;]*\d+[\w\.:;]*)*$/i)
     end
-    
+
     # @return [Fixnum] the first (!) numeric data contained in the variable's
     #   value; zero if no numeric data is present
     def to_i

data/lib/citeproc/version.rb

@@ -1,3 +1,3 @@
 module CiteProc
-  VERSION = '1.0.0.pre5'.freeze
+  VERSION = '1.0.0.pre6'.freeze
 end

data/spec/citeproc/names_spec.rb

@@ -459,7 +459,7 @@ module CiteProc
         end
         
         it '#parse! raises an error on bad input' do
-          expect { Names.parse!('A,B,C,D,E') }.to raise_error(ParseError)
+          expect { Names.parse!('23') }.to raise_error(ParseError)
         end
         
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: citeproc
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre5
+  version: 1.0.0.pre6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2013-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70321665463660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70321665463660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: namae
-  requirement: &70321665462900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70321665462900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70321665462100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70321665462100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70321665477800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70321665477800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70321665477300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +85,12 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70321665477300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: ! "\n    A cite processor interface for Citation Style Language (CSL)
   styles.\n    "
 email:
@@ -136,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3374209156135938924
+      hash: 91495025789271723
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A cite processor interface.