citeproc-ruby 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4e81b938c5b2d7ee24c8f40614cc712a2816595
-  data.tar.gz: d1b0fa4a3efa5c4f0a90083babd3ccc708dd9c73
+  metadata.gz: 61a47839dcb7a73c69ebd1e7ec7fadd7996c014d
+  data.tar.gz: 4ea72fbdc878a1bd5217680d62f0233f7db49319
 SHA512:
-  metadata.gz: 27e961fe5c47fc447ff13ede27936e4723a6ebb6cc7ba863ab1275e72c34afe54d6cc897c99d504efcc545258ded89fcd9cf4821aee7aeeecb015e14743eec05
-  data.tar.gz: 17c41ba68777d182e88e4e65664401ed53c47b31107e561fb5a7ec606ad1666e73de11bc2172aabf6f2f3c879eeaa0d3c3655262713350e78a58f3cd3c1d51fc
+  metadata.gz: 8e8009f337db47b1efbd844d149a538add3a126dae038bec8e33692fddc3e4cda75ff0f88a9d00d68012b3c91c6d472d96afcbe15980f434d57ee82682f5220a
+  data.tar.gz: c170fd2378c2d198194cde8fdfe838a6ce184ff5f048cbddcd62cbe061e73441204e913be80314a63f8a848cd425fcb29f2d8470d45f7008e729c6804d1921d4

data/Gemfile

@@ -6,7 +6,7 @@ gemspec
 
 group :development, :test do
   gem 'rake', '~>10.0'
-  gem 'rspec', '~>3.0'
+  gem 'rspec', '~>3.0', '<3.2'
   gem 'cucumber', '~>1.2'
   gem 'simplecov', '~>0.8'
   gem 'rubinius-coverage', :platforms => :rbx
@@ -14,8 +14,14 @@ group :development, :test do
 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 'debugger', :require => false, :platforms => :mri_19
+
   gem 'rubinius-debugger', :require => false, :platforms => :rbx
   gem 'rubinius-compiler', :require => false, :platforms => :rbx
 end

data/features/renderer.feature

@@ -72,3 +72,23 @@ Feature: Rendering CSL nodes
       |        |
       | pages  |
 
+  @group @substitute
+  Scenario: Substitute in Groups
+    Given the following style node:
+      """
+      <group>
+        <text value="by: "/>
+        <names variable="author">
+          <substitute>
+            <text value="Anonymous"/>
+          </substitute>
+        </names>
+      </group>
+      """
+    When I render the following citation items as "text":
+      | author   |
+      | Jane Doe |
+      |          |
+    Then the results should be:
+      | by: Jane Doe  |
+      | by: Anonymous |

data/features/support/env.rb

@@ -12,8 +12,10 @@ begin
     Debugger.start
   when defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
     require 'rubinius/debugger'
-  else
+  when RUBY_VERSION < '2.0'
     require 'debugger'
+  else
+    require 'byebug'
   end
 rescue LoadError
   # ignore

data/lib/citeproc/ruby/format.rb

@@ -229,14 +229,17 @@ module CiteProc
           # TODO add support for stop words consisting of multiple words
           #output.gsub!(/\b(\p{Lu})(\p{Lu}+)\b/) { "#{$1}#{CiteProc.downcase($2)}" }
 
-          # TODO exceptions: first, last word; followed by colon
+          # TODO exceptions: word followed by colon
+          first = true
           output.gsub!(/\b(\p{Ll})(\p{L}+)\b/) do |word|
-            if Format.stopword?(word)
+            if Format.stopword?(word) and not first
               word
             else
+              first = false
               "#{CiteProc.upcase($1)}#{$2}"
             end
           end
+          output.gsub!(/\b(\p{Ll})(\p{L}+)\b$/) { "#{CiteProc.upcase($1)}#{$2}" }
 
         end
       end

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

@@ -1,8 +1,8 @@
 module CiteProc
   module Ruby
-    
+
     class Renderer
-      
+
       private
 
       # @param item [CiteProc::CitationItem]
@@ -13,8 +13,8 @@ module CiteProc
           render item, child
         }.join('')
       end
-      
+
     end
-    
+
   end
 end

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

@@ -332,6 +332,12 @@ module CiteProc
               # of the rendering process!
               item.suppress!(*observer.accessed)
 
+              # Report a read-access using the substitution string
+              # for the name variable being substituted, or the first
+              # name variable (if there are more than one).
+              variable = node.parent.variable[/\w+/]
+              item.data.simulate_read_attribute variable, string
+
               return string # break out of each loop!
             end
 

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

@@ -25,7 +25,9 @@ module CiteProc
         end
 
         def skip?
-          !history.empty? && history.values.all?(&:nil?)
+          !history.empty? && history.values.all? { |v|
+            v.nil? || v.respond_to?(:empty?) && v.empty?
+          }
         end
 
         def accessed

data/lib/citeproc/ruby/version.rb

@@ -1,5 +1,5 @@
 module CiteProc
   module Ruby
-    VERSION = '1.0.5'
+    VERSION = '1.0.6'
   end
 end

data/spec/citeproc/ruby/formats/default_spec.rb

@@ -106,8 +106,11 @@ module CiteProc
           node[:'text-case'] = 'title'
 
           expect(format.apply('The adventures of Huckleberry Finn', node)).to eq('The Adventures of Huckleberry Finn')
-          expect(format.apply("This IS a pen that is a smith pencil", node)).to eq('This IS a Pen That Is a Smith Pencil')
-          #format.apply('of mice and men', node).should == 'Of Mice And Men'
+          expect(format.apply('This IS a pen that is a smith pencil', node)).to eq('This IS a Pen That Is a Smith Pencil')
+          expect(format.apply('of mice and men', node)).to eq('Of Mice and Men')
+          expect(format.apply('history of the word the', node)).to eq('History of the Word The')
+          expect(format.apply('faster than the speed of sound', node)).to eq('Faster than the Speed of Sound')
+          expect(format.apply('on the drug-resistance of enteric bacteria', node)).to eq('On the Drug-Resistance of Enteric Bacteria')
         end
       end
 

data/spec/citeproc/ruby/renderer/group_spec.rb

@@ -83,6 +83,32 @@ module CiteProc
           end
         end
       end
+
+      describe 'when there is a names node with substitute in the group' do
+
+        before(:each) do
+          subst = CSL::Style::Substitute.new()
+          subst << CSL::Style::Text.new( :value => 'Anonymous') 
+          names = CSL::Style::Names.new( :variable => 'author')
+          names << subst
+          node << names
+        end
+
+        describe 'when the variable is set' do
+          before(:each) { item.data.author = 'Some Author' }
+
+          it 'returns the content of the nested node' do
+            expect(renderer.render_group(item, node)).to eq('Some Author')
+          end
+        end
+
+        describe 'when the variable is not set' do
+          it 'returns the substitution of the nested node' do
+            expect(renderer.render_group(item, node)).to eq('Anonymous')
+          end
+        end
+
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -21,8 +21,10 @@ begin
     # Debugger.start
   when defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
     require 'rubinius/debugger'
-  else
+  when RUBY_VERSION < '2.0'
     require 'debugger'
+  else
+    require 'byebug'
   end
 rescue LoadError
   # ignore

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: citeproc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citeproc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: csl
   requirement: !ruby/object:Gem::Requirement