csl 1.0.0.pre21 → 1.0.0.pre22

data/lib/csl/locale/date.rb

@@ -2,24 +2,24 @@ module CSL
   class Locale
 
     # A localized Date comprises a set of formatting rules for dates.
-		class Date < Node
+    class Date < Node
 
-		  attr_struct :form, *Schema.attr(:formatting, :delimiter)
-		  attr_children :'date-part'
+      attr_struct :form, *Schema.attr(:formatting, :delimiter)
+      attr_children :'date-part'
 
-		  alias parts  date_part
-		  alias locale parent
+      alias parts  date_part
+      alias locale parent
 
-		  def initialize(attributes = {})
-		    super(attributes)
-		    children[:'date-part'] = []
+      def initialize(attributes = {})
+        super(attributes)
+        children[:'date-part'] = []
 
-		    yield self if block_given?
-		  end
+        yield self if block_given?
+      end
       
-			def added_to(node)
-				raise ValidationError, "parent must be locale node: was #{node.inspect}" unless node.is_a?(Locale)
-			end
+      def added_to(node)
+        raise ValidationError, "parent must be locale node: was #{node.inspect}" unless node.is_a?(Locale)
+      end
 
       def delimiter
         attributes.fetch(:delimiter, '')
@@ -46,18 +46,18 @@ module CSL
       end
       alias has_parts? has_date_parts?
       
-		end
+    end
 
-		# DatePart represent the localized formatting options for an individual
-		# date part (day, month, or year).
-		class DatePart < Node
+    # DatePart represent the localized formatting options for an individual
+    # date part (day, month, or year).
+    class DatePart < Node
       has_no_children
 
       attr_struct :name, :form, :'range-delimiter',
         *Schema.attr(:formatting, :periods)
 
       include CSL::DatePart
-		end
+    end
 
 
   end

data/lib/csl/locale/style_options.rb

@@ -1,11 +1,11 @@
 module CSL
-	class Locale
+  class Locale
 
-		class StyleOptions < Node
-			has_no_children
-			attr_defaults :'punctuation-in-quote' => false,
-			  :'limit-day-ordinals-to-day-1' => false
-		end
+    class StyleOptions < Node
+      has_no_children
+      attr_defaults :'punctuation-in-quote' => false,
+        :'limit-day-ordinals-to-day-1' => false
+    end
 
-	end
+  end
 end

data/lib/csl/locale/term.rb

@@ -213,15 +213,22 @@ module CSL
         attr_reader :form_fallbacks
 
         def specialize(options)
-          options = options.select do |k,v|
-            !v.nil? && Term::Attributes.keys.include?(k.to_sym)
+          specialized = {}
+          
+          options.each do |key, value|
+            key = key.to_sym
+
+            if !value.nil? && Term::Attributes.keys.include?(key)
+              specialized[key] = value
+            end
           end
 
-          options.delete :'gender-form' unless
-            options[:'gender-form'].to_s =~ /^masculine|feminine$/
+          specialized.delete :'gender-form' unless
+            specialized[:'gender-form'].to_s =~ /^masculine|feminine$/
 
-          options
+          specialized
         end
+
       end
 
       # This method returns whether or not the ordinal term matchs the

data/lib/csl/node.rb

@@ -28,17 +28,17 @@ module CSL
         @default_attributes ||= {}
       end
 
-			def hide_default_attributes?
-				@hide_default_attributes ||= true
-			end
+      def hide_default_attributes?
+        !@show_default_attributes
+      end
 
-			def hide_default_attributes!
-				@hide_default_attributes = true
-			end
+      def hide_default_attributes!
+        @show_default_attributes = false
+      end
 
-			def show_default_attributes!
-				@hide_default_attributes = false
-			end
+      def show_default_attributes!
+        @show_default_attributes = true
+      end
 
       def constantize(name)
         pattern = /:#{name.to_s.tr('-', '')}$/i
@@ -246,11 +246,11 @@ 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?
+    # @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
@@ -263,29 +263,29 @@ 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
+    # @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.
@@ -452,9 +452,11 @@ module CSL
     private
 
     def attribute_assignments
-			a = self.class.hide_default_attributes? ? custom_attributes : attributes
-      a.map { |name, value|
-        value.nil? ? nil : [name, value.to_s.inspect].join('=')
+      attrs = self.class.hide_default_attributes? ?
+        custom_attributes : attributes.to_hash
+
+      attrs.map { |name, value|
+        value.nil? ? nil : [name, CSL.encode_xml_attr(value.to_s)].join('=')
       }.compact
     end
 
@@ -494,7 +496,7 @@ module CSL
     attr_accessor :text
 
     def to_s
-      text.to_s.strip
+      CSL.encode_xml_text text.to_s.strip
     end
 
     # TextNodes quack like a string.
@@ -530,7 +532,7 @@ module CSL
     end
 
     def tags
-      ["<#{attribute_assignments.unshift(nodename).join(' ')}>#{text}</#{nodename}>"]
+      ["<#{attribute_assignments.unshift(nodename).join(' ')}>#{to_s}</#{nodename}>"]
     end
 
     def inspect

data/lib/csl/pretty_printer.rb

@@ -15,14 +15,14 @@ module CSL
 
     private
     
-		def tabwidth
-			2
-		end
-		
-		def preamble
-		  ''
-		end
-		
+    def tabwidth
+      2
+    end
+    
+    def preamble
+      ''
+    end
+    
     def pp(tag, level = 0)
       if tag.is_a?(Array)
         tag.map { |t| pp t, level + 1 }.join("\n")

data/lib/csl/schema.rb

@@ -2,10 +2,17 @@ module CSL
   
   class Schema
     
-    @version   = '1.0.1'.freeze
+    @version         = '1.0.1'.freeze
+    @major_version   = '1.0'.freeze
+
     @namespace = 'http://purl.org/net/xbiblio/csl'.freeze
     @preamble  = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n".freeze
     
+    @default_license = 'http://creativecommons.org/licenses/by-sa/3.0/'
+    @default_rights_string =
+      "This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: #{@default_license}"
+
+    
     @types = %w{ article article-journal article-magazine article-newspaper
       bill book broadcast chapter entry entry-dictionary entry-encyclopedia
       figure graphic interview legal_case legislation manuscript map
@@ -84,15 +91,20 @@ module CSL
         names-delimiter
       },
       :conditionals => %w{
-        disambiguate is-numeric  is-uncertain-date locator
-        position type variable
+        disambiguate position
+        is-numeric is-numeric-any is-numeric-all is-numeric-none
+        is-uncertain-date is-uncertain-date-any is-uncertain-date-all
+        is-uncertain-date-none
+        locator locator-any locator-all locator-none
+        type type-any type-all type-none
+        variable variable-any variable-all variable-none
       }
     })
     
     @attributes.each_value { |v| v.map!(&:to_sym).freeze }
 
-		@attributes[:formatting] = [:'text-case'].concat(
-			@attributes.values_at(:affixes, :font).flatten)
+    @attributes[:formatting] = [:'text-case'].concat(
+      @attributes.values_at(:affixes, :font).flatten)
 
     @attributes.freeze
 
@@ -131,8 +143,9 @@ module CSL
     
     class << self
       
-      attr_accessor :version, :namespace, :types, :variables, :categories,
-        :attributes, :preamble, :values
+      attr_accessor :version, :major_version, :namespace, :types,
+        :variables, :categories, :attributes, :preamble, :values,
+        :default_rights_string, :default_license
       
       private :new
       

data/lib/csl/style.rb

@@ -20,9 +20,10 @@ module CSL
       end
     end
 
-    attr_defaults :version => Schema.version, :xmlns => Schema.namespace
+    attr_defaults :version => Schema.major_version,
+      :xmlns => Schema.namespace
 
-		show_default_attributes!
+    show_default_attributes!
 
     attr_struct :xmlns, :version, :class, :'default-locale',
       :'initialize-with-hyphen', :'page-range-format',
@@ -39,11 +40,13 @@ module CSL
     alias has_macros? has_macro?
 
     def_delegators :info, :self_link, :self_link=, :has_self_link?,
-      :template_link, :template_link=, :has_template_link?,
+      :self_link!, :template_link, :template_link=, :has_template_link?,
       :documentation_link, :documentation_link=, :has_documentation_link?,
       :independent_parent_link, :independent_parent_link=,
       :has_independent_parent_link?, :title=, :id=, :has_title?, :has_id?,
-      :published_at, :updated_at, :citation_format, :citation_format=
+      :published_at, :updated_at, :citation_format, :citation_format=,
+      :updated_at, :update!, :license, :license=, :default_license?,
+      :default_license!
 
     def initialize(attributes = {})
       super(attributes, &nil)
@@ -81,16 +84,16 @@ module CSL
     alias_child :metadata, :info
 
     # @return [String] the style's id
-		def id
-			return unless info.has_id?
-			info.id.to_s
-		end
+    def id
+      return unless info.has_id?
+      info.id.to_s
+    end
 
     # @return [String] the style's title
-		def title
-			return unless info.has_title?
-			info.title.to_s
-		end
+    def title
+      return unless info.has_title?
+      info.title.to_s
+    end
 
     alias has_template? has_template_link?
 

data/lib/csl/style/choose.rb

@@ -15,13 +15,15 @@ module CSL
         end
         
         def conditions
-          attributes_for(*Schema.attr(:conditionals)).map { |type, values|
-            values.to_s.split(/\s+/).map { |value| [type, value] }
-          }.flatten(1)
+          attributes_for(*Schema.attr(:conditionals)).map do |name, values|
+            extract_type_and_matcher_from(name) << values.to_s.split(/\s+/)
+          end
         end
 
-        def matcher
-          case attributes[:match]
+        def matcher(match = nil)
+          match ||= attributes[:match]
+
+          case match
           when 'any'
             :any?
           when 'none'
@@ -29,7 +31,14 @@ module CSL
           else
             :all?
           end
-        end 
+        end
+        
+        private
+
+        def extract_type_and_matcher_from(attribute)
+          type, match = attribute.to_s.split(/-(any|all|none)$/, 2)
+          [type.to_sym, matcher(match)]
+        end
       end
     end
 

data/lib/csl/style/label.rb

@@ -36,7 +36,6 @@ module CSL
       end
 
       def has_variable?
-        return parent.has_variable? if names_label?
         attribute?(:variable)
       end
 
@@ -44,9 +43,8 @@ module CSL
       # is the child of a {Names} node, returns the parent's variable
       # attribute instead.
       #
-      # @return [String] the value of the node's variable attribute
+      # @return [String, nil] the value of the node's variable attribute
       def variable
-        return parent.variable if name_label?
         attributes[:variable]
       end
 

data/lib/csl/style/layout.rb

@@ -2,11 +2,11 @@ module CSL
   class Style
     
     class Layout < Node
-      attr_struct *Schema.attr(:affixes, :font, :delimiter)
+      attr_struct(*Schema.attr(:affixes, :font, :delimiter))
     
-			def delimiter
-				attributes.fetch(:delimiter, '')
-			end
+      def delimiter
+        attributes.fetch(:delimiter, '')
+      end
     end
     
   end

data/lib/csl/style/names.rb

@@ -16,12 +16,16 @@ module CSL
         yield self if block_given?
       end
 
+      def delimiter
+        attributes.fetch(:delimiter, '')
+      end
+
       def has_variable?
         attribute?(:variable)
       end
 
       def variable
-        attributes[:variable]
+        attributes[:variable].to_s
       end
 
     end