csl 1.0.0.pre5 → 1.0.0.pre6

data/lib/csl.rb

@@ -6,6 +6,8 @@ require 'singleton'
 require 'set'
 require 'time'
 
+require 'namae'
+
 require 'csl/version'
 
 require 'csl/compatibility'
@@ -23,6 +25,7 @@ require 'csl/node'
 require 'csl/info'
 
 require 'csl/locale'
+require 'csl/locale/ordinalize'
 require 'csl/locale/date'
 require 'csl/locale/term'
 require 'csl/locale/style_options'

data/lib/csl/info.rb

@@ -105,16 +105,16 @@ module CSL
     # @return [self]
     def update!(timestamp = Time.now)
       ts = timestamp.respond_to?(:xmlschema) ? timestamp.xmlschema : timestamp.to_s
-      
+
       if has_updated?
         updated = Updated.new { |u| u.text = ts }
       else
         updated.text = ts
       end
-      
+
       self
     end
-    
+
     # @return [Time,nil] when the info node's parent was published
     def published_at
       return unless has_published?
@@ -125,30 +125,30 @@ module CSL
     # @return [self]
     def publish!(timestamp = Time.now)
       ts = timestamp.respond_to?(:xmlschema) ? timestamp.xmlschema : timestamp.to_s
-      
+
       if has_published?
         published = Published.new { |u| u.text = ts }
       else
         published.text = ts
       end
-      
+
       self
     end
-    
+
     # @return [Symbol] the parent style's citation format
     def citation_format
       return unless has_categories?
-      
+
       cat = categories.detect { |c| c.attribute? :'citation-format' }
       return if cat.nil?
-      
+
       cat[:'citation-format'].to_sym
     end
-    
+
     def citation_format=(new_format)
-      cat = categories.detect { |c| c.attribute? :'citation-format' }      
+      cat = categories.detect { |c| c.attribute? :'citation-format' }
       cat = add_child Info::Category.new if cat.nil?
-      
+
       cat[:'citation-format'] = new_format.to_s
     end
 
@@ -158,20 +158,22 @@ module CSL
 
     class Contributor < Node
       attr_children :name, :email, :uri
+			def_delegators :name, *Namae::Name.members
     end
 
     class Author < Node
       attr_children :name, :email, :uri
+			def_delegators :name, *Namae::Name.members
     end
 
     class Translator < Node
       attr_children :name, :email, :uri
+			def_delegators :name, *Namae::Name.members
     end
 
     class Link < Node
+			has_language
       attr_struct :href, :rel
-
-      # TODO xml:lang
     end
 
     class DependentStyle < TextNode
@@ -187,6 +189,18 @@ module CSL
     end
 
     class Name < TextNode
+
+			def_delegators :namae, *Namae::Name.members
+
+			private
+
+			def namae
+				@namae || namae!
+			end
+
+			def namae!
+				@namae = Namae::Name.parse to_s
+			end
     end
 
     class Email < TextNode
@@ -196,24 +210,23 @@ module CSL
     end
 
     class Title < TextNode
-      # TODO xml:lang
+			has_language
     end
 
     class TitleShort < TextNode
-      # TODO xml:lang
+			has_language
     end
 
     class Summary < TextNode
-      # TODO xml:lang
+			has_language
     end
 
     class Rights < TextNode
+			has_language
       attr_struct :license
-      # TODO xml:lang
     end
 
     class Updated < TextNode
-
       def to_time
         return if empty?
         Time.parse(to_s)

data/lib/csl/locale.rb

@@ -5,17 +5,17 @@ module CSL
   #
   class Locale < Node
     types << CSL::Info
-    
+
     include Comparable
     
     @default = 'en-US'.freeze
 
     @root = File.expand_path('../../../vendor/locales', __FILE__).freeze
-        
+
     @extension = '.xml'.freeze
     @prefix = 'locales-'.freeze
-    
-    
+
+
     # Default languages/regions.
     # Auto-detection is based on these lists.
     @regions = Hash[*%w{
@@ -28,38 +28,40 @@ module CSL
     @languages = @regions.invert.merge(Hash[*%w{
       AT de BR pt CA en CH de GB en
     }.map(&:to_sym)]).freeze
-    
-    
+
+
     class << self
       include Loader
-      
+
       attr_accessor :default
       attr_reader :languages, :regions
 
       def parse(data)
         node = CSL.parse!(data, self)
-        
+
         raise ParseError, "root node is not a locale: #{node.inspect}" unless
           node.is_a?(self)
-        
+
         node
-      end      
+      end
     end
-    
+
     attr_defaults :version => Schema.version, :xmlns => Schema.namespace
     attr_struct :xmlns, :version
 
     attr_children :'style-options', :info, :date, :terms
-    
-    attr_accessor :language, :region
-    
+
+		has_language
+		
+    attr_accessor :region
+
     alias_child :metadata, :info
     alias_child :dates, :date
     alias_child :options, :style_options
 
     private :attributes
     undef_method :[]=
-        
+
     # call-seq:
     #   Locale.new                                         -> default
     #   Locale.new('en')                                   -> American English
@@ -78,10 +80,10 @@ module CSL
       when 1
         if arguments[0].is_a?(Hash)
           arguments[0] = arguments[0].symbolize_keys
-          
+
           locale = arguments[0].delete(:lang) ||
             arguments[0].delete(:'xml:lang') || Locale.default
-            
+
           attributes, options = arguments
         else
           attributes, locale, options = {}, arguments
@@ -91,15 +93,15 @@ module CSL
       else
         raise ArgumentError, "wrong number of arguments (#{arguments.length} for 0..2)"
       end
-        
+
       super(attributes, &nil)
-      
+
       set(locale) unless locale.nil?
-      
+
       unless options.nil?
         children[:'style-options'] = StyleOptions.new(options)
       end
-      
+
       yield self if block_given?
     end
 
@@ -107,31 +109,31 @@ module CSL
     # def initialize_copy(other)
     #   @options = other.options.dup
     # end
-    
-    
+
+
     def added_to(node)
       raise ValidationError, "not allowed to add locale to #{node.nodename}" unless
         node.nodename == 'style'
     end
-    
-    
+
+
     def version
       attributes[:version]
     end
-    
+
     def version=(version)
       raise ArgumentError, "failed to set version to #{version}" unless
         version.respond_to?(:to_s)
-        
+
       version = version.to_s.strip
-      
+
       raise ArgumentError, "failed to set version to #{version}: not a version string" unless
         version =~ /^\d[\d\.]+$/
 
       if version > Schema.version
         warn "setting version to #{version}; latest supported version is #{Schema.version}"
       end
-      
+
       attributes[:version] = version
     end
 
@@ -139,24 +141,27 @@ module CSL
     def legacy?
       version < Schema.version
     end
-    
-    # call-seq:
-    #   locale.set('en')    -> sets language to :en, region to :US
-    #   locale.set('de-AT') -> sets language to :de, region to :AT
-    #   locale.set('-DE')   -> sets langauge to :de, region to :DE
+
+    # @example
+    #   locale.set('en')    #-> sets language to :en, region to :US
+    #   locale.set('de-AT') #-> sets language to :de, region to :AT
+    #   locale.set('-DE')   #-> sets langauge to :de, region to :DE
     #
     # Sets language and region according to the passed-in locale string. If
     # the region part is not defined by the string, this method will set the
     # region to the default region for the given language.
     #
-    # Raises ArgumentError if the argument is no valid locale string. A valid
-    # locale string is based on the syntax of IETF language tags; it consists
-    # of either a language or region tag (or both), separated by a hyphen.
+    # @raise [ArgumentError] if the argument is no valid locale string.
+		# 	A valid locale string is based on the syntax of IETF language tags;
+		#   it consists of either a language or region tag (or both), separated
+		#   by a hyphen.
+		#
+		# @return [self]
     def set(locale)
       language, region = locale.to_s.scan(/([a-z]{2})?(?:-([A-Z]{2}))?/)[0].map do |tag|
         tag.respond_to?(:to_sym) ? tag.to_sym : nil
       end
-      
+
       case
       when language && region
         @language, @region = language, region
@@ -167,26 +172,27 @@ module CSL
       else
         raise ArgumentError, "not a valid locale string: #{locale.inspect}"
       end
-      
+
       self
     end
-    
+
     # Sets the locale's language and region to nil.
+		# @return [self]
     def clear
       @language, @region = nil
       self
     end
-    
+
     def translate(*arguments)
       raise 'not implemented'
     end
 
     alias _ translate
     alias t translate
-    
-    # call-seq:
-    #   locale.each_term { |term| block } -> locale
-    #   locale.each_term                  -> enumerator
+
+    # @example
+    #   locale.each_term { |term| block } #-> locale
+    #   locale.each_term                  #-> enumerator
     #
     # Calls block once for each term defined by the locale. If no block is
     # given, an enumerator is returned instead.
@@ -198,10 +204,10 @@ module CSL
         enum_for :each_term
       end
     end
-    
-    # call-seq:
-    #   locale.each_date { |date_format| block } -> locale
-    #   locale.each_date                         -> enumerator
+
+    # @example
+    #   locale.each_date { |date_format| block } #-> locale
+    #   locale.each_date                         #-> enumerator
     #
     # Calls block once for each date format defined by the locale. If no
     # block is given, an enumerator is returned instead.
@@ -212,12 +218,12 @@ module CSL
         enum_for :each_date
       end
     end
-    
+
     # @returns [Boolean] whether or not the Locale is the default locale
     def default?
       to_s == Locale.default
     end
-    
+
     # @return [Boolean] whehter or not the Locale's region is the default
     #   region for its language
     def default_region?
@@ -230,92 +236,10 @@ module CSL
       language && language == Locale.languages[region]
     end
 
-    # Ordinalizes the passed-in number using either the ordinal or
-    # long-ordinal forms defined by the locale. If a long-ordinal form is
-    # requested but not available, the regular ordinal will be returned
-    # instead.
-    #
-    # @example
-    #   Locale.load('en').ordinalize(13)
-    #   #-> "13th"
-    #
-    #   de = Locale.load('de')
-    #   de.ordinalize(13)
-    #   #-> "13."
-    #
-    #   de.ordinalize(3, :form => :long, :gender => :feminine)
-    #   #-> "dritte"
-    #
-    # @note
-    #   For CSL 1.0 (and older) locales that do not define an "ordinal-00"
-    #   term the algorithm specified by CSL 1.0 is used; otherwise uses the
-    #   CSL 1.0.1 algorithm with improved support for languages other than
-    #   English.
-    #
-    # @param number [#to_i] the number to ordinalize
-    # @param options [Hash] formatting options
-    #
-    # @option options [:short,:long] :form (:short) which ordinals form to use
-    # @option options [:feminine,:masculine,:neutral] :gender (:neutral)
-    #   which ordinals gender-form to use
-    #
-    # @raise [ArgumentError] if number cannot be converted to an integer
-    #
-    # @return [String] the ordinal for the passed-in number
-    def ordinalize(number, options = {})
-      raise ArgumentError, "unable to ordinalize #{number}; integer expected" unless
-        number.respond_to?(:to_i)
-        
-      number, query = number.to_i, ordinalize_query_for(options)
-      
-      key = query[:name]
-      
-      # try to match long-ordinals first
-      if key.start_with?('l')
-        query[:name] = key % number.abs 
-        ordinal = terms[query]
-        
-        if ordinal.nil?
-          key = 'ordinal-%02d'
-        else
-          return ordinal.to_s(options)
-        end
-      end
-      
-      # CSL 1.0
-      if legacy? || terms['ordinal-00'].nil? 
-        return legacy_ordinalize(number)
-      end
-      
-      # CSL 1.0.1
-      # 1. try to find exact match
-      # 2. if no match is found, try to match modulus of number,
-      #    dividing mod by 10 at each iteration
-      # 3. repeat until a match is found or mod reaches 0
-
-      mod = 10 ** Math.log10([number.abs, 1].max).to_i
-
-      query[:name] = key % number.abs
-      ordinal = terms[query]
-      
-      while ordinal.nil? && mod > 0
-        query[:name] = key % (number.abs % mod)
-        ordinal = terms[query]
-        mod = mod / 10
-      end
-      
-      if ordinal.nil? && query.key?(:'gender-form')
-        query.delete(:'gender-form')
-        ordinal = terms[query]
-      end
-      
-      [number, ordinal.to_s(options)].join
-    end
-    
     def validate
       Schema.validate self
     end
-    
+
     def valid?
       validate.empty?
     end
@@ -356,14 +280,14 @@ module CSL
     def to_s
       [language, region].compact.join('-')
     end
-    
+
     # @return [String] a string representation of the Locale
     def inspect
       "#<#{self.class.name} #{to_s}>"
     end
-    
+
     private
-    
+
     def attribute_assignments
       if root?
         super.push('xml:lang="%s"' % to_s)
@@ -371,39 +295,11 @@ module CSL
         'xml:lang="%s"' % to_s
       end
     end
-    
+
     def preamble
       Schema.preamble.dup
-    end 
-
-    # @return [Hash] a valid ordinalize query; the name attribute is a format string
-    def ordinalize_query_for(options)
-      q = { :name => 'ordinal-%02d' }
-
-      unless options.nil?
-        if options.key?(:form) && options[:form].to_s =~ /^long(-ordinal)?$/i
-          q[:name] = 'long-ordinal-%02d'
-        end
-      
-        gender = (options[:'gender-form'] || options[:gender]).to_s
-        unless gender.empty? || gender =~ /^n/i
-          q[:'gender-form'] = (gender =~ /^m/i) ? 'masculine' : 'feminine'
-        end
-      end
-      
-      q
-    end
-    
-    def legacy_ordinalize(number)
-      case
-      when (11..13).include?(number.abs % 100)
-        [number, terms['ordinal-04']].join
-      when (1..3).include?(number.abs % 10)
-        [number, terms['ordinal-%02d' % (number.abs % 10)]].join
-      else
-        [number, terms['ordinal-04']].join
-      end
     end
+
   end
-  
+
 end