citeproc-ruby 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 921caaacab669f170d0b1043a7b0aa9d33a611bc
-  data.tar.gz: 0775a1787a30941529cc07fb21a9dc0244f094ba
+  metadata.gz: 0d5201ef4533faad4c1d0b174be62ef093a2ac74
+  data.tar.gz: a789cdc717e7f13b366fa5d7bdda6fe14663fcd6
 SHA512:
-  metadata.gz: 608a8459ad04db43c67430c8959a4847209303f5563690a71ef71088135a3c7615f4f6b180a1aad9710b39d28d18d49fbe3826279b1a77adde18d26fcf455acc
-  data.tar.gz: 55700a7d962669f7c1e02c38c42ae9e050b1b686b2425a41e6a2861aa4010e14746c4652cd21912644b69c5e616539984906261bc0bc4bbd434491a8e7f6939c
+  metadata.gz: cd67a84a38bb7cfb7d5d61135ba2b6dfd202ae90fd2946ff96c549addb776e46634cee0e153dc64594cc79e42e5c11da46f247893023d06c7b785c45878ca0f6
+  data.tar.gz: bfb356e63b75055399d902ae1da8dcf230681387a7d6754c47d3b37b9de4be0f6da79eb5c33b9a44ab3c344c6b62cb1b27dddcd8eaac89baf8092370790ae939

data/Gemfile

@@ -8,9 +8,6 @@ group :development, :test do
   gem 'rake', '~>10.0'
   gem 'rspec', '~>3.0', '<3.2.0'
   gem 'cucumber', '~>2.3'
-  gem 'simplecov', '~>0.8'
-  gem 'rubinius-coverage', :platforms => :rbx
-  gem 'coveralls', :require => false
 end
 
 group :debug do
@@ -27,7 +24,11 @@ group :debug do
 end
 
 group :optional do
-	gem 'edtf'
+  if RUBY_VERSION >= '2.2.2'
+    gem 'edtf', '~>3.0'
+  else
+    gem 'edtf', '~>2.0'
+  end
 	gem 'chronic'
 end
 
@@ -41,8 +42,14 @@ group :extra do
 	gem 'redcarpet', '~>3.0', :platforms => :mri
 end
 
-platform :rbx do
-  gem 'rubysl'
-  gem 'racc'
-  gem 'json'
+group :coverage do
+  gem 'simplecov', '~>0.8'
+  gem 'rubinius-coverage', :platforms => :rbx
+  gem 'coveralls', :require => false
+end
+
+group :rbx do
+  gem 'rubysl', :platforms => :rbx
+  gem 'racc', :platforms => :rbx
+  gem 'json', '~>1.8', :platforms => :rbx
 end

data/Rakefile

@@ -39,9 +39,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 citeproc-ruby.gemspec"

data/features/names.feature

@@ -88,6 +88,7 @@ Feature: CSL Name Rendering
       | UNKNOWN                 |
       | Doe, John, and Jane Doe |
 
+
   Scenario: Suppression after substitutions
     Given the following style node:
       """
@@ -101,6 +102,9 @@ Feature: CSL Name Rendering
         </names>
         <names variable="editor">
           <label prefix=" (" suffix=")"/>
+          <substitute>
+            <text variable="title"/>
+          </substitute>
         </names>
         <text variable="title" text-case="uppercase"/>
       </group>
@@ -108,10 +112,12 @@ Feature: CSL Name Rendering
     When I render the following citation items as "html":
       | editor                  | author                  | title     |
       | John Doe                | Jane Doe                | The Title |
+      |                         | Jane Doe                | The Title |
       | John Doe                |                         | The Title |
       |                         |                         | The Title |
     Then the results should be:
       | Doe, Jane, John Doe (editor), THE TITLE           |
+      | Doe, Jane, The Title                              |
       | Doe, John, THE TITLE                              |
       | The Title                                         |
 

data/lib/citeproc/ruby/renderer.rb

@@ -19,14 +19,6 @@ module CiteProc
         end
       end
 
-      def locale
-        @locale ||= CSL::Locale.load
-      end
-
-      def locale=(new_locale)
-        @locale = CSL::Locale.load new_locale
-      end
-
       def abbreviate(*arguments)
         return unless engine
         engine.abbreviate(*arguments)

data/lib/citeproc/ruby/renderer/label.rb

@@ -13,7 +13,7 @@ module CiteProc
 
         case
         when node.page?
-          value, name = item.read_attribute(:page) || item.data[:page].to_s, :page
+          value, name = item.read_attribute(:page) || item.data.unobservable_read_attribute(:page).to_s, :page
 
           format_page_range!(value, node.page_range_format)
 
@@ -23,7 +23,7 @@ module CiteProc
           # in item.data; there should be no locator there
           # either but the read access will be noticed by
           # observers (if any).
-          value, name = item.locator || item.data.locator, item.label || 'page'
+          value, name = item.locator || item.data.unobservable_read_attribute(:locator), item.label || 'page'
 
         when node.names_label?
 
@@ -31,13 +31,13 @@ module CiteProc
           # by fetching editors since we can assume
           # that both are present and identical!
           if variable == :editortranslator
-            value, name = item.data[:editor], variable.to_s
+            value, name = item.data.unobservable_read_attribute(:editor), variable.to_s
           else
-            value, name = item.data[variable], variable.to_s
+            value, name = item.data.unobservable_read_attribute(variable), variable.to_s
           end
 
         else
-          value, name = item.data[variable], node.term
+          value, name = item.data.unobservable_read_attribute(variable), node.term
         end
 
         return '' if value.nil? || value.respond_to?(:empty?) && value.empty?

data/lib/citeproc/ruby/renderer/names.rb

@@ -13,12 +13,9 @@ module CiteProc
           [role.to_sym, item.data[role]]
         end
 
-        names.reject! { |n| n[1].nil? || n[1].empty? }
+        suppressed = names.reject! { |n| item.suppressed? n[0] }
 
-        # Filter out suppressed names only now, because
-        # we are not interested in suppressed variables
-        # which are empty anyway!
-        suppressed = names.reject! { |n| item.suppressed? n }
+        names.reject! { |n| n[1].nil? || n[1].empty? }
 
         if names.empty?
           # We also return when the list is empty because

data/lib/citeproc/ruby/version.rb

@@ -1,5 +1,5 @@
 module CiteProc
   module Ruby
-    VERSION = '1.1.2'
+    VERSION = '1.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: citeproc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-23 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citeproc
@@ -138,7 +138,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 Citation Style Language (CSL) cite processor
@@ -175,4 +175,3 @@ test_files:
 - spec/fixtures/styles/apa-with-different-translations.csl
 - spec/fixtures/styles/apa.csl
 - spec/spec_helper.rb
-has_rdoc: yard