csl 1.0.0.pre1 → 1.0.0.pre2

data/.gitignore

@@ -6,3 +6,4 @@ Gemfile.lock
 /.yardoc
 /.rbx
 *.rbc
+*.gem

data/.travis.yml

@@ -10,4 +10,13 @@ rvm:
   - 1.8.7
   - ree
 notifications:
-  email: false
+  email:
+    recipients:
+      - i@nukshuk.io
+    on_success: change
+    on_failure: always
+matrix:
+  allow_failures:
+    rvm:
+      - rbx-18mode
+      - rbx-19mode

data/Rakefile

@@ -39,7 +39,7 @@ task :release do |t|
   system "gem build csl.gemspec"
   system "git tag #{CSL::VERSION}"
   system "git push --tags"
-  system "gem push csl-#{CSL::VERSION}"  
+  system "gem push csl-#{CSL::VERSION}.gem"
 end
 
 task :default => [:spec, :cucumber]

data/features/locales/ordinalize.feature

@@ -854,6 +854,115 @@ Feature: Converting numbers to ordinals using CSL locales
       | 21:e    |
 #      | 101:e   |
 #      | 1001:e  |
+#      | 301:e   |
+      | 21:e    |
+      | 21:e    |
+#      | 1001:e  |
+
+  @v1.0.1 @locale @ordinals @i18n @gender @lang:pl
+  Scenario: Gendered Swedish CSL 1.0.1 locales
+    Given the locale:
+      """
+      <?xml version="1.0" encoding="utf-8"?>
+      <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0.1" xml:lang="sv">
+        <terms>
+          <term name="ordinal-00">:e</term>
+
+          <term name="ordinal-01">:a</term>
+          <term name="ordinal-01" gender-form="masculine">:e</term>
+          <term name="ordinal-01" gender-form="feminine">:a</term>
+
+          <term name="ordinal-02">:a</term>
+          <term name="ordinal-02" gender-form="masculine">:e</term>
+          <term name="ordinal-02" gender-form="feminine">:a</term>
+
+          <term name="ordinal-11">:e</term>
+          <term name="ordinal-11" gender-form="feminine">:e</term>
+          <term name="ordinal-12">:e</term>
+          <term name="ordinal-12" gender-form="feminine">:e</term>
+
+          <term name="ordinal-21">:e</term>
+          <term name="ordinal-21" gender-form="feminine">:e</term>
+          <term name="ordinal-22">:e</term>
+          <term name="ordinal-22" gender-form="feminine">:e</term>
+
+          <term name="ordinal-31">:e</term>
+          <term name="ordinal-32">:e</term>
+
+          <term name="ordinal-41">:e</term>
+          <term name="ordinal-42">:e</term>
+
+          <term name="ordinal-51">:e</term>
+          <term name="ordinal-52">:e</term>
+
+          <term name="ordinal-61">:e</term>
+          <term name="ordinal-62">:e</term>
+
+          <term name="ordinal-71">:e</term>
+          <term name="ordinal-72">:e</term>
+
+          <term name="ordinal-81">:e</term>
+          <term name="ordinal-82">:e</term>
+
+          <term name="ordinal-91">:e</term>
+          <term name="ordinal-92">:e</term>
+        </terms>
+      </locale>
+      """
+    When I ordinalize these numbers:
+      | num   | form  | gender    | number   |
+      | 0     |       |           |          |
+      | 1     |       |           |          |
+      | 2     |       |           |          |
+      | 3     |       |           |          |
+      | 4     |       |           |          |
+      | 5     |       |           |          |
+      | 6     |       |           |          |
+      | 7     |       |           |          |
+      | 8     |       |           |          |
+      | 9     |       |           |          |
+      | 10    |       |           |          |
+      | 1     |       | feminine  |          |
+      | 1     |       | masculine |          |
+      | 2     |       | feminine  |          |
+      | 2     |       | masculine |          |
+      | 23    |       |           |          |
+      | 999   |       |           |          |
+      | 11    |       |           |          |
+      | 11    |       | feminine  |          |
+      | 11    |       | masculine |          |
+      | 21    |       |           |          |
+#      | 101   |       |           |          |
+#      | 1001  |       | feminine  |          |
+#      | 301   |       |           |          |
+      | 21    |       | masculine | singular |
+      | 21    |       | masculine | plural   |
+#      | 1001  |       | masculine |          |
+    Then the ordinals should be:
+      | ordinal |
+      | 0:e     |
+      | 1:a     |
+      | 2:a     |
+      | 3:e     |
+      | 4:e     |
+      | 5:e     |
+      | 6:e     |
+      | 7:e     |
+      | 8:e     |
+      | 9:e     |
+      | 10:e    |
+      | 1:a     |
+      | 1:e     |
+      | 2:a     |
+      | 2:e     |
+      | 23:e    |
+      | 999:e   |
+      | 11:e    |
+      | 11:e    |
+      | 11:e    |
+      | 21:e    |
+#      | 101:e   |
+#      | 1001:e  |
 #      | 301:e   |
       | 21:e    |
       | 21:e    |

data/features/style/loading.feature

@@ -8,33 +8,33 @@ Feature: Loading CSL Style
       <?xml version="1.0" encoding="utf-8"?>
       <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
         <info>
-      	<title>American Psychological Association 6th Edition</title>
-      	<id>http://www.zotero.org/styles/apa</id>
-      	<link href="http://www.zotero.org/styles/apa" rel="self"/>
-      	<link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
-      	<author>
-      	  <name>Simon Kornblith</name>
-      	  <email>simon@simonster.com</email>
-      	</author>
-      	<contributor>
-      	  <name>Bruce D'Arcus</name>
-      	</contributor>
-      	<contributor>
-      	  <name>Curtis M. Humphrey</name>
-      	</contributor>
-      	<contributor>
-      	  <name>Richard Karnesky</name>
-      	  <email>karnesky+zotero@gmail.com</email>
-      	  <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-      	</contributor>
-      	<contributor>
-      	  <name>Sebastian Karcher</name>
-      	</contributor>
-      	<category field="psychology"/>
-      	<category field="generic-base"/>
-      	<category citation-format="author-date"/>
-      	<updated>2010-01-27T20:08:03+00:00</updated>
-      	<rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+        	<title>American Psychological Association 6th Edition</title>
+        	<id>http://www.zotero.org/styles/apa</id>
+        	<link href="http://www.zotero.org/styles/apa" rel="self"/>
+        	<link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
+        	<author>
+        	  <name>Simon Kornblith</name>
+        	  <email>simon@simonster.com</email>
+        	</author>
+        	<contributor>
+        	  <name>Bruce D'Arcus</name>
+        	</contributor>
+        	<contributor>
+        	  <name>Curtis M. Humphrey</name>
+        	</contributor>
+        	<contributor>
+        	  <name>Richard Karnesky</name>
+        	  <email>karnesky+zotero@gmail.com</email>
+        	  <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
+        	</contributor>
+        	<contributor>
+        	  <name>Sebastian Karcher</name>
+        	</contributor>
+        	<category field="psychology"/>
+        	<category field="generic-base"/>
+        	<category citation-format="author-date"/>
+        	<updated>2010-01-27T20:08:03+00:00</updated>
+        	<rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
         </info>
         <locale xml:lang="en">
       	<terms>

data/lib/csl.rb

@@ -29,7 +29,7 @@ require 'csl/locale/style_options'
 require 'csl/style'
 require 'csl/style/bibliography'
 require 'csl/style/citation'
-require 'csl/style/conditional'
+require 'csl/style/choose'
 require 'csl/style/date'
 require 'csl/style/group'
 require 'csl/style/label'
@@ -51,4 +51,12 @@ module CSL
     Parser.instance.parse!(*arguments)
   end
   
+  def validate(node)
+    Schema.validate(node)
+  end
+
+  def valid?(node)
+    Schema.valid?(node)
+  end
+
 end

data/lib/csl/compatibility.rb

@@ -17,3 +17,7 @@ class Module
     end
   end
 end
+
+class Struct
+  alias_method :__class__, :class
+end unless Struct.instance_methods.include?(:__class__)

data/lib/csl/errors.rb

@@ -9,7 +9,10 @@ module CSL
     end    
   end
   
-	class ParseError < Error; end
-	class ValidationError < Error; end
+	class ParseError < Error
+	end
+
+	class ValidationError < Error
+	end
 
 end

data/lib/csl/info.rb

@@ -2,9 +2,9 @@ module CSL
   
   class Info < Node
 
-    attr_children :author, :category, :contributor, :id, :issn, :eissn,
-      :issnl, :link, :published, :rights, :summary, :title, :'title-short',
-      :updated, :'link-dependent-style'
+    attr_children :title, :'title-short', :id, :issn, :eissn, :issnl,
+      :link, :author, :contributor, :category, :published, :summary,
+      :updated, :rights, :'link-dependent-style'
     
     alias contributors contributor
     
@@ -21,7 +21,7 @@ module CSL
       attr_children :name, :email, :uri
     end
     
-    class Link < TextNode
+    class Link < Node
       attr_struct :href, :rel
     end
 
@@ -30,10 +30,37 @@ module CSL
     end
 
 
-    class Category < TextNode
+    class Category < Node
       attr_struct :field, :'citation-format'
     end    
+
+    class Id < TextNode
+    end
+    
+    class Name < TextNode
+    end
+    
+    class Email < TextNode
+    end
+
+    class Title < TextNode
+    end
+
+    class ShortTitle < TextNode
+    end
+
+    class Summary < TextNode
+    end
     
+    class Rights < TextNode
+    end
+
+    class Uri < TextNode
+    end
+
+    class Updated < TextNode
+    end
+
   end
     
   

data/lib/csl/loader.rb

@@ -25,9 +25,9 @@ module CSL
       when input.to_s =~ /^\s*</
         data = input
       else
-
+                
 				case
-				when File.exists?(input)
+				when File.exists?(input.to_s)
 					location = input
 				when File.exists?(extend_name(input))
 					location = extend_name(input)
@@ -56,7 +56,7 @@ module CSL
     # Extends the passed-in string to a style/locale name, by prefixing and
     # appending the default name prefix and extension.
     def extend_name(string)
-      if File.extname(string).empty?
+      if File.extname(string.to_s).empty?
         name = [string, extension].compact.join
       else
         name = string.to_s.dup

data/lib/csl/locale.rb

@@ -37,7 +37,7 @@ module CSL
       attr_reader :languages, :regions
 
       def parse(data)
-        node = CSL.parse!(data)
+        node = CSL.parse!(data, self)
         
         raise ParseError, "root node is not a locale: #{node.inspect}" unless
           node.is_a?(self)
@@ -48,6 +48,7 @@ module CSL
     end
     
     attr_defaults :version => Schema.version, :xmlns => Schema.namespace
+    attr_struct :xmlns, :version
 
     attr_children :'style-options', :info, :date, :terms
     
@@ -312,6 +313,14 @@ module CSL
       [number, ordinal.to_s(options)].join
     end
     
+    def validate
+      Schema.validate self
+    end
+    
+    def valid?
+      validate.empty?
+    end
+
     # Locales are sorted first by language, then by region; sort order is
     # alphabetical with the following exceptions: the default locale is
     # prioritised; in case of a language match the default region of that
@@ -357,9 +366,17 @@ module CSL
     private
     
     def attribute_assignments
-      super.push('xml:lang="%s"' % to_s)
+      if root?
+        super.push('xml:lang="%s"' % to_s)
+      else
+        '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' }

data/lib/csl/locale/date.rb

@@ -4,7 +4,7 @@ module CSL
     # A localized Date comprises a set of formatting rules for dates.
 		class Date < Node
 		  
-		  attr_struct :form, *Schema.attr(:font, :delimiter, :textcase)
+		  attr_struct :form, :'text-case', *Schema.attr(:font, :delimiter)
 		  attr_children :'date-part'
 		  
 		  alias parts  date_part
@@ -32,8 +32,8 @@ module CSL
 		class DatePart < Node
       has_no_children    
       
-      attr_struct :name, :form, :'range-delimiter',
-        *Schema.attr(:affixes, :textcase, :font, :periods)
+      attr_struct :name, :form, :'range-delimiter', :'text-case',
+        *Schema.attr(:affixes, :font, :periods)
 
       %w{ day month year }.each do |part|
         define_method("#{part}?") do

data/lib/csl/locale/term.rb

@@ -147,6 +147,9 @@ module CSL
       #
       # @option options [:singular,:plural] :number (:singular) whether to
       #   return the term's singular or plural variant.
+      # @option options [Boolean] :plural (false) whether or not to return
+      #   the term's plural variant (this option, if set, takes precedence
+      #   over :number).
       #
       # @return [String] the term as a string
       def to_s(options = nil)
@@ -169,12 +172,19 @@ module CSL
       def pluralize?(options)
         return false if options.nil?
         
-        key = options[:number] || options['number']
+        case
+        when options.key?(:plural) || options.key?('plural')
+          options[:plural] || options['plural']
+        when options.key?(:number) || options.key?('number')
+          key = options[:number] || options['number']
         
-        if key.is_a?(Fixnum) || key.to_s =~ /^[+-]?\d+$/
-          key.to_i > 1
+          if key.is_a?(Fixnum) || key.to_s =~ /^[+-]?\d+$/
+            key.to_i > 1
+          else
+            !key.blank? && key.to_s =~ /^plural/i
+          end
         else
-          !key.blank? && key.to_s =~ /^plural/i
+          false
         end
       end
         

data/lib/csl/node.rb

@@ -29,22 +29,27 @@ module CSL
       end
       
       def constantize(name)
-        types.detect do |t|
-          t.name.split(/::/)[-1].gsub(/([[:lower:]])([[:upper:]])/, '\1-\2').downcase == name
+        klass = types.detect { |t| t.matches?(name) }
+        
+        if klass || !superclass.respond_to?(:constantize)
+          klass
+        else
+          superclass.constantize(name)
         end
       end
+
+      # @return [Boolean] whether or not the node's name matches the passed-in name
+      def matches?(nodename)
+        name.split(/::/)[-1].gsub(/([[:lower:]])([[:upper:]])/, '\1-\2').downcase == nodename
+      end
       
       # Returns a new node with the passed in name and attributes.
       def create(name, attributes = {}, &block)
         klass = constantize(name)
 
-        unless klass.nil?
-          klass.new(attributes, &block)
-        else
-          node = new(attributes, &block)
-          node.nodename = name
-          node
-        end
+        node = (klass || Node).new(attributes, &block)        
+        node.nodename = name
+        node
       end
       
       def create_attributes(attributes)
@@ -72,11 +77,11 @@ module CSL
 
           # 1.8 Compatibility
           @keys = attributes.map(&:to_sym).freeze
-          
+
           class << self
             attr_reader :keys
           end
-                    
+
           def initialize(attrs = {})
             super(*attrs.symbolize_keys.values_at(*keys))
           end
@@ -84,7 +89,7 @@ module CSL
           # @return [<Symbol>] a list of symbols representing the names/keys
           #   of the attribute variables.
           def keys
-            self.class.keys
+            __class__.keys
           end
 
           def values
@@ -102,7 +107,7 @@ module CSL
           end
           
           def fetch(key, default = nil)
-            value = keys.include?(key.to_sym) && send(key)
+            value = keys.include?(key.to_sym) && send(:'[]', key)
             
             if block_given? 
               value || yield(key)
@@ -120,8 +125,8 @@ module CSL
               other.respond_to?(:each_pair)
 
             other.each_pair do |part, value|
-              writer = "#{part}="
-              send(writer, value) if !value.nil? && respond_to?(writer)
+              part = part.to_sym
+              send(:'[]=', part, value) if !value.nil? && keys.include?(part)
             end
 
             self
@@ -187,6 +192,14 @@ module CSL
     end
     alias has_text? textnode?
 
+    def save_to(path, options = {})
+      File.open(path, 'w:UTF-8') do |f|
+        f << (options[:compact] ? to_xml : pretty_print)
+      end
+      
+      self
+    end
+    
     def <=>(other)
       [nodename, attributes, children] <=> [other.nodename, other.attributes, other.children]
     rescue
@@ -200,9 +213,9 @@ module CSL
         tags = []
         tags << "<#{[nodename, *attribute_assignments].join(' ')}>"
         
-        tags << children.map do |node|
+        tags << children.map { |node|
           node.respond_to?(:tags) ? node.tags : [node.to_s]
-        end
+        }.flatten(1)
         
         tags << "</#{nodename}>"
         tags
@@ -235,8 +248,17 @@ module CSL
 
     class << self
       undef_method :attr_children
+      
+      # @override
+      def create(name, attributes = {}, &block)
+        klass = constantize(name)
+
+        node = (klass || TextNode).new(attributes, &block)
+        node.nodename = name
+        node
+      end
     end
-    
+
     attr_accessor :text
     alias to_s text
 
@@ -269,11 +291,7 @@ module CSL
     end
     
     def tags
-      tags = []
-      tags << "<#{attribute_assignments.unshift(nodename).join(' ')}>"
-      tags << text
-      tags << "</#{nodename}>"
-      tags
+      ["<#{attribute_assignments.unshift(nodename).join(' ')}>#{text}</#{nodename}>"]
     end
     
     def inspect