csl 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b21430641829a22f55906ab8297b87e430152ae9
-  data.tar.gz: 09ac43ef5066e3357f15a32617a151adfec1e833
+  metadata.gz: 9a40d05b869d0449dfa44789ebb566a7982370c4
+  data.tar.gz: 250321443eee09d877016c6294f3ee4394764161
 SHA512:
-  metadata.gz: 73c5b22e998780e1cd5fc9bf5b2070065df192065533cf975b7afcad3a35b33a8286ce72bd8525be0cff61b0411d8d6046547bd168e23291b794095e7bd35b22
-  data.tar.gz: 76ea3c044d2b599dda2d588ba285a951b82fc1a531afe0778a0ecf44fc854eb7ff81154880cfbb5b89d0337ca9072a57d5f687ac8beecf61cd4f4177aa4e2fbb
+  metadata.gz: 42cebdb43391419a9aa21e5e1c711de3b6a2d77afc5d0353d696dcadb2ddb60ff6f3e2098e02a8ee4e9ab160febd0d62346c6aeb0cb330facf73de0e1482463b
+  data.tar.gz: a7df94ba34b1edde8ea787779c9779b35efad66fffebdaf6384f42c63bead587cd13fac6aeba5da0421bc1f9449acf4552bb27a1b58a9b3d400b588286d60d3f

data/lib/csl/locale.rb

@@ -347,7 +347,11 @@ module CSL
     # block is given, an enumerator is returned instead.
     def each_date
       if block_given?
-        date.each(&Proc.new)
+        if date.is_a? CSL::Node
+          yield date
+        else
+          date.each(&Proc.new)
+        end
       else
         enum_for :each_date
       end
@@ -485,7 +489,7 @@ module CSL
 
       if has_dates?
         other.each_date do |date|
-          delete_children each_date.select { |d| d[:form] == date[:form] }
+          delete_children(*each_date.select { |d| d[:form] == date[:form] })
           add_child date.deep_copy
         end
       else

data/lib/csl/treelike.rb

@@ -388,7 +388,7 @@ module CSL
           def empty?
             all?(&:nil?)
           end
-          
+
           def select(&block)
             each.select(&block)
           end

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL
-  VERSION = '1.4.2'.freeze
+  VERSION = '1.4.3'.freeze
 end

data/spec/csl/locale/date_spec.rb

@@ -3,24 +3,24 @@ require 'spec_helper'
 module CSL
 
   describe Locale::Date do
-  
+
     let(:date) { Locale::Date.new }
-    
+
     it { is_expected.not_to be_nil }
-    
+
     it { is_expected.to be_text }
     it { is_expected.not_to be_numeric }
-  
+
     describe '#parts' do
-      
+
       it 'returns nil by default' do
         expect(date.parts).to be_empty
       end
-      
+
     end
-    
+
     describe '#to_xml' do
-      
+
       it 'returns <date/> by default' do
         expect(Locale::Date.new.to_xml).to eq('<date/>')
       end
@@ -28,36 +28,36 @@ module CSL
       it 'returns <date form="numeric"/> for an empty numeric date' do
         expect(Locale::Date.new(:form => 'numeric').to_xml).to eq('<date form="numeric"/>')
       end
-      
+
     end
-    
+
   end
 
   describe Locale::DatePart do
 
     it { is_expected.not_to be_nil }
-    
+
     it { is_expected.not_to be_day }
     it { is_expected.not_to be_month }
     it { is_expected.not_to be_year }
-  
+
     describe '#to_xml' do
-      
+
       it 'returns <date-part/> by default' do
         expect(Locale::DatePart.new.to_xml).to eq("<date-part/>")
       end
-      
+
       it 'returns <date-part name="year"/> when the name is "year"' do
         expect(Locale::DatePart.new(:name => 'year').to_xml).to eq('<date-part name="year"/>')
       end
-      
+
       it 'returns <date-part name="month" form="numeric" prefix="-"/> for a numeric month with prefix "-"' do
         expect(Locale::DatePart.new(:name => 'month', :form => 'numeric', :prefix => '-').to_xml).to match(/(\s(name|form|prefix)="[^"]+"){3}/)
       end
-      
+
     end
-    
+
   end
 
 
-end
+end

data/spec/csl/locale_spec.rb

@@ -154,6 +154,15 @@ module CSL
           locale.merge!(Locale.load('en-US'))
           expect(locale).to have_dates
         end
+
+        it 'merges dates of both locales' do
+          locale << Locale::Date.new(:form => 'numeric')
+
+          other = Locale.load('en-US')
+          locale.merge! other
+
+          expect(locale.dates.length).to eq(other.dates.length)
+        end
       end
 
       describe 'terms' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-16 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: A Ruby CSL parser and library