citeproc-ruby 0.0.4 → 0.0.5

data/resource/style/vancouver.csl

@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="minimal">
+  <info>
+    <title>Vancouver</title>
+    <id>http://www.zotero.org/styles/vancouver</id>
+    <link href="http://www.zotero.org/styles/vancouver" rel="self"/>
+    <author>
+      <name>Michael Berkowitz</name>
+      <email>mberkowi@gmu.edu</email>
+    </author>
+    <contributor>
+      <name>Sean Takats</name>
+      <email>stakats@gmu.edu</email>
+    </contributor>
+    <contributor>
+      <name>Sebastian Karcher</name>
+    </contributor>
+    <category field="medicine"/>
+    <category citation-format="numeric"/>
+    <updated>2008-09-16T00:00:00+00:00</updated>
+    <summary>
+      Vancouver style as outlined by International Committee of Medical Journal Editors Uniform Requirements for Manuscripts Submitted to Biomedical Journals: Sample References
+    </summary>
+    <link href="http://www.nlm.nih.gov/bsd/uniform_requirements.html" rel="documentation"/>
+    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="retrieved">available</term>
+      <term name="section" form="short">sect.</term>
+    </terms>
+  </locale>
+  <locale xml:lang="de">
+    <terms>
+      <term name="retrieved">verfügbar</term>
+      <term name="from">unter</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="long" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <group delimiter=": ">
+      <choose>
+        <if type="chapter paper-conference">
+          <text term="in" text-case="capitalize-first"/>
+        </if>
+      </choose>
+      <names variable="editor" suffix=".">
+        <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+        <label form="long" prefix=", "/>
+      </names>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": " suffix=";">
+      <choose>
+        <if type="thesis">
+          <text variable="publisher-place" prefix="[" suffix="]"/>
+        </if>
+        <else>
+          <text variable="publisher-place"/>
+        </else>
+      </choose>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="URL">
+        <group delimiter=": ">
+          <group delimiter=" ">
+            <text term="retrieved" text-case="capitalize-first"/>
+            <text term="from"/>
+          </group>
+          <text variable="URL"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="accessed-date">
+    <choose>
+      <if variable="URL">
+        <group prefix="[" suffix="]" delimiter=" ">
+          <text term="cited" text-case="lowercase"/>
+          <date variable="accessed" suffix="">
+            <date-part name="year"/>
+            <date-part name="month" prefix=" " form="short" strip-periods="true"/>
+            <date-part name="day" prefix=" "/>
+          </date>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article-journal article-magazine chapter paper-conference article-newspaper" match="any">
+        <group suffix="." delimiter=" ">
+          <text variable="container-title" form="short"/>
+          <choose>
+            <if variable="URL">
+              <text term="internet" prefix="[" suffix="]" text-case="capitalize-first"/>
+            </if>
+          </choose>
+        </group>
+        <text macro="edition" prefix=" "/>
+      </if>
+      <!--add event-name and event-place once they become available-->
+      <else-if type="bill legislation">
+        <group delimiter=", ">
+          <group delimiter=". ">
+            <text variable="container-title" form="short"/>
+            <group delimiter=" ">
+              <text term="section" form="short" text-case="capitalize-first"/>
+              <text variable="section"/>
+            </group>
+          </group>
+          <text variable="number"/>
+        </group>
+      </else-if>
+      <else>
+        <text variable="container-title" suffix="." form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+    <choose>
+      <if type="article-journal article-magazine chapter paper-conference article-newspaper" match="none">
+        <choose>
+          <if variable="URL">
+            <text term="internet" prefix=" [" suffix="]" text-case="capitalize-first"/>
+          </if>
+        </choose>
+        <text macro="edition" prefix=". "/>
+      </if>
+    </choose>
+    <choose>
+      <if type="thesis">
+        <text variable="genre" prefix=" [" suffix="]"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group suffix=";" delimiter=" ">
+          <date variable="issued" delimiter=" ">
+            <date-part name="year"/>
+            <date-part name="month" form="short" strip-periods="true"/>
+            <date-part name="day"/>
+          </date>
+          <text macro="accessed-date"/>
+        </group>
+      </if>
+      <else-if type="bill legislation">
+        <group delimiter=", ">
+          <date variable="issued" delimiter=" ">
+            <date-part name="month" form="short" strip-periods="true"/>
+            <date-part name="day"/>
+          </date>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="report">
+        <date variable="issued" delimiter=" ">
+          <date-part name="year"/>
+          <date-part name="month" form="short" strip-periods="true"/>
+        </date>
+      </else-if>
+      <else>
+        <group suffix=".">
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <text macro="accessed-date" prefix=" "/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text variable="page" prefix=":"/>
+      </if>
+      <else>
+        <text variable="page" prefix=" p. "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="journal-location">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <text variable="volume"/>
+        <text variable="issue" prefix="(" suffix=")"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="report-details">
+    <choose>
+      <if type="report">
+        <text variable="number" prefix="Report No.: "/>
+      </if>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter=",">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" suffix=". "/>
+      <group delimiter=". " suffix=". ">
+        <text macro="author"/>
+        <text macro="title"/>
+      </group>
+      <group delimiter=" " suffix=". ">
+        <text macro="editor"/>
+        <text macro="container-title"/>
+        <text macro="publisher"/>
+        <group>
+          <text macro="date"/>
+          <text macro="journal-location"/>
+          <text macro="pages"/>
+        </group>
+      </group>
+      <text macro="report-details" suffix=". "/>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>

data/spec/citeproc/date_spec.rb

@@ -6,12 +6,17 @@ module CiteProc
     
     describe '#new' do
       it { should_not be_nil }
+      
+      it 'accepts date-parts containing a single year' do
+        Date.new('date-parts' => [[1998]]).year.should == 1998
+      end
+      
     end
     
     describe '.create' do
-      it 'should accept parameters and return a new instance' do
+      it 'accepts parameters and returns a new instance' do
         Date.create('date-parts' => [[2001, 1]]).year.should == 2001
-      end
+      end      
     end
     
     describe '#sort' do
@@ -79,7 +84,6 @@ module CiteProc
       end
     end
 
-    
   end
 
 end

data/spec/citeproc/variable_spec.rb

@@ -15,7 +15,7 @@ module CiteProc
       
       it 'supports self yielding block' do
         Variable.new { |v| v.value = 'test' }.value.should == 'test'
-      end
+      end      
     end
     
     describe '#to_s' do

data/spec/csl/style_spec.rb

@@ -30,13 +30,13 @@ module CSL
       it 'returns id, title, and link information' do
         # style.id.should == 'http://www.zotero.org/styles/apa'
         # style.link.should == 'http://www.zotero.org/styles/apa'
-        apa.title.should == 'American Psychological Association'
+        apa.title.should =~ /American Psychological Association/
       end
     end
   
     describe 'macros' do
       it 'initialises a macros hash' do
-        apa.macros.keys.sort.should == ["access", "author", "author-short", "citation-locator", "container-contributors", "edition", "event", "issued", "issued-year", "locators", "publisher", "secondary-contributors", "title"]
+        apa.macros.keys.sort.should include("issued")
         apa.macros.values.map(&:class).uniq.should == [CSL::Nodes::Macro]
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: citeproc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000Z
+date: 2012-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &2152765020 !ruby/object:Gem::Requirement
+  requirement: &70124942643240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,73 +21,73 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2152765020
+  version_requirements: *70124942643240
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152764360 !ruby/object:Gem::Requirement
+  requirement: &70124942640860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2152764360
+  version_requirements: *70124942640860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152763640 !ruby/object:Gem::Requirement
+  requirement: &70124942654240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *2152763640
+  version_requirements: *70124942654240
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2152762940 !ruby/object:Gem::Requirement
+  requirement: &70124942651940 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152762940
+  version_requirements: *70124942651940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152762240 !ruby/object:Gem::Requirement
+  requirement: &70124942650180 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2152762240
+  version_requirements: *70124942650180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152761540 !ruby/object:Gem::Requirement
+  requirement: &70124942648420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *2152761540
+  version_requirements: *70124942648420
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152761000 !ruby/object:Gem::Requirement
+  requirement: &70124942672100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *2152761000
+  version_requirements: *70124942672100
 description: A CSL (Citation Style Language) Processor
 email:
 - http://sylvester.keil.or.at
@@ -131,9 +131,14 @@ files:
 - resource/locale/locales-de-CH.xml
 - resource/locale/locales-de-DE.xml
 - resource/locale/locales-el-GR.xml
+- resource/locale/locales-en-GB.xml
 - resource/locale/locales-en-US.xml
 - resource/locale/locales-es-ES.xml
 - resource/locale/locales-et-EE.xml
+- resource/locale/locales-eu.xml
+- resource/locale/locales-fa-IR.xml
+- resource/locale/locales-fi-FI.xml
+- resource/locale/locales-fr-CA.xml
 - resource/locale/locales-fr-FR.xml
 - resource/locale/locales-he-IL.xml
 - resource/locale/locales-hu-HU.xml
@@ -141,6 +146,7 @@ files:
 - resource/locale/locales-it-IT.xml
 - resource/locale/locales-ja-JP.xml
 - resource/locale/locales-kh-KH.xml
+- resource/locale/locales-km-KH.xml
 - resource/locale/locales-ko-KR.xml
 - resource/locale/locales-mn-MN.xml
 - resource/locale/locales-nb-NO.xml
@@ -167,39 +173,33 @@ files:
 - resource/schema/csl-types.rnc
 - resource/schema/csl-variables.rnc
 - resource/schema/csl.rnc
-- resource/style/acta-materialia-x.csl
-- resource/style/advanced-engineering-materials-x.csl
-- resource/style/ama.csl
-- resource/style/ama2-x.csl
-- resource/style/apa-x.csl
 - resource/style/apa.csl
-- resource/style/apsa-x.csl
-- resource/style/apsa.csl
-- resource/style/asa-x.csl
-- resource/style/asa.csl
-- resource/style/asm-journals-x.csl
-- resource/style/bibtex-x2.csl
-- resource/style/bluebook-demo-x.csl
-- resource/style/bluebook-demo.csl
+- resource/style/bibtex.csl
+- resource/style/chicago-annotated-bibliography.csl
+- resource/style/chicago-author-date-basque.csl
+- resource/style/chicago-author-date-de.csl
 - resource/style/chicago-author-date-listing.csl
 - resource/style/chicago-author-date.csl
+- resource/style/chicago-dated-note-biblio-no-ibid.csl
 - resource/style/chicago-fullnote-bibliography-bb.csl
+- resource/style/chicago-fullnote-bibliography-delimiter-fixes.csl
+- resource/style/chicago-fullnote-bibliography-no-ibid-delimiter-fixes.csl
+- resource/style/chicago-fullnote-bibliography-no-ibid.csl
 - resource/style/chicago-fullnote-bibliography.csl
+- resource/style/chicago-library-list.csl
+- resource/style/chicago-note-biblio-no-ibid.csl
 - resource/style/chicago-note-bibliography.csl
 - resource/style/chicago-note.csl
-- resource/style/greek-chicago-x.csl
-- resource/style/harvard1-institution-italic.csl
-- resource/style/harvard1.csl
+- resource/style/chicago-quick-copy.csl
 - resource/style/ieee.csl
-- resource/style/mhra-x.csl
-- resource/style/mhra.csl
-- resource/style/mhra_note_without_bibliography-x.csl
-- resource/style/mhra_note_without_bibliography.csl
-- resource/style/mla-x.csl
+- resource/style/mla-notes.csl
+- resource/style/mla-underline.csl
+- resource/style/mla-url.csl
 - resource/style/mla.csl
-- resource/style/nature-x.csl
-- resource/style/nature.csl
-- resource/style/nlm.csl
+- resource/style/vancouver-brackets.csl
+- resource/style/vancouver-superscript-bracket-only-year.csl
+- resource/style/vancouver-superscript.csl
+- resource/style/vancouver.csl
 - spec/citeproc/bibliography_spec.rb
 - spec/citeproc/citeproc_spec.rb
 - spec/citeproc/date_spec.rb