citeproc 1.0.0.pre12 → 1.0.0

data/lib/citeproc/utilities.rb

@@ -1,20 +1,20 @@
 module CiteProc
-	
+
   module Utilities
 
     # call-seq:
     # process(mode = :bibliography, items, options = {})
     def process(*arguments)
     end
-    
+
     def cite(items, options = {})
       process(:citation, items, options)
     end
-    
+
     def bibliography(items, options = {})
       process(:bibliography, items, options)
     end
-		
+
   end
-  	
-end
+
+end

data/lib/citeproc/variable.rb

@@ -133,8 +133,9 @@ module CiteProc
     def_delegators :@value, :to_s,
       *::String.instance_methods(false).select {|m| m.to_s =~ /!$/ }
 
-    def_delegators :to_s, :=~, :===,
-      *::String.instance_methods(false).reject {|m| m.to_s =~ /^\W|!$|to_s/ }
+    def_delegators :to_s, :=~, :===, *String.instance_methods(false).reject { |m|
+      m.to_s =~ /^[\W_]|[!=_]$|^(to_s|inspect|replace|first|last|dup|clone|to_f|to_i)$/
+    }
 
 
     # Creates new Variable for the passed-in value
@@ -278,7 +279,7 @@ module CiteProc
 
     # @return [String] a JSON string representation of the variable
     def to_json
-      MultiJson.encode(to_citeproc)
+      ::JSON.dump(to_citeproc)
     end
 
     # @return [String] a human-readable representation of the variable
@@ -291,4 +292,4 @@ module CiteProc
   # A CiteProc Variable used for string values.
   class Text < Variable
   end
-end
+end

data/lib/citeproc/version.rb

@@ -1,3 +1,3 @@
 module CiteProc
-  VERSION = '1.0.0.pre12'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/spec/citeproc/assets_spec.rb

@@ -1,25 +1,27 @@
 module CiteProc
 
 	describe 'Assets' do
-		let(:file) { Tempfile.new('asset') }
-		let(:root) { File.dirname(file.path) }
-		let(:name) { File.basename(file.path) }
-		let(:extension) { File.extname(name) }
 
 		before(:all) do
-			file.write("asset content\n")
-			file.close
+		  @file = Tempfile.new('asset')
+			@file.write("asset content\n")
+			@file.close
+			
+			@root = File.dirname(@file.path)
+			@name = File.basename(@file.path)
+			
+			@extension = File.extname(@name)
 		end
 
-		after(:all) { file.unlink }
+		after(:all) { @file.unlink }
 
 		describe 'Style' do
 
 			before(:all) do
 				@default_root = Style.root
 				@default_extension = Style.extension
-				Style.root = root
-				Style.extension = extension
+				Style.root = @root
+				Style.extension = @extension
 			end
 
 			after(:all) do
@@ -34,20 +36,20 @@ module CiteProc
 			describe '.open' do  
 
 				it 'accepts an absolute file name' do
-					Style.open(file.path).to_s.should == "asset content\n"
+					Style.open(@file.path).to_s.should == "asset content\n"
 				end
 
 				it 'accepts a file name' do
-					Style.open(name).to_s.should == "asset content\n"
+					Style.open(@name).to_s.should == "asset content\n"
 				end
 
 				it 'accepts a file name without extension' do
-					Style.open(name.sub(/#{extension}$/,'')).to_s.should == "asset content\n"
+					Style.open(@name.sub(/#{@extension}$/,'')).to_s.should == "asset content\n"
 				end
 
 
 				it 'accepts an io object' do
-					Style.open(file.open).to_s.should == "asset content\n"
+					Style.open(@file.open).to_s.should == "asset content\n"
 				end
 
 				it 'returns the given string if it looks like XML' do
@@ -57,11 +59,11 @@ module CiteProc
 
       describe '.extend_name' do
         it 'adds the default extension if the file does not already end with it' do
-          Style.extend_name(name.sub(/#{extension}$/,'')).should == name
+          Style.extend_name(@name.sub(/#{@extension}$/,'')).should == @name
         end
         
         it 'does not add the default extension if the file already ends with it' do
-          Style.extend_name(name).should == name
+          Style.extend_name(@name).should == @name
         end
       end
       

data/spec/citeproc/bibliography_spec.rb

@@ -1,42 +1,42 @@
 require 'spec_helper'
 
 module CiteProc
-  
+
   describe Bibliography do
-    
+
     it { should be_empty }
     it { should_not have_errors }
-    
+
     describe '#to_citeproc conversion' do
-      
+
       it 'returns an array' do
         subject.to_citeproc.should be_a(Array)
       end
-      
+
       it 'returns exactly two elements' do
         subject.to_citeproc.should have(2).elements
       end
-      
+
       it 'returns formatting options as the first element' do
         subject.to_citeproc.first.should be_a(Hash)
       end
 
       describe 'the formatting options' do
         let(:options) { subject.to_citeproc[0] }
-        
+
         it 'contains a the error list' do
           options.should have_key('bibliography_errors')
           options['bibliography_errors'].should be_empty
         end
-        
+
       end
-      
+
       it 'returns the list of references as the second element' do
         subject.to_citeproc.last.should be_a(Array)
       end
-      
+
     end
-    
+
     describe '.create (citeproc parser)' do
       let(:js) { <<-JS_END }
       [
@@ -56,17 +56,17 @@ module CiteProc
         ]
       ]
       JS_END
-      
+
       it 'parses citeproc/json strings' do
-        b = Bibliography.create(js)
+        b = Bibliography.create!(js)
         b.should be_a(Bibliography)
         b.should have(2).references
         b.should_not have_errors
-        b.options[:align].should be true
+        b.options[:'second-field-align'].should be true
       end
-      
+
     end
-    
+
   end
-  
+
 end

data/spec/citeproc/citation_data_spec.rb

@@ -2,93 +2,93 @@ require 'spec_helper'
 
 module CiteProc
 
-	describe 'citation input' do
-
-		let(:hash) {{
-			"citationItems" => [
-				{
-					"id" => "ITEM-1"
-				}
-			],
-			"properties" => {
-				"noteIndex" => 1
-			}
-		}}
-
-		let(:json) { MultiJson.encode(hash) }
-
-
-
-		describe CitationData do
-
-			it { should_not be nil }
-			it { should be_empty }
-
-			it 'has not been processed by default' do
-				CitationData.new.should_not be_processed
-			end
-		
-			describe '.new' do
-			
-				it 'accepts a citeproc hash' do
-					d = CitationData.new(hash)
-					d.should be_footnote
-					d.should_not be_empty
-					d[0].should be_a(CitationItem)
-					d.index.should == 1
-				end
-			
-				it 'accepts an array of items' do
-					CitationData.new([CitationItem.new(:id => 'id')]).should have(1).items
-				end
-				
-				it 'accepts an array of hashes' do
-					CitationData.new([{:id => 'id'}])[0].should be_a(CitationItem)
-				end
-				
-			end
-		
-			describe '#to_citeproc' do
-			
-				it 'returns empty an empty/default citation data element by default' do
-					CitationData.new.to_citeproc.should == { 'citationItems' => [], 'properties' => { 'noteIndex' => 0}}
-				end
-			
-			
-			end
-		
-		end
-	
-		describe CitationItem do
-		
-			it { should_not be nil }
-			it { should be_empty }
-	
-			describe '.new' do
-				
-				it 'accepts a hash as input' do
-					CitationItem.new(:label => 'chapter').should have_label
-				end
-				
-			end
-		
-			describe '#to_citeproc' do
-			
-				it 'returns empty citation data by default' do
-					CitationItem.new.to_citeproc.should == {}
-				end
-			
-				it 'returns a hash with stringified keys' do
-					CitationItem.new(:type => :article).to_citeproc.should have_key('type')
-				end
-
-				it 'returns a hash with stringified values' do
-					CitationItem.new(:type => :article).to_citeproc.should have_value('article')
-				end
-			
-			end
-		
-		end
-		
-	end
-end
+  describe 'citation input' do
+
+    let(:hash) {{
+      "citationItems" => [
+        {
+          "id" => "ITEM-1"
+        }
+      ],
+      "properties" => {
+        "noteIndex" => 1
+      }
+    }}
+
+    let(:json) { ::JSON.dump(hash) }
+
+
+
+    describe CitationData do
+
+      it { should_not be nil }
+      it { should be_empty }
+
+      it 'has not been processed by default' do
+        CitationData.new.should_not be_processed
+      end
+
+      describe '.new' do
+
+        it 'accepts a citeproc hash' do
+          d = CitationData.new(hash)
+          d.should be_footnote
+          d.should_not be_empty
+          d[0].should be_a(CitationItem)
+          d.index.should == 1
+        end
+
+        it 'accepts an array of items' do
+          CitationData.new([CitationItem.new(:id => 'id')]).should have(1).items
+        end
+
+        it 'accepts an array of hashes' do
+          CitationData.new([{:id => 'id'}])[0].should be_a(CitationItem)
+        end
+
+      end
+
+      describe '#to_citeproc' do
+
+        it 'returns empty an empty/default citation data element by default' do
+          CitationData.new.to_citeproc.should == { 'citationItems' => [], 'properties' => { 'noteIndex' => 0}}
+        end
+
+
+      end
+
+    end
+
+    describe CitationItem do
+
+      it { should_not be nil }
+      it { should be_empty }
+
+      describe '.new' do
+
+        it 'accepts a hash as input' do
+          CitationItem.new(:label => 'chapter').should have_label
+        end
+
+      end
+
+      describe '#to_citeproc' do
+
+        it 'returns empty citation data by default' do
+          CitationItem.new.to_citeproc.should == {}
+        end
+
+        it 'returns a hash with stringified keys' do
+          CitationItem.new(:type => :article).to_citeproc.should have_key('type')
+        end
+
+        it 'returns a hash with stringified values' do
+          CitationItem.new(:type => :article).to_citeproc.should have_value('article')
+        end
+
+      end
+
+    end
+
+  end
+end

data/spec/citeproc/engine_spec.rb

@@ -6,15 +6,14 @@ module CiteProc
     it 'cannot be instantiated' do
       lambda { Engine.new }.should raise_error(NoMethodError)
     end
-    
+
     describe 'subclasses' do
       let(:subject) { Class.new(Engine).new }
 
       it 'can be instantiated' do
         subject.should_not be nil
       end
-            
     end
-    
+
   end
-end
+end

data/spec/citeproc/item_spec.rb

@@ -1,71 +1,79 @@
 require 'spec_helper'
 
 module CiteProc
-	describe Item do
-		
-		
-		describe '.new' do
-  		it { should_not be nil }
-
-			it 'creates number variables for number fields' do
-				Item.new(:edition => 23).edition.should be_a(Number)
-			end
-
-			it 'creates text variable for text fields' do
-				Item.new(:ISBN => 23).isbn.should be_a(Text)
-			end
-			
-			it 'creates date variables for date fields' do
-				Item.new(:accessed => Time.now).accessed.should be_a(CiteProc::Date)
-			end
-			
-			it 'creates names variables for name fields' do
-				Item.new(:editor => { :given => 'Jane' }).editor.should be_a(Names)
-				Item.new(:editor => 'Plato and Socrates').editor.should have(2).names
-			end
-			
-			it 'creates text variables for unknown fields' do
-				v = Item.new(:unknown => 42)[:unknown]
-				v.should be_a(Variable)
-				v.should == '42'
-			end
-		end
-		
-		describe '#empty' do
-  		it { should be_empty }
-		  
-		  it 'returns false when there is at least one variable in the item' do
-		    Item.new(:title => 'foo').should_not be_empty
-		  end
-		end
-		
-		describe '#each' do
-		  it 'yields each variable to the given block' do
-		    Item.new(:title => 'foo', :edition => 2).each.map {|kv| kv.join('-') }.sort.should == %w{edition-2 title-foo}
-		  end
-		end
-
-		describe '#each_value' do
-		  it "yields each variable's value to the given block" do
-		    Item.new(:title => 'foo', :edition => 2).each_value.map(&:to_s).sort.should == %w{2 foo}
-		  end
-		end
-		
-		describe '#to_citeproc' do
-			
-			it 'returns an empty hash by default' do
-				Item.new.to_citeproc.should == {}
-			end
-			
-			it 'returns a hash with stringified keys' do
-				Item.new(:issue => 42).to_citeproc.should have_key('issue')
-			end
-
-			it 'returns a hash with stringified values' do
-				Item.new(:issue => 42).to_citeproc.values[0].should == '42'
-			end
-
-			
-		end
-	end
-end
+  describe Item do
+
+
+    describe '.new' do
+      it { should_not be nil }
+
+      it 'creates number variables for number fields' do
+        Item.new(:edition => 23).edition.should be_a(Number)
+      end
+
+      it 'creates text variable for text fields' do
+        Item.new(:ISBN => 23).isbn.should be_a(Text)
+      end
+
+      it 'creates date variables for date fields' do
+        Item.new(:accessed => Time.now).accessed.should be_a(CiteProc::Date)
+      end
+
+      it 'creates names variables for name fields' do
+        Item.new(:editor => { :given => 'Jane' }).editor.should be_a(Names)
+        Item.new(:editor => 'Plato and Socrates').editor.should have(2).names
+      end
+
+      it 'creates text variables for unknown fields' do
+        v = Item.new(:unknown => 42)[:unknown]
+        v.should be_a(Variable)
+        v.should == '42'
+      end
+    end
+
+    describe '#empty' do
+      it { should be_empty }
+
+      it 'returns false when there is at least one variable in the item' do
+        Item.new(:title => 'foo').should_not be_empty
+      end
+    end
+
+    describe '#each' do
+      it 'yields each variable to the given block' do
+        Item.new(:title => 'foo', :edition => 2).each.map {|kv| kv.join('-') }.sort.should == %w{edition-2 title-foo}
+      end
+    end
+
+    describe '#each_value' do
+      it "yields each variable's value to the given block" do
+        Item.new(:title => 'foo', :edition => 2).each_value.map(&:to_s).sort.should == %w{2 foo}
+      end
+    end
+
+    describe '#to_citeproc' do
+      it 'returns an empty hash by default' do
+        Item.new.to_citeproc.should == {}
+      end
+
+      it 'returns a hash with stringified keys' do
+        Item.new(:issue => 42).to_citeproc.should have_key('issue')
+      end
+
+      it 'returns a hash with stringified values' do
+        Item.new(:issue => 42).to_citeproc.values[0].should == '42'
+      end
+    end
+
+    describe '#dup' do
+      it 'returns a copy' do
+        item = Item.new
+        item.dup.should_not equal(item)
+      end
+
+      it 'copies all variables' do
+        Item.new(:issued => 1976).dup[:issued].year.should == 1976
+      end
+    end
+  end
+end