csl 1.0.0.pre2 → 1.0.0.pre3

data/.travis.yml

@@ -17,6 +17,5 @@ notifications:
     on_failure: always
 matrix:
   allow_failures:
-    rvm:
-      - rbx-18mode
-      - rbx-19mode
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode

data/features/locales/ordinalize.feature

@@ -860,52 +860,14 @@ Feature: Converting numbers to ordinals using CSL locales
 #      | 1001:e  |
 
   @v1.0.1 @locale @ordinals @i18n @gender @lang:pl
-  Scenario: Gendered Swedish CSL 1.0.1 locales
+  Scenario: Gendered Polish 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">
+      <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0.1" xml:lang="pl">
         <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>
       """
@@ -932,39 +894,26 @@ Feature: Converting numbers to ordinals using CSL locales
       | 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    |
-#      | 1001:e  |
-
+    # 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    |

data/lib/csl.rb

@@ -4,6 +4,7 @@ require 'forwardable'
 require 'open-uri'
 require 'singleton'
 require 'set'
+require 'time'
 
 require 'csl/version'
 

data/lib/csl/info.rb

@@ -6,9 +6,54 @@ module CSL
       :link, :author, :contributor, :category, :published, :summary,
       :updated, :rights, :'link-dependent-style'
     
-    alias contributors contributor
+    alias_child :contributors, :contributor
+    alias_child :authors, :contributor
+    alias_child :links, :link
     
+    def initialize(attributes = {})
+      super(attributes, &nil)
+      children[:link] = []
+
+      yield self if block_given?
+    end
+    
+    # @!attribute self_link
+    # @return [String,nil] the style's URI
+
+    # @!attribute template_link
+    # @return [String,nil] URI of the style from which the current style is derived
+    
+    # @!attribute documentation_link
+    # @return [String,nil] URI of style documentation
+    [:self, :template, :documentation].each do |type|
+      method_id = "#{type}_link"
+      
+      define_method method_id do
+        link = links.detect { |l| l.match? :rel => type.to_s }
+        link.nil? ? nil : link[:href]
+      end
+      
+      alias_method "has_#{method_id}?", method_id
+      
+      define_method "#{method_id}=" do |value|
+        link = links.detect { |l| l.match? :rel => type.to_s }
+        
+        if link.nil?
+          set_child_link :href => value.to_s, :rel => type.to_s
+        else
+          link[:href] = value.to_s
+          link
+        end
+      end
+    end
+    
+    def id
+      children[:id]
+    end
     
+    alias id= set_child_id
+
+
     class Contributor < Node
       attr_children :name, :email, :uri
     end

data/lib/csl/locale.rb

@@ -4,6 +4,7 @@ module CSL
   # translations, and a number ordinalizer.
   #
   class Locale < Node
+    types << CSL::Info
     
     include Comparable
     
@@ -30,7 +31,6 @@ module CSL
     
     
     class << self
-      
       include Loader
       
       attr_accessor :default
@@ -43,8 +43,7 @@ module CSL
           node.is_a?(self)
         
         node
-      end
-      
+      end      
     end
     
     attr_defaults :version => Schema.version, :xmlns => Schema.namespace
@@ -54,9 +53,9 @@ module CSL
     
     attr_accessor :language, :region
     
-    alias metadata info
-    alias dates    date
-    alias options  style_options
+    alias_child :metadata, :info
+    alias_child :dates, :date
+    alias_child :options, :style_options
 
     private :attributes
     undef_method :[]=
@@ -93,7 +92,7 @@ module CSL
         raise ArgumentError, "wrong number of arguments (#{arguments.length} for 0..2)"
       end
         
-      super(attributes)
+      super(attributes, &nil)
       
       set(locale) unless locale.nil?
       
@@ -360,7 +359,7 @@ module CSL
     
     # @return [String] a string representation of the Locale
     def inspect
-      "#<#{self.class.name} #{to_s}: dates=[#{dates.length}] terms=[#{terms.length}]>"
+      "#<#{self.class.name} #{to_s}>"
     end
     
     private

data/lib/csl/locale/term.rb

@@ -19,13 +19,15 @@ module CSL
       alias each each_child
       
       def lookup(query)
-        terms = if Regexp === query
-          registry.keys.select { |t| t =~ query }.flatten(1)
+        query = { :name => query } unless query.is_a?(Hash)
+        
+        terms = if query[:name].is_a?(Regexp)
+          registry.select { |name, _| name =~ query[:name] }.flatten(1)
         else
-          registry[(Hash === query) ? query[:name] : query.to_s]
+          registry[query[:name].to_s]
         end
 
-        terms.detect { |t| t.matches?(query) }
+        terms.detect { |t| t.exact_match?(query) }
       end
       
       alias [] lookup
@@ -82,33 +84,7 @@ module CSL
         children.multiple.to_s
       end      
 
-      alias plural pluralize
-
-      # Tests whether or not the Term matches the passed-in query. Tests
-      # vary slightly depending on the the query's type: if a String or
-      # Regexp is passed-in, the return value will be true if the Term's
-      # name matches the query (disregarding all other attributes); if the
-      # query is a Hash, however, the return value will only be true if
-      # all passed-in attributes
-      #
-      # @param query [Hash,Regexp,#to_s] the query
-      # @raise [ArgumentError] if the term cannot be matched using query
-      #
-      # @return [Boolean] whether or not the query matches the term
-      def match?(query)
-        case
-        when query.is_a?(Hash)
-          query.symbolize_keys.values_at(*attributes.keys) == attributes.values_at(*attributes.keys)
-        when query.is_a?(Regexp)
-          query =~ name
-        when query.respond_to?(:to_s)
-          query.to_s == name
-        else
-          raise ArgumentError, "cannot match term to query: #{query.inspect}"
-        end
-      end
-      alias matches? match?
-      
+      alias plural pluralize      
       
       # @!method masculine?
       # @return [Boolean] whether or not the term is masculine

data/lib/csl/node.rb

@@ -29,19 +29,25 @@ module CSL
       end
       
       def constantize(name)
-        klass = types.detect { |t| t.matches?(name) }
+        pattern = /#{name.to_s.tr('-', '')}$/i
+        klass = types.detect { |t| t.matches?(pattern) }
         
-        if klass || !superclass.respond_to?(:constantize)
+        case
+        when !klass.nil?
           klass
+        when nesting[-2].respond_to?(:constantize)
+          nesting[-2].constantize(name)
         else
-          superclass.constantize(name)
+          nil
         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
+      # @return [Boolean] whether or not the node's name matches the
+      #   passed-in name pattern
+      def match?(name_pattern)
+        name_pattern === name
       end
+      alias matches? match?
       
       # Returns a new node with the passed in name and attributes.
       def create(name, attributes = {}, &block)
@@ -199,7 +205,77 @@ module CSL
       
       self
     end
-    
+
+    # Tests whether or not the Name matches the passed-in node name and
+    # attribute conditions; if a Hash is passed as a single argument,
+    # it is taken as the conditions parameter (the name parameter is
+    # automatically matches in this case).
+    #
+    # Whether or not the arguments match the node is determined as
+    # follows:
+    #
+    # 1. The name must match {#nodename}
+    # 2. All attribute name/value pairs passed as conditions must match
+    #    the corresponding attributes of the node
+    #
+    # Note that only attributes present in the passed-in conditions
+    # influence the match – if you want to match only nodes that contain
+    # no other attributes than specified by the conditions, {#exact_match?}
+    # should be used instead.
+    #
+    # @see #exact_match?
+    #
+    # @param name [String,Regexp] must match the nodename
+    # @param conditions [Hash] the conditions
+    #
+    # @return [Boolean] whether or not the query matches the node
+    def match?(name = nodename, conditions = {})
+      name, conditions = match_conditions_for(name, conditions)
+      
+      return false unless name === nodename
+      return true  if conditions.empty?
+
+      conditions.values.zip(
+        attributes.values_at(*conditions.keys)).all? do |condition, value|
+          condition === value
+        end
+    end
+    alias matches? match?
+
+    # Tests whether or not the Name matches the passed-in node name and
+    # attribute conditions exactly; if a Hash is passed as a single argument,
+    # it is taken as the conditions parameter (the name parameter is
+    # automatically matches in this case).
+    #
+    # Whether or not the arguments match the node is determined as
+    # follows:
+    #
+    # 1. The name must match {#nodename}
+    # 2. All attribute name/value pairs of the node must match the
+    #    corresponding pairs in the passed-in Hash
+    #
+    # Note that all node attributes are used by this method – if you want
+    # to match only a subset of attributes {#match?} should be used instead.
+    #
+    # @see #match?
+    #
+    # @param name [String,Regexp] must match the nodename
+    # @param conditions [Hash] the conditions
+    #
+    # @return [Boolean] whether or not the query matches the node exactly
+    def exact_match?(name = nodename, conditions = {})
+      name, conditions = match_conditions_for(name, conditions)
+      
+      return false unless name === nodename
+      return true  if conditions.empty?
+      
+      conditions.values_at(*attributes.keys).zip(
+        attributes.values_at(*attributes.keys)).all? do |condition, value|
+          condition === value
+        end
+    end
+    alias matches_exactly? exact_match?
+
     def <=>(other)
       [nodename, attributes, children] <=> [other.nodename, other.attributes, other.children]
     rescue
@@ -225,7 +301,7 @@ module CSL
     end
     
     def inspect
-      "#<#{[self.class.name, *attribute_assignments].join(' ')} children=[#{children.length}]>"
+      "#<#{[self.class.name, *attribute_assignments].join(' ')} children=[#{children.count}]>"
     end
     
     alias to_s pretty_print
@@ -239,6 +315,17 @@ module CSL
       }.compact
     end
     
+    def match_conditions_for(name, conditions)
+      case name
+      when Hash
+        conditions, name = name, nodename
+      when Symbol
+        name = name.to_s
+      end
+
+      [name, conditions.symbolize_keys]
+    end
+
   end
   
   

data/lib/csl/schema.rb

@@ -101,9 +101,14 @@ module CSL
     }
     
     begin
-      require 'nokogiri'
-      @validator = @validators[:nokogiri]
-      @schema = Nokogiri::XML::RelaxNG(File.open(@file))
+      # TODO enable java validator when nokogiri issue is fixed
+      if RUBY_PLATFORM =~ /java/i
+        @validator = @validators[:default]
+      else
+        require 'nokogiri'
+        @validator = @validators[:nokogiri]
+        @schema = Nokogiri::XML::RelaxNG(File.open(@file, 'r:UTF-8'))
+      end
     rescue LoadError
       @validator = @validators[:default]
     end
@@ -130,7 +135,7 @@ module CSL
       #
       #   CSL::Schema.validate('my-styles/style.csl')
       #   CSL::Schema.validate('my-styles/*.csl')
-      #   CSL::Schema.validate('http://www.example.org/style.csl')
+      #   CSL::Schema.validate('http://www.zotero.org/styles/vancouver')
       #
       # @param style [Node,String,IO,Array] the style (or a list of styles)
       #   to validate.

data/lib/csl/style.rb

@@ -1,6 +1,7 @@
 module CSL
   
   class Style < Node
+    types << CSL::Info << CSL::Locale
     
     @default = :apa
 
@@ -21,7 +22,7 @@ module CSL
           node.is_a?(self)
         
         node
-      end
+      end      
     end
     
     attr_defaults :version => Schema.version, :xmlns => Schema.namespace
@@ -33,15 +34,17 @@ module CSL
     attr_children :'style-options', :info, :locale, :macro,
       :citation, :bibliography
     
-    alias metadata info
     alias options  style_options
     alias locales  locale
     
-    def initialize(attributes = {})
-      super(attributes)
+    def_delegators :info, :self_link, :self_link=, :has_self_link?,
+      :template_link, :template_link=, :has_template_link?,
+      :documentation_link, :documentation_link=, :has_documentation_link?,
+			:title=, :id=
       
-      children[:locale] = []
-      children[:macro]  = []
+    def initialize(attributes = {})
+      super(attributes, &nil)      
+      children[:locale], children[:macro] = [], []
       
       yield self if block_given?
     end
@@ -54,11 +57,35 @@ module CSL
       validate.empty?
     end
     
+    def info
+      children[:info] ||= Info.new
+    end
+    
+    alias_child :metadata, :info
+    
+    # @return [String] the style's id
+		def id
+			return nil unless info.has_id?
+			info.id.to_s
+		end
+    
+    # @return [String] the style's title
+		def title
+			return nil unless info.has_title?
+			info.title.to_s
+		end
+		
+		# @return [Time] timestamp for the time set in info.updated
+		def updated_at
+			return nil unless info.has_updated?
+			Time.parse(info.updated)
+		end
+
     private
     
     def preamble
       Schema.preamble.dup
     end 
   end
-    
+ 
 end

data/lib/csl/treelike.rb

@@ -12,7 +12,7 @@ module CSL
       base.extend(ClassMethods)
     end
     
-    # @eturn [String] the node's name.
+    # @return [String] the node's name.
     def nodename
       @nodename ||= self.class.name.split(/::/)[-1].gsub(/([[:lower:]])([[:upper:]])/, '\1-\2').downcase
     end
@@ -63,6 +63,7 @@ module CSL
       nodes.each do |node|
         add_child node
       end
+      self
     end
     
     def add_child(node)
@@ -86,28 +87,40 @@ module CSL
     end
     
     # Returns the first immediate child node whose nodename matches the
-    # passed-in name or pattern; returns nil there is no match.
-    def find_child_by_name(name)
+    # passed-in name/pattern and attribute conditions.
+    #
+    # @param name [String,Regexp] the node name to match
+    # @param conditions [Hash] the attributes to match
+    #
+    # @return [Node,nil] the first matching child node
+    def find_child(name, conditions = {})
       children.detect do |child|
-        name === child.nodename
+        child.match?(name, conditions)
       end
     end
-    alias > find_child_by_name
+    alias > find_child
     
     # Returns all immediate child nodes whose nodename matches the passed-in
-    # name or pattern; returns an empty array if there is no match.
-    def find_children_by_name(name)
+    # name/pattern and attribute conditions; returns an empty array if there
+    # is no match.
+    #
+    # @param name [String,Regexp] the node name to match
+    # @param conditions [Hash] the attributes to match
+    #
+    # @return [Array<Node>] all matching child nodes
+    def find_children(name, conditions = {})
       children.select do |child|
-        name === child.nodename
+        child.match?(name, conditions)
       end
     end
-    alias >> find_children_by_name
+    alias >> find_children
 
-    # Returns true if the node has child nodes; false otherwise.
+    # @return [Boolean] true if this node has child nodes; false otherwise.
     def has_children?
       !empty?
     end
 
+    # @return [Boolean] true if this node has no child nodes; false otherwise.
 		def empty?
 			children.empty?
 		end
@@ -143,6 +156,7 @@ module CSL
       @siblings = each_sibling.to_a
     end
     
+    # Traverses the node's sub-tree in depth-first order.
     def each_descendant
       if block_given?
         each_child do |child|
@@ -156,8 +170,8 @@ module CSL
       end
     end
     
-    # Returns all descendants of the node. See #descendants1 for a memoized
-    # version.
+    # Returns all descendants of the node. See {#descendants!}
+    # for a memoized version.
     def descendants
       @descendants = each_descendant.to_a
     end
@@ -177,22 +191,22 @@ module CSL
       end
     end
     
-    # Returns this node's ancestors as an array.
+    # @returns this node's ancestors as an array
     def ancestors
       @ancestors = each_ancestor.to_a
     end
     
-    # Returns the node's current depth in the tree.
+    # @return [Fixnum] the node's current depth in the tree
     def depth
       @depth = ancestors.length
     end
     
-    # Returns the root node.
+    # @return [Node] the root node
     def root
       @root = root? ? self : parent.root!
     end
     
-    # Returns true if the node is a root node, or false.
+    # @returns [Boolean] whether or not the node is the tree's root node
     def root?
       parent.nil?
     end
@@ -249,13 +263,12 @@ module CSL
       end
       
 			def constantize_nodename(name)
+			  return constantize(name) if respond_to?(:constantize)
+			  
         klass = name.to_s.capitalize.gsub(/(\w)-(\w)/) { [$1, $2.upcase].join }
-				
-				case
-				when respond_to?(:constantize)
-					constantize(klass)
-				when const_defined?(klass)
-					const_get(klass)
+        
+				if const_defined?(klass)
+				  const_get(klass)	
 				else
 					nil
 				end
@@ -264,6 +277,11 @@ module CSL
 			
       private
       
+      def attr_child_names_for(name)
+        reader = name.to_s.downcase.tr('-', '_')
+        [name.to_sym, reader, "set_child_#{reader}", "has_#{reader}?"]
+      end
+      
       # Creates a Struct for the passed-in child node names that will be
       # used internally by the Node to manage its children. The Struct
       # will be automatically initialized and is used similarly to the
@@ -273,19 +291,23 @@ module CSL
       # a node defining it's children that way can only contain nodes of the
       # given types.
       #
-      # This method also generates accessors for each child.
+      # This method also generates accessors for each child. The writer
+      # method will try to coerce the passed-in value into the correct
+      # node type automatically.
       def attr_children(*names)
         
         names.each do |name|
-          name   = name.to_sym
-          reader = name.to_s.downcase.tr('-', '_')
-          writer = "set_child_#{reader}"
-          
+          name, reader, writer, predicate = attr_child_names_for(name)
 
           define_method(reader) do
             children[name]
           end unless method_defined?(reader)
 
+          define_method(predicate) do
+            c = children[name]
+            !(c.nil? || c.is_a?(Array) && c.empty?)
+          end unless method_defined?(predicate)
+
           unless method_defined?(writer)
             define_method(writer) do |value|
               begin
@@ -304,10 +326,10 @@ module CSL
               end unless value.respond_to?(:nodename)
 
               children << value
+              value
             end
             
-            alias_method :"#{reader}=", writer
-            
+            alias_method :"#{reader}=", writer unless method_defined?(:"#{reader}=")
           end
         end
         
@@ -327,11 +349,15 @@ module CSL
           # @return [<Symbol>] a list of symbols representing the names/keys
           #   of the attribute variables.
           def keys
-            self.class.keys
+            __class__.keys
           end
           
           alias original_each each
           
+          def count
+            values.reject { |c| c.nil? || c.empty? }.length
+          end
+
           # Iterates through all children. Nil values are skipped and Arrays
           # expanded.
           def each
@@ -417,7 +443,13 @@ module CSL
         })
       end
       
-      # Turns the Node into a leaf-node.
+      def alias_child(new_name, old_name)
+        attr_child_names_for(new_name).zip(attr_child_names_for(old_name)).each do |nn, on|
+          alias_method nn, on if method_defined?(on)
+        end
+      end
+
+      # Turns the node into a leaf-node.
       def has_no_children   
         undef_method :add_child
         undef_method :added_child
@@ -434,6 +466,10 @@ module CSL
           false
         end
 
+        define_method(:empty?) do
+          true
+        end
+
       end
             
     end

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL  
-  VERSION = '1.0.0.pre2'.freeze
+  VERSION = '1.0.0.pre3'.freeze
 end

data/spec/csl/info_spec.rb

@@ -7,6 +7,8 @@ module CSL
     it { should_not be_nil }
     it { should_not have_children }
     
+    let(:info) { Info.new }
+    
     describe '#nodename' do
       it 'returns "info"' do
         subject.nodename.should == 'info'
@@ -18,10 +20,6 @@ module CSL
         Info.new.children.should be_a(Info::Children)
       end
       
-      it 'allows to set the id by writer method' do
-        lambda { Info.new.children.id = 'foo' }.should_not raise_error
-      end
-
       it 'allows to set the id by array accessor' do
         lambda { Info.new.children[:id] = 'foo' }.should_not raise_error
       end
@@ -29,8 +27,37 @@ module CSL
 
     describe '#category' do
       it 'returns nil by default' do
-        Info.new.category.should be nil
+        Info.new.category.should be_nil
+      end
+    end
+
+    describe 'link accessors' do
+      it { should_not have_self_link }
+      it { should_not have_documentation_link }
+      it { should_not have_template_link }
+      
+      it 'self_link is nil by default' do
+        Info.new.self_link.should be_nil
+      end
+
+      it 'returns nil if no suitable link is set' do
+        Info.new {|i| i.link = {:href => 'foo', :rel => 'documentation'} }.self_link.should be_nil
+      end
+      
+      it 'returns the href value of the link if it is set' do
+        Info.new {|i| i.link = {:href => 'foo', :rel => 'self'} }.self_link.should == 'foo'
+      end
+      
+      it 'setter changes the value of existing link' do
+        info = Info.new {|i| i.link = {:href => 'foo', :rel => 'self'} }
+        expect { info.self_link = 'bar' }.to change { info.self_link }.from('foo').to('bar')
+      end
+
+      it 'setter creates new link node if link did not exist' do
+        expect { info.self_link = 'bar' }.to change { info.has_self_link? }
+        info.links[0].should be_a(Info::Link)
       end
+      
     end
     
     describe '#to_xml' do
@@ -43,7 +70,7 @@ module CSL
       end
 
       it 'prints the category if present' do
-        Info.new { |i| i.category = 'author' }.to_xml.should == '<info><category>author</category></info>'
+        Info.new { |i| i.category = {:'citation-format' => 'author'} }.to_xml.should == '<info><category citation-format="author"/></info>'
       end
     end
     

data/spec/csl/locale/term_spec.rb

@@ -57,15 +57,15 @@ module CSL
       
       describe '#match?' do
         it 'matches the name when passed a string' do
-          m.matches?('month-05').should be_true
+          m.should be_match(:name => 'month-05')
         end
 
         it 'matches the name when passed a pattern' do
-          m.matches?(/month-\d\d/).should be_true
+          m.should be_match(:name => /month-\d\d/)
         end
         
-        it 'does not match when passed a matching hash without gender' do
-          f.matches?(:name => 'edition').should_not be_true
+        it 'matches when passed a matching hash without gender' do
+          f.should be_match(:name => 'edition')
         end
 
         it 'does not match when passed a matching hash with wrong gender' do
@@ -76,6 +76,12 @@ module CSL
           f.matches?(:name => 'edition', :gender => 'feminine').should be_true
         end
       end
+
+      describe '#exact_match?' do
+        it 'does not match when passed a matching hash without gender' do
+          f.should_not be_exact_match(:name => 'edition')
+        end
+      end
       
       describe 'attributes#to_a' do
         it 'returns an array of all attribute values of underlying struct' do

data/spec/csl/schema_spec.rb

@@ -97,7 +97,8 @@ module CSL
         Schema.validate(Style.load(:apa)).should == []
       end
       
-    end
+    # TODO fix nokogiri/jing validation
+    end unless RUBY_PLATFORM =~ /java/i
     
   end
 end

data/spec/csl/style_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 module CSL
   describe Style do
+    let(:style) { Style.new }
   
     it 'has a 1.x version by default' do
       Style.new[:version].should match(/1\.\d+(\.\d+)?/) 
@@ -16,6 +17,40 @@ module CSL
         Style.parse(Style.load(:apa).to_xml).should be_a(Style)
       end
     end
-  
+
+    describe '#children' do
+    
+      it { should_not have_info }
+      it { should_not have_locale }
+      it { should_not have_macro }
+      it { should_not have_citation }
+      it { should_not have_bibliography }
+      
+      describe 'when it has a title' do
+        before(:all) { style.title = 'foo' }
+        
+        it { style.should have_info }
+        
+        it 'info.title is a text node' do
+          style.info.title.should be_a(TextNode)
+        end
+        
+        it '#title returns the title as a string' do
+          style.title.should be_a(String)
+        end
+      end
+    end
+    
+    describe '#id accessor' do
+      
+      it 'returns nil by default' do
+        Style.new.id.should be_nil
+      end
+      
+      it 'writer sets the id to the passed-in string' do
+        expect { style.id = 'foobar' }.to change { style.id }.from(nil).to('foobar')
+      end
+    end
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre2
+  version: 1.0.0.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70209999248220 !ruby/object:Gem::Requirement
+  requirement: &70232058166620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70209999248220
+  version_requirements: *70232058166620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70209999246540 !ruby/object:Gem::Requirement
+  requirement: &70232058165200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70209999246540
+  version_requirements: *70232058165200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70209999245240 !ruby/object:Gem::Requirement
+  requirement: &70232058177680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70209999245240
+  version_requirements: *70232058177680
 description: ! "\n\t\tA Ruby parser and library for the Citation Style Language (CSL),
   an open\n\t\tXML-based language to describe the formatting of citations and\n\t\tbibliographies.\n\t\t"
 email: