csl 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e9a04436494ad7b0835b2ad4047f4c0619e2ed9
-  data.tar.gz: e45ef6316ed80e5df5e384172a79ba312c12cb1b
+  metadata.gz: 0713aebef8b4b19124d4c66d1e676fcad67f00f6
+  data.tar.gz: cdf39965329842bca3883f1990f5e274af212576
 SHA512:
-  metadata.gz: f0c793a99ea9fcb56bb0a13d07a3e20fe9a754dd986f4a052a91fc5f0c0886d0b8f9f958882a9dc50f9ee2e5053005070f96476fba228951ec409487a8a1f279
-  data.tar.gz: 6aceddaa4130fd9d8031c4c295eb1c19dd44f362bad9abe5a2b5459e35d20db98933a34f0fd24eaed1dd872edf8850305beb42d4f1d80ee349a8066fb703efe5
+  metadata.gz: dec7d5d77b9b9e480cf8bb7adcc626054a8702cfb4733a1fb084dd00f09e5acaf141b71da301f21021bf5c0667afc6479f101a39b7a7bd3c8dcff7f9f138f7e9
+  data.tar.gz: e59701c6f0016b4610429df1a4c17edc201dad11efd416c92134e6f22a23abd55d62a58cd5fd25b9987644f93012b331229562dbf0e0968532f206d7577b6e25

data/Gemfile

@@ -5,9 +5,6 @@ group :development, :test do
   gem 'rake', '~>10.0'
   gem 'rspec', '~>3.0'
   gem 'cucumber', '~>1.2'
-  gem 'simplecov', '~>0.8', :require => false
-  gem 'rubinius-coverage', :platform => :rbx
-  gem 'coveralls', :require => false
 end
 
 group :debug do
@@ -39,12 +36,16 @@ group :extra do
   gem 'redcarpet', '~>3.0', :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
-  platform :rbx do
-    gem 'rubysl', '~>2.0'
-    gem 'json', '~>1.8'
-    gem 'racc'
-  end
+  gem 'rubysl', '~>2.0', :platforms => :rbx
+  gem 'racc', :platforms => :rbx
+  gem 'json', '~>1.8', :platforms => :rbx
 end
 
 # vim: syntax=ruby

data/Rakefile

@@ -34,9 +34,13 @@ Cucumber::Rake::Task.new(:cucumber) do |t|
   t.profile = 'default'
 end
 
-require 'coveralls/rake/task'
-Coveralls::RakeTask.new
-task :test_with_coveralls => [:spec, :cucumber, 'coveralls:push']
+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"

data/lib/csl/style/names.rb

@@ -88,32 +88,32 @@ module CSL
       def truncate?(names, subsequent = false)
         names = names.length if names.respond_to?(:length)
         limit = truncate_when(subsequent)
+        count = truncate_at(subsequent)
 
-        !limit.zero? && names.to_i >= limit
+        !count.nil? && !limit.nil? && names.to_i >= limit.to_i
       end
 
       # @param [Enumerable] names
       # @return [Array] the truncated list of names
       def truncate(names, subsequent = false)
-        limit = truncate_at(subsequent)
-
-        return [] if limit.zero?
-        names.take limit
+        count = truncate_at(subsequent)
+        count = names.length if count.nil?
+        names.take count.to_i
       end
 
       def truncate_when(subsequent = false)
         if subsequent && attribute?(:'et-al-subsequent-min')
-          attributes[:'et-al-subsequent-min'].to_i
+          attributes[:'et-al-subsequent-min']
         else
-          attributes[:'et-al-min'].to_i
+          attributes[:'et-al-min']
         end
       end
 
       def truncate_at(subsequent = false)
         if subsequent && attribute?(:'et-al-subsequent-use-first')
-          attributes.fetch(:'et-al-subsequent-use-first', 1).to_i
+          attributes.fetch(:'et-al-subsequent-use-first')
         else
-          attributes.fetch(:'et-al-use-first', 1).to_i
+          attributes.fetch(:'et-al-use-first')
         end
       end
 

data/lib/csl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A Ruby CSL parser and library
@@ -182,4 +182,3 @@ test_files:
 - spec/fixtures/locales/locales-en-US.xml
 - spec/fixtures/styles/apa.csl
 - spec/spec_helper.rb
-has_rdoc: yard