csl 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f920dbb7c10c61a8b61e466240c5f16869363df0
-  data.tar.gz: b6f70a565ce53bc5b707ebe554718e3982dbe1cc
+  metadata.gz: b4f4e2dd15fcca560abf0a5d5527097bf02d95ba
+  data.tar.gz: f8aa36164f892d1b45c86dc23d4f360d0c3c03c0
 SHA512:
-  metadata.gz: 1a1e39250f3363a65f49a1b10fac9b7d1d564a267296bbc8433de4e0d9bc21b2b8909513954fe4ce55514f971b189600f4519298850ab4e5cc9cf17c0f1aa86d
-  data.tar.gz: 5dc8b7ce0f7bc79178c4f123e5b4bb375ad07a4bee53e2ab3bbb379a9f830d4077fa6132bb9747bd73d05ea175172df7e8e94984d05d7640ae5b057fd42d521e
+  metadata.gz: aad6d6d7102be615407a550b3cfbb7aeca23a5c3aff00b2d896b512f66325ee9fcb5fd61482976b63b91adc07eb03317648d609812f15df9fa244b17f4492200
+  data.tar.gz: 691ec4b1b95f4d01e8cfa41f7ec60e49986eac63436313d6cea1122e0c46bb9f839fefc147d06aab21c4e83e7f1ce5da0e1c48b222a9205c51f9796869afbd9e

data/.gitignore

@@ -6,6 +6,7 @@ Gemfile.lock
 /.yardoc
 /.rbx
 *.rbc
+*.swp
 *.gem
 .ruby-version
 .rvm

data/lib/csl/locale/term.rb

@@ -357,7 +357,11 @@ module CSL
 
       def tags
         if textnode?
-          ["<#{[nodename, *attribute_assignments].join(' ')}>", text, "</#{nodename}>"]
+          [
+            "<#{[nodename, *attribute_assignments].join(' ')}>",
+            CSL.encode_xml_text(text),
+            "</#{nodename}>"
+          ]
         else
           super
         end
@@ -417,4 +421,4 @@ module CSL
 
     TextNode.types << Term
   end
-end
+end

data/lib/csl/node.rb

@@ -293,6 +293,15 @@ module CSL
       attributes.fetch(name, false)
     end
 
+    # @param [[String]] names list of attribute names
+    # @return [Boolean] true if the node contains attributes for all
+    #   passed-in names; false otherwise.
+    def attributes?(*names)
+      names.flatten(1).all? do |name|
+        attribute?(name)
+      end
+    end
+
     # Returns true if the node contains any attributes (ignores nil values);
     # false otherwise.
     def has_attributes?
@@ -541,4 +550,4 @@ module CSL
 
   end
 
-end
+end

data/lib/csl/schema.rb

@@ -110,7 +110,12 @@ module CSL
     
     @validators = {
       :nokogiri => lambda { |schema, style|
-        schema.validate(Nokogiri::XML(style)).map { |e| [e.line, e.message] }
+        begin
+          schema.validate(Nokogiri::XML(style, nil, nil, Nokogiri::XML::ParseOptions::PEDANTIC)).
+            map { |e| [e.line, e.message] }
+        rescue
+          [[0, $!.message]]
+        end
       },
       
       :default => lambda { |schema, style|
@@ -217,4 +222,4 @@ module CSL
     end
     
   end  
-end
+end

data/lib/csl/style/names.rb

@@ -35,6 +35,10 @@ module CSL
 
       attr_struct :form, *Schema.attr(:name, :affixes, :font, :delimiter)
 
+      attr_defaults :form => 'long', :delimiter => ', ',
+        :'delimiter-precedes-last' => 'contextual', :initialize => true,
+        :'sort-separator' => ', '
+
       attr_children :'name-part'
 
       alias parts name_part
@@ -46,6 +50,163 @@ module CSL
         yield self if block_given?
       end
 
+
+      def initialize?
+        attributes[:initialize].to_s !~ /^false$/i
+      end
+
+      def et_al
+        parent && parent.et_al
+      end
+
+      # @param names [#to_i, Enumerable] the list of names (or its length)
+      # @return [Boolean] whether or not the should be truncate
+      def truncate?(names, subsequent = false)
+        names = names.length if names.respond_to?(:length)
+        limit = truncate_when(subsequent)
+
+        !limit.zero? && names.to_i >= limit
+      end
+
+      # @param [Enumerable] names
+      # @return [Array] the truncated list of names
+      def truncate(names, subsequent = false)
+        limit = truncate_at(subsequent)
+
+        return names if limit.zero?
+        names.take limit
+      end
+
+      def truncate_when(subsequent = false)
+        if subsequent && attribute?(:'et-al-subsequent-min')
+          attribute[:'et-al-subsequent-min'].to_i
+        else
+          attribute[:'et-al-min'].to_i
+        end
+      end
+
+      def truncate_at(subsequent = false)
+        if subsequent && attribute?(:'et-al-subsequent-use-first')
+          attribute[:'et-al-subsequent-use-first'].to_i
+        else
+          attribute[:'et-al-use-first'].to_i
+        end
+      end
+
+      # @return [String] the delimiter between family and given names
+      #   in sort order
+      def sort_separator
+        attributes[:'sort-separator'].to_s
+      end
+
+      # @return [String] the delimiter between names
+      def delimiter
+        attributes[:delimiter].to_s
+      end
+
+      def name_as_sort_order?
+        attribute?(:'name-as-sort-order')
+      end
+
+      def name_as_sort_order
+        attributes[:'name-as-sort-order'].to_s
+      end
+
+      alias sort_order name_as_sort_order
+
+      def first_name_as_sort_order?
+        attributes[:'name-as-sort-order'].to_s =~ /^first$/i
+      end
+
+      def all_names_as_sort_order?
+        attributes[:'name-as-sort-order'].to_s =~ /^all$/i
+      end
+
+      
+      # @param names [#to_i, Enumerable] the list of names (or its length)
+      # @return [Boolean] whether or not the delimiter will be inserted between
+      #   the penultimate and the last name
+      def delimiter_precedes_last?(names)
+        names = names.length if names.respond_to?(:length)
+
+        case
+        when !attribute?(:and)
+          true
+        when delimiter_never_precedes_last?
+          false
+        when delimiter_always_precedes_last?
+          true
+        when delimiter_precedeces_last_after_inverted_name?
+          if name_as_sort_order?
+            all_names_as_sort_order? || names.to_i == 2
+          else
+            false
+          end
+
+        else
+          names.to_i > 2
+        end
+      end
+
+      # @return [Boolean] whether or not the should always be inserted between
+      #   the penultimate and the last name
+      def delimiter_always_precedes_last?
+        !!(attributes[:'delimiter-precedes-last'].to_s =~ /^always$/i)
+      end
+
+      # Set the :'delimiter-precedes-last' attribute to 'always'.
+      # @return [self] self
+      def delimiter_always_precedes_last!
+        attributes[:'delimiter-precedes-last'] = 'always'
+        self
+      end
+
+      alias delimiter_precedes_last! delimiter_always_precedes_last!
+
+
+      # @return [Boolean] whether or not the should never be inserted between
+      #   the penultimate and the last name
+      def delimiter_never_precedes_last?
+        !!(attributes[:'delimiter-precedes-last'].to_s =~ /^never$/i)
+      end
+
+      # Set the :'delimiter-precedes-last' attribute to 'never'
+      # @return [self] self
+      def delimiter_never_precedes_last!
+        attributes[:'delimiter-precedes-last'] = 'never'
+        self
+      end
+
+      # @return [Boolean] whether or not the should be inserted between the
+      #   penultimate and the last name depending on the number of names
+      def delimiter_contextually_precedes_last?
+        !!(attributes[:'delimiter-precedes-last'].to_s =~ /^contextual/i)
+      end
+
+      # Set the :'delimiter-precedes-last' attribute to 'contextual'
+      # @return [self] self
+      def delimiter_contextually_precedes_last!
+        attributes[:'delimiter-precedes-last'] = 'contextual'
+        self
+      end
+
+      def delimiter_precedes_last_after_inverted_name?
+        !!(attributes[:'delimiter-precedes-last'].to_s =~ /^after-inverted-name/i)
+      end
+
+      def delimiter_precedes_last_after_inverted_name!
+        attributes[:'delimiter-precedes-last'] = 'after-inverted-name'
+        self
+      end
+
+      def ellipsis?
+        attributes[:'et-al-use-last'].to_s =~ /^true$/
+      end
+
+      def connector
+        c = attributes[:and]
+        c == 'symbol' ? '&' : c
+      end
     end
 
     class NamePart < Node
@@ -56,6 +217,8 @@ module CSL
     class EtAl < Node
       has_no_children
       attr_struct :term, *Schema.attr(:affixes, :font)
+
+      attr_defaults :term => 'et-al'
     end
 
     class Substitute < Node

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL  
-  VERSION = '1.0.1'.freeze
-end
+  VERSION = '1.0.2'.freeze
+end

data/spec/csl/schema_spec.rb

@@ -96,9 +96,16 @@ module CSL
       it 'accepts and validates a style instance' do
         Schema.validate(Style.load(:apa)).should == []
       end
+
+      it 'does not accept invalid xml markup' do
+        Schema.validate(%Q{
+         <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0">
+         </stle>
+        })[0][0].should == 0 # error on line 0 -> parse error
+      end
       
     # TODO fix nokogiri/jing validation
     end unless RUBY_PLATFORM =~ /java/i
     
   end
-end
+end

data/spec/csl/style/names_spec.rb

@@ -2,22 +2,35 @@ require 'spec_helper'
 
 module CSL
   describe Style::Names do
-    
+
   end
 
   describe Style::Name do
-  
+
+    it { should be_delimiter_contextually_precedes_last }
+
+    [:never, :always, :contextually].each do |setting|
+      setter = "delimiter_#{setting}_precedes_last!"
+      predicate = "delimiter_#{setting}_precedes_last?"
+
+      describe "##{setter}" do
+        it 'sets the delimiter precedes last option accordingly' do
+          subject.send(setter).send(predicate).should == true
+        end
+      end
+    end
+
   end
 
   describe Style::NamePart do
-  
+
   end
 
   describe Style::EtAl do
-  
+
   end
 
   describe Style::Substitute do
-  
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-27 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae