csl 1.0.0.pre21 → 1.0.0.pre22

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d4cb72ec6f5e2c4a369fe2fb0a5a36df75da5df9
+  data.tar.gz: 4910056174f713025c28fd9a8136468fd785651a
+SHA512:
+  metadata.gz: 74f0b979d50b5348d4f6a2b1e33c373e53abee501f840e9926f949ad2f4fb77c9a9bb07dbd302caffdfa2dc3b729cf06ddf1fb67ca4f7eebfc9efa998cdc3d34
+  data.tar.gz: 6330e92fe3e39b5a4cb8b6fd365f2cfb5a95d425a8b74f046a02a83bd4580c4b9a9932e400c9e8491cc85e5a422ebcf542665a65c3b99e94b436615e2148bbde

data/.gitignore

@@ -7,3 +7,5 @@ Gemfile.lock
 /.rbx
 *.rbc
 *.gem
+.ruby-version
+.rvm

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 bundler_args: --without debug extra
 rvm:
+  - 2.0.0
   - 1.9.2
   - 1.9.3
   - jruby-18mode
@@ -12,10 +13,10 @@ rvm:
 notifications:
   email:
     recipients:
-      - i@nukshuk.io
+      - sylvester@keil.or.at
     on_success: change
     on_failure: always
 matrix:
   allow_failures:
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode
+    - rvm: jruby-19mode
+    - rvm: rbx-19mode

data/Gemfile

@@ -1,9 +1,16 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
+group :development, :test do
+  gem 'rake', '~>10.0'
+  gem 'rspec', '~>2.13'
+  gem 'cucumber', '~>1.2'
+end
+
 group :debug do
   gem 'ruby-debug', :platforms => [:mri_18, :jruby]
   gem 'debugger', :platforms => [:mri_19]
+  gem 'debugger2', :platforms => [:mri_20]
 end
 
 group :optional do
@@ -16,10 +23,10 @@ group :extra do
   gem 'guard', '~>1.2'
   gem 'guard-rspec', '~>1.1'
   gem 'guard-cucumber', '~>1.2'
-  gem 'rb-fsevent', '~>0.9.1', :platforms => [:mri_19, :rbx]
+  gem 'rb-fsevent', '~>0.9.1', :platforms => [:mri_19, :mri_20, :rbx]
 
-	gem 'yard', '~>0.8', :platforms => [:mri_19]
-	gem 'redcarpet', '~>2.1', :platforms => [:mri_19]
+  gem 'yard', '~>0.8', :platforms => [:mri_19, :mri_20]
+  gem 'redcarpet', '~>2.1', :platforms => [:mri_19, :mri_20]
 end
 
 # vim: syntax=ruby

data/Rakefile

@@ -43,3 +43,10 @@ task :release do |t|
 end
 
 task :default => [:spec, :cucumber]
+
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new
+rescue LoadError => e
+  # ignore
+end

data/csl.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.summary     = 'A Ruby CSL parser and library'
   s.description =
     """
-		A Ruby parser and library for the Citation Style Language (CSL), an open
-		XML-based language to describe the formatting of citations and
-		bibliographies.
+		A Ruby parser and library for the Citation Style Language (CSL),
+		an open XML-based language to describe the formatting of citations
+		and bibliographies.
 		"""
 
   s.license     = 'AGPL'
@@ -24,10 +24,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency('namae', ['~>0.3'])
 
-  s.add_development_dependency('cucumber', ['~>1.1'])
-  s.add_development_dependency('rspec', ['~>2.7'])
-  s.add_development_dependency('rake', ['~>0.9'])
-
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables  = []

data/features/step_definitions/parser_steps.rb

@@ -4,7 +4,9 @@ When /^I parse the CSL string(?: in the (\w+) scope)?$/ do |scope, string|
 end
 
 Then /^(?:the )?(\w+[\?!]?) should be "([^"]*)"$/ do |name, expected|
-  @csl.send(name).to_s.should == expected
+  actual = @csl.send(name)
+  actual = !!actual if expected =~ /^true|false$/
+  actual.to_s.should == expected
 end
 
 Then /^the (\w+) (\w+) should be "([^"]*)"$/ do |outer, inner, expected|

data/lib/csl/compatibility.rb

@@ -1,7 +1,7 @@
 
 class Symbol
   include Comparable
-  
+
   def <=>(other)
     return unless other.kind_of? Symbol
     to_s <=> other.to_s
@@ -20,4 +20,35 @@ end
 
 class Struct
   alias_method :__class__, :class
-end unless Struct.instance_methods.include?(:__class__)
+end unless Struct.instance_methods.include?(:__class__)
+
+module CSL
+  module_function
+
+  if RUBY_VERSION < '1.9'
+
+    XML_ENTITY_SUBSTITUTION = Hash[*%w{
+     & &amp; < &lt; > &gt; ' &apos; " &quot;
+    }].freeze
+
+    def encode_xml_text(string)
+      string.gsub(/[&<>]/) { |match|
+        XML_ENTITY_SUBSTITUTION[match]
+      }
+    end
+
+    def encode_xml_attr(string)
+      string.gsub(/[&<>'"]/) { |match|
+        XML_ENTITY_SUBSTITUTION[match]
+      }.inspect
+    end
+  else
+    def encode_xml_text(string)
+      string.encode(:xml => :text)
+    end
+
+    def encode_xml_attr(string)
+      string.encode(:xml => :attr)
+    end
+  end
+end

data/lib/csl/errors.rb

@@ -5,14 +5,14 @@ module CSL
 
     def initialize(message, original = $!)
       @original = original
-			super(message)
+      super(message)
     end    
   end
   
-	class ParseError < Error
-	end
+  class ParseError < Error
+  end
 
-	class ValidationError < Error
-	end
+  class ValidationError < Error
+  end
 
 end

data/lib/csl/extensions.rb

@@ -35,11 +35,11 @@ module CSL
       end
     end
 
-		module Nesting
-			def nesting
-				name.split(/::/).inject([]) { |ns, n| ns << (ns[-1] || Object).const_get(n) }
-			end
-		end
+    module Nesting
+      def nesting
+        name.split(/::/).inject([]) { |ns, n| ns << (ns[-1] || Object).const_get(n) }
+      end
+    end
 
     module Blank
       def blank?
@@ -55,7 +55,7 @@ class Hash
 end
 
 class Module
-	include CSL::Extensions::Nesting
+  include CSL::Extensions::Nesting
 end
 
 class Object

data/lib/csl/info.rb

@@ -37,7 +37,7 @@ module CSL
 
     attr_children :title, :'title-short', :id, :issn, :eissn, :issnl,
       :link, :author, :contributor, :translator, :category, :published,
-			:summary, :updated, :rights, :'link-dependent-style'
+      :summary, :updated, :rights, :'link-dependent-style'
 
     alias_child :contributors, :contributor
     alias_child :authors, :author
@@ -96,6 +96,11 @@ module CSL
 
     alias id= set_child_id
 
+    def self_link!
+      return unless has_id?
+      self.self_link = id
+    end
+
     # @return [Time,nil] when the info node's parent was last updated
     def updated_at
       return unless has_updated?
@@ -108,9 +113,9 @@ module CSL
       ts = timestamp.respond_to?(:xmlschema) ? timestamp.xmlschema : timestamp.to_s
 
       if has_updated?
-        updated = Updated.new { |u| u.text = ts }
-      else
         updated.text = ts
+      else
+        add_child Updated.new { |u| u.text = ts }
       end
 
       self
@@ -128,14 +133,43 @@ module CSL
       ts = timestamp.respond_to?(:xmlschema) ? timestamp.xmlschema : timestamp.to_s
 
       if has_published?
-        published = Published.new { |u| u.text = ts }
-      else
         published.text = ts
+      else
+        add_child Published.new { |u| u.text = ts }
       end
 
       self
     end
 
+    def license
+      return unless has_rights?
+      rights[:license] || rights.to_s
+    end
+
+    def license=(license)
+      if has_rights?
+        rights[:license] = license
+      else
+        add_child Rights.new(:license => license)
+      end
+    end
+
+    def default_license?
+      has_rights? && rights[:license] == Schema.default_license &&
+        rights.to_s == Schema.default_rights_string
+    end
+
+    def default_license!
+      if has_rights?
+        rights[:license] = Schema.default_license
+        rights.text = Schema.default_rights_string
+      else
+        add_child Rights.new(:license => Schema.default_license) { |r|
+          r.text = Schema.default_rights_string
+        }
+      end
+    end
+
     # @return [Symbol] the parent style's citation format
     def citation_format
       return unless has_categories?
@@ -159,21 +193,21 @@ module CSL
 
     class Contributor < Node
       attr_children :name, :email, :uri
-			def_delegators :name, *Namae::Name.members
+      def_delegators :name, *Namae::Name.members
     end
 
     class Author < Node
       attr_children :name, :email, :uri
-			def_delegators :name, *Namae::Name.members
+      def_delegators :name, *Namae::Name.members
     end
 
     class Translator < Node
       attr_children :name, :email, :uri
-			def_delegators :name, *Namae::Name.members
+      def_delegators :name, *Namae::Name.members
     end
 
     class Link < Node
-			has_language
+      has_language
       attr_struct :href, :rel
     end
 
@@ -191,17 +225,17 @@ module CSL
 
     class Name < TextNode
 
-			def_delegators :namae, *Namae::Name.members
+      def_delegators :namae, *Namae::Name.members
 
-			private
+      private
 
-			def namae
-				@namae || namae!
-			end
+      def namae
+        @namae || namae!
+      end
 
-			def namae!
-				@namae = Namae::Name.parse to_s
-			end
+      def namae!
+        @namae = Namae::Name.parse to_s
+      end
     end
 
     class Email < TextNode
@@ -211,19 +245,19 @@ module CSL
     end
 
     class Title < TextNode
-			has_language
+      has_language
     end
 
     class TitleShort < TextNode
-			has_language
+      has_language
     end
 
     class Summary < TextNode
-			has_language
+      has_language
     end
 
     class Rights < TextNode
-			has_language
+      has_language
       attr_struct :license
     end
 

data/lib/csl/loader.rb

@@ -37,26 +37,26 @@ module CSL
 
         input = input.to_s
 
-				case
-				when File.exists?(input)
-					location = input
-				when File.exists?(extend_name(input))
-					location = extend_name(input)
-				when File.exists?(extend_path(input))
-					location = extend_path(input)
-				else
-					location = input
-				end
+        case
+        when File.exists?(input)
+          location = input
+        when File.exists?(extend_name(input))
+          location = extend_name(input)
+        when File.exists?(extend_path(input))
+          location = extend_path(input)
+        else
+          location = input
+        end
 
-				Kernel.open(location, 'r:UTF-8') do |io|
+        Kernel.open(location, 'r:UTF-8') do |io|
           data = io.read
         end
       end
 
-			parse(data)
+      parse(data)
 
-		rescue => e
-			raise ParseError, "failed to load #{input.inspect}: #{e.message}"
+    rescue => e
+      raise ParseError, "failed to load #{input.inspect}: #{e.message}"
     end
 
     def list

data/lib/csl/locale.rb

@@ -72,12 +72,15 @@ module CSL
       attr_reader :tag_pattern
     end
 
-    attr_defaults :version => Schema.version, :xmlns => Schema.namespace
-    attr_struct :xmlns, :version
+    attr_defaults :version => Schema.major_version,
+      :xmlns => Schema.namespace
+
+    show_default_attributes!
 
-    attr_children :'style-options', :info, :date, :terms
+    attr_struct :xmlns, :version
+    attr_children :info, :'style-options', :date, :terms
 
-		has_language
+    has_language
 
     attr_accessor :region
 
@@ -165,7 +168,7 @@ module CSL
 
     # @return [Boolean] whether or not the Locale's version is less than CSL-Ruby's default version
     def legacy?
-      version < Schema.version
+      version < Schema.major_version
     end
 
     # @example
@@ -178,18 +181,18 @@ module CSL
     # region to the default region for the given language.
     #
     # @raise [ArgumentError] if the argument is no valid locale string.
-		# 	A valid locale string is based on the syntax of IETF language tags;
-		#   it consists of either a language or region tag (or both), separated
-		#   by a hyphen.
-		#
-		# @return [self]
+    #   A valid locale string is based on the syntax of IETF language tags;
+    #   it consists of either a language or region tag (or both), separated
+    #   by a hyphen.
+    #
+    # @return [self]
     def set(locale)
       @language, @region = Locale.normalize(locale).split(/-/).map(&:to_sym)
       self
     end
 
     # Sets the locale's language and region to nil.
-		# @return [self]
+    # @return [self]
     def clear
       @language, @region = nil
       self
@@ -238,12 +241,12 @@ module CSL
       raise ArgumentError, "unable to ordinalize #{number}; integer expected" unless
         number.respond_to?(:to_i)
 
-      number = number.to_i      
+      number = number.to_i
       ordinal = terms.ordinalize number, options
 
       return number.to_s if ordinal.nil?
       return ordinal.to_s(options) if ordinal.long_ordinal?
-      
+
       [number, ordinal.to_s(options)].join
     end
 
@@ -301,20 +304,20 @@ module CSL
       validate.empty?
     end
 
-		# @return [Locale]
-		def merge(*others)
-			deep_copy.merge!(*others)
-		end
+    # @return [Locale]
+    def merge(*others)
+      deep_copy.merge!(*others)
+    end
 
-		# @return [self]
-		def merge!(*others)
-			others.each do |other|
-			  merge_options other
-			  merge_dates other
-			end
+    # @return [self]
+    def merge!(*others)
+      others.each do |other|
+        merge_options other
+        merge_dates other
+      end
 
-			self
-		end
+      self
+    end
 
 
     # Locales are sorted first by language, then by region; sort order is
@@ -373,22 +376,22 @@ module CSL
       Schema.preamble.dup
     end
 
-		# @param other [Locale] an other locale whose options should be merged
-		# @return [self]
-		def merge_options(other)
-		  return self unless other.has_options?
+    # @param other [Locale] an other locale whose options should be merged
+    # @return [self]
+    def merge_options(other)
+      return self unless other.has_options?
 
-		  if has_options?
-		    options.attributes.merge! other.options.attributes
-		  else
-		    add_child other.options.dup
-		  end
+      if has_options?
+        options.attributes.merge! other.options.attributes
+      else
+        add_child other.options.dup
+      end
 
-		  self
-		end
+      self
+    end
 
-		# @param other [Locale] an other locale whose date nodes should be merged
-		# @return [self]
+    # @param other [Locale] an other locale whose date nodes should be merged
+    # @return [self]
     def merge_dates(other)
       return self unless other.has_dates?