csl 1.0.0.pre10 → 1.0.0.pre11

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL  
-  VERSION = '1.0.0.pre10'.freeze
+  VERSION = '1.0.0.pre11'.freeze
 end

data/spec/csl/locale/style_options_spec.rb

@@ -11,7 +11,7 @@ module CSL
     
     describe '#to_xml' do
       it 'returns <style-options punctuation-in-quote="false"/> by default' do
-        subject.to_xml.should == '<style-options punctuation-in-quote="false"/>'
+        subject.to_xml.should =~ /<style-options [^\/>]+\/>/
       end
     end
     

data/spec/csl/locale/term_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module CSL
   describe Locale::Terms do
-	
+
 		it { should_not be nil }
 
 		describe '#to_xml' do
@@ -10,9 +10,36 @@ module CSL
 				subject.to_xml.should == '<terms/>'
 			end
 		end
-		
+
+		describe '#ordinalize' do
+
+		  describe "given standard English terms" do
+  		  let(:en) do
+  		    Locale::Terms.parse <<-EOS
+  	      <terms>
+    	      <term name="ordinal">th</term>
+            <term name="ordinal-01">st</term>
+            <term name="ordinal-02">nd</term>
+            <term name="ordinal-03">rd</term>
+            <term name="ordinal-11">th</term>
+            <term name="ordinal-12">th</term>
+            <term name="ordinal-13">th</term>
+  	      </terms>
+  	      EOS
+  		  end
+
+        %w{
+          ordinal ordinal-01 ordinal-02 ordinal-03 ordinal
+        }.each_with_index do |ordinal, number|
+  		    it "returns #{ordinal.inspect} for #{number}" do
+  		      en.ordinalize(number)[:name].should == ordinal
+  		    end
+  		  end
+		  end
+		end
+
 	end
-	
+
   describe Locale::Term do
 
     it { should_not be_nil }
@@ -30,9 +57,9 @@ module CSL
 		end
 
     describe 'gender attribute is set' do
-      let(:m) { Locale::Term.new(:name => 'month-05') { |t| t.masculine!; t.text = 'Mai' } } 
-      let(:f) { Locale::Term.new(:name => 'edition') { |t| t.feminine!; t.text = 'Ausgabe' } } 
-      
+      let(:m) { Locale::Term.new(:name => 'month-05') { |t| t.masculine!; t.text = 'Mai' } }
+      let(:f) { Locale::Term.new(:name => 'edition') { |t| t.feminine!; t.text = 'Ausgabe' } }
+
       it 'is gendered' do
         m.should be_gendered
         f.should be_gendered
@@ -42,19 +69,19 @@ module CSL
         m.should be_masculine
         f.should be_feminine
       end
-      
+
       it 'is not neutral' do
         m.should_not be_neutral
         f.should_not be_neutral
       end
-      
+
       describe '#to_xml' do
         it 'contains the correct gender' do
           m.to_xml.should =~ /gender="masculine"/
           f.to_xml.should =~ /gender="feminine"/
         end
       end
-      
+
       describe '#match?' do
         it 'matches the name when passed a string' do
           m.should be_match(:name => 'month-05')
@@ -63,7 +90,7 @@ module CSL
         it 'matches the name when passed a pattern' do
           m.should be_match(:name => /month-\d\d/)
         end
-        
+
         it 'matches when passed a matching hash without gender' do
           f.should be_match(:name => 'edition')
         end
@@ -71,7 +98,7 @@ module CSL
         it 'does not match when passed a matching hash with wrong gender' do
           f.matches?(:name => 'edition', :gender => 'masculine').should_not be_true
         end
-        
+
         it 'matches when passed a matching hash with matching gender' do
           f.matches?(:name => 'edition', :gender => 'feminine').should be_true
         end
@@ -82,22 +109,22 @@ module CSL
           f.should_not be_exact_match(:name => 'edition')
         end
       end
-      
+
       describe 'attributes#to_a' do
         it 'returns an array of all attribute values of underlying struct' do
           f.attributes.to_a.should == ['edition', nil, 'feminine', nil, nil]
         end
       end
     end
-    
+
     describe '#to_s' do
       it 'returns an empty string by default' do
         Locale::Term.new.to_s.should == ''
       end
-      
+
       describe 'given a simple term' do
         let(:node) { Locale::Term.new { |t| t.text = 'foo' } }
-        
+
         it "returns the term's text" do
           node.to_s.should == node.text
         end
@@ -109,7 +136,7 @@ module CSL
         it "returns the term's singular form by default" do
           node.to_s.should == node.singularize
         end
-        
+
         it "returns the term's plural form when passed :number => :plural" do
           node.to_s(:number => :plural).should == node.pluralize
         end
@@ -128,12 +155,12 @@ module CSL
 
       end
     end
-    
+
 		describe '#to_xml' do
 			it 'returns <term/> by default' do
 				subject.to_xml.should == '<term/>'
 			end
-			
+
 			it 'returns <term>foo</term> when the text is "foo"' do
 				Locale::Term.new { |t| t.text = 'foo' }.to_xml.should == '<term>foo</term>'
 			end
@@ -141,7 +168,7 @@ module CSL
 			it 'returns <term><multiple>foo</multiple></term> when multiple is "foo"' do
 				Locale::Term.new { |t| t.multiple = 'foo' }.to_xml.should == '<term><multiple>foo</multiple></term>'
 			end
-			
+
 		end
   end
 end

data/spec/csl/locale_spec.rb

@@ -9,29 +9,42 @@ module CSL
 		let(:locale) { Locale.new }
 
 		let(:en) { Locale.new('en-US') }
+		let(:gb) { Locale.new('en-GB') }
 		let(:de) { Locale.new('de-DE') }
-		let(:fr) { Locale.new('fr-FR') }
 
 		describe '.regions' do
-			
+
 			it 'returns the default region when passed a language symbol' do
 				Locale.regions[:en].should == :US
 			end
-			
+
 		end
-		
+
 		describe '.languages' do
-			
+
 			describe 'the language hash' do
 				it 'returns the default language when passed a region string' do
 					%w{ US en GB en AT de DE de }.map(&:to_sym).each_slice(2) do |region, language|
 						Locale.languages[region].should == language
 					end
 				end
-			end			
-			
+			end
+
 		end
-		
+
+		describe '.normalize' do
+      {
+        'en' => 'en-US',
+        '-GB' => 'en-GB',
+        '-BR' => 'pt-BR',
+        'de-AT' => 'de-AT'
+      }.each_pair do |tag, expected|
+        it "converts #{tag.inspect} to #{expected.inspect}" do
+          Locale.normalize(tag).should == expected
+        end
+      end
+		end
+
 		describe '.new' do
 			it { should_not be_nil }
 
@@ -50,18 +63,18 @@ module CSL
       it 'contains no terms by default' do
         Locale.new.terms.should be_nil
       end
-      
+
 		end
 
     describe '.load' do
-      
+
       describe 'when called with "en-GB" ' do
         let(:locale) { Locale.load('en-GB') }
-        
+
         it 'the returned locale has the correct IETF tag' do
           locale.to_s.should == 'en-GB'
         end
-      
+
         it 'the locale has language :en' do
           locale.language.should == :en
         end
@@ -69,13 +82,13 @@ module CSL
         it 'the locale has region :GB' do
           locale.region.should == :GB
         end
-        
+
       end
-      
+
     end
 
-		describe '#set' do			
-			
+		describe '#set' do
+
 			it 'when passed "en-GB" sets language to :en and region to :GB' do
 				locale.set('en-GB')
 				[locale.language, locale.region].should == [:en, :GB]
@@ -90,39 +103,64 @@ module CSL
 				locale.set('-AT')
 				[locale.language, locale.region].should == [:de, :AT]
 			end
-			
+
 		end
-		
+
+		describe '#merge!' do
+		  let(:locale_with_options) { Locale.new('en', :foo => 'bar') }
+
+		  describe 'style options' do
+  		  it 'does not change the options if none are set on either locale' do
+  		    expect { locale.merge!(en) }.not_to change { locale.options }
+  		  end
+
+  		  it 'creates a duplicate option element if the first locale has no options' do
+  		    locale.should_not have_options
+  		    locale.merge!(locale_with_options)
+  		    locale.should have_options
+  		    locale.options[:foo].should == 'bar'
+          locale.options.should_not equal(locale_with_options.options)
+  		  end
+
+  		  it 'merges the options if both locales have options' do
+  		    locale << Locale::StyleOptions.new(:bar => 'foo')
+  		    
+  		    expect { locale.merge!(locale_with_options) }.not_to change { locale.options.object_id }
+  		    
+  		    locale.options[:foo].should == 'bar'
+  		    locale.options[:bar].should == 'foo'
+  		  end
+
+  		  it 'overrides the options with those in the other locale' do
+  		    locale << Locale::StyleOptions.new(:bar => 'foo', :foo => 'foo')
+  		    locale.merge!(locale_with_options)
+  		    locale.options[:foo].should == 'bar'
+  		    locale.options[:bar].should == 'foo'
+  		  end
+  		end
+  		
+  		describe 'dates' do
+  		  it 'does not change the dates if none are set on either locale' do
+  		    expect { locale.merge!(en) }.not_to change { locale.dates }
+  		  end
+  		  
+  		  it 'creates duplicate date elements if the first locale has no options' do
+  		    locale.merge!(Locale.load('en-US'))
+  		    locale.should have_dates
+  		  end
+  		end
+		end
+
 		describe '#legacy?' do
 		  it 'returns false by default' do
 		    locale.should_not be_legacy
 		  end
-		  
+
 		  it 'returns true if the version is less than 1.0.1' do
-		    locale.version = '1.0'
+		    locale.version = '0.8'
 		    locale.should be_legacy
 		  end
 		end
-		
-		describe '#ordinalize_query_for' do
-		  
-		  it 'returns { :name => "ordinal-%02d" } by default' do
-		    locale.send(:ordinalize_query_for, nil).should == { :name => "ordinal-%02d" }
-		  end
-
-		  it 'returns { :name => "ordinal-%02d" } for { :form => :short }' do
-		    locale.send(:ordinalize_query_for, { :form => :short }).should == { :name => "ordinal-%02d" }
-		  end
 
-		  it 'returns { :name => "long-ordinal-%02d" } for { :form => :long }' do
-		    locale.send(:ordinalize_query_for, { :form => :long }).should == { :name => "long-ordinal-%02d" }
-		  end
-
-		  it 'returns { :name => "ordinal-%02d", :"gender-form" => "feminine" } for { :gender => :feminine }' do
-		    locale.send(:ordinalize_query_for, { :gender => :feminine }).should == { :name => "ordinal-%02d", :'gender-form' => 'feminine' }
-		  end
-		  
-		end
-		
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre10
+  version: 1.0.0.pre11
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
-  requirement: &70315294433280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70315294433280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70315294432260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70315294432260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70315294431720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70315294431720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70315294431000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +69,12 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70315294431000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 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:
@@ -65,7 +85,6 @@ extra_rdoc_files: []
 files:
 - .document
 - .gitignore
-- .gitmodules
 - .rspec
 - .simplecov
 - .travis.yml
@@ -164,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2344357487878349673
+      hash: -1272288240557992685
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -173,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Ruby CSL parser and library