csl 1.0.0.pre15 → 1.0.0.pre16

data/lib/csl/locale/term.rb

@@ -21,17 +21,36 @@ module CSL
 
       alias each each_child
 
-      # @return [Term, nil] the first term that matches the query
+      # If a style uses a term in a form that is undefined, there is a
+      # fallback to other forms: "verb-short" first falls back to "verb",
+      # "symbol" first falls back to "short", and "verb" and "short" both
+      # fall back to "long". If no form fallback is available, nil is
+      # returned instead.
+      #
+      # @return [Term, nil] the term that matches the query
       def lookup(name, options = {})
         options = Term.specialize(options)
+
         options[:name] = name = name.to_s
+        options[:form] = 'long' unless options.key?(:form)
+
+        # NB: currently only ordinals support gender-forms
+        options.delete(:'gender-form')
+
+        candidates = registry[name]
+        return if candidates.empty?
 
-        # TODO default to long form
+        # loop terminates when a matching term is found or
+        # when there are no more form fallbacks left
+        while true do
+          term = candidates.detect { |t| t.match?(options) }
+          return term unless term.nil?
 
-        term = registry[name].detect { |t| t.match?(options) }
-        return term unless term.nil? && options.delete(:'gender-form')
+          fallback = Term.form_fallbacks[options[:form].to_s]
+          return if fallback == options[:form]
 
-        registry[name].detect { |t| t.match?(options) }
+          options[:form] = fallback
+        end
       end
       alias [] lookup
 
@@ -175,11 +194,24 @@ module CSL
       attr_struct :name, :form, :gender, :'gender-form', :match
       attr_children :single, :multiple
 
+      attr_defaults :form => 'long'
+
       attr_accessor :text
 
       def_delegators :attributes, :hash, :eql?, :name, :form, :gender
 
+      @form_fallbacks = {
+        'long'       => 'long',
+        'verb'       => 'long',
+        'short'      => 'long',
+        'verb-short' => 'verb',
+        'symbol'     => 'short'
+      }.freeze
+
       class << self
+
+        attr_reader :form_fallbacks
+
         def specialize(options)
           options = options.select do |k,v|
             !v.nil? && Term::Attributes.keys.include?(k.to_sym)
@@ -243,7 +275,7 @@ module CSL
         return :default if attributes.name == 'ordinal'
         attributes.name[/\d+/].to_i
       end
-      
+
       def gendered?
         !attributes.gender.blank?
       end
@@ -256,8 +288,21 @@ module CSL
         attribute?(:form) && attributes.form.to_s =~ /^short$/i
       end
 
+      def verb?
+        attribute?(:form) && attributes.form.to_s =~ /^verb$/i
+      end
+
+      def verb_short?
+        attribute?(:form) && attributes.form.to_s =~ /^verb-short$/i
+      end
+
+      def symbol?
+        attribute?(:form) && attributes.form.to_s =~ /^symbol$/i
+      end
+
       def long?
-        !short?
+        return true unless attribute?(:form)
+        attributes.form.to_s =~ /^long$/i
       end
 
       def textnode?

data/lib/csl/node.rb

@@ -28,6 +28,18 @@ module CSL
         @default_attributes ||= {}
       end
 
+			def hide_default_attributes?
+				@hide_default_attributes ||= true
+			end
+
+			def hide_default_attributes!
+				@hide_default_attributes = true
+			end
+
+			def show_default_attributes!
+				@hide_default_attributes = false
+			end
+
       def constantize(name)
         pattern = /:#{name.to_s.tr('-', '')}$/i
         klass = types.detect { |t| t.matches?(pattern) }
@@ -106,7 +118,7 @@ module CSL
       end
 
       def attr_defaults(attributes)
-        @default_attributes = attributes
+        default_attributes.merge! attributes
       end
 
       # Creates a new Struct for the passed-in attributes. Node instances
@@ -234,6 +246,12 @@ module CSL
       copy
     end
 
+		# @return [Boolean] whether or not the node has default attributes
+		def has_default_attributes?
+			!default_attributes.empty?
+		end
+		alias has_defaults? has_default_attributes?
+
     # Iterates through the Node's attributes
     def each
       if block_given?
@@ -245,6 +263,30 @@ module CSL
     end
     alias each_pair each
 
+		# @param name [#to_sym] the name of the attribute
+		# @return [Boolean] whether or not key is set to the default value
+		def default_attribute?(name)
+			defaults = self.class.default_attributes
+			name, value = name.to_sym, attributes.fetch(name)
+			
+			return false unless !value.nil? || defaults.key?(name)
+			defaults[name] == value
+		end
+
+		# @return [Hash] the attributes currently set to their default values
+		def default_attributes
+			attributes.to_hash.select do |name, _|
+				default_attribute?(name)
+			end
+		end
+
+		# @return [Hash] the attributes currently not set to their default values
+		def custom_attributes
+			attributes.to_hash.reject do |name, _|
+				default_attribute?(name)
+			end
+		end
+
     # Returns true if the node contains an attribute with the passed-in name;
     # false otherwise.
     def attribute?(name)
@@ -410,7 +452,8 @@ module CSL
     private
 
     def attribute_assignments
-      each_pair.map { |name, value|
+			a = self.class.hide_default_attributes? ? custom_attributes : attributes
+      a.map { |name, value|
         value.nil? ? nil : [name, value.to_s.inspect].join('=')
       }.compact
     end

data/lib/csl/style.rb

@@ -22,6 +22,8 @@ module CSL
 
     attr_defaults :version => Schema.version, :xmlns => Schema.namespace
 
+		show_default_attributes!
+
     attr_struct :xmlns, :version, :class, :'default-locale',
       :'initialize-with-hyphen', :'page-range-format',
       :'demote-non-dropping-particle', *Schema.attr(:name, :names)

data/lib/csl/style/label.rb

@@ -72,8 +72,9 @@ module CSL
       end
       alias name_label? names_label?
 
+      # @return [String] the term name for the label's variable
       def term
-        Label.terms[variable]
+        Label.terms[variable.to_s]
       end
     end
 

data/lib/csl/style/number.rb

@@ -1,6 +1,8 @@
 module CSL
   class Style
 
+		# Numbers are CSL rendering elements which output the number variable
+		# selected with the required variable attribute.
     class Number < Node
       attr_struct :variable, :form, :'text-case',
         *Schema.attr(:affixes, :display, :font)

data/lib/csl/style/text.rb

@@ -33,10 +33,6 @@ module CSL
 				attribute?(:term)
 			end
 
-			def term_options
-				attributes_for :term, :plural, :form
-			end
-
 			def has_value?
 				attribute?(:value)
 			end

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL  
-  VERSION = '1.0.0.pre15'.freeze
+  VERSION = '1.0.0.pre16'.freeze
 end

data/spec/csl/locale/style_options_spec.rb

@@ -11,7 +11,7 @@ module CSL
     
     describe '#to_xml' do
       it 'returns <style-options punctuation-in-quote="false"/> by default' do
-        subject.to_xml.should =~ /<style-options [^\/>]+\/>/
+        subject.to_xml.should =~ /<style-options\/>/
       end
     end
     

data/spec/csl/locale/term_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'spec_helper'
 
 module CSL
@@ -53,18 +54,54 @@ module CSL
               <single>page</single>
               <multiple>pages</multiple>
             </term>
+            <term name="section">
+              <single>section</single>
+              <multiple>sections</multiple>
+            </term>
+            <term name="section" form="short">sec.</term>
+            <term name="section" form="symbol">
+              <single>§</single>
+              <multiple>§§</multiple>
+            </term>
+            <term name="editor">
+              <single>editor</single>
+              <multiple>editors</multiple>
+            </term>
+            <term name="editor" form="short">
+              <single>ed.</single>
+              <multiple>eds.</multiple>
+            </term>
+            <term name="editor" form="verb">edited by</term>
+            <term name="editor" form="verb-short">ed.</term>
   	      </terms>
   	      EOS
   		  end
-  		  
+
   		  it 'returns nil if there is no matching term' do
   		    en.lookup(:foo).should be_nil
   		  end
 
-  		  it 'returns the first matching form by default' do
-  		    en.lookup(:page).should be_short
+  		  it 'returns the long form by default' do
+  		    en.lookup(:page).should be_long
   		  end
-  		  
+
+  		  it 'returns the term in the passed-in form if available' do
+  		    en.lookup(:section, :form => 'long').should be_long
+  		    en.lookup(:section, :form => 'short').should be_short
+  		    en.lookup(:section, :form => 'symbol').should be_symbol
+
+  		    en.lookup(:editor).should be_long
+  		    en.lookup(:editor, :form => 'long').should be_long
+  		    en.lookup(:editor, :form => 'verb').should be_verb
+  		    en.lookup(:editor, :form => 'verb-short').should be_verb_short
+  		  end
+
+  		  it 'returns the right fallback form if the passed-in form is not available' do
+  		    en.lookup(:page, :form => 'verb').should be_long
+  		    en.lookup(:page, :form => 'verb-short').should be_long
+  		    en.lookup(:page, :form => 'symbol').should be_short
+        end
+
   		  it 'ignores irrelevant options' do
   		    en.lookup(:page, :plural => true).should_not be_nil
   		  end
@@ -78,9 +115,10 @@ module CSL
     it { should_not be_nil }
 
     it { should_not be_gendered }
-
     it { should be_neutral }
 
+    it { should be_long }
+
     it { should_not be_ordinal }
     it { should_not be_short_ordinal }
     it { should_not be_long_ordinal }
@@ -149,7 +187,7 @@ module CSL
 
       describe 'attributes#to_a' do
         it 'returns an array of all attribute values of underlying struct' do
-          f.attributes.to_a.should == ['edition', nil, 'feminine', nil, nil]
+          f.attributes.to_a.should == ['edition', 'long', 'feminine', nil, nil]
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre15
+  version: 1.0.0.pre16
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -182,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3229480668265481885
+      hash: -3642197188366485862
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: