csl 1.0.0.pre4 → 1.0.0.pre5

data/features/locales/ordinalize.feature

@@ -127,11 +127,11 @@ Feature: Converting numbers to ordinals using CSL locales
           <term name="long-ordinal-01">erstes</term>
           <term name="long-ordinal-01" gender-form="feminine">
             <single>erste</single>
-            <multiple>ersten</multiple>            
+            <multiple>ersten</multiple>
           </term>
           <term name="long-ordinal-01" gender-form="masculine">
             <single>erster</single>
-            <multiple>ersten</multiple>            
+            <multiple>ersten</multiple>
           </term>
           <term name="long-ordinal-02">zweites</term>
           <term name="long-ordinal-02" gender-form="feminine">zweite</term>
@@ -187,17 +187,20 @@ Feature: Converting numbers to ordinals using CSL locales
             <single>e</single>
             <multiple>es</multiple>
           </term>
-          
-          <term name="ordinal-01">e</term>
-          <term name="ordinal-01" gender-form="feminine">
+
+          <term name="ordinal-01" modulo="1">
+            <single>re</single>
+            <multiple>res</multiple>
+          </term>
+          <term name="ordinal-01" gender-form="feminine" modulo="1">
             <single>re</single>
             <multiple>res</multiple>
           </term>
-          <term name="ordinal-01" gender-form="masculine">
+          <term name="ordinal-01" gender-form="masculine" modulo="1">
             <single>er</single>
             <multiple>ers</multiple>
           </term>
-          
+
         </terms>
       </locale>
       """
@@ -439,7 +442,7 @@ Feature: Converting numbers to ordinals using CSL locales
           <term name="ordinal-17">de</term>
           <term name="ordinal-18">de</term>
           <term name="ordinal-19">de</term>
-  
+
           <term name="ordinal-22">ste</term>
           <term name="ordinal-23">ste</term>
           <term name="ordinal-24">ste</term>
@@ -503,7 +506,7 @@ Feature: Converting numbers to ordinals using CSL locales
           <term name="ordinal-96">ste</term>
           <term name="ordinal-97">ste</term>
           <term name="ordinal-99">ste</term>
-  
+
         </terms>
       </locale>
       """

data/lib/csl/info.rb

@@ -139,9 +139,17 @@ module CSL
     def citation_format
       return unless has_categories?
       
+      cat = categories.detect { |c| c.attribute? :'citation-format' }
+      return if cat.nil?
+      
+      cat[:'citation-format'].to_sym
     end
     
-    def ciation_format=(new_format)
+    def citation_format=(new_format)
+      cat = categories.detect { |c| c.attribute? :'citation-format' }      
+      cat = add_child Info::Category.new if cat.nil?
+      
+      cat[:'citation-format'] = new_format.to_s
     end
 
     #

data/lib/csl/style.rb

@@ -46,7 +46,7 @@ module CSL
       :documentation_link, :documentation_link=, :has_documentation_link?,
       :independent_parent_link, :independent_parent_link=,
       :has_independent_parent_link?, :title=, :id=, :has_title?, :has_id?,
-      :published_at, :updated_at
+      :published_at, :updated_at, :citation_format, :citation_format=
 
     def initialize(attributes = {})
       super(attributes, &nil)

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL  
-  VERSION = '1.0.0.pre4'.freeze
+  VERSION = '1.0.0.pre5'.freeze
 end

data/spec/csl/info_spec.rb

@@ -31,6 +31,52 @@ module CSL
       end
     end
 
+    describe 'citation-format' do
+      it 'has no citation-format by default' do
+        Info.new.citation_format.should be_nil
+      end
+      
+      it 'setting a citation-format creates a new category node' do
+        expect { info.citation_format = 'foo' }.to change { info.has_categories? }
+      end
+
+      it 'setting a citation-format actually sets the citation-format' do
+        expect { info.citation_format = 'bar' }.to change { info.citation_format }.to(:bar)
+      end
+      
+      describe 'given a category node with the citation-attribute set' do
+        before(:all) { info.add_child Info::Category.new(:'citation-format' => 'author') }
+        
+        it 'has a citation format' do
+          info.citation_format.should == :author
+        end
+        
+        it 'setting a citation-format does not create a new category node' do
+          expect { info.citation_format = 'foo' }.not_to change { info.categories.length }
+        end
+        
+        it 'setting a citation-format actually sets the citation-format' do
+          expect { info.citation_format = 'bar' }.to change { info.citation_format }.to(:bar)
+        end
+      end
+      
+      describe 'given a category node without the citation-attribute set' do
+        before(:all) { info.add_child Info::Category.new(:field => 'literature') }
+      
+        it 'has no citation-format by default' do
+          info.citation_format.should be_nil
+        end
+
+        it 'setting a citation-format creates a new category node' do
+          expect { info.citation_format = 'foo' }.to change { info.categories.length }.from(1).to(2)
+        end
+
+        it 'setting a citation-format actually sets the citation-format' do
+          expect { info.citation_format = 'bar' }.to change { info.citation_format }.to(:bar)
+        end
+      end
+    end
+    
     describe 'link accessors' do
       it { should_not have_self_link }
       it { should_not have_documentation_link }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre4
+  version: 1.0.0.pre5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-14 00:00:00.000000000 Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70119260445480 !ruby/object:Gem::Requirement
+  requirement: &70119062651280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70119260445480
+  version_requirements: *70119062651280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70119260460240 !ruby/object:Gem::Requirement
+  requirement: &70119062664520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70119260460240
+  version_requirements: *70119062664520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70119260458480 !ruby/object:Gem::Requirement
+  requirement: &70119062661920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70119260458480
+  version_requirements: *70119062661920
 description: ! "\n\t\tA Ruby parser and library for the Citation Style Language (CSL),
   an open\n\t\tXML-based language to describe the formatting of citations and\n\t\tbibliographies.\n\t\t"
 email: