citeproc-ruby 1.0.3 → 1.0.4

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

@@ -16,12 +16,12 @@ module CiteProc
 
       describe 'given an empty node' do
         it 'returns an empty string for an empty item' do
-          renderer.render_number(item, node).should == ''
+          expect(renderer.render_number(item, node)).to eq('')
         end
 
         it 'returns an empty string for an item with variables' do
           item.data.edition = 'foo'
-          renderer.render_number(item, node).should == ''
+          expect(renderer.render_number(item, node)).to eq('')
         end
       end
 
@@ -29,14 +29,14 @@ module CiteProc
         before(:each) { node[:variable] = :edition }
 
         it 'returns an empty string for an empty item' do
-          renderer.render_number(item, node).should == ''
+          expect(renderer.render_number(item, node)).to eq('')
         end
 
         describe 'and an item with a corresponding text value' do
           before(:each) { item.data.edition = 'foo,bar' }
 
           it 'returns the text value as is' do
-            renderer.render_number(item, node).should == 'foo,bar'
+            expect(renderer.render_number(item, node)).to eq('foo,bar')
           end
         end
 
@@ -44,14 +44,14 @@ module CiteProc
           before(:each) { item.data.edition = '42' }
 
           it 'returns the number as a string' do
-            renderer.render_number(item, node).should == '42'
+            expect(renderer.render_number(item, node)).to eq('42')
           end
           
           describe 'when the node is set to roman' do
             before(:each) { node[:form] = :roman }
             
             it 'returns the number romanized' do
-              renderer.render_number(item, node).should == 'xlii'
+              expect(renderer.render_number(item, node)).to eq('xlii')
             end
           end
           
@@ -59,7 +59,7 @@ module CiteProc
             before(:each) { node[:form] = :ordinal }
             
             it 'returns the number ordinalized' do
-              renderer.render_number(item, node).should == '42nd'
+              expect(renderer.render_number(item, node)).to eq('42nd')
             end
           end
           
@@ -69,14 +69,14 @@ module CiteProc
           before(:each) { item.data.edition = '42, 43 , 44 ,45,46   , 47,  48' }
 
           it 'returns the numbers as a normalized list' do
-            renderer.render_number(item, node).should == '42, 43, 44, 45, 46, 47, 48'
+            expect(renderer.render_number(item, node)).to eq('42, 43, 44, 45, 46, 47, 48')
           end
           
           describe 'when the node is set to roman' do
             before(:each) { node[:form] = :roman }
             
             it 'returns the romanized list' do
-              renderer.render_number(item, node).should == 'xlii, xliii, xliv, xlv, xlvi, xlvii, xlviii'
+              expect(renderer.render_number(item, node)).to eq('xlii, xliii, xliv, xlv, xlvi, xlvii, xlviii')
             end
           end
           
@@ -84,7 +84,7 @@ module CiteProc
             before(:each) { node[:form] = :ordinal }
             
             it 'returns the ordinalized list' do
-              renderer.render_number(item, node).should == '42nd, 43rd, 44th, 45th, 46th, 47th, 48th'
+              expect(renderer.render_number(item, node)).to eq('42nd, 43rd, 44th, 45th, 46th, 47th, 48th')
             end
           end
         end
@@ -93,7 +93,7 @@ module CiteProc
           before(:each) { item.data.edition = '42-44, 46 -51 & 52 - 65& 66- 68' }
 
           it 'returns the numbers as a normalized list' do
-            renderer.render_number(item, node).should == '42-44, 46-51 & 52-65 & 66-68'
+            expect(renderer.render_number(item, node)).to eq('42-44, 46-51 & 52-65 & 66-68')
           end
         end
 
@@ -101,14 +101,14 @@ module CiteProc
           before(:each) { item.data.edition = 'A42 - B44, 46-51 & 52-65ff' }
 
           it 'returns the numbers as a normalized list' do
-            renderer.render_number(item, node).should == 'A42-B44, 46-51 & 52-65ff'
+            expect(renderer.render_number(item, node)).to eq('A42-B44, 46-51 & 52-65ff')
           end
           
           describe 'when the node is set to roman' do
             before(:each) { node[:form] = :roman }
             
             it 'returns the list with only the simple numbers romanized' do
-              renderer.render_number(item, node).should == 'A42-B44, xlvi-li & lii-65ff'
+              expect(renderer.render_number(item, node)).to eq('A42-B44, xlvi-li & lii-65ff')
             end
           end
         end

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

@@ -16,12 +16,12 @@ module CiteProc
         let(:node) { CSL::Style::Text.new }
 
         it 'returns an empty string for an empty item' do
-          renderer.render_text(item, node).should == ''
+          expect(renderer.render_text(item, node)).to eq('')
         end
 
         it 'returns an empty string for an item with variables' do
           item.data.title = 'foo'
-          renderer.render_text(item, node).should == ''
+          expect(renderer.render_text(item, node)).to eq('')
         end
       end
 
@@ -29,12 +29,12 @@ module CiteProc
         let(:node) { CSL::Style::Text.new(:value => 'foobar') }
 
         it 'returns the value for an empty item' do
-          renderer.render_text(item, node).should == 'foobar'
+          expect(renderer.render_text(item, node)).to eq('foobar')
         end
 
         it 'returns the value for an item with variables' do
           item.data.title = 'foo'
-          renderer.render_text(item, node).should == 'foobar'
+          expect(renderer.render_text(item, node)).to eq('foobar')
         end
       end
 
@@ -42,17 +42,17 @@ module CiteProc
         let(:node) { CSL::Style::Text.new(:variable => 'title') }
 
         it 'returns an empty strong for an empty item' do
-          renderer.render_text(item, node).should == ''
+          expect(renderer.render_text(item, node)).to eq('')
         end
 
         it 'returns an empty strong for an item with no matching variable' do
           item.data.publisher = 'the full title'
-          renderer.render_text(item, node).should == ''
+          expect(renderer.render_text(item, node)).to eq('')
         end
 
         it "returns the variable's value for an item with a matching variable" do
           item.data.title = 'the full title'
-          renderer.render_text(item, node).should == 'the full title'
+          expect(renderer.render_text(item, node)).to eq('the full title')
         end
 
         describe 'when the form attribute is set to :short' do
@@ -63,16 +63,16 @@ module CiteProc
 
           it "prefers the short version if available" do
             item.data.title_short = 'the short title'
-            renderer.render_text(item, node).should == 'the short title'
+            expect(renderer.render_text(item, node)).to eq('the short title')
           end
 
           it "falls back to the variable if unavailable" do
-            renderer.render_text(item, node).should == 'the full title'
+            expect(renderer.render_text(item, node)).to eq('the full title')
           end
 
           it "falls back to the long form if the short form variable is not present" do
             node[:variable] = 'title-short'
-            renderer.render_text(item, node).should == 'the full title'
+            expect(renderer.render_text(item, node)).to eq('the full title')
           end
         end
       end
@@ -81,19 +81,19 @@ module CiteProc
         let(:node) { CSL::Style::Text.new(:term => 'anonymous') }
 
         it "returns the term's long form by default" do
-          renderer.render_text(item, node).should == 'anonymous'
+          expect(renderer.render_text(item, node)).to eq('anonymous')
         end
 
         describe 'when the form attribute is set to :short' do
           before(:each) { node[:form] = 'short' }
 
           it "returns the term's short form by default" do
-            renderer.render_text(item, node).should == 'anon.'
+            expect(renderer.render_text(item, node)).to eq('anon.')
           end
 
           it 'falls back to the long version if there is no short version' do
             node[:term] = 'et-al'
-            renderer.render_text(item, node).should == 'et al.'
+            expect(renderer.render_text(item, node)).to eq('et al.')
           end
         end
       end
@@ -108,15 +108,15 @@ module CiteProc
         end
 
         it 'renders the macro' do
-          node.stub(:macro).and_return(macro)
-          renderer.render(item, node).should == 'foobar'
+          allow(node).to receive(:macro).and_return(macro)
+          expect(renderer.render(item, node)).to eq('foobar')
         end
 
         it 'applies formats to the result' do
-          node.stub(:macro).and_return(macro)
+          allow(node).to receive(:macro).and_return(macro)
           node[:prefix] = '('
           node[:suffix] = ')'
-          renderer.render(item, node).should == '(foobar)'
+          expect(renderer.render(item, node)).to eq('(foobar)')
         end
       end
     end

data/spec/citeproc/ruby/renderer_spec.rb

@@ -10,53 +10,53 @@ module CiteProc
 
       describe '#format_page_range' do
         it 'supports "minimal" format' do
-          renderer.format_page_range('42-45', 'minimal').should == '42–5'
-          renderer.format_page_range('321-328', 'minimal').should == '321–8'
-          renderer.format_page_range('2787-2816', 'minimal').should == '2787–816'
-          renderer.format_page_range('8-45', 'minimal').should == '8–45'
+          expect(renderer.format_page_range('42-45', 'minimal')).to eq('42–5')
+          expect(renderer.format_page_range('321-328', 'minimal')).to eq('321–8')
+          expect(renderer.format_page_range('2787-2816', 'minimal')).to eq('2787–816')
+          expect(renderer.format_page_range('8-45', 'minimal')).to eq('8–45')
 
-          renderer.format_page_range('42-5', 'minimal').should == '42–5'
-          renderer.format_page_range('321-28', 'minimal').should == '321–8'
-          renderer.format_page_range('321-8', 'minimal').should == '321–8'
-          renderer.format_page_range('2787-816', 'minimal').should == '2787–816'
+          expect(renderer.format_page_range('42-5', 'minimal')).to eq('42–5')
+          expect(renderer.format_page_range('321-28', 'minimal')).to eq('321–8')
+          expect(renderer.format_page_range('321-8', 'minimal')).to eq('321–8')
+          expect(renderer.format_page_range('2787-816', 'minimal')).to eq('2787–816')
         end
 
         it 'supports "minimal-two" format' do
-          renderer.format_page_range('42-45', 'minimal-two').should == '42–45'
-          renderer.format_page_range('321-328', 'minimal-two').should == '321–28'
-          renderer.format_page_range('2787-2816', 'minimal-two').should == '2787–816'
-          renderer.format_page_range('2-5', 'minimal-two').should == '2–5'
-          renderer.format_page_range('2-402', 'minimal-two').should == '2–402'
+          expect(renderer.format_page_range('42-45', 'minimal-two')).to eq('42–45')
+          expect(renderer.format_page_range('321-328', 'minimal-two')).to eq('321–28')
+          expect(renderer.format_page_range('2787-2816', 'minimal-two')).to eq('2787–816')
+          expect(renderer.format_page_range('2-5', 'minimal-two')).to eq('2–5')
+          expect(renderer.format_page_range('2-402', 'minimal-two')).to eq('2–402')
 
-          renderer.format_page_range('42-5', 'minimal-two').should == '42–45'
-          renderer.format_page_range('321-28', 'minimal-two').should == '321–28'
-          renderer.format_page_range('321-8', 'minimal-two').should == '321–28'
-          renderer.format_page_range('2787-816', 'minimal-two').should == '2787–816'
+          expect(renderer.format_page_range('42-5', 'minimal-two')).to eq('42–45')
+          expect(renderer.format_page_range('321-28', 'minimal-two')).to eq('321–28')
+          expect(renderer.format_page_range('321-8', 'minimal-two')).to eq('321–28')
+          expect(renderer.format_page_range('2787-816', 'minimal-two')).to eq('2787–816')
         end
 
         it 'supports "expanded" format' do
-          renderer.format_page_range('42-45', 'expanded').should == '42–45'
-          renderer.format_page_range('321-328', 'expanded').should == '321–328'
-          renderer.format_page_range('2787-2816', 'expanded').should == '2787–2816'
-          renderer.format_page_range('2-5', 'expanded').should == '2–5'
-          renderer.format_page_range('2-402', 'expanded').should == '2–402'
+          expect(renderer.format_page_range('42-45', 'expanded')).to eq('42–45')
+          expect(renderer.format_page_range('321-328', 'expanded')).to eq('321–328')
+          expect(renderer.format_page_range('2787-2816', 'expanded')).to eq('2787–2816')
+          expect(renderer.format_page_range('2-5', 'expanded')).to eq('2–5')
+          expect(renderer.format_page_range('2-402', 'expanded')).to eq('2–402')
 
-          renderer.format_page_range('42-5', 'expanded').should == '42–45'
-          renderer.format_page_range('321 - 28', 'expanded').should == '321–328'
-          renderer.format_page_range('321 -8', 'expanded').should == '321–328'
-          renderer.format_page_range('2787- 816', 'expanded').should == '2787–2816'
+          expect(renderer.format_page_range('42-5', 'expanded')).to eq('42–45')
+          expect(renderer.format_page_range('321 - 28', 'expanded')).to eq('321–328')
+          expect(renderer.format_page_range('321 -8', 'expanded')).to eq('321–328')
+          expect(renderer.format_page_range('2787- 816', 'expanded')).to eq('2787–2816')
         end
 
         it 'supports "chicago" format' do
-          renderer.format_page_range('3-10; 71-72', 'chicago').should == '3–10; 71–72'
-          renderer.format_page_range('100-104; 600-613; 1100-23', 'chicago').should == '100–104; 600–613; 1100–1123'
-          renderer.format_page_range('107-08; 505-517; 1002-006', 'chicago').should == '107–8; 505–17; 1002–6'
-          renderer.format_page_range('321-325; 415-532; 11564-11568; 13792-803', 'chicago').should == '321–25; 415–532; 11564–68; 13792–803'
-          renderer.format_page_range('1496-504; 2787-2816', 'chicago').should == '1496–1504; 2787–2816'
+          expect(renderer.format_page_range('3-10; 71-72', 'chicago')).to eq('3–10; 71–72')
+          expect(renderer.format_page_range('100-104; 600-613; 1100-23', 'chicago')).to eq('100–104; 600–613; 1100–1123')
+          expect(renderer.format_page_range('107-08; 505-517; 1002-006', 'chicago')).to eq('107–8; 505–17; 1002–6')
+          expect(renderer.format_page_range('321-325; 415-532; 11564-11568; 13792-803', 'chicago')).to eq('321–25; 415–532; 11564–68; 13792–803')
+          expect(renderer.format_page_range('1496-504; 2787-2816', 'chicago')).to eq('1496–1504; 2787–2816')
         end
 
         it 'formats multiple page ranges' do
-          renderer.format_page_range('42-45 and 57; 81-3 & 123-4', 'minimal-two').should == '42–45 and 57; 81–83 & 123–24'
+          expect(renderer.format_page_range('42-45 and 57; 81-3 & 123-4', 'minimal-two')).to eq('42–45 and 57; 81–83 & 123–24')
         end
       end
     end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: citeproc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-08-01 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: csl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 description: |
@@ -47,10 +47,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".rspec"
-- ".simplecov"
-- ".yardopts"
+- .document
+- .rspec
+- .simplecov
+- .yardopts
 - AGPL
 - BSDL
 - Gemfile
@@ -117,12 +117,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []