csl 1.4.5 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0713aebef8b4b19124d4c66d1e676fcad67f00f6
-  data.tar.gz: cdf39965329842bca3883f1990f5e274af212576
+SHA256:
+  metadata.gz: fb03f0268591576f09ecfcdae39744460bc1b9d35b9b63f186e1c5dee8e131d8
+  data.tar.gz: b633824d0f2bc138f74a8747a1785edf2194a6eb2013daa3bac57469474de1c4
 SHA512:
-  metadata.gz: dec7d5d77b9b9e480cf8bb7adcc626054a8702cfb4733a1fb084dd00f09e5acaf141b71da301f21021bf5c0667afc6479f101a39b7a7bd3c8dcff7f9f138f7e9
-  data.tar.gz: e59701c6f0016b4610429df1a4c17edc201dad11efd416c92134e6f22a23abd55d62a58cd5fd25b9987644f93012b331229562dbf0e0968532f206d7577b6e25
+  metadata.gz: 41a71ce9c56b13f24c1713c237e90a555113c5a06ec0800e71c53750aa3c9048c1582b1aa3f09ce86d9b964dd84bdca94a9439f84cbc51f35654b1abc6b5a5e1
+  data.tar.gz: 4fbe146239c6afc00e3f52768a09758549e0c6c92ed386a9a4c7b97dc1e784564773bca261f4bf848e202ccce31406604db8560fc3573c2b6746e4817c84637a

data/.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_WITHOUT: debug:extra
+    strategy:
+      matrix:
+        ruby-version:
+          - 3.0
+          - 2.7
+          - 2.6
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - run: bundle exec rake

data/BSDL

@@ -1,7 +1,7 @@
 CSL-Ruby. A Ruby CSL parser and library.
 
 Copyright 2012 President and Fellows of Harvard College.
-Copyright 2009-2014 Sylvester Keil. All rights reserved.
+Copyright 2009-2020 Sylvester Keil. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

data/Gemfile

@@ -2,50 +2,29 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'rake', '~>10.0'
-  gem 'rspec', '~>3.0'
-  gem 'cucumber', '~>1.2'
+  gem 'rake'
+  gem 'rspec'
+  gem 'cucumber'
 end
 
 group :debug do
-  if RUBY_VERSION >= '2.0'
-    gem 'byebug', :require => false, :platforms => :mri
-  else
-    gem 'debugger', :require => false, :platforms => :mri
-  end
-
-  gem 'ruby-debug', :require => false, :platforms => :jruby
-
-  gem 'rubinius-debugger', :require => false, :platforms => :rbx
-  gem 'rubinius-compiler', :require => false, :platforms => :rbx
+  gem 'byebug', require: false, platforms: :mri
+  gem 'ruby-debug', require: false, platforms: :jruby
 end
 
 group :optional do
-  gem 'nokogiri', '~> 1.6'
+  gem 'nokogiri'
 end
 
 group :extra do
-  gem 'guard', '~>2.2'
-  gem 'guard-rspec'
-  gem 'guard-cucumber'
-  gem 'bond'
   gem 'diff-lcs'
   gem 'pry'
-  gem 'rb-fsevent', '~>0.9', :platforms => :ruby
-  gem 'yard', '~>0.8', :platforms => :mri
-  gem 'redcarpet', '~>3.0', :platforms => :mri
+  gem 'yard', platforms: :mri
+  gem 'redcarpet', platforms: :mri
 end
 
 group :coverage do
-  gem 'coveralls', :require => false
-  gem 'simplecov', '~>0.8', :require => false
-  gem 'rubinius-coverage', :platform => :rbx
-end
-
-group :rbx do
-  gem 'rubysl', '~>2.0', :platforms => :rbx
-  gem 'racc', :platforms => :rbx
-  gem 'json', '~>1.8', :platforms => :rbx
+  gem 'simplecov', require: false
 end
 
 # vim: syntax=ruby

data/README.md

@@ -4,10 +4,6 @@ CSL-Ruby provides a Ruby parser and a comprehensive API for the
 [Citation Style Language](http://citationstyles.org) (CSL), an XML-based
 format to describe the formatting of citations, notes and bibliographies.
 
-[![Build Status](https://secure.travis-ci.org/inukshuk/csl-ruby.png)](http://travis-ci.org/inukshuk/csl-ruby)
-[![Coverage Status](https://coveralls.io/repos/inukshuk/csl-ruby/badge.png?branch=master)](https://coveralls.io/r/inukshuk/csl-ruby?branch=master)
-[![Dependency Status](https://gemnasium.com/inukshuk/csl-ruby.png)](https://gemnasium.com/inukshuk/csl-ruby)
-
 Styles and Locales
 ------------------
 You can load CSL styles and locales by passing a respective XML string, file
@@ -139,7 +135,7 @@ this project as part of [Google Summer of Code](https://developers.google.com/op
 
 Copyright
 ---------
-Copyright 2009-2015 Sylvester Keil. All rights reserved.
+Copyright 2009-2020 Sylvester Keil. All rights reserved.
 
 Copyright 2012 President and Fellows of Harvard College.
 

data/Rakefile

@@ -34,14 +34,6 @@ Cucumber::Rake::Task.new(:cucumber) do |t|
   t.profile = 'default'
 end
 
-begin
-  require 'coveralls/rake/task'
-  Coveralls::RakeTask.new
-  task :test_with_coveralls => [:spec, :cucumber, 'coveralls:push']
-rescue LoadError => e
-  # ignore
-end
-
 task :release do |t|
   system "gem build csl.gemspec"
   system "git tag #{CSL::VERSION}"

data/csl.gemspec

@@ -8,7 +8,9 @@ EXCLUDES = %w{
   .coveralls.yml
   .travis.yml
   .csl.gemspec
-}
+  .simplecov
+  .rspec
+} | `git ls-files -- {spec,features}/*`.split("\n")
 
 Gem::Specification.new do |s|
   s.name        = 'csl'
@@ -17,27 +19,22 @@ Gem::Specification.new do |s|
   s.authors     = ['Sylvester Keil']
   s.email       = ['http://sylvester.keil.or.at']
   s.homepage    = 'https://github.com/inukshuk/csl-ruby'
+  s.licenses     = ['AGPL-3.0','BSD-2-Clause']
+  s.date        = Time.now.strftime('%Y-%m-%d')
   s.summary     = 'A Ruby CSL parser and library'
-  s.description =
-    """
+  s.description = <<~EOS
 		A Ruby parser and full API for the Citation Style Language (CSL),
 		an open XML-based language to describe the formatting of citations
 		and bibliographies.
-		"""
-
-  s.license     = 'AGPL-3.0'
-  s.date        = Time.now.strftime('%Y-%m-%d')
+	EOS
 
-  s.required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency('namae', ['~>0.7'])
+  s.required_ruby_version = '>= 2.2'
+  s.add_runtime_dependency('namae', ['~>1.0'])
+  s.add_runtime_dependency('rexml')
 
   s.files        = `git ls-files`.split("\n") - EXCLUDES
-  s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables  = []
   s.require_path = 'lib'
-
-  s.has_rdoc      = 'yard'
 end
 
 # vim: syntax=ruby

data/cucumber.yml

@@ -1 +1 @@
-default: --format progress --require features --color
+default: --format progress --require features --color --publish-quiet

data/lib/csl/locale.rb

@@ -330,9 +330,9 @@ module CSL
     #
     # Calls block once for each term defined by the locale. If no block is
     # given, an enumerator is returned instead.
-    def each_term
+    def each_term(&block)
       if block_given?
-        terms.each(&Proc.new)
+        terms.each(&block)
         self
       else
         enum_for :each_term
@@ -345,12 +345,12 @@ module CSL
     #
     # Calls block once for each date format defined by the locale. If no
     # block is given, an enumerator is returned instead.
-    def each_date
+    def each_date(&block)
       if block_given?
         if date.is_a? CSL::Node
           yield date
         else
-          date.each(&Proc.new)
+          date.each(&block)
         end
       else
         enum_for :each_date

data/lib/csl/locale/term.rb

@@ -441,7 +441,7 @@ module CSL
         when options.key?(:number) || options.key?('number')
           key = options[:number] || options['number']
 
-          if key.is_a?(Fixnum) || key.to_s =~ /^[+-]?\d+$/
+          if key.is_a?(Integer) || key.to_s =~ /^[+-]?\d+$/
             key.to_i > 1
           else
             !key.blank? && key.to_s =~ /^plural/i

data/lib/csl/node.rb

@@ -268,9 +268,9 @@ module CSL
     alias has_defaults? has_default_attributes?
 
     # Iterates through the Node's attributes
-    def each
+    def each(&block)
       if block_given?
-        attributes.each_pair(&Proc.new)
+        attributes.each_pair(&block)
         self
       else
         to_enum

data/lib/csl/treelike.rb

@@ -17,9 +17,9 @@ module CSL
       @nodename ||= self.class.name.split(/::/)[-1].gsub(/([[:lower:]])([[:upper:]])/, '\1-\2').downcase
     end
 
-    def each_child
+    def each_child(&block)
       if block_given?
-        children.each(&Proc.new)
+        children.each(&block)
         self
       else
         enum_for :each_child
@@ -167,11 +167,11 @@ module CSL
     end
 
     # Traverses the node's sub-tree in depth-first order.
-    def each_descendant
+    def each_descendant(&block)
       if block_given?
         each_child do |child|
           yield child
-          child.each_descendant(&Proc.new)
+          child.each_descendant(&block)
         end
 
         self
@@ -230,7 +230,11 @@ module CSL
     %w{ ancestors descendants siblings root depth }.each do |name|
       ivar = "@#{name}"
       define_method("#{name}!") do
-        instance_variable_get(ivar) || send(name)
+        if instance_variable_defined?(ivar)
+          instance_variable_get(ivar) 
+        else 
+          send(name)
+        end
       end
     end
 
@@ -376,9 +380,9 @@ module CSL
 
           # Iterates through all children. Nil values are skipped and Arrays
           # expanded.
-          def each
+          def each(&block)
             if block_given?
-              order.each(&Proc.new)
+              order.each(&block)
               self
             else
               to_enum

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL
-  VERSION = '1.4.5'.freeze
+  VERSION = '1.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.6.0
 platform: ruby
 authors:
 - Sylvester Keil
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -16,16 +16,32 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-description: "\n\t\tA Ruby parser and full API for the Citation Style Language (CSL),\n\t\tan
-  open XML-based language to describe the formatting of citations\n\t\tand bibliographies.\n\t\t"
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |
+  A Ruby parser and full API for the Citation Style Language (CSL),
+  an open XML-based language to describe the formatting of citations
+  and bibliographies.
 email:
 - http://sylvester.keil.or.at
 executables: []
@@ -33,29 +49,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".rspec"
-- ".simplecov"
 - ".yardopts"
 - AGPL
 - BSDL
 - Gemfile
-- Guardfile
 - README.md
 - Rakefile
 - csl.gemspec
 - cucumber.yml
-- features/locales/loading.feature
-- features/locales/ordinalize.feature
-- features/parser/choose.feature
-- features/parser/info.feature
-- features/parser/localized_dates.feature
-- features/parser/terms.feature
-- features/step_definitions/locale_steps.rb
-- features/step_definitions/parser_steps.rb
-- features/step_definitions/style_steps.rb
-- features/style/loading.feature
-- features/support/env.rb
 - lib/csl.rb
 - lib/csl/compatibility.rb
 - lib/csl/date_part.rb
@@ -87,33 +90,6 @@ files:
 - lib/csl/style/text.rb
 - lib/csl/treelike.rb
 - lib/csl/version.rb
-- spec/csl/info_spec.rb
-- spec/csl/locale/date_spec.rb
-- spec/csl/locale/style_options_spec.rb
-- spec/csl/locale/term_spec.rb
-- spec/csl/locale_spec.rb
-- spec/csl/node_spec.rb
-- spec/csl/parser_spec.rb
-- spec/csl/schema_spec.rb
-- spec/csl/style/bibliography_spec.rb
-- spec/csl/style/choose_spec.rb
-- spec/csl/style/citation_spec.rb
-- spec/csl/style/date_spec.rb
-- spec/csl/style/group_spec.rb
-- spec/csl/style/label_spec.rb
-- spec/csl/style/layout_spec.rb
-- spec/csl/style/macro_spec.rb
-- spec/csl/style/names_spec.rb
-- spec/csl/style/number_spec.rb
-- spec/csl/style/sort_spec.rb
-- spec/csl/style/text_spec.rb
-- spec/csl/style_spec.rb
-- spec/csl/treelike_spec.rb
-- spec/fixtures/locales/locales-de-DE.xml
-- spec/fixtures/locales/locales-en-GB.xml
-- spec/fixtures/locales/locales-en-US.xml
-- spec/fixtures/styles/apa.csl
-- spec/spec_helper.rb
 - vendor/schema/csl-categories.rng
 - vendor/schema/csl-terms.rng
 - vendor/schema/csl-types.rng
@@ -122,8 +98,9 @@ files:
 homepage: https://github.com/inukshuk/csl-ruby
 licenses:
 - AGPL-3.0
+- BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,54 +108,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: A Ruby CSL parser and library
-test_files:
-- features/locales/loading.feature
-- features/locales/ordinalize.feature
-- features/parser/choose.feature
-- features/parser/info.feature
-- features/parser/localized_dates.feature
-- features/parser/terms.feature
-- features/step_definitions/locale_steps.rb
-- features/step_definitions/parser_steps.rb
-- features/step_definitions/style_steps.rb
-- features/style/loading.feature
-- features/support/env.rb
-- spec/csl/info_spec.rb
-- spec/csl/locale/date_spec.rb
-- spec/csl/locale/style_options_spec.rb
-- spec/csl/locale/term_spec.rb
-- spec/csl/locale_spec.rb
-- spec/csl/node_spec.rb
-- spec/csl/parser_spec.rb
-- spec/csl/schema_spec.rb
-- spec/csl/style/bibliography_spec.rb
-- spec/csl/style/choose_spec.rb
-- spec/csl/style/citation_spec.rb
-- spec/csl/style/date_spec.rb
-- spec/csl/style/group_spec.rb
-- spec/csl/style/label_spec.rb
-- spec/csl/style/layout_spec.rb
-- spec/csl/style/macro_spec.rb
-- spec/csl/style/names_spec.rb
-- spec/csl/style/number_spec.rb
-- spec/csl/style/sort_spec.rb
-- spec/csl/style/text_spec.rb
-- spec/csl/style_spec.rb
-- spec/csl/treelike_spec.rb
-- spec/fixtures/locales/locales-de-DE.xml
-- spec/fixtures/locales/locales-en-GB.xml
-- spec/fixtures/locales/locales-en-US.xml
-- spec/fixtures/styles/apa.csl
-- spec/spec_helper.rb
+test_files: []