csl 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e30d2946a20188221543f891c506525015d014d
-  data.tar.gz: 81aef0240b86caa2ad7d0cd18fe0922beb30d50f
+  metadata.gz: 4c96baa9f034b77ad151b2128a0fe71abdb5fcce
+  data.tar.gz: 0a6f6c77c9cafdaf1b17a2bdb409c027268c6128
 SHA512:
-  metadata.gz: bbbfbb2549ab0f66796897d374d5e7a56541236670537c0cc390fdb11c93f9cb295bdc52e75bb606ffdbe0949c30aa67e50079ef82a4d759e216bce2cecb2a4f
-  data.tar.gz: a63a040322afce1fdb1784a8acd22979209416f8e38aa81f07d358c998a0374849de73ef4fde7679161e6a560ab8f54abcf4c342a990e69efa9651b8128bfdaa
+  metadata.gz: fdc03ad00c37bb330330dcdb20bd5e7233cfb130aa8e57213c51db877e99a4520d86d65c3c6b7bf7c435d84c50a240e096eaea4d20f3394367c292e7fdfb4c8c
+  data.tar.gz: cb38396b2dc1608de0fbd61d42a6f0798ed7ece661def1e105d75fdc020fbaf5094d729dbd0361194a3ceb0692ac94ed3378fad3cb64f6c6fa579fc92aa0e948

data/features/locales/loading.feature

@@ -41,7 +41,7 @@ Feature: Loading CSL Locales
             <multiple>Ref.</multiple>
           </term>
           <term name="retrieved">abgerufen</term>
-          
+
           <!-- LONG ROLE FORMS -->
           <term name="author">
             <single/>
@@ -54,4 +54,4 @@ Feature: Loading CSL Locales
     And the region should be "AT"
     And the attribute "version" should be "1.0"
     And the locale should should have 14 terms
-    And the plural of the term "reference" should be "Referenzen"
+    And the plural of the term "reference" should be "Referenzen"

data/features/parser/localized_dates.feature

@@ -1,35 +1,35 @@
 Feature: Parse CSL localized date elements
-	As a hacker of CSL styles
-	I want to be able to parse CSL localized date strings
-	
-	Scenario: A text date
-		When I parse the CSL string in the Locale scope
-			"""
-			<date form="text">
-		    <date-part name="month" suffix=" "/>
-		    <date-part name="day" form="numeric-leading-zeros" suffix=", "/>
-		    <date-part name="year"/>
-		  </date>
-			"""
-		Then the nodename should be "date"
-		And the attribute "form" should be "text"
-		And the node should have 3 parts
-		And text? should be "true"
-		And the part number 1 should have the attribute "name" set to "month"
+  As a hacker of CSL styles
+  I want to be able to parse CSL localized date strings
+
+  Scenario: A text date
+    When I parse the CSL string in the Locale scope
+      """
+      <date form="text">
+        <date-part name="month" suffix=" "/>
+        <date-part name="day" form="numeric-leading-zeros" suffix=", "/>
+        <date-part name="year"/>
+      </date>
+      """
+    Then the nodename should be "date"
+    And the attribute "form" should be "text"
+    And the node should have 3 parts
+    And text? should be "true"
+    And the part number 1 should have the attribute "name" set to "month"
+
+  Scenario: A numeric date
+    When I parse the CSL string in the Locale scope
+      """
+      <date form="numeric">
+        <date-part name="month" form="numeric-leading-zeros" suffix="/"/>
+        <date-part name="day" form="numeric-leading-zeros" suffix="/"/>
+        <date-part name="year"/>
+      </date>
+      """
+    Then the nodename should be "date"
+    And the attribute "form" should be "numeric"
+    And the node should have 3 parts
+    And text? should be "false"
+    And numeric? should be "true"
+    And the part number 3 should have the attribute "name" set to "year"
 
-	Scenario: A numeric date
-		When I parse the CSL string in the Locale scope
-			"""
-		  <date form="numeric">
-		    <date-part name="month" form="numeric-leading-zeros" suffix="/"/>
-		    <date-part name="day" form="numeric-leading-zeros" suffix="/"/>
-		    <date-part name="year"/>
-		  </date>
-			"""
-		Then the nodename should be "date"
-		And the attribute "form" should be "numeric"
-		And the node should have 3 parts
-		And text? should be "false"
-		And numeric? should be "true"
-		And the part number 3 should have the attribute "name" set to "year"
-	

data/features/parser/terms.feature

@@ -1,7 +1,7 @@
 Feature: Parse CSL localized terms
   As a hacker of CSL styles
   I want to be able to parse CSL localized terms
-  
+
   Scenario: A few standard terms
     When I parse the CSL string
       """

data/features/style/loading.feature

@@ -8,41 +8,41 @@ Feature: Loading CSL Style
       <?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="never">
         <info>
-        	<title>American Psychological Association 6th Edition</title>
-        	<id>http://www.zotero.org/styles/apa</id>
-        	<link href="http://www.zotero.org/styles/apa" rel="self"/>
-        	<link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
-        	<author>
-        	  <name>Simon Kornblith</name>
-        	  <email>simon@simonster.com</email>
-        	</author>
-        	<contributor>
-        	  <name>Bruce D'Arcus</name>
-        	</contributor>
-        	<contributor>
-        	  <name>Curtis M. Humphrey</name>
-        	</contributor>
-        	<contributor>
-        	  <name>Richard Karnesky</name>
-        	  <email>karnesky+zotero@gmail.com</email>
-        	  <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-        	</contributor>
-        	<contributor>
-        	  <name>Sebastian Karcher</name>
-        	</contributor>
-        	<category field="psychology"/>
-        	<category field="generic-base"/>
-        	<category citation-format="author-date"/>
-        	<updated>2010-01-27T20:08:03+00:00</updated>
-        	<rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+          <title>American Psychological Association 6th Edition</title>
+          <id>http://www.zotero.org/styles/apa</id>
+          <link href="http://www.zotero.org/styles/apa" rel="self"/>
+          <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
+          <author>
+            <name>Simon Kornblith</name>
+            <email>simon@simonster.com</email>
+          </author>
+          <contributor>
+            <name>Bruce D'Arcus</name>
+          </contributor>
+          <contributor>
+            <name>Curtis M. Humphrey</name>
+          </contributor>
+          <contributor>
+            <name>Richard Karnesky</name>
+            <email>karnesky+zotero@gmail.com</email>
+            <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
+          </contributor>
+          <contributor>
+            <name>Sebastian Karcher</name>
+          </contributor>
+          <category field="psychology"/>
+          <category field="generic-base"/>
+          <category citation-format="author-date"/>
+          <updated>2010-01-27T20:08:03+00:00</updated>
+          <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
         </info>
         <locale xml:lang="en">
-      	<terms>
-      	  <term name="translator" form="short">
-      		<single>trans.</single>
-      		<multiple>trans.</multiple>
-      	  </term>
-      	</terms>
+        <terms>
+          <term name="translator" form="short">
+          <single>trans.</single>
+          <multiple>trans.</multiple>
+          </term>
+        </terms>
         </locale>
       </style>
       """

data/lib/csl/locale.rb

@@ -101,13 +101,13 @@ module CSL
     def initialize(*arguments)
       case arguments.length
       when 0
-        locale, attributes, options = Locale.default, {}, nil
+        locale, attributes, options = nil, {}, nil
       when 1
         if arguments[0].is_a?(Hash)
           arguments[0] = arguments[0].symbolize_keys
 
           locale = arguments[0].delete(:lang) ||
-            arguments[0].delete(:'xml:lang') || Locale.default
+            arguments[0].delete(:'xml:lang')
 
           attributes, options = arguments
         else
@@ -371,6 +371,17 @@ module CSL
       language && language == Locale.languages[region]
     end
 
+    def like?(other)
+      return false unless other.is_a? Locale
+      return true  if universal? || other.universal?
+
+      language == other.language
+    end
+
+    def universal?
+      language.nil?
+    end
+
     def validate
       Schema.validate self
     end
@@ -389,6 +400,7 @@ module CSL
       others.each do |other|
         merge_options other
         merge_dates other
+        merge_terms other
       end
 
       self
@@ -485,6 +497,16 @@ module CSL
 
       self
     end
+
+    def merge_terms(other)
+      return self unless other.has_terms?
+
+      other.each_term do |term|
+        store term.deep_copy
+      end
+
+      self
+    end
   end
 
 end

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL
-  VERSION = '1.3.2'.freeze
+  VERSION = '1.4.0'.freeze
 end

data/spec/csl/locale_spec.rb

@@ -48,12 +48,12 @@ module CSL
     describe '.new' do
       it { is_expected.not_to be_nil }
 
-      it 'defaults to default language' do
-        expect(Locale.new.language).to eq(Locale.default.split(/-/)[0].to_sym)
+      it 'has no language' do
+        expect(Locale.new.language).to be_nil
       end
 
-      it 'defaults to default region' do
-        expect(Locale.new.region).to eq(Locale.default.split(/-/)[1].to_sym)
+      it 'has no region' do
+        expect(Locale.new.region).to be_nil
       end
 
       it 'contains no dates by default' do
@@ -87,6 +87,12 @@ module CSL
 
     end
 
+    describe '.parse' do
+      it 'does not set a default language' do
+        expect(Locale.parse('<locale/>').language).to be_nil
+      end
+    end
+
     describe '#set' do
 
       it 'when passed "en-GB" sets language to :en and region to :GB' do
@@ -149,6 +155,29 @@ module CSL
           expect(locale).to have_dates
         end
       end
+
+      describe 'terms' do
+        let(:us) { Locale.load('en-US') }
+
+        it 'does not change the terms if none are set on either locale' do
+          expect { locale.merge!(Locale.new) }.not_to change { locale.terms.to_s }
+        end
+
+        it 'overrides terms with those of the other locale' do
+          expect(locale).not_to have_terms
+
+          locale.merge! us
+          expect(locale).to have_terms
+        end
+
+        it 'makes copies of the terms' do
+          locale.merge! us
+          expect(locale).to have_terms
+
+          expect(locale.terms.first).to eq(us.terms.first)
+          expect(locale.terms.first).not_to be(us.terms.first)
+        end
+      end
     end
 
     describe '#legacy?' do

data/spec/csl/style_spec.rb

@@ -2,30 +2,28 @@ require 'spec_helper'
 
 module CSL
   describe Style do
-    before do
-      @style = Style.new
-    end
+    let(:style) { Style.new }
 
     it 'has a 1.x version by default' do
-      expect(@style[:version]).to match(/1\.\d+(\.\d+)?/)
+      expect(style[:version]).to match(/1\.\d+(\.\d+)?/)
     end
 
     it 'has the default version' do
-      expect(@style.default_attribute?(:version)).to be_truthy
+      expect(style.default_attribute?(:version)).to be_truthy
     end
 
     it 'has a the default namespace attribute' do
-      expect(@style[:xmlns]).to eq(CSL::Schema.namespace)
-      expect(@style.default_attribute?(:xmlns)).to be_truthy
+      expect(style[:xmlns]).to eq(CSL::Schema.namespace)
+      expect(style.default_attribute?(:xmlns)).to be_truthy
     end
 
     describe '#to_xml' do
       it 'returns an empty style' do
-        expect(@style.to_xml).to match(/^<style[^>]*\/>/)
+        expect(style.to_xml).to match(/^<style[^>]*\/>/)
       end
 
       it 'includes the xml namespace' do
-        expect(@style.to_xml).to match(CSL::Schema.namespace)
+        expect(style.to_xml).to match(CSL::Schema.namespace)
       end
 
       it 'supports round-trip for apa style' do
@@ -62,52 +60,52 @@ module CSL
       it { is_expected.not_to have_bibliography }
 
       describe 'when it has a title' do
-        before { @style.title = 'foo' }
+        before { style.title = 'foo' }
 
-        it { expect(@style).to have_info }
+        it { expect(style).to have_info }
 
         it 'info.title is a text node' do
-          expect(@style.info.title).to be_a(TextNode)
+          expect(style.info.title).to be_a(TextNode)
         end
 
         it '#title returns the title as a string' do
-          expect(@style.title).to be_a(String)
+          expect(style.title).to be_a(String)
         end
       end
     end
 
     describe '#id accessor' do
       it 'returns nil by default' do
-        expect(@style.id).to be_nil
+        expect(style.id).to be_nil
       end
 
       it 'writer sets the id to the passed-in string' do
-        expect { @style.id = 'foobar' }.to change { @style.id }.from(nil).to('foobar')
+        expect { style.id = 'foobar' }.to change { style.id }.from(nil).to('foobar')
       end
     end
 
     describe 'independent and dependent styles' do
       it 'styles are independent by default' do
-        expect(@style).to be_independent
+        expect(style).to be_independent
       end
 
       it 'styles do not have independent-parent links by default' do
-        expect(@style).not_to have_independent_parent_link
+        expect(style).not_to have_independent_parent_link
       end
 
       it 'when setting an independet-parent link a style becomes dependent' do
-        expect { @style.independent_parent_link = 'foo' }.to change { @style.independent? }
+        expect { style.independent_parent_link = 'foo' }.to change { style.independent? }
       end
 
       it 'looks up independent styles parents locally first' do
-        @style.independent_parent_link = 'http://example.com/non-existent/styles/apa'
-        expect(@style.independent_parent).to eq Style.load('apa')
+        style.independent_parent_link = 'http://example.com/non-existent/styles/apa'
+        expect(style.independent_parent).to eq Style.load('apa')
       end
     end
 
     describe 'macros' do
       it 'has no macros by default' do
-        expect(@style).not_to have_macros
+        expect(style).not_to have_macros
       end
 
       it 'raises a validation error when adding a macro without name' do
@@ -115,23 +113,23 @@ module CSL
       end
 
       describe 'when it has an "author" macro' do
-        before { @style << Style::Macro.new(:name => 'author') }
+        before { style << Style::Macro.new(:name => 'author') }
 
         it 'has macros' do
-          expect(@style).to have_macros
+          expect(style).to have_macros
         end
 
         it 'the macro is registered in the macros hash' do
-          expect(@style.macros).to have_key('author')
-          expect(@style.macros['author']).to be_a(Style::Macro)
+          expect(style.macros).to have_key('author')
+          expect(style.macros['author']).to be_a(Style::Macro)
         end
 
         it 'raises a validation error when adding a macro with a duplicate name' do
-          expect { @style << Style::Macro.new(:name => 'author') }.to raise_error(ValidationError)
+          expect { style << Style::Macro.new(:name => 'author') }.to raise_error(ValidationError)
         end
 
         it 'unregisters the macro when it is deleted' do
-          expect { @style.delete @style.macros['author'] }.to change { @style.macros.length }
+          expect { style.delete style.macros['author'] }.to change { style.macros.length }
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae