citeproc-ruby 0.0.5 → 0.0.6

data/lib/citeproc/processor.rb

@@ -159,7 +159,7 @@ module CiteProc
     end
     
     def new_self_recording_hash
-      Hash.new { |h,k| h[k] = Hash.new { |h,k| h[k] = k } }
+      Hash.new { |hash, key| hash[key] = Hash.new { |h,k| h[k] = k } }
     end
   end
   

data/lib/citeproc/version.rb

@@ -1,3 +1,3 @@
 module CiteProc
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.6'.freeze
 end

data/lib/csl/nodes.rb

@@ -178,7 +178,7 @@ module CSL
         
         unless processor.nil?
           yield processor.locale.send(type) 
-          yield CSL::Locale.new(processor.language)
+          yield CSL::Locale.new(processor.language).send(type)
         end
         
         CSL.default_locale.send(type)[key]
@@ -575,8 +575,8 @@ module CSL
         
         year = date.year.abs.to_s
         year = year[-2..-1] if form == 'short'
-        year = [year, localized_terms('ad')].join if date.ad?
-        year = [year, localized_terms('bc')].join if date.bc?
+        year = [year, localized_terms('ad', processor)].join if date.ad?
+        year = [year, localized_terms('bc', processor)].join if date.bc?
         year
       end
       
@@ -666,7 +666,7 @@ module CSL
       def process(data, processor)
         number = data[variable]
    
-        term = localized_terms(variable)
+        term = localized_terms(variable, processor)
         attributes['gender-form'] = term.gender if term.has_gender?
         
         case
@@ -843,7 +843,7 @@ module CSL
       # name in the list.
       def ampersand(processor)
         if self.and?
-          ampersand = self.and == 'symbol' ? '&' : localized_terms(self.and == 'text' ? 'and' : self.and).to_s(attributes)
+          ampersand = self.and == 'symbol' ? '&' : localized_terms(self.and == 'text' ? 'and' : self.and, processor).to_s(attributes)
           delimiter_precedes_last? ? [delimiter, ampersand, ' '].join : ampersand.center(ampersand.length + 2)
         else
           delimiter
@@ -902,8 +902,7 @@ module CSL
       attr_accessor :parent
 
       def process(data, processor)
-        super
-        localized_terms(term ||  'et-al').to_s(attributes)
+        localized_terms(term ||  'et-al', processor).to_s(attributes)
       rescue Exception => e
         handle_processing_error(e, data, processor)        
       end
@@ -937,13 +936,13 @@ module CSL
       attr_fields %w{ variable plural form }
     
       def process(data, processor)
-        localized_terms(data['label'].to_s).to_s(attributes.merge({ 'plural' =>  plural?(data, 0).to_s }))
+        localized_terms(data['label'].to_s, processor).to_s(attributes.merge({ 'plural' =>  plural?(data, 0).to_s }))
       rescue Exception => e
         handle_processing_error(e, data, processor)        
       end
     
       def process_names(role, number, processor)
-        localized_terms(role).to_s(attributes.merge({ 'plural' => plural?(nil, number).to_s }))        
+        localized_terms(role, processor).to_s(attributes.merge({ 'plural' => plural?(nil, number).to_s }))        
       rescue Exception => e
         handle_processing_error(e, data, processor)        
       end
@@ -996,6 +995,8 @@ module CSL
         
       def process(data, processor)
         super
+				start_observing(data)
+				
         children.each do |child|
           processed = child.process(data, processor)
           return processed unless processed.empty?
@@ -1003,8 +1004,26 @@ module CSL
         ''
       rescue Exception => e
         handle_processing_error(e, data, processor)        
+			ensure
+				stop_observing(data)
       end
     
+			def start_observing(item)
+				@item = item
+        item.add_observer(self)
+      end
+      
+      def stop_observing(item)
+        item.delete_observer(self)
+			ensure
+				@item = nil
+      end
+      
+      def update(key, value)
+				if key.to_s =~ /author|editor|translator/ && !value.nil?
+					@item[key] = nil
+				end
+      end
     end
 
     # The cs:names element can be used to display the contents of one or more
@@ -1077,7 +1096,7 @@ module CSL
             
               if names.length > truncated.length
                 # use delimiter before et al. if there is more than a single name; squeeze whitespace
-                others = (et_al.nil? ? localized_terms('et-al').to_s : et_al.process(data, processor))
+                others = (et_al.nil? ? localized_terms('et-al', processor).to_s : et_al.process(data, processor))
                 link = (name.et_al_use_first.to_i > 1 || name.delimiter_precedes_et_al? ? name.delimiter : ' ')
 
                 processed << [link, others].join.squeeze(' ')
@@ -1108,7 +1127,7 @@ module CSL
       # followed by the list proper.
       def collect_names(item)
         return [] unless self.variable?
-        self.variable.split(/\s+/).map { |variable| [variable, (item[variable] || []).map(&:clone)] }
+        self.variable.split(/\s+/).map { |variable| [variable, (item[variable] || []).map(&:clone)] }.reject { |(_, n)| n.empty? }
       end
     
       def inherit_attributes(node)

data/spec/citeproc/citeproc_spec.rb

@@ -37,6 +37,10 @@ module CiteProc
           proc.import(fixture['input'])
           proc.format = :html
 
+          if tokens[1] =~ /LocalizedDateFormats-([\w-]+)/
+            proc.locale = $1
+          end
+            
           proc.add_abbreviations(fixture['abbreviations']) if fixture['abbreviations']
       
           case fixture['mode']

data/spec/citeproc/processor_spec.rb

@@ -13,8 +13,8 @@ module CiteProc
       end
       
       it 'returns a formatted citation' do
-        Processor.process(item, :mode => :citation, :style => :apa).should == '(Poe, 1996)'
-        Processor.process(item, :mode => :citation, :style => :mla).should == '(Poe)'
+        Processor.process(item, :mode => :citation, :style => :apa)[0].should == '(Poe, 1996)'
+        Processor.process(item, :mode => :citation, :style => :mla)[0].should == '(Poe)'
       end
 
       it 'returns a formatted bibliographic entry' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: citeproc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &70124942643240 !ruby/object:Gem::Requirement
+  requirement: &70271244355620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70124942643240
+  version_requirements: *70271244355620
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70124942640860 !ruby/object:Gem::Requirement
+  requirement: &70271244354860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70124942640860
+  version_requirements: *70271244354860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70124942654240 !ruby/object:Gem::Requirement
+  requirement: &70271244353520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70124942654240
+  version_requirements: *70271244353520
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70124942651940 !ruby/object:Gem::Requirement
+  requirement: &70271244370300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124942651940
+  version_requirements: *70271244370300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70124942650180 !ruby/object:Gem::Requirement
+  requirement: &70271244368520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70124942650180
+  version_requirements: *70271244368520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70124942648420 !ruby/object:Gem::Requirement
+  requirement: &70271244366160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70124942648420
+  version_requirements: *70271244366160
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70124942672100 !ruby/object:Gem::Requirement
+  requirement: &70271244364740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70124942672100
+  version_requirements: *70271244364740
 description: A CSL (Citation Style Language) Processor
 email:
 - http://sylvester.keil.or.at